From 4331c6df620b6b6fbdc930503e36d78f2c5a3303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20T=C3=A1mara?= Date: Thu, 30 Oct 2008 16:27:13 -0500 Subject: [PATCH 1/5] Updating Spanish Translation --- es_ES.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/es_ES.csv b/es_ES.csv index e023534f88..5412581b7d 100644 --- a/es_ES.csv +++ b/es_ES.csv @@ -231,6 +231,7 @@ view,account.invoice.refund_invoice.init,0,Refund Invoice,Factura de Devolución view,account.invoice.tax,0,Invoice Tax,Impuesto en Factura,0 view,account.invoice.tax,0,Invoice Taxes,Impuestos de Facturas,0 view,account.invoice.tax,0,Tax Code,Código de Impuesto,0 +view,party.party,0,Payment Terms,Términos de Pago,0 wizard_button,"account.invoice.credit_invoice,init,credit",0,Credit,Crédito,0 wizard_button,"account.invoice.credit_invoice,init,end",0,Cancel,Cancelar,0 wizard_button,"account.invoice.pay_invoice,ask,end",0,Cancel,Cancelar,0 From b2257425bf74b2e5ad5ec3a09074395345a33136 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20T=C3=A1mara?= Date: Fri, 31 Oct 2008 13:07:40 -0500 Subject: [PATCH 2/5] Applied Clean Wizard Translations --- es_ES.csv | 8 -------- 1 file changed, 8 deletions(-) diff --git a/es_ES.csv b/es_ES.csv index 5412581b7d..4b93c82a58 100644 --- a/es_ES.csv +++ b/es_ES.csv @@ -34,10 +34,8 @@ error,account.invoice.tax,0,"You can not modify tax from an invoice that is open error,account.period,0,You can not change the invoice sequence if there is already an invoice opened in the period,No puede cambiar la secuencia de una factura si hay una factura abierta en el período,0 field,"account.fiscalyear,in_credit_note_sequence",0,Supplier Credit Note Sequence,Secuencia de la Nota Crédito del Proveedor,0 field,"account.fiscalyear,in_invoice_sequence",0,Supplier Invoice Sequence,Secuencia de Factura de Proveedor,0 -field,"account.fiscalyear,in_refund_sequence",0,Supplier Refund Sequence,Secuencia de Devolución a Proveedor,0 field,"account.fiscalyear,out_credit_note_sequence",0,Customer Credit Note Sequence,Secuencia de Nota Crédito de Cliente,0 field,"account.fiscalyear,out_invoice_sequence",0,Customer Invoice Sequence,Secuencia de Facturas de Cliente,0 -field,"account.fiscalyear,out_refund_sequence",0,Customer Refund Sequence,Secuencia de Devolución del Cliente,0 field,"account.invoice,account",0,Account,Cuenta,0 field,"account.invoice,amount_to_pay",0,Amount to Pay,Cantidad a pagar,0 field,"account.invoice,amount_to_pay_today",0,Amount to Pay Today,Cantidad a pagar hoy,0 @@ -127,10 +125,8 @@ field,"account.invoice,type_name",0,Type,Tipo,0 field,"account.invoice,untaxed_amount",0,Untaxed,Sin Impuesto,0 field,"account.period,in_credit_note_sequence",0,Supplier Credit Note Sequence,Secuencia de la Nota Crédito del Proveedor,0 field,"account.period,in_invoice_sequence",0,Supplier Invoice Sequence,Secuencia de Factura de Proveedor,0 -field,"account.period,in_refund_sequence",0,Supplier Refund Sequence,Secuencia de Devolución a Proveedor,0 field,"account.period,out_credit_note_sequence",0,Customer Credit Note Sequence,Secuencia de Nota Crédito de Cliente,0 field,"account.period,out_invoice_sequence",0,Customer Invoice Sequence,Secuencia de Facturas de Cliente,0 -field,"account.period,out_refund_sequence",0,Customer Refund Sequence,Secuencia de Devolución del Cliente,0 field,"party.address,invoice",0,Invoice,Factura,0 field,"party.party,payment_term",0,Invoice Payment Term,Término de Pago de la Factura,0 field,"party.party,supplier_payment_term",0,Supplier Payment Term,Término de Pago a Proveedor,0 @@ -188,10 +184,8 @@ selection,"account.invoice,state",0,Paid,Pagado,0 selection,"account.invoice,state",0,Pro forma,Pro forma,0 selection,"account.invoice,type",0,Credit Note,Nota de Crédito,0 selection,"account.invoice,type",0,Invoice,Factura,0 -selection,"account.invoice,type",0,Refund,Devolución,0 selection,"account.invoice,type",0,Supplier Credit Note,Nota Crédito del Proveedor,0 selection,"account.invoice,type",0,Supplier Invoice,Factura de Proveedor,0 -selection,"account.invoice,type",0,Supplier Refund,Devolución a Proveedor,0 view,account.invoice,0,Amount Second Currency,Cantidad en la Moneda Secundaria,0 view,account.invoice,0,_Cancel,_Cancelar,0 view,account.invoice,0,Credit,Crédito,0 @@ -240,5 +234,3 @@ wizard_button,"account.invoice.pay_invoice,init,choice",0,Ok,Aceptar,0 wizard_button,"account.invoice.pay_invoice,init,end",0,Cancel,Cancelar,0 wizard_button,"account.invoice.print_invoice_report,warning,end",0,Cancel,Cancelar,0 wizard_button,"account.invoice.print_invoice_report,warning,print",0,Print,Imprimir,0 -wizard_button,"account.invoice.refund_invoice,init,end",0,Cancel,Cancelar,0 -wizard_button,"account.invoice.refund_invoice,init,refund",0,Refund,Devolución,0 From 17133d094d0ef48b9f4cc970e7185d14c6b4f64b Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Nov 2008 22:02:29 +0100 Subject: [PATCH 3/5] updated translation for de_DE --- de_DE.csv | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/de_DE.csv b/de_DE.csv index ef24371852..5f45b1b51c 100644 --- a/de_DE.csv +++ b/de_DE.csv @@ -142,7 +142,7 @@ model,"ir.action,name",act_invoice_form,All Invoices,Alle Rechnungen,0 model,"ir.action,name",credit_invoice,Credit,Gutschrift erstellen,0 model,"ir.action,name",act_invoice_out_credit_note_form,Credit Notes,Gutschriften an Kunden,0 model,"ir.action,name",,Custom Invoice,,0 -model,"ir.action,name",report_invoice,Custom Invoice,Angepasste Rechnung drucken,0 +model,"ir.action,name",report_invoice,Invoice,Angepasste Rechnung drucken,0 model,"ir.action,name",print_invoice_report,Invoice,Rechnung drucken,0 model,"ir.action,name",act_invoice_out_invoice_form,Invoices,Rechnungsausgang,0 model,"ir.action,name",wizard_pay_invoice,Pay Invoice,Rechnung bezahlen,0 @@ -238,4 +238,3 @@ wizard_button,"account.invoice.pay_invoice,init,choice",0,Ok,OK,0 wizard_button,"account.invoice.pay_invoice,init,end",0,Cancel,Abbrechen,0 wizard_button,"account.invoice.print_invoice_report,warning,end",0,Cancel,Abbrechen,0 wizard_button,"account.invoice.print_invoice_report,warning,print",0,Print,Drucken,0 -wizard_button,"account.invoice.refund_invoice,init,end",0,Cancel,Abbrechen,0 From f38bbb2ada62c5aec0d796f4dd8c27b361877315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 4 Nov 2008 18:10:39 +0100 Subject: [PATCH 4/5] Fix currency_digits for pay invoice --- invoice.py | 29 +++++++++++++++++++++++++++-- invoice.xml | 14 +++++++++----- 2 files changed, 36 insertions(+), 7 deletions(-) diff --git a/invoice.py b/invoice.py index 6c2e47c57d..ea2d10bc36 100644 --- a/invoice.py +++ b/invoice.py @@ -2101,8 +2101,11 @@ Period() class PayInvoiceInit(WizardOSV): _name = 'account.invoice.pay_invoice.init' - amount = fields.Numeric('Amount', digits=(16, 2), required=True) + amount = fields.Numeric('Amount', digits="(16, currency_digits)", + required=True) currency = fields.Many2One('currency.currency', 'Currency', required=True) + currency_digits = fields.Integer('Currency Digits', readonly=True, + on_change_with=['currency']) description = fields.Char('Description', size=None, required=True) journal = fields.Many2One('account.journal', 'Journal', required=True, domain=[('type', '=', 'cash')]) @@ -2112,6 +2115,15 @@ class PayInvoiceInit(WizardOSV): date_obj = self.pool.get('ir.date') return date_obj.today(cursor, user, context=context) + def on_change_with_currency_digits(self, cursor, user, ids, vals, + context=None): + currency_obj = self.pool.get('currency.currency') + if vals.get('currency'): + currency = currency_obj.browse(cursor, user, vals['currency'], + context=context) + return currency.digits + return 2 + PayInvoiceInit() @@ -2132,8 +2144,10 @@ class PayInvoiceAsk(WizardOSV): 'invisible': "type != 'writeoff'", 'required': "type == 'writeoff'", }) - amount = fields.Numeric('Amount', digits=(16, 2), readonly=True) + amount = fields.Numeric('Amount', digits="(16, currency_digits)", readonly=True) currency = fields.Many2One('currency.currency', 'Currency', readonly=True) + currency_digits = fields.Integer('Currency Digits', readonly=True, + on_change_with=['currency']) lines_to_pay = fields.Char(string='Lines to Pay', size=None) lines = fields.One2Many('account.move.line', 'ham', 'Lines', domain="[('id', 'in', eval(lines_to_pay)), " \ @@ -2151,6 +2165,15 @@ class PayInvoiceAsk(WizardOSV): def default_type(self, cursor, user, context=None): return 'writeoff' + def on_change_with_currency_digits(self, cursor, user, ids, vals, + context=None): + currency_obj = self.pool.get('currency.currency') + if vals.get('currency'): + currency = currency_obj.browse(cursor, user, vals['currency'], + context=context) + return currency.digits + return 2 + PayInvoiceAsk() @@ -2200,6 +2223,7 @@ class PayInvoice(Wizard): res = {} invoice = invoice_obj.browse(cursor, user, data['id'], context=context) res['currency'] = invoice.currency.id + res['currency_digits'] = invoice.currency.digits res['amount'] = invoice.amount_to_pay_today res['description'] = invoice.number return res @@ -2233,6 +2257,7 @@ class PayInvoice(Wizard): res['amount'] = data['form']['amount'] res['currency'] = data['form']['currency'] + res['currency_digits'] = data['form']['currency_digits'] res['description'] = data['form']['description'] res['journal'] = data['form']['journal'] res['date'] = data['form']['date'] diff --git a/invoice.xml b/invoice.xml index 307363b4a7..48d84eca87 100644 --- a/invoice.xml +++ b/invoice.xml @@ -760,6 +760,7 @@ this repository contains the full copyright notices and license terms. -->