[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,
+                                help='Leave this field empty if this product is'
-                                compute="_compute_branch")
+                                     ' 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,
+                                help='Leave this field empty if the partner is'
-                                compute="_compute_branch")
+                                     ' 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

multi_branch_base/static/description/index.html

@@ -26,11 +26,10 @@
             style="padding: 4rem 1rem !important; background-color: #714B67 !important; height: 600px !important; border-radius: 20px !important;">
             <h1
                 style="font-family: 'Montserrat', sans-serif !important; font-weight: 600 !important; color: #FFFFFF !important;  font-size: 3.5rem !important; text-align: center !important;">
-                Multi Branch Operations</h1>
+                Multi Branch Operations Setup for Odoo POS</h1>
             <p
                 style="font-family: 'Montserrat', sans-serif !important; font-weight: 300 !important; color: #FFFFFF !important;  font-size: 1.4rem !important; text-align: center !important;">
-                Multiple Branch Unit Operation Setup for All
+                Multi Branch Operations Setup for Odoo POS
-                   Modules In Odoo
             </p>
             <img src="./assets/screenshots/hero.png" class="img-responsive" width="100%" height="auto" />
         </div>
@@ -111,12 +110,13 @@
         <div class="col-mg-12 pl-3">
             <p
                 style="font-family: 'Roboto', sans-serif !important; font-weight: 400 !important; color: #282F33 !important; font-size: 1rem !important; line-height: 30px !important;">
-               Multi Branch module helps to manage the operations of multiple branches of a single company.
+                This module helps to control multiple branches of a single
-                You can manage multiple branches and all the operations of different branches of in the Inventory,
+                company on POS.Here a branch can be set for each POS.After
-                Accounting, Sales and Purchase applications by installing this single module.
+                configuring a branch for a POS, then thereafter all the
-                After installing the module, the administrator can create multiple branches for the company by providing the details from
+                operations related to the particular POS will be related with
-                Settings -> Users and Companies -> Branches. Allowed branches and default branch can be set for each user from
+                the branch. This module requires the base Branch module.After
-                Settings -> Users and Companies -> Users. Once it is configured, the user can access the all branches which are allowed for the particular user.
+                installing the base Branch module and POS Branch addon, the user
+                can implement the branch concept on Odoo POS.
             </p>
 
         </div>
@@ -138,7 +138,7 @@
                 <h4
                     style="font-family: 'Roboto', sans-serif !important; font-weight: 600 !important; color: #282F33 !important; font-size: 1.3rem !important;">
 
-                    Create Branches for the Company.</h4>
+                    Branch for POS.</h4>
 
             </div>
         </div>
@@ -151,7 +151,7 @@
                 <h4
                     style="font-family: 'Roboto', sans-serif !important; font-weight: 600 !important; color: #282F33 !important; font-size: 1.3rem !important;">
 
-                   Branch for User.</h4>
+                   Branch for POS Orders.</h4>
 
             </div>
         </div>
@@ -164,7 +164,7 @@
                 <h4
                     style="font-family: 'Roboto', sans-serif !important; font-weight: 600 !important; color: #282F33 !important; font-size: 1.3rem !important;">
 
-                    Branch on Product.</h4>
+                    Branch for POS Session .</h4>
 
             </div>
         </div>
@@ -177,7 +177,7 @@
                 <h4
                     style="font-family: 'Roboto', sans-serif !important; font-weight: 600 !important; color: #282F33 !important; font-size: 1.3rem !important;">
 
-                    Branch on Partner.</h4>
+                    Branch on Receipt.</h4>
 
             </div>
         </div>
@@ -190,137 +190,7 @@
                 <h4
                     style="font-family: 'Roboto', sans-serif !important; font-weight: 600 !important; color: #282F33 !important; font-size: 1.3rem !important;">
 
-                    Branch on Journal.</h4>
+                        Branch Wise Report.</h4>
-
-            </div>
-        </div>
-
-        <div class="col-md-6 pl-3 pt-3 d-flex">
-            <div>
-                <img src="assets/icons/check.png">
-            </div>
-            <div>
-                <h4
-                    style="font-family: 'Roboto', sans-serif !important; font-weight: 600 !important; color: #282F33 !important; font-size: 1.3rem !important;">
-
-                    Branch on Account.</h4>
-
-            </div>
-        </div>
-
-        <div class="col-md-6 pl-3 pt-3 d-flex">
-            <div>
-                <img src="assets/icons/check.png">
-            </div>
-            <div>
-                <h4
-                    style="font-family: 'Roboto', sans-serif !important; font-weight: 600 !important; color: #282F33 !important; font-size: 1.3rem !important;">
-
-                    Branch on Customer Vendor Payments.</h4>
-
-            </div>
-        </div>
-
-        <div class="col-md-6 pl-3 pt-3 d-flex">
-            <div>
-                <img src="assets/icons/check.png">
-            </div>
-            <div>
-                <h4
-                    style="font-family: 'Roboto', sans-serif !important; font-weight: 600 !important; color: #282F33 !important; font-size: 1.3rem !important;">
-
-                    Branch on Customer Invoice.</h4>
-
-            </div>
-        </div>
-
-        <div class="col-md-6 pl-3 pt-3 d-flex">
-            <div>
-                <img src="assets/icons/check.png">
-            </div>
-            <div>
-                <h4
-                    style="font-family: 'Roboto', sans-serif !important; font-weight: 600 !important; color: #282F33 !important; font-size: 1.3rem !important;">
-
-                    Branch on Vendor Bill.</h4>
-
-            </div>
-        </div>
-
-        <div class="col-md-6 pl-3 pt-3 d-flex">
-            <div>
-                <img src="assets/icons/check.png">
-            </div>
-            <div>
-                <h4
-                    style="font-family: 'Roboto', sans-serif !important; font-weight: 600 !important; color: #282F33 !important; font-size: 1.3rem !important;">
-
-                    Branch on Warehouse.</h4>
-
-            </div>
-        </div>
-
-        <div class="col-md-6 pl-3 pt-3 d-flex">
-            <div>
-                <img src="assets/icons/check.png">
-            </div>
-            <div>
-                <h4
-                    style="font-family: 'Roboto', sans-serif !important; font-weight: 600 !important; color: #282F33 !important; font-size: 1.3rem !important;">
-
-                    Branch on Operation Types.</h4>
-
-            </div>
-        </div>
-
-        <div class="col-md-6 pl-3 pt-3 d-flex">
-            <div>
-                <img src="assets/icons/check.png">
-            </div>
-            <div>
-                <h4
-                    style="font-family: 'Roboto', sans-serif !important; font-weight: 600 !important; color: #282F33 !important; font-size: 1.3rem !important;">
-
-                    Branch on transfer.</h4>
-
-            </div>
-        </div>
-
-        <div class="col-md-6 pl-3 pt-3 d-flex">
-            <div>
-                <img src="assets/icons/check.png">
-            </div>
-            <div>
-                <h4
-                    style="font-family: 'Roboto', sans-serif !important; font-weight: 600 !important; color: #282F33 !important; font-size: 1.3rem !important;">
-
-                    Branch on Sales flow.</h4>
-
-            </div>
-        </div>
-
-        <div class="col-md-6 pl-3 pt-3 d-flex">
-            <div>
-                <img src="assets/icons/check.png">
-            </div>
-            <div>
-                <h4
-                    style="font-family: 'Roboto', sans-serif !important; font-weight: 600 !important; color: #282F33 !important; font-size: 1.3rem !important;">
-
-                    Branch on Purchase flow.</h4>
-
-            </div>
-        </div>
-
-        <div class="col-md-6 pl-3 pt-3 d-flex">
-            <div>
-                <img src="assets/icons/check.png">
-            </div>
-            <div>
-                <h4
-                    style="font-family: 'Roboto', sans-serif !important; font-weight: 600 !important; color: #282F33 !important; font-size: 1.3rem !important;">
-
-                    Branch on Reports.</h4>
 
             </div>
         </div>
@@ -338,190 +208,62 @@
         <div class="col-lg-12 my-2">
             <h4 class="my-2"
                 style="font-family: 'Roboto', sans-serif !important; font-weight: 600 !important; color: #282F33 !important; font-size: 1.3rem !important;">
-                Branch Creation</h4>
+                Branch for POS</h4>
-            <p
-                style="font-family: 'Roboto', sans-serif !important; font-weight: 400 !important; color: #282F33 !important; font-size: 1rem !important;">
-                Administrator can create Branches for the
-                company from Settings -> Users & Companies -> Branches -> Create
-            </p>
-            <img src="assets/screenshots/mb01.png" class="img-responsive img-thumbnail border" width="100%"
-                height="auto" />
-        </div>
-
-        <div class="col-lg-12 my-2">
-            <h4 class="my-2"
-                style="font-family: 'Roboto', sans-serif !important; font-weight: 600 !important; color: #282F33 !important; font-size: 1.3rem !important;">
-                Allowed & Default Branch</h4>
-            <p
-                style="font-family: 'Roboto', sans-serif !important; font-weight: 400 !important; color: #282F33 !important; font-size: 1rem !important;">
-                 Allowed branches and default branch can be set for each user.
-                The showing Branches will be based on the allowed Companies
-                for the particular user
-            </p>
-            <img src="assets/screenshots/mb02.png" class="img-responsive img-thumbnail border" width="100%"
-                height="auto" />
-        </div>
-
-        <div class="col-lg-12 my-2">
-            <h4 class="my-2"
-                style="font-family: 'Roboto', sans-serif !important; font-weight: 600 !important; color: #282F33 !important; font-size: 1.3rem !important;">
-                Product</h4>
-            <p
-                style="font-family: 'Roboto', sans-serif !important; font-weight: 400 !important; color: #282F33 !important; font-size: 1rem !important;">
-                 Branch can be set for products.
-                If a product is shared between branches then it is suggested to
-                keep branch field as empty
-            </p>
-            <img src="assets/screenshots/mb03.png" class="img-responsive img-thumbnail border" width="100%"
-                height="auto" />
-        </div>
-
-        <div class="col-lg-12 my-2">
-            <h4 class="my-2"
-                style="font-family: 'Roboto', sans-serif !important; font-weight: 600 !important; color: #282F33 !important; font-size: 1.3rem !important;">
-                Partners</h4>
-            <p
-                style="font-family: 'Roboto', sans-serif !important; font-weight: 400 !important; color: #282F33 !important; font-size: 1rem !important;">
-                Branch can be set for partners
-            </p>
-            <img src="assets/screenshots/mb04.png" class="img-responsive img-thumbnail border" width="100%"
-                height="auto" />
-        </div>
-
-        <div class="col-lg-12 my-2">
-            <h4 class="my-2"
-                style="font-family: 'Roboto', sans-serif !important; font-weight: 600 !important; color: #282F33 !important; font-size: 1.3rem !important;">
-                Journal</h4>
-            <p
-                style="font-family: 'Roboto', sans-serif !important; font-weight: 400 !important; color: #282F33 !important; font-size: 1rem !important;">
-                Branch for Journals
-            </p>
-            <img src="assets/screenshots/mb05.png" class="img-responsive img-thumbnail border" width="100%"
-                height="auto" />
-        </div>
-
-        <div class="col-lg-12 my-2">
-            <h4 class="my-2"
-                style="font-family: 'Roboto', sans-serif !important; font-weight: 600 !important; color: #282F33 !important; font-size: 1.3rem !important;">
-                Chart of Accounts</h4>
-            <p
-                style="font-family: 'Roboto', sans-serif !important; font-weight: 400 !important; color: #282F33 !important; font-size: 1rem !important;">
-                Branch for Chart of Accounts
-            </p>
-            <img src="assets/screenshots/mb06.png" class="img-responsive img-thumbnail border" width="100%"
-                height="auto" />
-        </div>
-
-        <div class="col-lg-12 my-2">
-            <h4 class="my-2"
-                style="font-family: 'Roboto', sans-serif !important; font-weight: 600 !important; color: #282F33 !important; font-size: 1.3rem !important;">
-                Warehouse</h4>
             <p
                 style="font-family: 'Roboto', sans-serif !important; font-weight: 400 !important; color: #282F33 !important; font-size: 1rem !important;">
-                 Branch can be set for Warehouse
+                User can create POS and set a branch for the POS.
             </p>
-            <img src="assets/screenshots/mb07.png" class="img-responsive img-thumbnail border" width="100%"
+            <img src="assets/screenshots/pos1.png" class="img-responsive img-thumbnail border" width="100%"
                 height="auto" />
         </div>
 
         <div class="col-lg-12 my-2">
             <h4 class="my-2"
                 style="font-family: 'Roboto', sans-serif !important; font-weight: 600 !important; color: #282F33 !important; font-size: 1.3rem !important;">
-                Operation Types</h4>
+                Branch for POS Sessions</h4>
             <p
                 style="font-family: 'Roboto', sans-serif !important; font-weight: 400 !important; color: #282F33 !important; font-size: 1rem !important;">
-                 When a Warehouse is created the corresponding operation types for the
+                Branch is added for POS Sessions.This will be updated based on the branch set for POS.
-                    Warehouse will be automatically created.If the particular Warehouse
-                    have a Branch, then the same Branch will be set for the operation
-                    types too.
             </p>
-            <img src="assets/screenshots/mb08.png" class="img-responsive img-thumbnail border" width="100%"
+            <img src="assets/screenshots/pos2.png" class="img-responsive img-thumbnail border" width="100%"
                 height="auto" />
         </div>
 
         <div class="col-lg-12 my-2">
             <h4 class="my-2"
                 style="font-family: 'Roboto', sans-serif !important; font-weight: 600 !important; color: #282F33 !important; font-size: 1.3rem !important;">
-                Purchase Order</h4>
+                Branch for POS Order</h4>
             <p
                 style="font-family: 'Roboto', sans-serif !important; font-weight: 400 !important; color: #282F33 !important; font-size: 1rem !important;">
-                For the newly created PO branch will be set based on the user.
+                For every POS order created Branch is registered.This will be the same branch set for the POS.
             </p>
-            <img src="assets/screenshots/mb09.png" class="img-responsive img-thumbnail border" width="100%"
+            <img src="assets/screenshots/pos3.png" class="img-responsive img-thumbnail border" width="100%"
                 height="auto" />
         </div>
 
         <div class="col-lg-12 my-2">
             <h4 class="my-2"
                 style="font-family: 'Roboto', sans-serif !important; font-weight: 600 !important; color: #282F33 !important; font-size: 1.3rem !important;">
-                Receipt</h4>
+                Branch on Receipt</h4>
             <p
                 style="font-family: 'Roboto', sans-serif !important; font-weight: 400 !important; color: #282F33 !important; font-size: 1rem !important;">
-                The receipt will be created once PO is confirmed.Here Destination Location and Branch will be set based on the Purchase Order Branch.
+                Branch is shown in the Receipt
-
             </p>
-            <img src="assets/screenshots/mb10.png" class="img-responsive img-thumbnail border" width="100%"
+            <img src="assets/screenshots/pos4.png" class="img-responsive img-thumbnail border" width="100%"
                 height="auto" />
         </div>
 
         <div class="col-lg-12 my-2">
             <h4 class="my-2"
                 style="font-family: 'Roboto', sans-serif !important; font-weight: 600 !important; color: #282F33 !important; font-size: 1.3rem !important;">
-                Bill</h4>
+                Branch wise report</h4>
             <p
                 style="font-family: 'Roboto', sans-serif !important; font-weight: 400 !important; color: #282F33 !important; font-size: 1rem !important;">
-                After validating the Receipt Vendor Bill can be created from the PO.For the created Bill Branch will be set as the branch selected for the PO
+                Branch wise POS Order report can be achieved.
-                and Journal will be set accordingly.
-
             </p>
-            <img src="assets/screenshots/mb11.png" class="img-responsive img-thumbnail border" width="100%"
+            <img src="assets/screenshots/pos5.png" class="img-responsive img-thumbnail border" width="100%"
                 height="auto" />
         </div>
-
-        <div class="col-lg-12 my-2">
-            <h4 class="my-2"
-                style="font-family: 'Roboto', sans-serif !important; font-weight: 600 !important; color: #282F33 !important; font-size: 1.3rem !important;">
-                Sale Order</h4>
-            <p
-                style="font-family: 'Roboto', sans-serif !important; font-weight: 400 !important; color: #282F33 !important; font-size: 1rem !important;">
-                On creating a new quotation/sale order the default branch set for
-                the user is set as the branch for the same if only one branch is allowed for the user.The warehouse used will
-                be the warehouse of the same branch.
-            </p>
-            <img src="assets/screenshots/mb12.png" class="img-responsive img-thumbnail border" width="100%"
-                height="auto" />
-        </div>
-
-        <div class="col-lg-12 my-2">
-            <h4 class="my-2"
-                style="font-family: 'Roboto', sans-serif !important; font-weight: 600 !important; color: #282F33 !important; font-size: 1.3rem !important;">
-                Delivery Order</h4>
-            <p
-                style="font-family: 'Roboto', sans-serif !important; font-weight: 400 !important; color: #282F33 !important; font-size: 1rem !important;">
-                On confirming a sale order the corresponding delivery order will be
-                created.The branch selected for the sale order will be populated as
-                the branch for the delivery order.Also the source location is
-                set accordingly.
-            </p>
-            <img src="assets/screenshots/mb13.png" class="img-responsive img-thumbnail border" width="100%"
-                height="auto" />
-        </div>
-
-        <div class="col-lg-12 my-2">
-            <h4 class="my-2"
-                style="font-family: 'Roboto', sans-serif !important; font-weight: 600 !important; color: #282F33 !important; font-size: 1.3rem !important;">
-                Invoice</h4>
-            <p
-                style="font-family: 'Roboto', sans-serif !important; font-weight: 400 !important; color: #282F33 !important; font-size: 1rem !important;">
-                For the invoice created for the sale order the branch will be set
-                based on the sale order.Here the journals are also set
-                based on the selected branch.If there is no available sales journal,
-                then the user can't create the invoice
-            </p>
-            <img src="assets/screenshots/mb14.png" class="img-responsive img-thumbnail border" width="100%"
-                height="auto" />
-        </div>
-
     </div>