changeset 7a97a877817c in modules/account_payment:default
details:
https://hg.tryton.org/modules/account_payment?cmd=changeset;node=7a97a877817c
description:
Add symbol widget
issue9059
review276871002
diffstat:
account.py | 9 +++++++++
view/move_line_list.xml | 9 ++++-----
view/payment_list.xml | 3 +--
3 files changed, 14 insertions(+), 7 deletions(-)
diffs (59 lines):
diff -r e5534a775cff -r 7a97a877817c account.py
--- a/account.py Sat Sep 12 18:32:14 2020 +0200
+++ b/account.py Fri Oct 09 19:09:05 2020 +0200
@@ -36,6 +36,9 @@
depends=['payment_kind', 'second_currency_digits',
'currency_digits']), 'get_payment_amount',
searcher='search_payment_amount')
+ payment_currency = fields.Function(fields.Many2One(
+ 'currency.currency', "Payment Currency"),
+ 'get_payment_currency')
payments = fields.One2Many('account.payment', 'line', 'Payments',
readonly=True,
states={
@@ -132,6 +135,12 @@
))
return [('id', 'in', query)]
+ def get_payment_currency(self, name):
+ if self.second_currency:
+ return self.second_currency.id
+ elif self.currency:
+ return self.currency.id
+
def get_payment_kind(self, name):
if (self.account.type.receivable
and (self.debit > 0 or self.credit < 0)):
diff -r e5534a775cff -r 7a97a877817c view/move_line_list.xml
--- a/view/move_line_list.xml Sat Sep 12 18:32:14 2020 +0200
+++ b/view/move_line_list.xml Fri Oct 09 19:09:05 2020 +0200
@@ -7,12 +7,11 @@
<field name="description" expand="1"/>
<field name="party" expand="1"/>
<field name="maturity_date"/>
- <field name="payment_amount"/>
- <field name="second_currency"/>
+ <field name="payment_amount" symbol="payment_currency"/>
<field name="account" expand="1"/>
- <field name="debit"/>
- <field name="credit"/>
- <field name="amount_second_currency"/>
+ <field name="debit" symbol="currency"/>
+ <field name="credit" symbol="currency"/>
+ <field name="amount_second_currency" symbol="second_currency"/>
<button name="payment_block"/>
<button name="payment_unblock"/>
<button name="pay" tree_invisible="1"/>
diff -r e5534a775cff -r 7a97a877817c view/payment_list.xml
--- a/view/payment_list.xml Sat Sep 12 18:32:14 2020 +0200
+++ b/view/payment_list.xml Fri Oct 09 19:09:05 2020 +0200
@@ -5,8 +5,7 @@
<field name="journal" expand="1"/>
<field name="kind"/>
<field name="party" expand="2"/>
- <field name="amount"/>
- <field name="currency"/>
+ <field name="amount" symbol="currency"/>
<field name="date"/>
<field name="state"/>
<button name="draft"/>
