[UPDT] Workflow updated

multi_branch_base/models/branch_product_template.py

@@ -28,8 +28,9 @@ class ProductTemplate(models.Model):
     _inherit = 'product.template'
 
     branch_id = fields.Many2one("res.branch", string='Branch', store=True,
-                                readonly=False,
-                                compute="_compute_branch")
+                                help='Leave this field empty if this product is'
+                                     ' shared between all branches'
+                                )
     allowed_branch_ids = fields.Many2many('res.branch', store=True,
                                           string="Allowed Branches",
                                           compute='_compute_allowed_branch_ids')
@@ -38,16 +39,3 @@ class ProductTemplate(models.Model):
     def _compute_allowed_branch_ids(self):
         for po in self:
             po.allowed_branch_ids = self.env.user.branch_ids.ids
-
-    @api.depends('company_id')
-    def _compute_branch(self):
-        for order in self:
-            company = self.env.company
-            so_company = order.company_id if order.company_id else self.env.company
-            branch_ids = self.env.user.branch_ids
-            branch = branch_ids.filtered(
-                lambda branch: branch.company_id == so_company)
-            if branch:
-                order.branch_id = branch.ids[0]
-            else:
-                order.branch_id = False

multi_branch_base/models/branch_res_partner.py

@@ -28,10 +28,11 @@ class BranchPartner(models.Model):
     _inherit = "res.partner"
 
     branch_id = fields.Many2one("res.branch", string='Branch', store=True,
-                                readonly=False,
-                                compute="_compute_branch")
+                                help='Leave this field empty if the partner is'
+                                     ' shared between all branches'
+                                )
     allowed_branch_ids = fields.Many2many('res.branch', store=True,
-                                          string="Allowed Branches",
+                                          string="Branches",
                                           compute='_compute_allowed_branch_ids')
 
     @api.depends('company_id')
@@ -39,19 +40,6 @@ class BranchPartner(models.Model):
         for po in self:
             po.allowed_branch_ids = self.env.user.branch_ids.ids
 
-    @api.depends('company_id')
-    def _compute_branch(self):
-        for order in self:
-            company = self.env.company
-            so_company = order.company_id if order.company_id else self.env.company
-            branch_ids = self.env.user.branch_ids
-            branch = branch_ids.filtered(
-                lambda branch: branch.company_id == so_company)
-            if branch:
-                order.branch_id = branch.ids[0]
-            else:
-                order.branch_id = False
-
     @api.model
     def default_get(self, default_fields):
         """Add the company of the parent as default if we are creating a