diff --git a/__pycache__/__init__.cpython-39.opt-1.pyc b/__pycache__/__init__.cpython-39.opt-1.pyc deleted file mode 100644 index bea736e..0000000 Binary files a/__pycache__/__init__.cpython-39.opt-1.pyc and /dev/null differ diff --git a/__pycache__/device.cpython-39.opt-1.pyc b/__pycache__/device.cpython-39.opt-1.pyc deleted file mode 100644 index 3c9eb98..0000000 Binary files a/__pycache__/device.cpython-39.opt-1.pyc and /dev/null differ diff --git a/__pycache__/sale.cpython-39.opt-1.pyc b/__pycache__/sale.cpython-39.opt-1.pyc deleted file mode 100644 index a707727..0000000 Binary files a/__pycache__/sale.cpython-39.opt-1.pyc and /dev/null differ diff --git a/__pycache__/statement.cpython-39.opt-1.pyc b/__pycache__/statement.cpython-39.opt-1.pyc deleted file mode 100644 index 39c9217..0000000 Binary files a/__pycache__/statement.cpython-39.opt-1.pyc and /dev/null differ diff --git a/__pycache__/user.cpython-39.opt-1.pyc b/__pycache__/user.cpython-39.opt-1.pyc deleted file mode 100644 index 94a654e..0000000 Binary files a/__pycache__/user.cpython-39.opt-1.pyc and /dev/null differ diff --git a/locale/es.po b/locale/es.po index 6c2e6b7..f504e82 100644 --- a/locale/es.po +++ b/locale/es.po @@ -98,6 +98,38 @@ msgctxt "field:sale.sale,shop_address:" msgid "Shop Address" msgstr "Dirección tienda" +msgctxt "field:close.statement.start,statementLines:" +msgid "Lines Statement" +msgstr "Extractos" + +msgctxt "field:statement.line,company:" +msgid "Company" +msgstr "Compañia" + +msgctxt "field:statement.line,journal:" +msgid "Journal" +msgstr "Extracto" + +msgctxt "field:statement.line,start_balance:" +msgid "Start Balance" +msgstr "Saldo Inicial" + +msgctxt "field:statement.line,balance:" +msgid "Balance" +msgstr "Saldo" + +msgctxt "field:statement.line,end_balance:" +msgid "End Balance" +msgstr "Saldo Final" + +msgctxt "field:statement.line,transfer:" +msgid "Transfer" +msgstr "Trasladar" + +msgctxt "field:statement.line,account:" +msgid "Account" +msgstr "Cuenta" + msgctxt "model:close.statement.done,name:" msgid "Close Statement" msgstr "Cerrar extracto" @@ -325,3 +357,5 @@ msgstr "Cancelar" msgctxt "wizard_button:sale.payment,start,pay_:" msgid "Pay" msgstr "Pagar" + + diff --git a/sale.py b/sale.py index 3ac0073..7ef3bcb 100644 --- a/sale.py +++ b/sale.py @@ -14,6 +14,7 @@ from trytond.i18n import gettext from trytond.exceptions import UserError from trytond.modules.currency.fields import Monetary +from trytond.exceptions import UserError __all__ = ['Sale', 'SalePaymentForm', 'WizardSalePayment', 'WizardSaleReconcile'] diff --git a/statement.py b/statement.py index 1c2afe8..8d5d588 100644 --- a/statement.py +++ b/statement.py @@ -199,7 +199,8 @@ class CloseStatementStart(ModelView): 'Close Statement' __name__ = 'close.statement.start' - statementLines = fields.One2Many('statement.line', None, 'Lines') + statementLines = fields.One2Many('statement.line', None, 'Lines Statement', + states={'readonly': True}) class CloseStatementDone(ModelView): @@ -242,7 +243,8 @@ class CloseStatement(Wizard): journals = [j.id for j in device.journals] draft_statements = { s.journal: s for s in Statement.search([ - ('journal', 'in', journals), + ('journal', 'in', journals), + ('state', '=', 'draft'), ], order=[ ('create_date', 'ASC'), ])} @@ -277,6 +279,7 @@ class CloseStatement(Wizard): draft_statements = { s.journal: s for s in Statement.search([ ('journal', 'in', journals), + ('state', '=', 'draft') ], order=[ ('create_date', 'ASC'), ])} @@ -306,10 +309,7 @@ class CloseStatement(Wizard): statement.lines = statement.lines + conciliation else: - end_balance = statement.start_balance - for line in statement.lines: - end_balance += line.amount - statement.end_balance = end_balance + statement.end_balance = end_balance statement.save() statements.append(statement) results.append(gettext('sale_payment.close_statement', @@ -342,13 +342,13 @@ class StatementLine(ModelView): currency = fields.Many2One( 'currency.currency', "Currency") start_balance = Monetary( - "Start Balance", currency='currency', digits='currency') + "Start Balance", currency='currency', digits='currency', states=_states) balance = Monetary( - "Balance", currency='currency', digits='currency') + "Balance", currency='currency', digits='currency', states=_states) + end_balance = Monetary( + "End Balance", currency='currency', digits='currency') transfer = Monetary( "Transfer", currency='currency', digits='currency') - end_balance = Monetary( - "End Balance", currency='currency', digits='currency') account = fields.Many2One('account.account', "Account", domain=[ ('company', '=', Eval('company', 0)), diff --git a/view/close_statement_start_form.xml b/view/close_statement_start_form.xml index 2b84936..5bf06af 100644 --- a/view/close_statement_start_form.xml +++ b/view/close_statement_start_form.xml @@ -2,12 +2,13 @@ -