Merge branch 'odoo-backup' of https://bitbucket.org/altafixco/indoteknik-addons into magento-solr-v1

2 files changed, 5 insertions, 1 deletions

diff --git a/indoteknik_custom/models/commision.py b/indoteknik_custom/models/commision.py
index 441dd54f..983c07fe 100644
--- a/indoteknik_custom/models/commision.py
+++ b/indoteknik_custom/models/commision.py
@@ -489,7 +489,10 @@ class CustomerCommision(models.Model):
             raise UserError('Line sudah ada, tidak bisa di generate ulang')
 
         if self.commision_type == 'fee':
-            self._generate_customer_commision_fee()
+            if self.brand_ids:
+                self._generate_customer_commision_rebate()
+            else:
+                self._generate_customer_commision_fee()
         else:
             self._generate_customer_commision_rebate()
 
diff --git a/indoteknik_custom/models/product_public_category.py b/indoteknik_custom/models/product_public_category.py
index 1039ec52..dadcb181 100755
--- a/indoteknik_custom/models/product_public_category.py
+++ b/indoteknik_custom/models/product_public_category.py
@@ -15,6 +15,7 @@ class ProductPublicCategory(models.Model):
     child_frontend_id = fields.One2many('product.public.category', 'parent_frontend_id', string='Children Frontend Categories')
     child_frontend_id2 = fields.Many2many('product.public.category', relation='website_categories_child_frontend_rel', column1='website_categories_homepage_id', column2='product_public_category_id', string='Category Level 3')
     sequence_frontend = fields.Integer(help="Gives the sequence order when displaying a list of product categories.", index=True)
+    short_desc = fields.Char(string='Short Description')
 
     # @api.model
     # def _onchange_child_frontend_id2(self, parent):