changeset a725643793fa in modules/account_asset:default
details:
https://hg.tryton.org/modules/account_asset?cmd=changeset;node=a725643793fa
description:
Add symbol widget
issue9059
review276871002
diffstat:
asset.py | 18 ++++++++++++++++--
view/asset_form.xml | 8 ++++----
view/asset_line_form.xml | 10 +++++-----
view/asset_line_tree.xml | 6 +++---
view/asset_tree.xml | 4 ++--
5 files changed, 30 insertions(+), 16 deletions(-)
diffs (130 lines):
diff -r 4f5d415e7aa3 -r a725643793fa asset.py
--- a/asset.py Sat Sep 19 11:37:11 2020 +0200
+++ b/asset.py Fri Oct 09 19:09:05 2020 +0200
@@ -94,6 +94,8 @@
},
depends=['state'],
required=True)
+ 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')
quantity = fields.Float('Quantity',
@@ -301,9 +303,14 @@
return Decimal(0)
@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
@fields.depends('supplier_invoice_line', 'unit')
@@ -718,6 +725,8 @@
'Accumulated Depreciation', readonly=True,
digits=(16, Eval('currency_digits', 2)), depends=['currency_digits'])
move = fields.Many2One('account.move', 'Account Move', readonly=True)
+ 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')
@@ -726,6 +735,11 @@
super(AssetLine, cls).__setup__()
cls._order.insert(0, ('date', 'ASC'))
+ @fields.depends('asset', '_parent_asset.currency')
+ def on_change_with_currency(self, name=None):
+ if self.asset:
+ return self.asset.currency.id
+
@fields.depends('asset', '_parent_asset.currency_digits')
def on_change_with_currency_digits(self, name=None):
if self.asset:
diff -r 4f5d415e7aa3 -r a725643793fa view/asset_form.xml
--- a/view/asset_form.xml Sat Sep 19 11:37:11 2020 +0200
+++ b/view/asset_form.xml Fri Oct 09 19:09:05 2020 +0200
@@ -9,11 +9,11 @@
<label name="supplier_invoice_line"/>
<field name="supplier_invoice_line"/>
<label name="value"/>
- <field name="value"/>
+ <field name="value" symbol="currency"/>
<label name="depreciated_amount"/>
- <field name="depreciated_amount"/>
+ <field name="depreciated_amount" symbol="currency"/>
<label name="residual_value"/>
- <field name="residual_value"/>
+ <field name="residual_value" symbol="currency"/>
<label name="purchase_date"/>
<field name="purchase_date"/>
<label name="start_date"/>
@@ -34,7 +34,7 @@
<label name="frequency"/>
<field name="frequency"/>
<label name="quantity"/>
- <field name="quantity"/>
+ <field name="quantity" symbol="unit"/>
<label name="unit"/>
<field name="unit"/>
<label name="move"/>
diff -r 4f5d415e7aa3 -r a725643793fa view/asset_line_form.xml
--- a/view/asset_line_form.xml Sat Sep 19 11:37:11 2020 +0200
+++ b/view/asset_line_form.xml Fri Oct 09 19:09:05 2020 +0200
@@ -8,16 +8,16 @@
<field name="date"/>
<newline/>
<label name="acquired_value"/>
- <field name="acquired_value"/>
+ <field name="acquired_value" symbol="currency"/>
<label name="depreciable_basis"/>
- <field name="depreciable_basis"/>
+ <field name="depreciable_basis" symbol="currency"/>
<newline/>
<label name="actual_value"/>
- <field name="actual_value"/>
+ <field name="actual_value" symbol="currency"/>
<label name="depreciation"/>
- <field name="depreciation"/>
+ <field name="depreciation" symbol="currency"/>
<label name="accumulated_depreciation"/>
- <field name="accumulated_depreciation"/>
+ <field name="accumulated_depreciation" symbol="currency"/>
<label name="move"/>
<field name="move"/>
</form>
diff -r 4f5d415e7aa3 -r a725643793fa view/asset_line_tree.xml
--- a/view/asset_line_tree.xml Sat Sep 19 11:37:11 2020 +0200
+++ b/view/asset_line_tree.xml Fri Oct 09 19:09:05 2020 +0200
@@ -4,8 +4,8 @@
<tree>
<field name="asset" expand="2"/>
<field name="date"/>
- <field name="actual_value" expand="1"/>
- <field name="depreciation" expand="1"/>
- <field name="accumulated_depreciation" expand="1"/>
+ <field name="actual_value" expand="1" symbol="currency"/>
+ <field name="depreciation" expand="1" symbol="currency"/>
+ <field name="accumulated_depreciation" expand="1" symbol="currency"/>
<field name="move" expand="1"/>
</tree>
diff -r 4f5d415e7aa3 -r a725643793fa view/asset_tree.xml
--- a/view/asset_tree.xml Sat Sep 19 11:37:11 2020 +0200
+++ b/view/asset_tree.xml Fri Oct 09 19:09:05 2020 +0200
@@ -6,7 +6,7 @@
<field name="product" expand="2"/>
<field name="start_date"/>
<field name="end_date"/>
- <field name="value"/>
- <field name="residual_value"/>
+ <field name="value" symbol="currency"/>
+ <field name="residual_value" symbol="currency"/>
<field name="state"/>
</tree>
