Merge remote-tracking branch 'origin/9.0' into 11.0-merge-9.0

account_payment_group/__manifest__.py

@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     "name": "Account Payment with Multiple methods",
-    "version": "9.0.1.25.0",
+    "version": "9.0.1.28.0",
     "category": "Accounting",
     "website": "www.adhoc.com.ar",
     "author": "ADHOC SA,Odoo Community Association (OCA)",

account_payment_group/i18n/es.po

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 9.0c\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-03 23:02+0000\n"
-"PO-Revision-Date: 2017-12-03 23:02+0000\n"
+"POT-Creation-Date: 2018-04-08 22:14+0000\n"
+"PO-Revision-Date: 2018-04-08 22:14+0000\n"
 "Last-Translator: Javier Diez <jd@adhoc.com.ar>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/adhoc/teams/46451/es/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,11 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: account_payment_group
+#: model:ir.ui.view,arch_db:account_payment_group.view_account_payment_form
+msgid "(on company currency)"
+msgstr ""
+
 #. module: account_payment_group
 #: model:ir.ui.view,arch_db:account_payment_group.view_account_payment_group_form
 msgid "+ Credit Note"
@@ -51,8 +56,8 @@ msgstr "Añadir Todo / Refrescar"
 
 #. module: account_payment_group
 #: model:ir.model.fields,field_description:account_payment_group.field_account_payment_group_unreconciled_amount
-msgid "Adjusment / Advance"
-msgstr "Adelanto / Avance"
+msgid "Adjustment / Advance"
+msgstr ""
 
 #. module: account_payment_group
 #: model:res.groups,name:account_payment_group.group_pay_now_customer_invoices
@@ -87,7 +92,6 @@ msgstr ""
 "crear usando el diario seleccionado"
 
 #. module: account_payment_group
-#: model:ir.model.fields,field_description:account_payment_group.field_account_payment_group_invoice_wizard_amount
 #: model:ir.model.fields,field_description:account_payment_group.field_account_payment_group_payments_amount
 #: model:ir.ui.view,arch_db:account_payment_group.view_move_line_tree
 msgid "Amount"
@@ -251,6 +255,11 @@ msgstr "¿Doble validación en los Pagos?"
 msgid "Draft"
 msgstr "Borrador"
 
+#. module: account_payment_group
+#: model:ir.model.fields,field_description:account_payment_group.field_account_payment_exchange_rate
+msgid "Exchange Rate"
+msgstr ""
+
 #. module: account_payment_group
 #: model:ir.model.fields,field_description:account_payment_group.field_account_payment_group_message_follower_ids
 msgid "Followers"
@@ -421,6 +430,12 @@ msgstr "Mensajes"
 msgid "Move line ids"
 msgstr "Apuntes Contables"
 
+#. module: account_payment_group
+#: code:addons/account_payment_group/models/account_payment_group.py:746
+#, python-format
+msgid "No puede conciliar en un solo pago deudas con distintas monedas"
+msgstr ""
+
 #. module: account_payment_group
 #: model:ir.ui.view,arch_db:account_payment_group.view_account_payment_group_search
 msgid "Not Cancelled"
@@ -459,6 +474,11 @@ msgstr "Número de mensajes no léidos"
 msgid "Open move line ids"
 msgstr "Abrir ids de la línea del movimiento"
 
+#. module: account_payment_group
+#: model:ir.model.fields,field_description:account_payment_group.field_account_payment_other_currency
+msgid "Other currency"
+msgstr ""
+
 #. module: account_payment_group
 #: model:ir.ui.view,arch_db:account_payment_group.view_account_payment_group_form
 msgid "Paid"
@@ -498,6 +518,8 @@ msgstr "Importe del Pago"
 
 #. module: account_payment_group
 #: model:ir.model.fields,field_description:account_payment_group.field_account_payment_amount_company_currency
+#: model:ir.model.fields,field_description:account_payment_group.field_account_payment_force_amount_company_currency
+#: model:ir.model.fields,field_description:account_payment_group.field_account_payment_signed_amount_company_currency
 msgid "Payment Amount on Company Currency"
 msgstr "Importe de Pago en Moneda de Compañía"
 
@@ -519,7 +541,7 @@ msgid "Payment Groups"
 msgstr "Grupos de Pago"
 
 #. module: account_payment_group
-#: code:addons/account_payment_group/models/account_payment.py:158
+#: code:addons/account_payment_group/models/account_payment.py:214
 #: model:ir.model.fields,field_description:account_payment_group.field_account_payment_group_payment_ids
 #: model:ir.ui.view,arch_db:account_payment_group.view_account_payment_group_form
 #, python-format
@@ -552,7 +574,7 @@ msgid "Payment group matched amount"
 msgstr "Importe imputado en el grupo de Pagos"
 
 #. module: account_payment_group
-#: code:addons/account_payment_group/wizards/account_payment_group_invoice_wizard.py:91
+#: code:addons/account_payment_group/wizards/account_payment_group_invoice_wizard.py:158
 #, python-format
 msgid "Payment id %s"
 msgstr "Id del Pago %s"
@@ -602,8 +624,8 @@ msgstr ""
 "Puede procesar esos pagos por sus propios medios o utilizando los servicios instalados."
 
 #. module: account_payment_group
-#: code:addons/account_payment_group/models/account_payment.py:125
-#: code:addons/account_payment_group/models/account_payment.py:129
+#: code:addons/account_payment_group/models/account_payment.py:181
+#: code:addons/account_payment_group/models/account_payment.py:185
 #, python-format
 msgid "Payments must be created from payments groups"
 msgstr "Los pagos deben ser creados desde grupos de pago"
@@ -738,6 +760,11 @@ msgstr "Estado"
 msgid "Supplier Payments"
 msgstr "Pagos de Proveedor"
 
+#. module: account_payment_group
+#: model:ir.model.fields,field_description:account_payment_group.field_account_payment_group_invoice_wizard_tax_ids
+msgid "Taxes"
+msgstr ""
+
 #. module: account_payment_group
 #: model:ir.model.fields,help:account_payment_group.field_account_payment_group_to_pay_move_line_ids
 msgid "This lines are the ones the user has selected to be paid."
@@ -761,7 +788,7 @@ msgid "To Pay Lines"
 msgstr "Líneas a Pagar"
 
 #. module: account_payment_group
-#: code:addons/account_payment_group/models/account_payment.py:142
+#: code:addons/account_payment_group/models/account_payment.py:198
 #: code:addons/account_payment_group/models/account_payment_group.py:680
 #, python-format
 msgid "To Pay Lines must be of the same account!"
@@ -774,6 +801,11 @@ msgstr "Las líneas a pagar deben ser de la misma cuenta!"
 msgid "Total"
 msgstr "Total"
 
+#. module: account_payment_group
+#: model:ir.model.fields,field_description:account_payment_group.field_account_payment_group_invoice_wizard_amount_total
+msgid "Total Amount"
+msgstr "Importe total"
+
 #. module: account_payment_group
 #: model:ir.ui.view,arch_db:account_payment_group.view_account_payment_transfer_search
 msgid "Transfer To"
@@ -801,6 +833,11 @@ msgstr "Mensajes No Leídos"
 msgid "Unread Messages Counter"
 msgstr "Contador de Mensajes No leídos"
 
+#. module: account_payment_group
+#: model:ir.model.fields,field_description:account_payment_group.field_account_payment_group_invoice_wizard_amount_untaxed
+msgid "Untaxed Amount"
+msgstr "Importe sin impuestos"
+
 #. module: account_payment_group
 #: model:ir.model.fields,help:account_payment_group.field_res_company_double_validation
 msgid "Use two steps validation on payments to suppliers"
@@ -856,6 +893,12 @@ msgstr "No puede enviar a pagar líneas de diferentes partners"
 msgid "You can only register payment if invoice is open"
 msgstr "Solamente puede registrar un pago si la factura está abierta"
 
+#. module: account_payment_group
+#: code:addons/account_payment_group/wizards/account_payment_group_invoice_wizard.py:109
+#, python-format
+msgid "You can only set amount total if taxes are of type percentage"
+msgstr ""
+
 #. module: account_payment_group
 #: model:ir.model,name:account_payment_group.model_account_config_settings
 msgid "account.config.settings"