Yaltik/flectra
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] Assign group in branch

Browse Source
This commit is contained in:
Haresh Chavda 2018-01-23 12:10:28 +05:30
parent c2c2f9e4fc
commit 113f9601f2
35 changed files with 67 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/account/views/account_invoice_view.xml
View File

@ -330,7 +330,7 @@
</group> </group>
<group> <group>
<field name="fiscal_position_id" options="{'no_create': True}" placeholder="Auto-detect"/> <field name="fiscal_position_id" options="{'no_create': True}" placeholder="Auto-detect"/>
<field name="branch_id" options="{'no_create': True, 'no_open': True}"/> <field name="branch_id" options="{'no_create': True, 'no_open': True}" groups="base_branch_company.group_multi_branch"/>
<field name="move_id" groups="account.group_account_user" attrs="{'invisible': [('move_id', '=', False)]}"/> <field name="move_id" groups="account.group_account_user" attrs="{'invisible': [('move_id', '=', False)]}"/>
<field name="date" domain="[('state', '=', 'draft'), ('company_id', '=', company_id)]" groups="account.group_account_user"/> <field name="date" domain="[('state', '=', 'draft'), ('company_id', '=', company_id)]" groups="account.group_account_user"/>
<field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/> <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
@ -478,7 +478,7 @@
<field domain="[('company_id', '=', company_id),('internal_type','=', 'receivable'), ('deprecated', '=', False)]" <field domain="[('company_id', '=', company_id),('internal_type','=', 'receivable'), ('deprecated', '=', False)]"
name="account_id" groups="account.group_account_user"/> name="account_id" groups="account.group_account_user"/>
<field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/> <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
<field name="branch_id" options="{'no_create': True}"/> <field name="branch_id" options="{'no_create': True}" groups="base_branch_company.group_multi_branch"/>
<field domain="[('partner_id.ref_company_ids', 'in', [company_id])]" name="partner_bank_id" invisible="1"/> <field domain="[('partner_id.ref_company_ids', 'in', [company_id])]" name="partner_bank_id" invisible="1"/>
</group> </group>
<group> <group>

12
addons/account/views/account_view.xml
View File

@ -1155,7 +1155,7 @@
<field name="move_id" attrs="{'readonly':[('parent_state','=','posted')]}"/> <field name="move_id" attrs="{'readonly':[('parent_state','=','posted')]}"/>
<field name="statement_id" readonly="True" attrs="{'invisible': [('statement_id','=',False)]}"/> <field name="statement_id" readonly="True" attrs="{'invisible': [('statement_id','=',False)]}"/>
<field name="invoice_id" attrs="{'invisible': [('invoice_id','=',False)]}"/> <field name="invoice_id" attrs="{'invisible': [('invoice_id','=',False)]}"/>
<field name="branch_id"/> <field name="branch_id" groups="base_branch_company.group_multi_branch"/>
</group> </group>
<group string="Dates"> <group string="Dates">
<field name="date_maturity"/> <field name="date_maturity"/>
@ -1228,7 +1228,7 @@
<field name="partner_id"/> <field name="partner_id"/>
<field name="account_id" options='{"no_open":True}' domain="[('company_id', '=', company_id)]" groups="account.group_account_user"/> <field name="account_id" options='{"no_open":True}' domain="[('company_id', '=', company_id)]" groups="account.group_account_user"/>
<field name="analytic_account_id" groups="account.group_account_user"/> <field name="analytic_account_id" groups="account.group_account_user"/>
<field name="branch_id"/> <field name="branch_id" groups="base_branch_company.group_multi_branch"/>
<field name="reconciled" invisible="1"/> <field name="reconciled" invisible="1"/>
<field name="full_reconcile_id"/> <field name="full_reconcile_id"/>
<field name="debit" sum="Total Debit"/> <field name="debit" sum="Total Debit"/>
@ -1306,7 +1306,7 @@
<field name="move_id" string="Number (Move)"/> <field name="move_id" string="Number (Move)"/>
<field name="tax_line_id"/> <field name="tax_line_id"/>
<field name="tax_ids" /> <field name="tax_ids" />
<field name="branch_id"/> <field name="branch_id" groups="base_branch_company.group_multi_branch"/>
<group expand="0" string="Group By"> <group expand="0" string="Group By">
<filter string="Partner" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Journal" domain="[]" context="{'group_by':'journal_id'}"/> <filter string="Journal" domain="[]" context="{'group_by':'journal_id'}"/>
@ -1374,7 +1374,7 @@
<field name="partner_id"/> <field name="partner_id"/>
<field name="ref"/> <field name="ref"/>
<field name="journal_id"/> <field name="journal_id"/>
<field name="branch_id"/> <field name="branch_id" groups="base_branch_company.group_multi_branch"/>
<field name="amount" sum="Total Amount"/> <field name="amount" sum="Total Amount"/>
<field name="state"/> <field name="state"/>
<field name="currency_id" invisible="1"/> <field name="currency_id" invisible="1"/>
@ -1456,7 +1456,7 @@
<group> <group>
<field name="journal_id" options="{'no_open': True, 'no_create': True}"/> <field name="journal_id" options="{'no_open': True, 'no_create': True}"/>
<field name="company_id" required="1" groups="base.group_multi_company"/> <field name="company_id" required="1" groups="base.group_multi_company"/>
<field name="branch_id" options="{'no_create': True}"/> <field name="branch_id" options="{'no_create': True}" groups="base_branch_company.group_multi_branch"/>
<field name="amount" invisible="1"/> <field name="amount" invisible="1"/>
<field name="currency_id" invisible="1"/> <field name="currency_id" invisible="1"/>
</group> </group>
@ -1470,7 +1470,7 @@
<field name="partner_id" <field name="partner_id"
domain="['|', ('parent_id', '=', False), ('is_company', '=', True)]"/> domain="['|', ('parent_id', '=', False), ('is_company', '=', True)]"/>
<field name="name"/> <field name="name"/>
<field name="branch_id"/> <field name="branch_id" groups="base_branch_company.group_multi_branch"/>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting"/> <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
<field name="analytic_tag_ids" groups="analytic.group_analytic_accounting"/> <field name="analytic_tag_ids" groups="analytic.group_analytic_accounting"/>
<field name="amount_currency" groups="base.group_multi_currency"/> <field name="amount_currency" groups="base.group_multi_currency"/>

2
addons/account/views/report_generalledger.xml
View File

@ -40,7 +40,7 @@
<t t-if="data['date_from']"><strong>Date from :</strong> <span t-esc="data['date_from']"/><br/></t> <t t-if="data['date_from']"><strong>Date from :</strong> <span t-esc="data['date_from']"/><br/></t>
<t t-if="data['date_to']"><strong>Date to :</strong> <span t-esc="data['date_to']"/></t> <t t-if="data['date_to']"><strong>Date to :</strong> <span t-esc="data['date_to']"/></t>
</div> </div>
<div class="col-xs-4"> <div class="col-xs-4" groups="base_branch_company.group_multi_branch">
<strong>Branch:</strong> <strong>Branch:</strong>
<p t-if="data['branch_id']"><span t-esc="data['branch_id'][1]"/></p> <p t-if="data['branch_id']"><span t-esc="data['branch_id'][1]"/></p>
</div> </div>

2
addons/account/views/report_invoice.xml
View File

@ -48,7 +48,7 @@
<strong>Reference:</strong> <strong>Reference:</strong>
<p t-field="o.reference"/> <p t-field="o.reference"/>
</div> </div>
<div name="branch" class="col-xs-2" t-if="o.branch_id"> <div name="branch" class="col-xs-2" t-if="o.branch_id" groups="base_branch_company.group_multi_branch">
<strong>Branch:</strong> <strong>Branch:</strong>
<p t-field="o.branch_id.name"/> <p t-field="o.branch_id.name"/>
</div> </div>

2
addons/account/views/report_partnerledger.xml
View File

@ -24,7 +24,7 @@
<p t-if="data['form']['target_move'] == 'all'">All Entries</p> <p t-if="data['form']['target_move'] == 'all'">All Entries</p>
<p t-if="data['form']['target_move'] == 'posted'">All Posted Entries</p> <p t-if="data['form']['target_move'] == 'posted'">All Posted Entries</p>
</div> </div>
<div class="col-xs-3"> <div class="col-xs-3" groups="base_branch_company.group_multi_branch">
<strong>Branch:</strong> <strong>Branch:</strong>
<p t-if="data['form']['branch_id']"><span t-esc="data['form']['branch_id'][1]"/></p> <p t-if="data['form']['branch_id']"><span t-esc="data['form']['branch_id'][1]"/></p>
</div> </div>

2
addons/account/wizard/account_report_aged_partner_balance_view.xml
View File

@ -12,7 +12,7 @@
<field name="date_from"/> <field name="date_from"/>
<field name="period_length"/> <field name="period_length"/>
<newline/> <newline/>
<field name="branch_id"/> <field name="branch_id" groups="base_branch_company.group_multi_branch"/>
<newline/> <newline/>
<field name="result_selection" widget="radio"/> <field name="result_selection" widget="radio"/>
<field name="target_move" widget="radio"/> <field name="target_move" widget="radio"/>

2
addons/account/wizard/account_report_common_view.xml
View File

@ -14,7 +14,7 @@
</group> </group>
<group col="2"> <group col="2">
<group> <group>
<field name="branch_id"/> <field name="branch_id" groups="base_branch_company.group_multi_branch"/>
</group> </group>
</group> </group>

4
addons/account_voucher/views/account_voucher_views.xml
View File

@ -233,7 +233,7 @@
<field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/> <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
<field name="partner_id" domain="[('customer','=',True)]" string="Customer" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": True}'/> <field name="partner_id" domain="[('customer','=',True)]" string="Customer" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": True}'/>
<field name="pay_now" required="1"/> <field name="pay_now" required="1"/>
<field name="branch_id"/> <field name="branch_id" groups="base_branch_company.group_multi_branch"/>
<field name="account_id" groups="account.group_account_user"/> <field name="account_id" groups="account.group_account_user"/>
</group> </group>
<group> <group>
@ -347,7 +347,7 @@
<field name="account_id" groups="account.group_account_user"/> <field name="account_id" groups="account.group_account_user"/>
<field name="name" colspan="2" attrs="{'invisible': [('pay_now', '=', 'pay_later')]}"/> <field name="name" colspan="2" attrs="{'invisible': [('pay_now', '=', 'pay_later')]}"/>
<field name="reference"/> <field name="reference"/>
<field name="branch_id"/> <field name="branch_id" groups="base_branch_company.group_multi_branch"/>
<field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/> <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
</group> </group>
<group> <group>

8
addons/analytic/views/analytic_account_views.xml
View File

@ -51,7 +51,7 @@
<field name="account_id"/> <field name="account_id"/>
<field name="currency_id" invisible="1"/> <field name="currency_id" invisible="1"/>
<field name="company_id" groups="base.group_multi_company"/> <field name="company_id" groups="base.group_multi_company"/>
<field name="branch_id" /> <field name="branch_id" groups="base_branch_company.group_multi_branch"/>
<field name="unit_amount" sum="Quantity"/> <field name="unit_amount" sum="Quantity"/>
<field name="amount" sum="Total"/> <field name="amount" sum="Total"/>
</tree> </tree>
@ -113,7 +113,7 @@
</group> </group>
<group> <group>
<field name="tag_ids" widget="many2many_tags"/> <field name="tag_ids" widget="many2many_tags"/>
<field name="branch_id" options="{'no_create': True}"/> <field name="branch_id" groups="base_branch_company.group_multi_branch" options="{'no_create': True}"/>
<field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/> <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
<field name="currency_id" options="{'no_create': True}" groups="base.group_multi_currency"/> <field name="currency_id" options="{'no_create': True}" groups="base.group_multi_currency"/>
</group> </group>
@ -138,7 +138,7 @@
<field name="partner_id"/> <field name="partner_id"/>
<field name="active" invisible="1"/> <field name="active" invisible="1"/>
<field name="company_id" groups="base.group_multi_company"/> <field name="company_id" groups="base.group_multi_company"/>
<field name="branch_id"/> <field name="branch_id" groups="base_branch_company.group_multi_branch"/>
<field name="debit"/> <field name="debit"/>
<field name="credit"/> <field name="credit"/>
<field name="balance"/> <field name="balance"/>
@ -232,7 +232,7 @@
<field name="tag_ids" widget="many2many_tags"/> <field name="tag_ids" widget="many2many_tags"/>
<field name="date"/> <field name="date"/>
<field name="company_id" groups="base.group_multi_company"/> <field name="company_id" groups="base.group_multi_company"/>
<field name="branch_id" options="{'no_create': True}"/> <field name="branch_id" groups="base_branch_company.group_multi_branch" options="{'no_create': True}"/>
</group> </group>
<group string="Amount"> <group string="Amount">
<field name="amount"/> <field name="amount"/>

3
addons/base_branch_company/demo/branch_data.xml
View File

@ -3,7 +3,7 @@
<data noupdate="1"> <data noupdate="1">
<record id="data_branch_1" model="res.branch"> <record id="data_branch_1" model="res.branch">
<field name="name">your company</field> <field name="name">Your Company</field>
<field name="code">YC</field> <field name="code">YC</field>
<field name="company_id" ref="base.main_company"/> <field name="company_id" ref="base.main_company"/>
<field name="street">80 Broad St</field> <field name="street">80 Broad St</field>
@ -14,7 +14,6 @@
<field name="phone">+1 485 123 8989</field> <field name="phone">+1 485 123 8989</field>
</record> </record>
<record id="base.user_root" model="res.users"> <record id="base.user_root" model="res.users">
<field name="branch_ids" eval="[(6,0,[ref('data_branch_1'),])]"/> <field name="branch_ids" eval="[(6,0,[ref('data_branch_1'),])]"/>
<field name='default_branch_id' ref='data_branch_1'/> <field name='default_branch_id' ref='data_branch_1'/>

2
addons/base_branch_company/views/res_branch_view.xml
View File

@ -88,7 +88,7 @@
<field name="inherit_id" ref="base.view_users_form"/> <field name="inherit_id" ref="base.view_users_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//page[@name='access_rights']/group[1]" position="after"> <xpath expr="//page[@name='access_rights']/group[1]" position="after">
<group> <group groups="base_branch_company.group_multi_branch">
<group string="Allowed Branches" attrs="{'invisible': [('branches_count', '&lt;=', 1)]}"> <group string="Allowed Branches" attrs="{'invisible': [('branches_count', '&lt;=', 1)]}">
<field name="default_branch_id"/> <field name="default_branch_id"/>
<field name="branch_ids" widget="many2many_tags"/> <field name="branch_ids" widget="many2many_tags"/>

6
addons/crm/views/crm_lead_views.xml
View File

@ -89,7 +89,7 @@
<field name="user_id" domain="[('share', '=', False)]" <field name="user_id" domain="[('share', '=', False)]"
context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'sales_team.group_sale_salesman_all_leads'], 'team_id': team_id}"/> context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'sales_team.group_sale_salesman_all_leads'], 'team_id': team_id}"/>
<field name="team_id" widget="selection" domain="[('use_leads','=',True)]"/> <field name="team_id" widget="selection" domain="[('use_leads','=',True)]"/>
<field name="branch_id" options="{'no_create': True, 'no_create_edit': True}"/> <field name="branch_id" groups="base_branch_company.group_multi_branch" options="{'no_create': True, 'no_create_edit': True}"/>
<field name="type" invisible="1"/> <field name="type" invisible="1"/>
</group> </group>
<group> <group>
@ -493,7 +493,7 @@
<group> <group>
<field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'sales_team.group_sale_salesman_all_leads'], 'team_id': team_id}" domain="[('share', '=', False)]"/> <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'sales_team.group_sale_salesman_all_leads'], 'team_id': team_id}" domain="[('share', '=', False)]"/>
<field name="team_id" widget="selection"/> <field name="team_id" widget="selection"/>
<field name="branch_id" options="{'no_create': True, 'no_create_edit': True}"/> <field name="branch_id" groups="base_branch_company.group_multi_branch" options="{'no_create': True, 'no_create_edit': True}"/>
</group> </group>
<group> <group>
<field name="priority" widget="priority"/> <field name="priority" widget="priority"/>
@ -652,7 +652,7 @@
<filter string="Sales Channel" context="{'group_by':'team_id'}"/> <filter string="Sales Channel" context="{'group_by':'team_id'}"/>
<filter string="Country" context="{'group_by':'country_id'}" /> <filter string="Country" context="{'group_by':'country_id'}" />
<filter string="Company" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <filter string="Company" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<filter string="Branch" context="{'group_by':'branch_id'}"/> <filter string="Branch" groups="base_branch_company.group_multi_branch" context="{'group_by':'branch_id'}"/>
<filter name="stage" string="Stage" context="{'group_by':'stage_id'}"/> <filter name="stage" string="Stage" context="{'group_by':'stage_id'}"/>
<filter string="Campaign" domain="[]" context="{'group_by':'campaign_id'}"/> <filter string="Campaign" domain="[]" context="{'group_by':'campaign_id'}"/>
<filter string="Medium" domain="[]" context="{'group_by':'medium_id'}"/> <filter string="Medium" domain="[]" context="{'group_by':'medium_id'}"/>

6
addons/project/views/project_views.xml
View File

@ -137,7 +137,7 @@
<field name="user_id" string="Project Manager" <field name="user_id" string="Project Manager"
attrs="{'readonly':[('active','=',False)]}"/> attrs="{'readonly':[('active','=',False)]}"/>
<field name="company_id"/> <field name="company_id"/>
<field name="branch_id"/> <field name="branch_id" groups="base_branch_company.group_multi_branch"/>
<field name="subtask_project_id" groups="project.group_subtask_project"/> <field name="subtask_project_id" groups="project.group_subtask_project"/>
<field name="privacy_visibility" widget="radio"/> <field name="privacy_visibility" widget="radio"/>
<field name="partner_id" string="Customer"/> <field name="partner_id" string="Customer"/>
@ -446,7 +446,7 @@
<field name="date_deadline"/> <field name="date_deadline"/>
<field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}"/> <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}"/>
<field name="task_seq" readonly="1"/> <field name="task_seq" readonly="1"/>
<field name="branch_id"/> <field name="branch_id" groups="base_branch_company.group_multi_branch"/>
<field name="priority"/> <field name="priority"/>
</group> </group>
</group> </group>
@ -943,7 +943,7 @@
<br/> <br/>
<field name="date_deadline"/> <field name="date_deadline"/>
<br/> <br/>
<field name="branch_id"/> <field name="branch_id" groups="base_branch_company.group_multi_branch"/>
<br/> <br/>
</span> </span>
</div> </div>

4
addons/project_scrum/reports/release_planning_template.xml
View File

@ -50,7 +50,7 @@
<th>Project</th> <th>Project</th>
<th>Assigned To</th> <th>Assigned To</th>
<th>Sprint</th> <th>Sprint</th>
<th>Branch</th> <th groups="base_branch_company.group_multi_branch">Branch</th>
<th>Start Date</th> <th>Start Date</th>
<th>End Date</th> <th>End Date</th>
<th>Actual End Date</th> <th>Actual End Date</th>
@ -71,7 +71,7 @@
<td> <td>
<span t-field="task.sprint_id"/> <span t-field="task.sprint_id"/>
</td> </td>
<td> <td groups="base_branch_company.group_multi_branch">
<span t-field="task.branch_id"/> <span t-field="task.branch_id"/>
</td> </td>
<td> <td>

6
addons/project_scrum/views/other_views.xml
View File

@ -13,7 +13,7 @@
<field name="company_id" options="{'no_create': True, 'no_create_edit': True}"/> <field name="company_id" options="{'no_create': True, 'no_create_edit': True}"/>
</field> </field>
<field name="branch_id" position="replace"> <field name="branch_id" position="replace">
<field name="branch_id" options="{'no_create': True, 'no_create_edit': True}"/> <field name="branch_id" groups="base_branch_company.group_multi_branch" options="{'no_create': True, 'no_create_edit': True}"/>
</field> </field>
<field name="partner_id" position="replace"> <field name="partner_id" position="replace">
<field name="partner_id" options="{'no_create': True, 'no_create_edit': True}"/> <field name="partner_id" options="{'no_create': True, 'no_create_edit': True}"/>
@ -81,7 +81,7 @@
<field name="company_id" options="{'no_create': True, 'no_create_edit': True}"/> <field name="company_id" options="{'no_create': True, 'no_create_edit': True}"/>
</field> </field>
<field name="branch_id" position="replace"> <field name="branch_id" position="replace">
<field name="branch_id" options="{'no_create': True, 'no_create_edit': True}"/> <field name="branch_id" groups="base_branch_company.group_multi_branch" options="{'no_create': True, 'no_create_edit': True}"/>
</field> </field>
<field name="partner_id" position="replace"> <field name="partner_id" position="replace">
<field name="partner_id" options="{'no_create': True, 'no_create_edit': True}"/> <field name="partner_id" options="{'no_create': True, 'no_create_edit': True}"/>
@ -123,7 +123,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//field[@name='date_deadline']" position="after"> <xpath expr="//field[@name='date_deadline']" position="after">
<field name="sprint_id"/> <field name="sprint_id"/>
<field name="branch_id"/> <field name="branch_id" groups="base_branch_company.group_multi_branch"/>
<field name="start_date"/> <field name="start_date"/>
<field name="end_date"/> <field name="end_date"/>
<field name="actual_end_date"/> <field name="actual_end_date"/>

8
addons/project_scrum/views/project_sprint_views.xml
View File

@ -67,7 +67,7 @@
attrs="{'readonly': [('state', '!=', 'draft')]}"/> attrs="{'readonly': [('state', '!=', 'draft')]}"/>
</group> </group>
<group> <group>
<field name="branch_id" <field name="branch_id" groups="base_branch_company.group_multi_branch"
options="{'no_create': True, 'no_create_edit': True}" options="{'no_create': True, 'no_create_edit': True}"
attrs="{'readonly': [('state', '!=', 'draft')]}"/> attrs="{'readonly': [('state', '!=', 'draft')]}"/>
<field name="duration" <field name="duration"
@ -135,7 +135,7 @@
<field name="sprint_seq"/> <field name="sprint_seq"/>
<field name="name"/> <field name="name"/>
<field name="project_id"/> <field name="project_id"/>
<field name="branch_id"/> <field name="branch_id" groups="base_branch_company.group_multi_branch"/>
<field name="goal_of_sprint"/> <field name="goal_of_sprint"/>
<field name="start_date"/> <field name="start_date"/>
<field name="end_date"/> <field name="end_date"/>
@ -151,7 +151,7 @@
<search string="Sprints"> <search string="Sprints">
<field name="name"/> <field name="name"/>
<field name="project_id"/> <field name="project_id"/>
<field name="branch_id"/> <field name="branch_id" groups="base_branch_company.group_multi_branch"/>
<filter string="Draft" name="filter_draft" <filter string="Draft" name="filter_draft"
domain="[('state', '=', 'draft')]"/> domain="[('state', '=', 'draft')]"/>
<filter string="In Progress" name="filter_progress" <filter string="In Progress" name="filter_progress"
@ -162,7 +162,7 @@
domain="[('state', '=', 'cancel')]"/> domain="[('state', '=', 'cancel')]"/>
<filter string="Project" name="group_by_project" <filter string="Project" name="group_by_project"
context="{'group_by': 'project_id'}"/> context="{'group_by': 'project_id'}"/>
<filter string="Branch" name="group_by_branch" <filter string="Branch" groups="base_branch_company.group_multi_branch" name="group_by_branch"
context="{'group_by': 'branch_id'}"/> context="{'group_by': 'branch_id'}"/>
</search> </search>
</field> </field>

6
addons/project_scrum/views/project_story_views.xml
View File

@ -24,7 +24,7 @@
</div> </div>
<group name="story_main_fields" col="4"> <group name="story_main_fields" col="4">
<field name="sprint_id" options="{'no_create': True, 'no_create_edit': True}" required="1"/> <field name="sprint_id" options="{'no_create': True, 'no_create_edit': True}" required="1"/>
<field name="branch_id" options="{'no_create': True, 'no_create_edit': True}"/> <field name="branch_id" groups="base_branch_company.group_multi_branch" options="{'no_create': True, 'no_create_edit': True}"/>
<field name="priority_id" options="{'no_create': True, 'no_create_edit': True}"/> <field name="priority_id" options="{'no_create': True, 'no_create_edit': True}"/>
<field name="story_type_id" options="{'no_create': True, 'no_create_edit': True}"/> <field name="story_type_id" options="{'no_create': True, 'no_create_edit': True}"/>
<field name="owner_id" readonly="1"/> <field name="owner_id" readonly="1"/>
@ -53,7 +53,7 @@
<tree string="Project Story"> <tree string="Project Story">
<field name="name"/> <field name="name"/>
<field name="owner_id"/> <field name="owner_id"/>
<field name="branch_id"/> <field name="branch_id" groups="base_branch_company.group_multi_branch"/>
<field name="sprint_id"/> <field name="sprint_id"/>
<field name="priority_id"/> <field name="priority_id"/>
<field name="story_type_id"/> <field name="story_type_id"/>
@ -69,7 +69,7 @@
<field name="name"/> <field name="name"/>
<field name="sprint_id"/> <field name="sprint_id"/>
<filter string="Sprint" name="group_by_sprint" context="{'group_by': 'sprint_id'}"/> <filter string="Sprint" name="group_by_sprint" context="{'group_by': 'sprint_id'}"/>
<filter string="Branch" name="group_by_branch" context="{'group_by': 'branch_id'}"/> <filter string="Branch" groups="base_branch_company.group_multi_branch" name="group_by_branch" context="{'group_by': 'branch_id'}"/>
<filter string="Owner" name="group_by_owner" context="{'group_by': 'owner_id'}"/> <filter string="Owner" name="group_by_owner" context="{'group_by': 'owner_id'}"/>
<filter string="Priority" name="group_by_priority" context="{'group_by': 'priority'}"/> <filter string="Priority" name="group_by_priority" context="{'group_by': 'priority'}"/>
<filter string="Type" name="group_by_type" context="{'group_by': 'type'}"/> <filter string="Type" name="group_by_type" context="{'group_by': 'type'}"/>

4
addons/project_scrum/views/project_team_views.xml
View File

@ -16,7 +16,7 @@
<field name="member_ids" widget="many2many_tags" options="{'no_create': True, 'no_create_edit': True}"/> <field name="member_ids" widget="many2many_tags" options="{'no_create': True, 'no_create_edit': True}"/>
<field name="master_id" options="{'no_create': True, 'no_create_edit': True}" <field name="master_id" options="{'no_create': True, 'no_create_edit': True}"
domain="[('id', 'in', member_ids)]"/> domain="[('id', 'in', member_ids)]"/>
<field name="branch_id" options="{'no_create': True, 'no_create_edit': True}"/> <field name="branch_id" groups="base_branch_company.group_multi_branch" options="{'no_create': True, 'no_create_edit': True}"/>
</group> </group>
<group col="2"> <group col="2">
<field name="strength"/> <field name="strength"/>
@ -41,7 +41,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Project Team"> <tree string="Project Team">
<field name="name"/> <field name="name"/>
<field name="branch_id"/> <field name="branch_id" groups="base_branch_company.group_multi_branch"/>
<field name="master_id"/> <field name="master_id"/>
<field name="strength"/> <field name="strength"/>
</tree> </tree>

4
addons/project_scrum/views/release_planning_views.xml
View File

@ -10,7 +10,7 @@
<field name="name" required="1"/> <field name="name" required="1"/>
<field name="release_date"/> <field name="release_date"/>
<field name="sprint_id" options="{'no_create': True, 'no_create_edit': True}"/> <field name="sprint_id" options="{'no_create': True, 'no_create_edit': True}"/>
<field name="branch_id" options="{'no_create': True, 'no_create_edit': True}"/> <field name="branch_id" groups="base_branch_company.group_multi_branch" options="{'no_create': True, 'no_create_edit': True}"/>
<field name="priority"/> <field name="priority"/>
<field name="velocity"/> <field name="velocity"/>
</group> </group>
@ -36,7 +36,7 @@
<field name="name" required="1"/> <field name="name" required="1"/>
<field name="release_date"/> <field name="release_date"/>
<field name="sprint_id"/> <field name="sprint_id"/>
<field name="branch_id"/> <field name="branch_id" groups="base_branch_company.group_multi_branch"/>
<field name="priority"/> <field name="priority"/>
<field name="velocity"/> <field name="velocity"/>
</tree> </tree>

4
addons/project_scrum/views/retrospective_views.xml
View File

@ -16,7 +16,7 @@
<group> <group>
<field name="sprint_id" options="{'no_create': True, 'no_create_edit': True}"/> <field name="sprint_id" options="{'no_create': True, 'no_create_edit': True}"/>
<field name="scrum_master" options="{'no_create': True, 'no_create_edit': True}"/> <field name="scrum_master" options="{'no_create': True, 'no_create_edit': True}"/>
<field name="branch_id" options="{'no_create': True, 'no_create_edit': True}"/> <field name="branch_id" groups="base_branch_company.group_multi_branch" options="{'no_create': True, 'no_create_edit': True}"/>
</group> </group>
</group> </group>
<notebook> <notebook>
@ -41,7 +41,7 @@
<field name="retrospective_method_id"/> <field name="retrospective_method_id"/>
<field name="scrum_master"/> <field name="scrum_master"/>
<field name="sprint_id"/> <field name="sprint_id"/>
<field name="branch_id"/> <field name="branch_id" groups="base_branch_company.group_multi_branch"/>
<field name="start_date"/> <field name="start_date"/>
<field name="end_date"/> <field name="end_date"/>
</tree> </tree>

2
addons/purchase/report/purchase_order_templates.xml
View File

@ -42,7 +42,7 @@
<strong>Order Date:</strong> <strong>Order Date:</strong>
<p t-field="o.date_order"/> <p t-field="o.date_order"/>
</div> </div>
<div name="branch" t-if="o.branch_id" class="col-xs-3"> <div name="branch" t-if="o.branch_id" class="col-xs-3" groups="base_branch_company.group_multi_branch">
<strong>Branch:</strong> <strong>Branch:</strong>
<p t-field="o.branch_id"/> <p t-field="o.branch_id"/>
</div> </div>

2
addons/purchase/report/purchase_quotation_templates.xml
View File

@ -27,7 +27,7 @@
</div> </div>
<div class="row"> <div class="row">
<div name="branch" t-if="o.branch_id" class="col-xs-3"> <div name="branch" t-if="o.branch_id" class="col-xs-3" groups="base_branch_company.group_multi_branch">
<strong>Branch:</strong> <strong>Branch:</strong>
<p t-field="o.branch_id"/> <p t-field="o.branch_id"/>
</div> </div>

4
addons/purchase/views/purchase_views.xml
View File

@ -284,7 +284,7 @@
<field name="dest_address_id" groups="stock.group_stock_multi_locations" attrs="{'invisible': [('default_location_dest_id_usage', '!=', 'customer')], 'required': [('default_location_dest_id_usage', '=', 'customer')]}"/> <field name="dest_address_id" groups="stock.group_stock_multi_locations" attrs="{'invisible': [('default_location_dest_id_usage', '!=', 'customer')], 'required': [('default_location_dest_id_usage', '=', 'customer')]}"/>
<field name="default_location_dest_id_usage" invisible="1"/> <field name="default_location_dest_id_usage" invisible="1"/>
<field name="incoterm_id"/> <field name="incoterm_id"/>
<field name="branch_id" options="{'no_create': True, 'no_create_edit': True}"/> <field name="branch_id" groups="base_branch_company.group_multi_branch" options="{'no_create': True, 'no_create_edit': True}"/>
</group> </group>
<group> <group>
<field name="invoice_status"/> <field name="invoice_status"/>
@ -390,7 +390,7 @@
<field name="date_order" /> <field name="date_order" />
<field name="partner_id"/> <field name="partner_id"/>
<field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/> <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
<field name="branch_id"/> <field name="branch_id" groups="base_branch_company.group_multi_branch" options="{'no_create': True}"/>
<field name="date_planned" invisible="context.get('quotation_only', False)"/> <field name="date_planned" invisible="context.get('quotation_only', False)"/>
<field name="origin"/> <field name="origin"/>
<field name="amount_untaxed" sum="Total Untaxed amount" string="Untaxed" widget="monetary"/> <field name="amount_untaxed" sum="Total Untaxed amount" string="Untaxed" widget="monetary"/>

2
addons/sale/report/sale_report_templates.xml
View File

@ -60,7 +60,7 @@
<strong>Payment Terms:</strong> <strong>Payment Terms:</strong>
<p t-field="doc.payment_term_id"/> <p t-field="doc.payment_term_id"/>
</div> </div>
<div name="branch" t-if="doc.branch_id" class="col-xs-3"> <div name="branch" t-if="doc.branch_id" class="col-xs-3" groups="base_branch_company.group_multi_branch">
<strong>Branch:</strong> <strong>Branch:</strong>
<p t-field="doc.branch_id"/> <p t-field="doc.branch_id"/>
</div> </div>

2
addons/sale/views/sale_views.xml
View File

@ -381,7 +381,7 @@
<field name="team_id" options="{'no_create': True}"/> <field name="team_id" options="{'no_create': True}"/>
<field name="client_order_ref"/> <field name="client_order_ref"/>
<field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/> <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
<field name="branch_id" options="{'no_create': True}"/> <field name="branch_id" options="{'no_create': True}" groups="base_branch_company.group_multi_branch"/>
<field name="analytic_account_id" context="{'default_partner_id':partner_invoice_id, 'default_name':name}" attrs="{'readonly': ['|',('analytic_account_id','!=',False),('invoice_count','!=',0),('state','=','sale')]}" groups="analytic.group_analytic_accounting"/> <field name="analytic_account_id" context="{'default_partner_id':partner_invoice_id, 'default_name':name}" attrs="{'readonly': ['|',('analytic_account_id','!=',False),('invoice_count','!=',0),('state','=','sale')]}" groups="analytic.group_analytic_accounting"/>
</group> </group>
<group name="sale_pay" string="Invoicing"> <group name="sale_pay" string="Invoicing">

4
addons/stock/report/report_deliveryslip.xml
View File

@ -31,7 +31,7 @@
<th name="td_sched_date_h"> <th name="td_sched_date_h">
<strong>Date</strong> <strong>Date</strong>
</th> </th>
<th t-if="o.branch_id"><strong>Branch</strong></th> <th t-if="o.branch_id" groups="base_branch_company.group_multi_branch"><strong>Branch</strong></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -47,7 +47,7 @@
<span t-field="o.scheduled_date"/> <span t-field="o.scheduled_date"/>
</t> </t>
</td> </td>
<td t-if="o.branch_id"> <td t-if="o.branch_id" groups="base_branch_company.group_multi_branch">
<span t-field="o.branch_id"/> <span t-field="o.branch_id"/>
</td> </td>
</tr> </tr>

4
addons/stock/report/report_stockinventory.xml
View File

@ -13,7 +13,7 @@
<tr> <tr>
<th><strong>Inventory</strong></th> <th><strong>Inventory</strong></th>
<th><strong>Date</strong></th> <th><strong>Date</strong></th>
<th t-if="o.branch_id"><strong>Branch</strong></th> <th t-if="o.branch_id" groups="base_branch_company.group_multi_branch"><strong>Branch</strong></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -24,7 +24,7 @@
<td> <td>
<span t-field="o.date"/> <span t-field="o.date"/>
</td> </td>
<td t-if="o.branch_id"> <td t-if="o.branch_id" groups="base_branch_company.group_multi_branch">
<span t-field="o.branch_id"/> <span t-field="o.branch_id"/>
</td> </td>
</tr> </tr>

4
addons/stock/report/report_stockpicking_operations.xml
View File

@ -51,7 +51,7 @@
<th><strong>State</strong></th> <th><strong>State</strong></th>
<th><strong>Commitment Date</strong></th> <th><strong>Commitment Date</strong></th>
<th name="td_sched_date_h"><strong>Scheduled Date</strong></th> <th name="td_sched_date_h"><strong>Scheduled Date</strong></th>
<th t-if="o.branch_id"><strong>Branch</strong></th> <th t-if="o.branch_id" groups="base_branch_company.group_multi_branch"><strong>Branch</strong></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -68,7 +68,7 @@
<td name="td_sched_date"> <td name="td_sched_date">
<span t-field="o.scheduled_date"/> <span t-field="o.scheduled_date"/>
</td> </td>
<td t-if="o.branch_id"> <td t-if="o.branch_id" groups="base_branch_company.group_multi_branch">
<span t-field="o.branch_id"/> <span t-field="o.branch_id"/>
</td> </td>
</tr> </tr>

2
addons/stock/views/stock_inventory_views.xml
View File

@ -140,7 +140,7 @@
<group> <group>
<group> <group>
<field name="location_id" domain="[('usage','not in', ['supplier','production'])]" groups="stock.group_stock_multi_locations"/> <field name="location_id" domain="[('usage','not in', ['supplier','production'])]" groups="stock.group_stock_multi_locations"/>
<field name="branch_id"/> <field name="branch_id" groups="base_branch_company.group_multi_branch"/>
<field name="filter" string="Inventory of" widget='radio' attrs="{'readonly': [('state', '!=', 'draft')]}"/> <field name="filter" string="Inventory of" widget='radio' attrs="{'readonly': [('state', '!=', 'draft')]}"/>
</group> </group>
<group> <group>

2
addons/stock/views/stock_location_views.xml
View File

@ -36,7 +36,7 @@
<group string="Additional Information"> <group string="Additional Information">
<field name="usage"/> <field name="usage"/>
<field name="partner_id"/> <field name="partner_id"/>
<field name="branch_id" options="{'no_create': True}"/> <field name="branch_id" options="{'no_create': True}" groups="base_branch_company.group_multi_branch"/>
<field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/> <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
<field name="scrap_location"/> <field name="scrap_location"/>
<field name="return_location"/> <field name="return_location"/>

8
addons/stock/views/stock_move_views.xml
View File

@ -12,7 +12,7 @@
<field name="product_packaging" domain="[('product_id','=',product_id)]" groups="product.group_stock_packaging"/> <field name="product_packaging" domain="[('product_id','=',product_id)]" groups="product.group_stock_packaging"/>
<field name="picking_id"/> <field name="picking_id"/>
<field name="location_id" groups="stock.group_stock_multi_locations"/> <field name="location_id" groups="stock.group_stock_multi_locations"/>
<field name="branch_id"/> <field name="branch_id" groups="base_branch_company.group_multi_branch"/>
<field name="location_dest_id" groups="stock.group_stock_multi_locations"/> <field name="location_dest_id" groups="stock.group_stock_multi_locations"/>
<field name="branch_dest_id"/> <field name="branch_dest_id"/>
<field name="create_date" groups="base.group_no_one"/> <field name="create_date" groups="base.group_no_one"/>
@ -60,7 +60,7 @@
<field name="create_date" invisible="1" groups="base.group_no_one"/> <field name="create_date" invisible="1" groups="base.group_no_one"/>
<field name="product_id"/> <field name="product_id"/>
<field name="location_id" groups="stock.group_stock_multi_locations" string="From"/> <field name="location_id" groups="stock.group_stock_multi_locations" string="From"/>
<field name="branch_id"/> <field name="branch_id" groups="base_branch_company.group_multi_branch"/>
<field name="location_dest_id" groups="stock.group_stock_multi_locations" string="To"/> <field name="location_dest_id" groups="stock.group_stock_multi_locations" string="To"/>
<field name="branch_dest_id"/> <field name="branch_dest_id"/>
<field name="product_uom_qty"/> <field name="product_uom_qty"/>
@ -116,7 +116,7 @@
<field name="product_uom_qty"/> <field name="product_uom_qty"/>
<field name="product_uom" options="{'no_open': True, 'no_create': True}" string="Unit of Measure" groups="product.group_uom"/> <field name="product_uom" options="{'no_open': True, 'no_create': True}" string="Unit of Measure" groups="product.group_uom"/>
<field name="location_id" invisible="1"/> <field name="location_id" invisible="1"/>
<field name="branch_id"/> <field name="branch_id" groups="base_branch_company.group_multi_branch"/>
<field name="create_date" invisible="1" /> <field name="create_date" invisible="1" />
<field name="date_expected" invisible="1" /> <field name="date_expected" invisible="1" />
<field name="picking_type_id" invisible="1"/> <field name="picking_type_id" invisible="1"/>
@ -224,7 +224,7 @@
<group name="main_grp_col1"> <group name="main_grp_col1">
<field name="reference"/> <field name="reference"/>
<field name="location_id"/> <field name="location_id"/>
<field name="branch_id"/> <field name="branch_id" groups="base_branch_company.group_multi_branch"/>
<field name="location_dest_id"/> <field name="location_dest_id"/>
<field name="branch_dest_id"/> <field name="branch_dest_id"/>
</group> </group>

2
addons/stock/views/stock_picking_views.xml
View File

@ -319,7 +319,7 @@
</group> </group>
<group> <group>
<field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/> <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
<field name="branch_id" options="{'no_create': True}"/> <field name="branch_id" groups="base_branch_company.group_multi_branch" options="{'no_create': True}"/>
<field name="group_id" groups="base.group_no_one"/> <field name="group_id" groups="base.group_no_one"/>
<field name="priority" attrs="{'invisible': [('picking_type_code', '=', 'incoming')]}"/> <field name="priority" attrs="{'invisible': [('picking_type_code', '=', 'incoming')]}"/>
</group> </group>

2
addons/stock/views/stock_quant_views.xml
View File

@ -48,7 +48,7 @@
<group> <group>
<field name="product_id"/> <field name="product_id"/>
<field name="location_id"/> <field name="location_id"/>
<field name="branch_id"/> <field name="branch_id" groups="base_branch_company.group_multi_branch"/>
<field name="lot_id" groups="stock.group_production_lot"/> <field name="lot_id" groups="stock.group_production_lot"/>
<field name="package_id" groups="stock.group_tracking_lot"/> <field name="package_id" groups="stock.group_tracking_lot"/>
<field name="owner_id" groups="stock.group_tracking_owner"/> <field name="owner_id" groups="stock.group_tracking_owner"/>

2
addons/stock/views/stock_scrap_views.xml
View File

@ -52,7 +52,7 @@
</div> </div>
</group> </group>
<group> <group>
<field name="branch_id" /> <field name="branch_id" groups="base_branch_company.group_multi_branch"/>
<field name="lot_id" attrs="{'invisible': [('tracking', '=', 'none')], 'required': [('tracking', '!=', 'none')]}" groups="stock.group_production_lot"/> <field name="lot_id" attrs="{'invisible': [('tracking', '=', 'none')], 'required': [('tracking', '!=', 'none')]}" groups="stock.group_production_lot"/>
<field name="tracking" invisible="1"/> <field name="tracking" invisible="1"/>
<field name="package_id" groups="stock.group_tracking_lot"/> <field name="package_id" groups="stock.group_tracking_lot"/>

2
addons/stock/views/stock_warehouse_views.xml
View File

@ -26,7 +26,7 @@
<group> <group>
<field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/> <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
<field name="partner_id"/> <field name="partner_id"/>
<field name="branch_id" options="{'no_create': True}"/> <field name="branch_id" groups="base_branch_company.group_multi_branch" options="{'no_create': True}"/>
</group> </group>
</group> </group>
<notebook colspan="4" groups="stock.group_adv_location"> <notebook colspan="4" groups="stock.group_adv_location">