diff --git a/account_banking_payment_export/README.rst b/account_banking_payment_export/README.rst index 8125d5e7c..a89f99daf 100644 --- a/account_banking_payment_export/README.rst +++ b/account_banking_payment_export/README.rst @@ -76,6 +76,7 @@ Contributors * Erwin van der Ploeg * Raphaël Valyi * Sandy Carter +* Angel Moya Maintainer ---------- diff --git a/account_banking_payment_export/i18n/account_banking_payment_export.pot b/account_banking_payment_export/i18n/account_banking_payment_export.pot index a51bcd871..96f1d47a9 100644 --- a/account_banking_payment_export/i18n/account_banking_payment_export.pot +++ b/account_banking_payment_export/i18n/account_banking_payment_export.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-31 22:52+0000\n" -"PO-Revision-Date: 2014-10-31 22:52+0000\n" +"POT-Creation-Date: 2015-07-02 10:51+0000\n" +"PO-Revision-Date: 2015-07-02 10:51+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -21,21 +21,6 @@ msgstr "" msgid "Active" msgstr "" -#. module: account_banking_payment_export -#: field:payment.mode,sale_ok:0 -msgid "Selectable on sale operations" -msgstr "" - -#. module: account_banking_payment_export -#: field:payment.mode,purchase_ok:0 -msgid "Selectable on purchase operations" -msgstr "" - -#. module: account_banking_payment_export -#: field:account.move.line,amount_to_pay:0 -msgid "Amount to pay" -msgstr "" - #. module: account_banking_payment_export #: view:payment.manual:account_banking_payment_export.view_payment_manual_form msgid "Cancel" @@ -69,7 +54,7 @@ msgid "Direct debit" msgstr "" #. module: account_banking_payment_export -#: code:addons/account_banking_payment_export/wizard/payment_order_create.py:77 +#: code:addons/account_banking_payment_export/wizard/payment_order_create.py:121 #, python-format msgid "Entry Lines" msgstr "" @@ -92,6 +77,17 @@ msgid "ID" msgstr "" #. module: account_banking_payment_export +#: model:ir.model,name:account_banking_payment_export.model_account_invoice +msgid "Invoice" +msgstr "" + +#. module: account_banking_payment_export +#: view:account.move.line:account_banking_payment_export.payment_order_populate_view_move_line_tree +msgid "Journal Entry" +msgstr "" + +#. module: account_banking_payment_export +#: view:account.move.line:account_banking_payment_export.payment_order_populate_view_move_line_tree #: model:ir.model,name:account_banking_payment_export.model_account_move_line msgid "Journal Items" msgstr "" @@ -118,6 +114,12 @@ msgstr "" msgid "Name" msgstr "" +#. module: account_banking_payment_export +#: view:payment.mode:account_banking_payment_export.view_payment_mode_form_inherit +#: field:payment.mode,note:0 +msgid "Note" +msgstr "" + #. module: account_banking_payment_export #: field:payment.mode.type,payment_order_type:0 msgid "Order type" @@ -157,7 +159,7 @@ msgid "Payment Order Export" msgstr "" #. module: account_banking_payment_export -#: code:addons/account_banking_payment_export/wizard/payment_order_create.py:169 +#: code:addons/account_banking_payment_export/wizard/payment_order_create.py:213 #, python-format msgid "Payment Orders" msgstr "" @@ -203,6 +205,16 @@ msgstr "" msgid "Select the Payment Wizard for payments of this type. Leave empty for manual processing" msgstr "" +#. module: account_banking_payment_export +#: field:payment.mode,purchase_ok:0 +msgid "Selectable on purchase operations" +msgstr "" + +#. module: account_banking_payment_export +#: field:payment.mode,sale_ok:0 +msgid "Selectable on sale operations" +msgstr "" + #. module: account_banking_payment_export #: model:ir.model,name:account_banking_payment_export.model_payment_manual msgid "Send payment order(s) manually" @@ -213,6 +225,12 @@ msgstr "" msgid "Specify the Code for Payment Type" msgstr "" +#. module: account_banking_payment_export +#: code:addons/account_banking_payment_export/models/account_invoice.py:34 +#, python-format +msgid "Structured Reference" +msgstr "" + #. module: account_banking_payment_export #: view:payment.mode.type:account_banking_payment_export.view_payment_mode_type_form #: field:payment.mode.type,suitable_bank_types:0 @@ -224,6 +242,16 @@ msgstr "" msgid "This field determines if this type applies to customers (Debit) or suppliers (Payment)" msgstr "" +#. module: account_banking_payment_export +#: view:account.move.line:account_banking_payment_export.payment_order_populate_view_move_line_tree +msgid "Total Credit" +msgstr "" + +#. module: account_banking_payment_export +#: view:account.move.line:account_banking_payment_export.payment_order_populate_view_move_line_tree +msgid "Total Debit" +msgstr "" + #. module: account_banking_payment_export #: code:addons/account_banking_payment_export/models/account_payment.py:69 #, python-format @@ -234,3 +262,15 @@ msgstr "" #: view:payment.order:account_banking_payment_export.view_banking_payment_order_form_1 msgid "launch_wizard" msgstr "" + +#. module: account_banking_payment_export +#: view:payment.order:account_banking_payment_export.view_banking_payment_order_form_1 +msgid "{\n" +" 'invisible': [('state', '!=', 'draft')]}" +msgstr "" + +#. module: account_banking_payment_export +#: view:payment.order.create:account_banking_payment_export.view_create_payment_order_lines +msgid "{'display_credit': context.get('display_credit', False),'display_debit': context.get('display_debit', False),'journal_type': 'sale', 'tree_view_ref' : 'account_banking_payment_export.payment_order_populate_view_move_line_tree'}" +msgstr "" + diff --git a/account_banking_payment_export/i18n/es.po b/account_banking_payment_export/i18n/es.po index e5e0afdbe..f31e31e22 100644 --- a/account_banking_payment_export/i18n/es.po +++ b/account_banking_payment_export/i18n/es.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-31 22:52+0000\n" -"PO-Revision-Date: 2014-10-31 22:52+0000\n" +"POT-Creation-Date: 2015-07-02 10:49+0000\n" +"PO-Revision-Date: 2015-07-02 10:49+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -21,21 +21,6 @@ msgstr "" msgid "Active" msgstr "Activo" -#. module: account_banking_payment_export -#: field:payment.mode,sale_ok:0 -msgid "Selectable on sale operations" -msgstr "Seleccionable en operaciones de venta" - -#. module: account_banking_payment_export -#: field:payment.mode,purchase_ok:0 -msgid "Selectable on purchase operations" -msgstr "Seleccionable en operaciones de compra" - -#. module: account_banking_payment_export -#: field:account.move.line,amount_to_pay:0 -msgid "Amount to pay" -msgstr "Importe a pagar" - #. module: account_banking_payment_export #: view:payment.manual:account_banking_payment_export.view_payment_manual_form msgid "Cancel" @@ -69,7 +54,7 @@ msgid "Direct debit" msgstr "Adeudo directo (cobro)" #. module: account_banking_payment_export -#: code:addons/account_banking_payment_export/wizard/payment_order_create.py:77 +#: code:addons/account_banking_payment_export/wizard/payment_order_create.py:121 #, python-format msgid "Entry Lines" msgstr "Líneas de pago" @@ -92,9 +77,20 @@ msgid "ID" msgstr "ID" #. module: account_banking_payment_export +#: model:ir.model,name:account_banking_payment_export.model_account_invoice +msgid "Invoice" +msgstr "Factura" + +#. module: account_banking_payment_export +#: view:account.move.line:account_banking_payment_export.payment_order_populate_view_move_line_tree +msgid "Journal Entry" +msgstr "Asiento contable" + +#. module: account_banking_payment_export +#: view:account.move.line:account_banking_payment_export.payment_order_populate_view_move_line_tree #: model:ir.model,name:account_banking_payment_export.model_account_move_line msgid "Journal Items" -msgstr "Asientos contables" +msgstr "Apuntes contables" #. module: account_banking_payment_export #: field:payment.manual,write_uid:0 @@ -118,6 +114,12 @@ msgstr "Pago manual" msgid "Name" msgstr "Nombre" +#. module: account_banking_payment_export +#: view:payment.mode:account_banking_payment_export.view_payment_mode_form_inherit +#: field:payment.mode,note:0 +msgid "Note" +msgstr "Descripción" + #. module: account_banking_payment_export #: field:payment.mode.type,payment_order_type:0 msgid "Order type" @@ -157,7 +159,7 @@ msgid "Payment Order Export" msgstr "Exportación de la orden de pago" #. module: account_banking_payment_export -#: code:addons/account_banking_payment_export/wizard/payment_order_create.py:169 +#: code:addons/account_banking_payment_export/wizard/payment_order_create.py:213 #, python-format msgid "Payment Orders" msgstr "Órdenes de pago" @@ -203,6 +205,16 @@ msgstr "Seleccione el tipo de exportación de pago para el modo de pago." msgid "Select the Payment Wizard for payments of this type. Leave empty for manual processing" msgstr "Seleccione el asistente de pago para los pagos de este tipo. Déjelo vacío para un procesado manual." +#. module: account_banking_payment_export +#: field:payment.mode,purchase_ok:0 +msgid "Selectable on purchase operations" +msgstr "Seleccionable en operaciones de compra" + +#. module: account_banking_payment_export +#: field:payment.mode,sale_ok:0 +msgid "Selectable on sale operations" +msgstr "Seleccionable en operaciones de venta" + #. module: account_banking_payment_export #: model:ir.model,name:account_banking_payment_export.model_payment_manual msgid "Send payment order(s) manually" @@ -213,6 +225,12 @@ msgstr "Enviar la(s) orden(es) de pago manualmente" msgid "Specify the Code for Payment Type" msgstr "Especifica el código para el tipo de pago" +#. module: account_banking_payment_export +#: code:addons/account_banking_payment_export/models/account_invoice.py:34 +#, python-format +msgid "Structured Reference" +msgstr "Referencia esctructurada" + #. module: account_banking_payment_export #: view:payment.mode.type:account_banking_payment_export.view_payment_mode_type_form #: field:payment.mode.type,suitable_bank_types:0 @@ -224,6 +242,16 @@ msgstr "Tipos de cuentas bancarias adecuadas" msgid "This field determines if this type applies to customers (Debit) or suppliers (Payment)" msgstr "Este campo determina si este tipo aplica a clientes (Cobro) o a proveedores (Pago)" +#. module: account_banking_payment_export +#: view:account.move.line:account_banking_payment_export.payment_order_populate_view_move_line_tree +msgid "Total Credit" +msgstr "Total haber" + +#. module: account_banking_payment_export +#: view:account.move.line:account_banking_payment_export.payment_order_populate_view_move_line_tree +msgid "Total Debit" +msgstr "Total debe" + #. module: account_banking_payment_export #: code:addons/account_banking_payment_export/models/account_payment.py:69 #, python-format @@ -234,3 +262,16 @@ msgstr "Sólo puede combinar órdenes de pago del mismo tipo" #: view:payment.order:account_banking_payment_export.view_banking_payment_order_form_1 msgid "launch_wizard" msgstr "Asistente" + +#. module: account_banking_payment_export +#: view:payment.order:account_banking_payment_export.view_banking_payment_order_form_1 +msgid "{\n" +" 'invisible': [('state', '!=', 'draft')]}" +msgstr "{\n" +" 'invisible': [('state', '!=', 'draft')]}" + +#. module: account_banking_payment_export +#: view:payment.order.create:account_banking_payment_export.view_create_payment_order_lines +msgid "{'display_credit': context.get('display_credit', False),'display_debit': context.get('display_debit', False),'journal_type': 'sale', 'tree_view_ref' : 'account_banking_payment_export.payment_order_populate_view_move_line_tree'}" +msgstr "{'display_credit': context.get('display_credit', False),'display_debit': context.get('display_debit', False),'journal_type': 'sale', 'tree_view_ref' : 'account_banking_payment_export.payment_order_populate_view_move_line_tree'}" + diff --git a/account_banking_payment_export/models/payment_mode.py b/account_banking_payment_export/models/payment_mode.py index fc2d81316..a0084f114 100644 --- a/account_banking_payment_export/models/payment_mode.py +++ b/account_banking_payment_export/models/payment_mode.py @@ -107,3 +107,4 @@ class PaymentMode(models.Model): default=True) purchase_ok = fields.Boolean(string='Selectable on purchase operations', default=True) + note = fields.Text(string="Note", translate=True) diff --git a/account_banking_payment_export/views/payment_mode.xml b/account_banking_payment_export/views/payment_mode.xml index 31e5bce0c..5441bb428 100644 --- a/account_banking_payment_export/views/payment_mode.xml +++ b/account_banking_payment_export/views/payment_mode.xml @@ -16,6 +16,11 @@ +
+ + + +
diff --git a/account_payment_partner/README.rst b/account_payment_partner/README.rst index e4e4d0a52..2837e36a1 100644 --- a/account_payment_partner/README.rst +++ b/account_payment_partner/README.rst @@ -64,6 +64,7 @@ Contributors * Alexandre Fayolle * Stéphane Bidoul * Danimar Ribeiro +* Angel Moya Maintainer ---------- diff --git a/account_payment_partner/__openerp__.py b/account_payment_partner/__openerp__.py index f62c4cca6..949c9791e 100644 --- a/account_payment_partner/__openerp__.py +++ b/account_payment_partner/__openerp__.py @@ -35,6 +35,7 @@ 'data': [ 'views/res_partner_view.xml', 'views/account_invoice_view.xml', + 'views/report_invoice.xml', 'security/ir.model.access.csv', ], 'demo': ['demo/partner_demo.xml'], diff --git a/account_payment_partner/i18n/account_payment_partner.pot b/account_payment_partner/i18n/account_payment_partner.pot index 3c5a39686..82c70d780 100644 --- a/account_payment_partner/i18n/account_payment_partner.pot +++ b/account_payment_partner/i18n/account_payment_partner.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-31 22:53+0000\n" -"PO-Revision-Date: 2014-10-31 22:53+0000\n" +"POT-Creation-Date: 2015-07-02 10:53+0000\n" +"PO-Revision-Date: 2015-07-02 10:53+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -15,6 +15,11 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: account_payment_partner +#: view:website:account.report_invoice_document +msgid "Bank Account:" +msgstr "" + #. module: account_payment_partner #: field:res.partner,customer_payment_mode:0 msgid "Customer Payment Mode" @@ -35,6 +40,11 @@ msgstr "" msgid "Payment Mode" msgstr "" +#. module: account_payment_partner +#: view:website:account.report_invoice_document +msgid "Payment Mode:" +msgstr "" + #. module: account_payment_partner #: help:res.partner,customer_payment_mode:0 msgid "Select the default payment mode for this customer." diff --git a/account_payment_partner/i18n/es.po b/account_payment_partner/i18n/es.po index 63748b988..8d9b6b91a 100644 --- a/account_payment_partner/i18n/es.po +++ b/account_payment_partner/i18n/es.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-31 22:53+0000\n" -"PO-Revision-Date: 2014-10-31 22:53+0000\n" +"POT-Creation-Date: 2015-07-02 10:55+0000\n" +"PO-Revision-Date: 2015-07-02 10:55+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -15,6 +15,11 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: account_payment_partner +#: view:website:account.report_invoice_document +msgid "Bank Account:" +msgstr "Cuenta bancaria:" + #. module: account_payment_partner #: field:res.partner,customer_payment_mode:0 msgid "Customer Payment Mode" @@ -35,6 +40,11 @@ msgstr "Empresa" msgid "Payment Mode" msgstr "Modo de pago" +#. module: account_payment_partner +#: view:website:account.report_invoice_document +msgid "Payment Mode:" +msgstr "Modo de pago:" + #. module: account_payment_partner #: help:res.partner,customer_payment_mode:0 msgid "Select the default payment mode for this customer." diff --git a/account_payment_partner/views/report_invoice.xml b/account_payment_partner/views/report_invoice.xml new file mode 100644 index 000000000..356ec1d4d --- /dev/null +++ b/account_payment_partner/views/report_invoice.xml @@ -0,0 +1,17 @@ + + + + + +