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

# Conflicts:
#	indoteknik_custom/models/purchase_order.py
#	indoteknik_custom/security/ir.model.access.csv

1 files changed, 23 insertions, 21 deletions

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 19a22cec..2b064042 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -157,7 +157,7 @@ class SaleOrder(models.Model):
     total_margin_excl_third_party = fields.Float('Before Margin', help="Before Margin in Sales Order Header")
 
     approval_status = fields.Selection([
-        ('pengajuan0', 'Approval Team Sales'),
+        ('pengajuan0', 'Approval Leader Team Sales'),
         ('pengajuan1', 'Approval Manager'),
         ('pengajuan2', 'Approval Pimpinan'),
         ('approved', 'Approved'),
@@ -2627,12 +2627,15 @@ class SaleOrder(models.Model):
                 self.check_credit_limit()
                 self.check_limit_so_to_invoice()
                 order.approval_status = 'pengajuan0'
-                order.message_post(body="Mengajukan approval ke Team Sales_")
+                order.message_post(body="Mengajukan approval ke Leader Team Sales_")
+                return self._create_approval_notification('Team Sales')
+            elif order._requires_approval_team_sales():
+                self.check_product_bom()
+                self.check_credit_limit()
+                self.check_limit_so_to_invoice()
+                order.approval_status = 'pengajuan0'
+                order.message_post(body="Mengajukan approval ke Leader Team Sales")
                 return self._create_approval_notification('Team Sales')
-            elif order._requires_approval_margin_leader():
-                order.approval_status = 'pengajuan2'
-                order.message_post(body="Mengajukan approval ke Pimpinan")
-                return self._create_approval_notification('Pimpinan')
             elif order._requires_approval_margin_manager():
                 self.check_product_bom()
                 self.check_credit_limit()
@@ -2640,13 +2643,11 @@ class SaleOrder(models.Model):
                 order.approval_status = 'pengajuan1'
                 order.message_post(body="Mengajukan approval ke Sales Manager")
                 return self._create_approval_notification('Sales Manager')
-            elif order._requires_approval_team_sales():
-                self.check_product_bom()
-                self.check_credit_limit()
-                self.check_limit_so_to_invoice()
-                order.approval_status = 'pengajuan0'
-                order.message_post(body="Mengajukan approval ke Team Sales")
-                return self._create_approval_notification('Team Sales')
+            elif order._requires_approval_margin_leader():
+                order.approval_status = 'pengajuan2'
+                order.message_post(body="Mengajukan approval ke Pimpinan")
+                return self._create_approval_notification('Pimpinan')
+
             # elif value_trigger:
             #     self.check_product_bom()
             #     self.check_credit_limit()
@@ -2921,18 +2922,19 @@ class SaleOrder(models.Model):
             value_trigger = order._requires_approval_by_value()
             if value_trigger:
                 order.approval_status = 'pengajuan0'
-                order.message_post(body="Mengajukan approval ke Team Sales")
+                order.message_post(body="Mengajukan approval ke Leader Team Sales")
                 return self._create_approval_notification('Team Sales')
-            elif order._requires_approval_margin_leader():
-                order.approval_status = 'pengajuan2'
-                return self._create_approval_notification('Pimpinan')
-            elif order._requires_approval_margin_manager():
-                order.approval_status = 'pengajuan1'
-                return self._create_approval_notification('Sales Manager')
             elif value_trigger or order._requires_approval_team_sales():
                 order.approval_status = 'pengajuan0'
-                order.message_post(body="Mengajukan approval ke Team Sales")
+                order.message_post(body="Mengajukan approval ke Leader Team Sales")
                 return self._create_approval_notification('Team Sales')
+            elif order._requires_approval_margin_manager():
+                order.approval_status = 'pengajuan1'
+                return self._create_approval_notification('Sales Manager')
+            elif order._requires_approval_margin_leader():
+                order.approval_status = 'pengajuan2'
+                return self._create_approval_notification('Pimpinan')
+
             # elif value_trigger:
             #     order.approval_status = 'pengajuan0'
             #     order.message_post(body="Mengajukan approval ke Team Sales (Total SO > 50jt)")