changeset f8de39ea0fbe in modules/purchase_requisition:default
details:
https://hg.tryton.org/modules/purchase_requisition?cmd=changeset;node=f8de39ea0fbe
description:
Add symbol widget
issue9059
review276871002
diffstat:
purchase.py | 7 +++++++
view/purchase_requisition_form.xml | 2 +-
view/purchase_requisition_line_form.xml | 4 ++--
view/purchase_requisition_line_list.xml | 7 +++----
view/purchase_requisition_line_list_sequence.xml | 7 +++----
view/purchase_requisition_tree.xml | 3 +--
6 files changed, 17 insertions(+), 13 deletions(-)
diffs (93 lines):
diff -r 9d1738290427 -r f8de39ea0fbe purchase.py
--- a/purchase.py Tue Jul 07 23:56:10 2020 +0200
+++ b/purchase.py Fri Oct 09 19:09:05 2020 +0200
@@ -474,6 +474,8 @@
fields.Integer('Unit Digits'), 'on_change_with_unit_digits')
unit_price = fields.Numeric(
'Unit Price', digits=price_digits, states=_states, depends=_depends)
+ currency = fields.Function(fields.Many2One('currency.currency',
+ 'Currency'), 'on_change_with_currency')
amount = fields.Function(
fields.Numeric('Amount',
digits=(
@@ -507,6 +509,11 @@
if self.product:
return self.product.default_uom_category.id
+ @fields.depends('requisition', '_parent_requisition.currency')
+ def on_change_with_currency(self, name=None):
+ if self.requisition:
+ return self.requisition.currency.id
+
@classmethod
def get_purchase_requisition_states(cls):
pool = Pool()
diff -r 9d1738290427 -r f8de39ea0fbe view/purchase_requisition_form.xml
--- a/view/purchase_requisition_form.xml Tue Jul 07 23:56:10 2020 +0200
+++ b/view/purchase_requisition_form.xml Fri Oct 09 19:09:05 2020 +0200
@@ -22,7 +22,7 @@
<label id="empty" colspan="2"/>
<group col="2" colspan="2" id="amount" yfill="1">
<label name="total_amount" xalign="1.0" xexpand="1"/>
- <field name="total_amount" xalign="1.0" xexpand="0"/>
+ <field name="total_amount" xalign="1.0" xexpand="0"
symbol="currency"/>
</group>
</page>
<page string="Other Info" id="other_info">
diff -r 9d1738290427 -r f8de39ea0fbe view/purchase_requisition_line_form.xml
--- a/view/purchase_requisition_line_form.xml Tue Jul 07 23:56:10 2020 +0200
+++ b/view/purchase_requisition_line_form.xml Fri Oct 09 19:09:05 2020 +0200
@@ -17,9 +17,9 @@
<label name="unit"/>
<field name="unit"/>
<label name="unit_price"/>
- <field name="unit_price"/>
+ <field name="unit_price" symbol="currency"/>
<label name="amount"/>
- <field name="amount"/>
+ <field name="amount" symbol="currency"/>
<separator name="description" colspan="4"/>
<field name="description" colspan="4"/>
</page>
diff -r 9d1738290427 -r f8de39ea0fbe view/purchase_requisition_line_list.xml
--- a/view/purchase_requisition_line_list.xml Tue Jul 07 23:56:10 2020 +0200
+++ b/view/purchase_requisition_line_list.xml Fri Oct 09 19:09:05 2020 +0200
@@ -5,8 +5,7 @@
<field name="requisition" expand="1"/>
<field name="product" expand="1"/>
<field name="supplier" expand="1"/>
- <field name="quantity"/>
- <field name="unit"/>
- <field name="unit_price"/>
- <field name="amount"/>
+ <field name="quantity" symbol="unit"/>
+ <field name="unit_price" symbol="currency"/>
+ <field name="amount" symbol="currency"/>
</tree>
diff -r 9d1738290427 -r f8de39ea0fbe
view/purchase_requisition_line_list_sequence.xml
--- a/view/purchase_requisition_line_list_sequence.xml Tue Jul 07 23:56:10
2020 +0200
+++ b/view/purchase_requisition_line_list_sequence.xml Fri Oct 09 19:09:05
2020 +0200
@@ -5,8 +5,7 @@
<field name="requisition" expand="1"/>
<field name="product" expand="1"/>
<field name="supplier" expand="1"/>
- <field name="quantity"/>
- <field name="unit"/>
- <field name="unit_price"/>
- <field name="amount"/>
+ <field name="quantity" symbol="unit"/>
+ <field name="unit_price" symbol="currency"/>
+ <field name="amount" symbol="currency"/>
</tree>
diff -r 9d1738290427 -r f8de39ea0fbe view/purchase_requisition_tree.xml
--- a/view/purchase_requisition_tree.xml Tue Jul 07 23:56:10 2020 +0200
+++ b/view/purchase_requisition_tree.xml Fri Oct 09 19:09:05 2020 +0200
@@ -6,7 +6,6 @@
<field name="supply_date"/>
<field name="employee" expand="2"/>
<field name="warehouse" expand="1"/>
- <field name="total_amount"/>
- <field name="currency"/>
+ <field name="total_amount" symbol="currency"/>
<field name="state"/>
</tree>
