changeset 08411d358af1 in modules/account_statement:default
details:
https://hg.tryton.org/modules/account_statement?cmd=changeset;node=08411d358af1
description:
Add symbol widget
issue9059
review276871002
diffstat:
statement.py | 26 +++++++++++++++++++++++---
view/statement_form.xml | 8 ++++----
view/statement_line_form.xml | 2 +-
view/statement_line_tree.xml | 2 +-
view/statement_line_tree_editable.xml | 2 +-
view/statement_origin_form.xml | 4 ++--
view/statement_origin_tree.xml | 4 ++--
7 files changed, 34 insertions(+), 14 deletions(-)
diffs (144 lines):
diff -r 26fa3b0a0196 -r 08411d358af1 statement.py
--- a/statement.py Sat Sep 12 01:31:15 2020 +0200
+++ b/statement.py Fri Oct 09 19:09:05 2020 +0200
@@ -86,6 +86,8 @@
'readonly': (Eval('state') != 'draft') | Eval('lines', [0]),
},
depends=['state', 'company'])
+ 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')
date = fields.Date('Date', required=True, select=True)
@@ -237,6 +239,11 @@
self.start_balance = statement.end_balance
@fields.depends('journal')
+ def on_change_with_currency(self, name=None):
+ if self.journal:
+ return self.journal.currency.id
+
+ @fields.depends('journal')
def on_change_with_currency_digits(self, name=None):
if self.journal:
return self.journal.currency.digits
@@ -667,9 +674,12 @@
"Date", required=True, states=_states, depends=_depends)
amount = fields.Numeric(
"Amount", required=True,
- digits=(16, Eval('_parent_statement', {})
- .get('currency_digits', 2)),
- states=_states, depends=_depends)
+ digits=(16, Eval('currency_digits', 2)),
+ states=_states, depends=_depends + ['currency_digits'])
+ 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')
party = fields.Many2One(
'party.party', "Party", states=_states, depends=_depends)
account = fields.Many2One(
@@ -706,6 +716,16 @@
def search_company(cls, name, clause):
return [('statement.' + clause[0],) + tuple(clause[1:])]
+ @fields.depends('statement', '_parent_statement.journal')
+ def on_change_with_currency(self, name=None):
+ if self.statement and self.statement.journal:
+ return self.statement.journal.currency.id
+
+ @fields.depends('statement', '_parent_statement.journal')
+ def on_change_with_currency_digits(self, name=None):
+ if self.statement and self.statement.journal:
+ return self.statement.journal.currency.digits
+
return Mixin
diff -r 26fa3b0a0196 -r 08411d358af1 view/statement_form.xml
--- a/view/statement_form.xml Sat Sep 12 01:31:15 2020 +0200
+++ b/view/statement_form.xml Fri Oct 09 19:09:05 2020 +0200
@@ -10,14 +10,14 @@
<field name="date"/>
<label name="start_balance"/>
<group id="balances" col="-1">
- <field name="start_balance"/>
+ <field name="start_balance" symbol="currency"/>
<label name="balance"/>
- <field name="balance"/>
+ <field name="balance" symbol="currency"/>
</group>
<label name="end_balance"/>
- <field name="end_balance"/>
+ <field name="end_balance" symbol="currency"/>
<label name="total_amount"/>
- <field name="total_amount"/>
+ <field name="total_amount" symbol="currency"/>
<newline/>
<label name="number_of_lines"/>
<field name="number_of_lines"/>
diff -r 26fa3b0a0196 -r 08411d358af1 view/statement_line_form.xml
--- a/view/statement_line_form.xml Sat Sep 12 01:31:15 2020 +0200
+++ b/view/statement_line_form.xml Fri Oct 09 19:09:05 2020 +0200
@@ -11,7 +11,7 @@
<label name="date"/>
<field name="date"/>
<label name="amount"/>
- <field name="amount"/>
+ <field name="amount" symbol="currency"/>
<label name="party"/>
<field name="party"/>
<label name="account"/>
diff -r 26fa3b0a0196 -r 08411d358af1 view/statement_line_tree.xml
--- a/view/statement_line_tree.xml Sat Sep 12 01:31:15 2020 +0200
+++ b/view/statement_line_tree.xml Fri Oct 09 19:09:05 2020 +0200
@@ -5,7 +5,7 @@
<field name="statement" expand="1"/>
<field name="number"/>
<field name="date"/>
- <field name="amount"/>
+ <field name="amount" symbol="currency"/>
<field name="party" expand="1"/>
<field name="account" expand="1"/>
<field name="invoice" expand="1"/>
diff -r 26fa3b0a0196 -r 08411d358af1 view/statement_line_tree_editable.xml
--- a/view/statement_line_tree_editable.xml Sat Sep 12 01:31:15 2020 +0200
+++ b/view/statement_line_tree_editable.xml Fri Oct 09 19:09:05 2020 +0200
@@ -5,7 +5,7 @@
<field name="statement" expand="1"/>
<field name="number"/>
<field name="date"/>
- <field name="amount" sum="Amount"/>
+ <field name="amount" sum="Amount" symbol="currency"/>
<field name="party" expand="1"/>
<field name="invoice" expand="1"/>
<field name="account" expand="1"/>
diff -r 26fa3b0a0196 -r 08411d358af1 view/statement_origin_form.xml
--- a/view/statement_origin_form.xml Sat Sep 12 01:31:15 2020 +0200
+++ b/view/statement_origin_form.xml Fri Oct 09 19:09:05 2020 +0200
@@ -11,9 +11,9 @@
<label name="date"/>
<field name="date"/>
<label name="amount"/>
- <field name="amount"/>
+ <field name="amount" symbol="currency"/>
<label name="pending_amount"/>
- <field name="pending_amount"/>
+ <field name="pending_amount" symbol="currency"/>
<label name="party"/>
<field name="party"/>
<label name="account"/>
diff -r 26fa3b0a0196 -r 08411d358af1 view/statement_origin_tree.xml
--- a/view/statement_origin_tree.xml Sat Sep 12 01:31:15 2020 +0200
+++ b/view/statement_origin_tree.xml Fri Oct 09 19:09:05 2020 +0200
@@ -5,8 +5,8 @@
<field name="statement" expand="1"/>
<field name="number"/>
<field name="date"/>
- <field name="amount" sum="Amount"/>
- <field name="pending_amount"/>
+ <field name="amount" sum="Amount" symbol="currency"/>
+ <field name="pending_amount" symbol="currency"/>
<field name="party" expand="1"/>
<field name="account" expand="1"/>
<field name="description" expand="1"/>
