changeset 62a4dbf21078 in modules/project_revenue:default
details:
https://hg.tryton.org/modules/project_revenue?cmd=changeset;node=62a4dbf21078
description:
Add symbol widget
issue9059
review276871002
diffstat:
view/work_form.xml | 6 +++---
view/work_list.xml | 6 +++---
view/work_list_children.xml | 4 ++--
view/work_tree.xml | 6 +++---
work.py | 11 +++++++++--
5 files changed, 20 insertions(+), 13 deletions(-)
diffs (94 lines):
diff -r 99134f01fd42 -r 62a4dbf21078 view/work_form.xml
--- a/view/work_form.xml Thu Jul 09 10:33:42 2020 +0100
+++ b/view/work_form.xml Fri Oct 09 19:09:05 2020 +0200
@@ -7,15 +7,15 @@
<label name="product"/>
<field name="product"/>
<label name="list_price"/>
- <field name="list_price"/>
+ <field name="list_price" symbol="currency"/>
<newline/>
</xpath>
<xpath
expr="/form/notebook/page[@id='general']/field[@name='total_effort']"
position="after">
<newline/>
<label name="cost"/>
- <field name="cost"/>
+ <field name="cost" symbol="currency"/>
<label name="revenue"/>
- <field name="revenue"/>
+ <field name="revenue" symbol="currency"/>
</xpath>
</data>
diff -r 99134f01fd42 -r 62a4dbf21078 view/work_list.xml
--- a/view/work_list.xml Thu Jul 09 10:33:42 2020 +0100
+++ b/view/work_list.xml Fri Oct 09 19:09:05 2020 +0200
@@ -4,8 +4,8 @@
<data>
<xpath expr="/tree/field[@name='total_effort']" position="after">
<field name="product"/>
- <field name="list_price"/>
- <field name="revenue"/>
- <field name="cost"/>
+ <field name="list_price" symbol="currency"/>
+ <field name="revenue" symbol="currency"/>
+ <field name="cost" symbol="currency"/>
</xpath>
</data>
diff -r 99134f01fd42 -r 62a4dbf21078 view/work_list_children.xml
--- a/view/work_list_children.xml Thu Jul 09 10:33:42 2020 +0100
+++ b/view/work_list_children.xml Fri Oct 09 19:09:05 2020 +0200
@@ -4,7 +4,7 @@
<data>
<xpath expr="/tree/field[@name='total_effort']" position="after">
<field name="product"/>
- <field name="list_price"/>
- <field name="cost"/>
+ <field name="list_price" symbol="currency"/>
+ <field name="cost" symbol="currency"/>
</xpath>
</data>
diff -r 99134f01fd42 -r 62a4dbf21078 view/work_tree.xml
--- a/view/work_tree.xml Thu Jul 09 10:33:42 2020 +0100
+++ b/view/work_tree.xml Fri Oct 09 19:09:05 2020 +0200
@@ -4,8 +4,8 @@
<data>
<xpath expr="/tree/field[@name='total_effort']" position="after">
<field name="product"/>
- <field name="list_price"/>
- <field name="revenue"/>
- <field name="cost"/>
+ <field name="list_price" symbol="currency"/>
+ <field name="revenue" symbol="currency"/>
+ <field name="cost" symbol="currency"/>
</xpath>
</data>
diff -r 99134f01fd42 -r 62a4dbf21078 work.py
--- a/work.py Thu Jul 09 10:33:42 2020 +0100
+++ b/work.py Fri Oct 09 19:09:05 2020 +0200
@@ -28,6 +28,8 @@
cost = fields.Function(fields.Numeric('Cost',
digits=(16, Eval('currency_digits', 2)),
depends=['currency_digits']), 'get_total')
+ currency = fields.Function(fields.Many2One('currency.currency',
+ 'Currency'), 'on_change_with_currency')
currency_digits = fields.Function(fields.Integer('Currency Digits'),
'on_change_with_currency_digits')
@@ -165,9 +167,14 @@
return revenues
@fields.depends('company')
- def on_change_with_currency_digits(self, name=None):
+ def on_change_with_currency(self, name=None):
if self.company:
- return self.company.currency.digits
+ return self.company.currency.id
+
+ @fields.depends('currency')
+ def on_change_with_currency_digits(self, name=None):
+ if self.currency:
+ return self.currency.digits
return 2
@staticmethod
