fixup!!! [11.0][MIG] account_payment_return

OCA · Mar 27, 2018 · 4919169 · 4919169
1 parent 0cd8ca0
commit 4919169
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 33 deletions.
diff --git a/account_payment_return/README.rst b/account_payment_return/README.rst
@@ -24,7 +24,7 @@ Usage
    find matches with invoices, move lines or moves. This functionality is extended
    by other modules as *account_payment_return_import_sepa_pain*
 
-#. It's possible to add a commission amount on each line.
+#. It's possible to add bank charges amount on each line.
 
 #. Next, press button "Confirm" to create a new move line that removes the
    balance from the bank journal and reconcile items together to show payment

diff --git a/account_payment_return/i18n/es.po b/account_payment_return/i18n/es.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-26 08:53+0000\n"
-"PO-Revision-Date: 2018-03-26 08:53+0000\n"
+"POT-Creation-Date: 2018-03-27 10:34+0000\n"
+"PO-Revision-Date: 2018-03-27 10:34+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -48,6 +48,21 @@ msgstr "Cancelar"
 msgid "Cancelled"
 msgstr "Cancelada"
 
+#. module: account_payment_return
+#: model:ir.model.fields,field_description:account_payment_return.field_payment_return_line_expense_account
+msgid "Charge Account"
+msgstr "Cuenta para cargos"
+
+#. module: account_payment_return
+#: model:ir.model.fields,field_description:account_payment_return.field_payment_return_line_expense_amount
+msgid "Charge Amount"
+msgstr "Importe del cargo"
+
+#. module: account_payment_return
+#: model:ir.model.fields,field_description:account_payment_return.field_payment_return_line_expense_partner_id
+msgid "Charge Partner"
+msgstr "Empresa del cargo"
+
 #. module: account_payment_return
 #: model:ir.model.fields,field_description:account_payment_return.field_payment_return_reason_code
 msgid "Code"
@@ -96,23 +111,23 @@ msgstr "Devoluciones de cobros"
 
 #. module: account_payment_return
 #: model:ir.model.fields,field_description:account_payment_return.field_account_journal_default_expense_account_id
-msgid "Default Commission Account"
-msgstr "Cuenta por defecto para comisiones"
+msgid "Default Charge Account"
+msgstr "Cuenta del cargo por defecto"
 
 #. module: account_payment_return
 #: model:ir.model.fields,field_description:account_payment_return.field_account_journal_default_expense_partner_id
-msgid "Default Commission Partner"
-msgstr "Empresa por defecto para comisiones"
+msgid "Default Charge Partner"
+msgstr "Empresa del cargo por defecto"
 
 #. module: account_payment_return
 #: model:ir.model.fields,help:account_payment_return.field_account_journal_default_expense_account_id
-msgid "Default account for commission expenses"
-msgstr "Cuenta por defecto para comisiones"
+msgid "Default account for charge expenses"
+msgstr "Cuenta por defecto para los cargos bancarios"
 
 #. module: account_payment_return
 #: model:ir.model.fields,help:account_payment_return.field_account_journal_default_expense_partner_id
-msgid "Default partner for commission expenses"
-msgstr "Empresa por defecto para comisiones"
+msgid "Default partner for charge expenses"
+msgstr "Empresa por defecto para los cargos bancarios"
 
 #. module: account_payment_return
 #: model:ir.model.fields,field_description:account_payment_return.field_payment_return_display_name
@@ -132,21 +147,6 @@ msgstr "Realizada"
 msgid "Draft"
 msgstr "Borrador"
 
-#. module: account_payment_return
-#: model:ir.model.fields,field_description:account_payment_return.field_payment_return_line_expense_account
-msgid "Expense Account"
-msgstr "Cuenta de gasto"
-
-#. module: account_payment_return
-#: model:ir.model.fields,field_description:account_payment_return.field_payment_return_line_expense_amount
-msgid "Expense amount"
-msgstr "Importe de comision"
-
-#. module: account_payment_return
-#: model:ir.model.fields,field_description:account_payment_return.field_payment_return_line_expense_partner_id
-msgid "Expense partner"
-msgstr "Empresa de comision"
-
 #. module: account_payment_return
 #: model:ir.model.fields,field_description:account_payment_return.field_payment_return_id
 #: model:ir.model.fields,field_description:account_payment_return.field_payment_return_line_id

diff --git a/account_payment_return/models/account_journal.py b/account_payment_return/models/account_journal.py
@@ -8,9 +8,9 @@ class AccountJournal(models.Model):
     _inherit = "account.journal"
 
     default_expense_account_id = fields.Many2one(
-        comodel_name='account.account', string='Default Commission Account',
-        help='Default account for commission expenses')
+        comodel_name='account.account', string='Default Charge Account',
+        help='Default account for charge expenses')
     default_expense_partner_id = fields.Many2one(
-        comodel_name="res.partner", string="Default Commission Partner",
+        comodel_name="res.partner", string="Default Charge Partner",
         domain=[('supplier', '=', True)], help='Default partner for '
-                                               'commission expenses')
+                                               'charge expenses')
diff --git a/account_payment_return/models/payment_return.py b/account_payment_return/models/payment_return.py
@@ -254,10 +254,10 @@ class PaymentReturnLine(models.Model):
         help="Returned amount. Can be different from the move amount",
         digits=dp.get_precision('Account'))
     expense_account = fields.Many2one(
-        comodel_name='account.account', string='Expense Account')
-    expense_amount = fields.Float(string='Expense amount')
+        comodel_name='account.account', string='Charge Account')
+    expense_amount = fields.Float(string='Charge Amount')
     expense_partner_id = fields.Many2one(
-        comodel_name="res.partner", string="Expense partner",
+        comodel_name="res.partner", string="Charge Partner",
         domain=[('supplier', '=', True)],
     )