audrius/contract
1
0
Fork 1
mirror of https://github.com/OCA/contract.git synced 2025-02-13 17:57:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #1048 into 16.0

Browse Source 
Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot
2024-02-13 08:18:15 +00:00
parent 76d5ff281b d62dede084
commit eff9351442
9 changed files with 14 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contract/views/abstract_contract_line.xml
View File

@@ -63,7 +63,7 @@
<field
colspan="2"
name="discount"
groups="base.group_no_one"
groups="product.group_discount_per_so_line"
nolabel="1"
/>
</group>

10
contract/views/contract.xml
View File

@@ -232,7 +232,10 @@
attrs="{'readonly': [('automatic_price', '=', True)]}"
/>
<field name="specific_price" invisible="1" />
<field name="discount" groups="base.group_no_one" />
<field
name="discount"
groups="product.group_discount_per_so_line"
/>
<field name="price_subtotal" />
<field name="recurring_interval" invisible="1" />
<field name="recurring_rule_type" invisible="1" />
@@ -332,7 +335,10 @@
attrs="{'readonly': [('automatic_price', '=', True)]}"
/>
<field name="specific_price" invisible="1" />
<field name="discount" groups="base.group_no_one" />
<field
name="discount"
groups="product.group_discount_per_so_line"
/>
<field name="price_subtotal" />
<field name="recurring_interval" invisible="1" />
<field name="recurring_rule_type" invisible="1" />

2
contract/views/contract_line.xml
View File

@@ -111,7 +111,7 @@
attrs="{'readonly': [('automatic_price', '=', True)]}"
/>
<field name="specific_price" invisible="1" />
<field name="discount" groups="base.group_no_one" />
<field name="discount" groups="product.group_discount_per_so_line" />
<field name="price_subtotal" />
<field name="recurring_interval" invisible="1" />
<field name="recurring_rule_type" invisible="1" />

5
contract/views/contract_template.xml
View File

@@ -55,7 +55,10 @@
attrs="{'readonly': [('automatic_price', '=', True)]}"
/>
<field name="specific_price" invisible="1" />
<field name="discount" groups="base.group_no_one" />
<field
name="discount"
groups="product.group_discount_per_so_line"
/>
<field name="price_subtotal" />
<field name="recurring_rule_type" invisible="1" />
<field name="recurring_interval" invisible="1" />

3
contract_sale/__manifest__.py
View File

@@ -12,10 +12,7 @@
"data": [
"security/ir.model.access.csv",
"security/contract_security.xml",
"views/abstract_contract_line.xml",
"views/contract.xml",
"views/contract_line.xml",
"views/contract_template.xml",
"views/res_partner_view.xml",
],
"license": "AGPL-3",

19
contract_sale/views/abstract_contract_line.xml
View File

@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<!--FORM view-->
<record id="contract_abstract_contract_line_form_view" model="ir.ui.view">
<field
name="name"
>contract.abstract.contract.line form view (in contract_sale)</field>
<field name="model">contract.abstract.contract.line</field>
<field
name="inherit_id"
ref="contract.contract_abstract_contract_line_form_view"
/>
<field name="arch" type="xml">
<field name="discount" position="attributes">
<attribute name="groups">product.group_discount_per_so_line</attribute>
</field>
</field>
</record>
</odoo>

17
contract_sale/views/contract.xml
View File

@@ -8,21 +8,4 @@
sequence="21"
groups="sales_team.group_sale_salesman"
/>
<record id="contract_contract_form_view" model="ir.ui.view">
<field name="name">contract.contract.form.contract.sale</field>
<field name="model">contract.contract</field>
<field name="inherit_id" ref="contract.contract_contract_form_view" />
<field name="arch" type="xml">
<xpath
expr="//field[@name='contract_line_ids']/tree/field[@name='discount']"
position="attributes"
>
<attribute
name="groups"
add="product.group_discount_per_so_line"
separator=","
/>
</xpath>
</field>
</record>
</odoo>

14
contract_sale/views/contract_line.xml
View File

@@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<!--TREE view-->
<record id="contract_line_tree_view" model="ir.ui.view">
<field name="name">contract.template.line tree view (in contract_sale)</field>
<field name="model">contract.line</field>
<field name="inherit_id" ref="contract.contract_line_tree_view" />
<field name="arch" type="xml">
<field name="discount" position="attributes">
<attribute name="groups">product.group_discount_per_so_line</attribute>
</field>
</field>
</record>
</odoo>

14
contract_sale/views/contract_template.xml
View File

@@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<!--FORM view-->
<record id="contract_template_form_view" model="ir.ui.view">
<field name="name">contract.template form view (in contract_sale)</field>
<field name="model">contract.template</field>
<field name="inherit_id" ref="contract.contract_template_form_view" />
<field name="arch" type="xml">
<field name="discount" position="attributes">
<attribute name="groups">product.group_discount_per_so_line</attribute>
</field>
</field>
</record>
</odoo>