NaNtic
/
trytond-sale_payment
mirror of https://github.com/NaN-tic/trytond-sale_payment.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FIX gettext messages when open/close statements 

#040032
This commit is contained in:
Raimon Esteve 2020-02-05 13:09:32 +01:00
parent 09516007ad
commit 962c101208
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
message.xml
View File

@ -30,5 +30,8 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.message" id="statement_already_closed"> <record model="ir.message" id="statement_already_closed">
<field name="text">Statement %(statement)s not found.</field> <field name="text">Statement %(statement)s not found.</field>
</record> </record>
<record model="ir.message" id="not_statement_found">
<field name="text">Not found statement related to %(journal)s journal.</field>
</record>
</data> </data>
</tryton> </tryton>

28
statement.py
View File

@ -166,7 +166,7 @@ class OpenStatement(Wizard):
for s in statements for s in statements
} }
vlist = [] vlist = []
result = '' results = []
for journal in device.journals: for journal in device.journals:
if journal not in journals_of_draft_statements: if journal not in journals_of_draft_statements:
values = { values = {
@ -178,13 +178,13 @@ class OpenStatement(Wizard):
'end_balance': Decimal('0.0'), 'end_balance': Decimal('0.0'),
} }
vlist.append(values) vlist.append(values)
result += gettext('sale_payment.open_statement', results.append(gettext('sale_payment.open_statement',
journal=journal.rec_name) journal=journal.rec_name))
else: else:
result += gettext('sale_payment.statement_already_opened', results.append(gettext('sale_payment.statement_already_opened',
journal=journal.rec_name) statement=journal.rec_name))
statements.extend(Statement.create(vlist)) statements.extend(Statement.create(vlist))
self.result = result self.result = '\n'.join(results)
else: else:
self.result = gettext('sale_payment.user_without_device', self.result = gettext('sale_payment.user_without_device',
user=user.rec_name) user=user.rec_name)
@ -238,7 +238,7 @@ class CloseStatement(Wizard):
('create_date', 'ASC'), ('create_date', 'ASC'),
])} ])}
result = '' results = []
statements = [] statements = []
for journal in device.journals: for journal in device.journals:
statement = draft_statements.get(journal) statement = draft_statements.get(journal)
@ -249,17 +249,17 @@ class CloseStatement(Wizard):
statement.end_balance = end_balance statement.end_balance = end_balance
statement.save() statement.save()
statements.append(statement) statements.append(statement)
result += gettext('sale_payment.close_statement', results.append(gettext('sale_payment.close_statement',
statement=statement.rec_name) statement=statement.rec_name))
elif statement: elif statement:
result += gettext('sale_payment.statement_already_closed', results.append(gettext('sale_payment.statement_already_closed',
statement=statement.rec_name) statement=statement.rec_name))
else: else:
result += gettext('sale_payment.not_statement_found', results.append(gettext('sale_payment.not_statement_found',
journal=journal.rec_name) journal=journal.rec_name))
if statements: if statements:
Statement.validate_statement(statements) Statement.validate_statement(statements)
self.result = result self.result = '\n'.join(results)
else: else:
self.result = gettext('sale_payment.user_without_device', self.result = gettext('sale_payment.user_without_device',
user=user.rec_name) user=user.rec_name)