fix merge conflicts

2016-01-16 19:11:01 +01:00
parent c27ca44a5b a782232ad8
commit 272d2d4f8a
11 changed files with 65 additions and 31 deletions
--- a/common/models/Product.php
+++ b/common/models/Product.php
@@ -46,6 +46,7 @@ class Product extends \common\models\BaseFitnessActiveRecord {
            [['id_product_category', 'id_account', 'name'], 'required'],
            [['id_product_category', 'id_account', 'purchase_price', 'sale_price', 'profit_margins', 'status'], 'integer'],
            [['product_number', 'barcode'], 'string', 'max' => 20],
+        	[['product_number', 'barcode'], 'filter', 'filter' => 'trim', 'skipOnArray' => true],
            [['name'], 'string', 'max' => 128],
            [['description'], 'string', 'max' => 255],
 //             [['product_number'], 'unique' ],