Cédric Krier pushed to branch branch/default at Tryton / Tryton
Commits:
bec291ff by Cédric Krier at 2023-02-28T13:08:32+01:00
Simplify amendment form
- - - - -
b9f7ad7b by Cédric Krier at 2023-02-28T13:20:14+01:00
Add company rule for amendment
Closes #11114
- - - - -
6 changed files:
- modules/purchase_amendment/CHANGELOG
- modules/purchase_amendment/purchase.xml
- modules/purchase_amendment/view/purchase_amendment_form.xml
- modules/sale_amendment/CHANGELOG
- modules/sale_amendment/sale.xml
- modules/sale_amendment/view/sale_amendment_form.xml
Changes:
=====================================
modules/purchase_amendment/CHANGELOG
=====================================
@@ -1,3 +1,4 @@
+* Add company rule for amendment
* Remove support for Python 3.7
* Add support for Python 3.11
=====================================
modules/purchase_amendment/purchase.xml
=====================================
@@ -84,6 +84,19 @@
<field name="perm_delete" eval="True"/>
</record>
+ <record model="ir.rule.group"
id="rule_group_purchase_amendment_companies">
+ <field name="name">User in companies</field>
+ <field name="model" search="[('model', '=',
'purchase.amendment')]"/>
+ <field name="global_p" eval="True"/>
+ </record>
+ <record model="ir.rule" id="rule_purchase_amendment_companies">
+ <field
+ name="domain"
+ eval="[('purchase.company', 'in', Eval('companies', []))]"
+ pyson="1"/>
+ <field name="rule_group"
ref="rule_group_purchase_amendment_companies"/>
+ </record>
+
<record model="ir.model.button"
id="purchase_amendment_validation_amendment_button">
<field name="name">validate_amendment</field>
<field name="string">Validate</field>
=====================================
modules/purchase_amendment/view/purchase_amendment_form.xml
=====================================
@@ -3,6 +3,6 @@
this repository contains the full copyright notices and license terms. -->
<form>
<label name="purchase"/>
- <field name="purchase" colspan="3"/>
+ <field name="purchase"/>
<label name="date"/>
<field name="date"/>
@@ -7,6 +7,6 @@
<label name="date"/>
<field name="date"/>
- <newline/>
+
<label name="description"/>
<field name="description" colspan="3"/>
<field name="lines" colspan="4"/>
=====================================
modules/sale_amendment/CHANGELOG
=====================================
@@ -1,3 +1,4 @@
+* Add company rule for amendment
* Remove support for Python 3.7
* Add support for Python 3.11
=====================================
modules/sale_amendment/sale.xml
=====================================
@@ -84,6 +84,19 @@
<field name="perm_delete" eval="True"/>
</record>
+ <record model="ir.rule.group" id="rule_group_sale_amendment_companies">
+ <field name="name">User in companies</field>
+ <field name="model" search="[('model', '=', 'sale.amendment')]"/>
+ <field name="global_p" eval="True"/>
+ </record>
+ <record model="ir.rule" id="rule_sale_amendment_companies">
+ <field
+ name="domain"
+ eval="[('sale.company', 'in', Eval('companies', []))]"
+ pyson="1"/>
+ <field name="rule_group"
ref="rule_group_sale_amendment_companies"/>
+ </record>
+
<record model="ir.model.button"
id="sale_amendment_validation_amendment_button">
<field name="name">validate_amendment</field>
<field name="string">Validate</field>
=====================================
modules/sale_amendment/view/sale_amendment_form.xml
=====================================
@@ -3,6 +3,6 @@
this repository contains the full copyright notices and license terms. -->
<form>
<label name="sale"/>
- <field name="sale" colspan="3"/>
+ <field name="sale"/>
<label name="date"/>
<field name="date"/>
@@ -7,6 +7,6 @@
<label name="date"/>
<field name="date"/>
- <newline/>
+
<label name="description"/>
<field name="description" colspan="3"/>
<field name="lines" colspan="4"/>
View it on Heptapod:
https://foss.heptapod.net/tryton/tryton/-/compare/400bcec7a82c73119572b77f5a3082e8f553e54c...b9f7ad7b8b826c600ad00d0879dfabfee7ba92f7
--
View it on Heptapod:
https://foss.heptapod.net/tryton/tryton/-/compare/400bcec7a82c73119572b77f5a3082e8f553e54c...b9f7ad7b8b826c600ad00d0879dfabfee7ba92f7
You're receiving this email because of your account on foss.heptapod.net.
