changeset 57d2c74e8999 in modules/account:default
details: https://hg.tryton.org/modules/account?cmd=changeset;node=57d2c74e8999
description:
Add symbol widget
issue9059
review276871002
diffstat:
account.py | 21 ++++++++++++++++++++-
move.py | 7 +++++++
tax.py | 11 +++++++++--
view/account_balance_sheet_tree.xml | 4 ++--
view/account_deferral_form.xml | 6 +++---
view/account_deferral_tree.xml | 8 +++-----
view/account_income_statement_tree.xml | 4 ++--
view/account_list_balance_sheet.xml | 10 ++++------
view/account_tree2.xml | 10 ++++------
view/aged_balance_list.xml | 10 +++++-----
view/general_ledger_account_list.xml | 8 ++++----
view/general_ledger_line_list.xml | 6 +++---
view/move_line_form.xml | 4 ++--
view/move_line_form_move.xml | 4 ++--
view/move_line_tree.xml | 4 ++--
view/move_line_tree_move.xml | 4 ++--
view/tax_code_tree2.xml | 2 +-
17 files changed, 75 insertions(+), 48 deletions(-)
diffs (343 lines):
diff -r 58c80b966fe8 -r 57d2c74e8999 account.py
--- a/account.py Sun Oct 04 16:28:48 2020 +0200
+++ b/account.py Fri Oct 09 19:09:05 2020 +0200
@@ -230,7 +230,8 @@
('company', '=', Eval('company')),
],
depends=['company'])
-
+ currency = fields.Function(fields.Many2One(
+ 'currency.currency', 'Currency'), 'get_currency')
currency_digits = fields.Function(fields.Integer('Currency Digits'),
'get_currency_digits')
amount = fields.Function(fields.Numeric('Amount',
@@ -266,6 +267,9 @@
def default_company(cls):
return Transaction().context.get('company')
+ def get_currency(self, name):
+ return self.company.currency.id
+
def get_currency_digits(self, name):
return self.company.currency.digits
@@ -1591,6 +1595,8 @@
digits=(16, Eval('currency_digits', 2)),
depends=['currency_digits']),
'get_account', searcher='search_account')
+ currency = fields.Function(fields.Many2One(
+ 'currency.currency', 'Currency'), 'get_currency')
currency_digits = fields.Function(fields.Integer('Currency Digits'),
'get_currency_digits')
@@ -1753,6 +1759,9 @@
if operator_(getattr(a, name), operand)]
return [('id', 'in', ids)]
+ def get_currency(self, name):
+ return self.company.currency.id
+
def get_currency_digits(self, name):
return self.company.currency.digits
@@ -1938,6 +1947,8 @@
('posted', 'Posted'),
], 'State')
state_string = state.translated('state')
+ currency = fields.Function(fields.Many2One(
+ 'currency.currency', "Currency"), 'get_currency')
currency_digits = fields.Function(fields.Integer('Currency Digits'),
'get_currency_digits')
@@ -1997,6 +2008,9 @@
def get_party_required(self, name):
return self.account.party_required
+ def get_currency(self, name):
+ return self.company.currency.id
+
def get_currency_digits(self, name):
return self.company.currency.digits
@@ -2328,6 +2342,8 @@
balance = fields.Numeric('Balance',
digits=(16, Eval('currency_digits', 2)),
depends=['currency_digits'])
+ currency = fields.Function(fields.Many2One(
+ 'currency.currency', "Currency"), 'get_currency')
currency_digits = fields.Function(fields.Integer('Currency Digits'),
'get_currency_digits')
@@ -2439,6 +2455,9 @@
else:
return Literal(False)
+ def get_currency(self, name):
+ return self.company.currency.id
+
def get_currency_digits(self, name):
return self.company.currency.digits
diff -r 58c80b966fe8 -r 57d2c74e8999 move.py
--- a/move.py Sun Oct 04 16:28:48 2020 +0200
+++ b/move.py Fri Oct 09 19:09:05 2020 +0200
@@ -680,6 +680,8 @@
('posted', 'Posted'),
], 'Move State'), 'on_change_with_move_state',
searcher='search_move_field')
+ 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')
second_currency_digits = fields.Function(fields.Integer(
@@ -791,6 +793,11 @@
return Decimal(0)
@fields.depends('account')
+ def on_change_with_currency(self, name=None):
+ if self.account:
+ return self.account.currency.id
+
+ @fields.depends('account')
def on_change_with_currency_digits(self, name=None):
if self.account:
return self.account.currency_digits
diff -r 58c80b966fe8 -r 57d2c74e8999 tax.py
--- a/tax.py Sun Oct 04 16:28:48 2020 +0200
+++ b/tax.py Fri Oct 09 19:09:05 2020 +0200
@@ -135,6 +135,8 @@
'account.tax.code', 'Parent', select=True, states=_states)
lines = fields.One2Many('account.tax.code.line', 'code', "Lines")
childs = fields.One2Many('account.tax.code', 'parent', 'Children')
+ 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')
amount = fields.Function(fields.Numeric(
@@ -170,9 +172,14 @@
return False
@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
@classmethod
diff -r 58c80b966fe8 -r 57d2c74e8999 view/account_balance_sheet_tree.xml
--- a/view/account_balance_sheet_tree.xml Sun Oct 04 16:28:48 2020 +0200
+++ b/view/account_balance_sheet_tree.xml Fri Oct 09 19:09:05 2020 +0200
@@ -3,6 +3,6 @@
this repository contains the full copyright notices and license terms. -->
<tree keyword_open="1">
<field name="name" expand="1"/>
- <field name="amount"/>
- <field name="amount_cmp" string="Comparison"/>
+ <field name="amount" symbol="currency"/>
+ <field name="amount_cmp" string="Comparison" symbol="currency"/>
</tree>
diff -r 58c80b966fe8 -r 57d2c74e8999 view/account_deferral_form.xml
--- a/view/account_deferral_form.xml Sun Oct 04 16:28:48 2020 +0200
+++ b/view/account_deferral_form.xml Fri Oct 09 19:09:05 2020 +0200
@@ -9,11 +9,11 @@
<field name="fiscalyear"/>
<newline/>
<label name="debit"/>
- <field name="debit"/>
+ <field name="debit" symbol="currency"/>
<label name="credit"/>
- <field name="credit"/>
+ <field name="credit" symbol="currency"/>
<label name="amount_second_currency"/>
- <field name="amount_second_currency"/>
+ <field name="amount_second_currency" symbol="second_currency"/>
<label name="second_currency"/>
<field name="second_currency"/>
</form>
diff -r 58c80b966fe8 -r 57d2c74e8999 view/account_deferral_tree.xml
--- a/view/account_deferral_tree.xml Sun Oct 04 16:28:48 2020 +0200
+++ b/view/account_deferral_tree.xml Fri Oct 09 19:09:05 2020 +0200
@@ -4,9 +4,7 @@
<tree>
<field name="account"/>
<field name="fiscalyear"/>
- <field name="debit"/>
- <field name="credit"/>
- <field name="currency"/>
- <field name="amount_second_currency"/>
- <field name="second_currency"/>
+ <field name="debit" symbol="currency"/>
+ <field name="credit" symbol="currency"/>
+ <field name="amount_second_currency" symbol="second_currency"/>
</tree>
diff -r 58c80b966fe8 -r 57d2c74e8999 view/account_income_statement_tree.xml
--- a/view/account_income_statement_tree.xml Sun Oct 04 16:28:48 2020 +0200
+++ b/view/account_income_statement_tree.xml Fri Oct 09 19:09:05 2020 +0200
@@ -3,6 +3,6 @@
this repository contains the full copyright notices and license terms. -->
<tree keyword_open="1">
<field name="name" expand="1"/>
- <field name="amount"/>
- <field name="amount_cmp" string="Comparison"/>
+ <field name="amount" symbol="currency"/>
+ <field name="amount_cmp" string="Comparison" symbol="currency"/>
</tree>
diff -r 58c80b966fe8 -r 57d2c74e8999 view/account_list_balance_sheet.xml
--- a/view/account_list_balance_sheet.xml Sun Oct 04 16:28:48 2020 +0200
+++ b/view/account_list_balance_sheet.xml Fri Oct 09 19:09:05 2020 +0200
@@ -4,10 +4,8 @@
<tree keyword_open="1">
<field name="code"/>
<field name="name" expand="1"/>
- <field name="debit"/>
- <field name="credit"/>
- <field name="balance"/>
- <field name="currency"/>
- <field name="amount_second_currency"/>
- <field name="second_currency"/>
+ <field name="debit" symbol="currency"/>
+ <field name="credit" symbol="currency"/>
+ <field name="balance" symbol="currency"/>
+ <field name="amount_second_currency" symbol="second_currency"/>
</tree>
diff -r 58c80b966fe8 -r 57d2c74e8999 view/account_tree2.xml
--- a/view/account_tree2.xml Sun Oct 04 16:28:48 2020 +0200
+++ b/view/account_tree2.xml Fri Oct 09 19:09:05 2020 +0200
@@ -4,10 +4,8 @@
<tree keyword_open="1">
<field name="name" expand="2"/>
<field name="code"/>
- <field name="debit"/>
- <field name="credit"/>
- <field name="balance"/>
- <field name="currency"/>
- <field name="amount_second_currency"/>
- <field name="second_currency"/>
+ <field name="debit" symbol="currency"/>
+ <field name="credit" symbol="currency"/>
+ <field name="balance" symbol="currency"/>
+ <field name="amount_second_currency" symbol="second_currency"/>
</tree>
diff -r 58c80b966fe8 -r 57d2c74e8999 view/aged_balance_list.xml
--- a/view/aged_balance_list.xml Sun Oct 04 16:28:48 2020 +0200
+++ b/view/aged_balance_list.xml Fri Oct 09 19:09:05 2020 +0200
@@ -3,9 +3,9 @@
this repository contains the full copyright notices and license terms. -->
<tree>
<field name="party" expand="2"/>
- <field name="term0" expand="1"/>
- <field name="term1" expand="1"/>
- <field name="term2" expand="1"/>
- <field name="term3" expand="1"/>
- <field name="balance" expand="1"/>
+ <field name="term0" expand="1" symbol="currency"/>
+ <field name="term1" expand="1" symbol="currency"/>
+ <field name="term2" expand="1" symbol="currency"/>
+ <field name="term3" expand="1" symbol="currency"/>
+ <field name="balance" expand="1" symbol="currency"/>
</tree>
diff -r 58c80b966fe8 -r 57d2c74e8999 view/general_ledger_account_list.xml
--- a/view/general_ledger_account_list.xml Sun Oct 04 16:28:48 2020 +0200
+++ b/view/general_ledger_account_list.xml Fri Oct 09 19:09:05 2020 +0200
@@ -3,8 +3,8 @@
this repository contains the full copyright notices and license terms. -->
<tree keyword_open="1">
<field name="account" expand="1"/>
- <field name="start_balance" sum="Start Balance"/>
- <field name="debit" sum="Debit"/>
- <field name="credit" sum="Credit"/>
- <field name="end_balance" sum="End Balance"/>
+ <field name="start_balance" sum="Start Balance" symbol="currency"/>
+ <field name="debit" sum="Debit" symbol="currency"/>
+ <field name="credit" sum="Credit" symbol="currency"/>
+ <field name="end_balance" sum="End Balance" symbol="currency"/>
</tree>
diff -r 58c80b966fe8 -r 57d2c74e8999 view/general_ledger_line_list.xml
--- a/view/general_ledger_line_list.xml Sun Oct 04 16:28:48 2020 +0200
+++ b/view/general_ledger_line_list.xml Fri Oct 09 19:09:05 2020 +0200
@@ -10,7 +10,7 @@
<field name="move_description" expand="1"/>
<field name="origin"/>
<field name="state"/>
- <field name="debit" sum="Debit"/>
- <field name="credit" sum="Credit"/>
- <field name="balance"/>
+ <field name="debit" sum="Debit" symbol="currency"/>
+ <field name="credit" sum="Credit" symbol="currency"/>
+ <field name="balance" symbol="currency"/>
</tree>
diff -r 58c80b966fe8 -r 57d2c74e8999 view/move_line_form.xml
--- a/view/move_line_form.xml Sun Oct 04 16:28:48 2020 +0200
+++ b/view/move_line_form.xml Fri Oct 09 19:09:05 2020 +0200
@@ -11,9 +11,9 @@
<label name="period"/>
<field name="period"/>
<label name="debit"/>
- <field name="debit"/>
+ <field name="debit" symbol="currency"/>
<label name="credit"/>
- <field name="credit"/>
+ <field name="credit" symbol="currency"/>
<label name="move_origin"/>
<field name="move_origin"/>
<label name="origin"/>
diff -r 58c80b966fe8 -r 57d2c74e8999 view/move_line_form_move.xml
--- a/view/move_line_form_move.xml Sun Oct 04 16:28:48 2020 +0200
+++ b/view/move_line_form_move.xml Fri Oct 09 19:09:05 2020 +0200
@@ -6,9 +6,9 @@
<field name="account"/>
<newline/>
<label name="debit"/>
- <field name="debit"/>
+ <field name="debit" symbol="currency"/>
<label name="credit"/>
- <field name="credit"/>
+ <field name="credit" symbol="currency"/>
<label name="origin"/>
<field name="origin" colspan="3"/>
<label name="description"/>
diff -r 58c80b966fe8 -r 57d2c74e8999 view/move_line_tree.xml
--- a/view/move_line_tree.xml Sun Oct 04 16:28:48 2020 +0200
+++ b/view/move_line_tree.xml Fri Oct 09 19:09:05 2020 +0200
@@ -7,8 +7,8 @@
<field name="date"/>
<field name="account" expand="1"/>
<field name="party" expand="1"/>
- <field name="debit" sum="Debit"/>
- <field name="credit" sum="Credit"/>
+ <field name="debit" sum="Debit" symbol="currency"/>
+ <field name="credit" sum="Credit" symbol="currency"/>
<field name="tax_lines"/>
<field name="description" expand="1"/>
<field name="move_description" expand="1"/>
diff -r 58c80b966fe8 -r 57d2c74e8999 view/move_line_tree_move.xml
--- a/view/move_line_tree_move.xml Sun Oct 04 16:28:48 2020 +0200
+++ b/view/move_line_tree_move.xml Fri Oct 09 19:09:05 2020 +0200
@@ -5,8 +5,8 @@
<field name="move"/>
<field name="account" expand="1"/>
<field name="party" expand="1"/>
- <field name="debit" sum="Debit"/>
- <field name="credit" sum="Credit"/>
+ <field name="debit" sum="Debit" symbol="currency"/>
+ <field name="credit" sum="Credit" symbol="currency"/>
<field name="tax_lines"/>
<field name="description" expand="1"/>
<field name="reconciliation"/>
diff -r 58c80b966fe8 -r 57d2c74e8999 view/tax_code_tree2.xml
--- a/view/tax_code_tree2.xml Sun Oct 04 16:28:48 2020 +0200
+++ b/view/tax_code_tree2.xml Fri Oct 09 19:09:05 2020 +0200
@@ -4,5 +4,5 @@
<tree keyword_open="1">
<field name="code"/>
<field name="name" expand="1"/>
- <field name="amount"/>
+ <field name="amount" symbol="currency"/>
</tree>
