diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index c6542758952..04cc796a644 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -499,7 +499,7 @@ [('type','=','in_refund')] {'type':'in_refund', 'journal_type': 'purchase_refund'} - A vendor refund is a credit note from your supplier indicating that he refunds part or totality of the invoice sent to you. + A supplier refund is a credit note from your supplier indicating that he refunds part or totality of the invoice sent to you. diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml index ad31f87d6ae..22ab46a1775 100644 --- a/addons/account/account_menuitem.xml +++ b/addons/account/account_menuitem.xml @@ -6,22 +6,23 @@ groups="group_account_user,group_account_manager,group_account_invoice" web_icon="images/accounting.png" web_icon_hover="images/accounting-hover.png"/> - - - + + + - + - - + + - + @@ -29,7 +30,7 @@ - + diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 8c26b8adaf8..0980e5ef6d7 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -2753,5 +2753,19 @@ action = self.pool.get('res.config').next(cr, uid, [], context) + + Partners + ir.actions.act_window + res.partner + form + + + + + diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml index bcedc3fa491..93bcc7724be 100644 --- a/addons/account/board_account_view.xml +++ b/addons/account/board_account_view.xml @@ -68,7 +68,7 @@ - + diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index e66de8e0f85..b317c70d6da 100644 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -1853,7 +1853,7 @@ msgstr "" #. module: account #: model:ir.actions.act_window,help:account.action_invoice_tree4 -msgid "A vendor refund is a credit note from your supplier indicating that he refunds part or totality of the invoice sent to you." +msgid "A supplier refund is a credit note from your supplier indicating that he refunds part or totality of the invoice sent to you." msgstr "" #. module: account diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po index 671709fd0b1..534a2b3b1b2 100644 --- a/addons/account/i18n/da.po +++ b/addons/account/i18n/da.po @@ -1896,7 +1896,7 @@ msgstr "" #. module: account #: model:ir.actions.act_window,help:account.action_invoice_tree4 msgid "" -"A vendor refund is a credit note from your supplier indicating that he " +"A supplier refund is a credit note from your supplier indicating that he " "refunds part or totality of the invoice sent to you." msgstr "" diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po index f2585ca625d..6b151e7a05a 100644 --- a/addons/account/i18n/de.po +++ b/addons/account/i18n/de.po @@ -1992,7 +1992,7 @@ msgstr "Bearbeite Buchungen" #. module: account #: model:ir.actions.act_window,help:account.action_invoice_tree4 msgid "" -"A vendor refund is a credit note from your supplier indicating that he " +"A supplier refund is a credit note from your supplier indicating that he " "refunds part or totality of the invoice sent to you." msgstr "" "Eine Gutschrift ist ein Beleg von Ihrem Lieferanten, der einen Teil oder " diff --git a/addons/account/i18n/el.po b/addons/account/i18n/el.po index 139bffec3a7..1618ebf1d30 100644 --- a/addons/account/i18n/el.po +++ b/addons/account/i18n/el.po @@ -1925,7 +1925,7 @@ msgstr "Ανοικτές Εγγραφές" #. module: account #: model:ir.actions.act_window,help:account.action_invoice_tree4 msgid "" -"A vendor refund is a credit note from your supplier indicating that he " +"A supplier refund is a credit note from your supplier indicating that he " "refunds part or totality of the invoice sent to you." msgstr "" diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po index f4c86e58355..aa931e3fd58 100644 --- a/addons/account/i18n/es.po +++ b/addons/account/i18n/es.po @@ -2003,7 +2003,7 @@ msgstr "Abrir asientos" #. module: account #: model:ir.actions.act_window,help:account.action_invoice_tree4 msgid "" -"A vendor refund is a credit note from your supplier indicating that he " +"A supplier refund is a credit note from your supplier indicating that he " "refunds part or totality of the invoice sent to you." msgstr "" "Un abono de proveedor de es una factura rectificativa de su proveedor " diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po index d41def5668a..9d2759daa1a 100644 --- a/addons/account/i18n/es_EC.po +++ b/addons/account/i18n/es_EC.po @@ -1914,7 +1914,7 @@ msgstr "Abrir Entradas" #. module: account #: model:ir.actions.act_window,help:account.action_invoice_tree4 msgid "" -"A vendor refund is a credit note from your supplier indicating that he " +"A supplier refund is a credit note from your supplier indicating that he " "refunds part or totality of the invoice sent to you." msgstr "" diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po index 64d5c2485c5..94267e96008 100644 --- a/addons/account/i18n/fr.po +++ b/addons/account/i18n/fr.po @@ -2070,7 +2070,7 @@ msgstr "Écritures Ouvertes" #. module: account #: model:ir.actions.act_window,help:account.action_invoice_tree4 msgid "" -"A vendor refund is a credit note from your supplier indicating that he " +"A supplier refund is a credit note from your supplier indicating that he " "refunds part or totality of the invoice sent to you." msgstr "" diff --git a/addons/account/i18n/hi.po b/addons/account/i18n/hi.po index f16f34640b5..cda0aee6d97 100644 --- a/addons/account/i18n/hi.po +++ b/addons/account/i18n/hi.po @@ -1894,7 +1894,7 @@ msgstr "" #. module: account #: model:ir.actions.act_window,help:account.action_invoice_tree4 msgid "" -"A vendor refund is a credit note from your supplier indicating that he " +"A supplier refund is a credit note from your supplier indicating that he " "refunds part or totality of the invoice sent to you." msgstr "" diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po index 4c63771f8dd..5f575b845a6 100644 --- a/addons/account/i18n/hu.po +++ b/addons/account/i18n/hu.po @@ -1934,7 +1934,7 @@ msgstr "" #. module: account #: model:ir.actions.act_window,help:account.action_invoice_tree4 msgid "" -"A vendor refund is a credit note from your supplier indicating that he " +"A supplier refund is a credit note from your supplier indicating that he " "refunds part or totality of the invoice sent to you." msgstr "" diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po index b3a38b33575..f3aaf2cf40f 100644 --- a/addons/account/i18n/it.po +++ b/addons/account/i18n/it.po @@ -1973,7 +1973,7 @@ msgstr "Apri registrazioni" #. module: account #: model:ir.actions.act_window,help:account.action_invoice_tree4 msgid "" -"A vendor refund is a credit note from your supplier indicating that he " +"A supplier refund is a credit note from your supplier indicating that he " "refunds part or totality of the invoice sent to you." msgstr "" "Il rimborso da un fornitore consiste in una nota di credito che indica che " diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po index ca162ca7502..12c61320444 100644 --- a/addons/account/i18n/nl.po +++ b/addons/account/i18n/nl.po @@ -1988,7 +1988,7 @@ msgstr "Open boekingen" #. module: account #: model:ir.actions.act_window,help:account.action_invoice_tree4 msgid "" -"A vendor refund is a credit note from your supplier indicating that he " +"A supplier refund is a credit note from your supplier indicating that he " "refunds part or totality of the invoice sent to you." msgstr "" diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po index 225501c159f..e23c26e9ef0 100644 --- a/addons/account/i18n/pl.po +++ b/addons/account/i18n/pl.po @@ -1945,7 +1945,7 @@ msgstr "Zapisy otwarte" #. module: account #: model:ir.actions.act_window,help:account.action_invoice_tree4 msgid "" -"A vendor refund is a credit note from your supplier indicating that he " +"A supplier refund is a credit note from your supplier indicating that he " "refunds part or totality of the invoice sent to you." msgstr "" diff --git a/addons/account/i18n/pt.po b/addons/account/i18n/pt.po index a4b56cb3789..088d2c315e7 100644 --- a/addons/account/i18n/pt.po +++ b/addons/account/i18n/pt.po @@ -1974,7 +1974,7 @@ msgstr "Movimentos em aberto" #. module: account #: model:ir.actions.act_window,help:account.action_invoice_tree4 msgid "" -"A vendor refund is a credit note from your supplier indicating that he " +"A supplier refund is a credit note from your supplier indicating that he " "refunds part or totality of the invoice sent to you." msgstr "" diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po index 0be3e8c4f1d..fcf6f25c65f 100644 --- a/addons/account/i18n/pt_BR.po +++ b/addons/account/i18n/pt_BR.po @@ -1920,7 +1920,7 @@ msgstr "Lançamentos abertos" #. module: account #: model:ir.actions.act_window,help:account.action_invoice_tree4 msgid "" -"A vendor refund is a credit note from your supplier indicating that he " +"A supplier refund is a credit note from your supplier indicating that he " "refunds part or totality of the invoice sent to you." msgstr "" diff --git a/addons/account/i18n/ro.po b/addons/account/i18n/ro.po index 4af2bf7674e..22698a9f2cf 100644 --- a/addons/account/i18n/ro.po +++ b/addons/account/i18n/ro.po @@ -1911,7 +1911,7 @@ msgstr "Înregistrări deschise" #. module: account #: model:ir.actions.act_window,help:account.action_invoice_tree4 msgid "" -"A vendor refund is a credit note from your supplier indicating that he " +"A supplier refund is a credit note from your supplier indicating that he " "refunds part or totality of the invoice sent to you." msgstr "" diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po index 2a337d2d682..d4b64cc492b 100644 --- a/addons/account/i18n/ru.po +++ b/addons/account/i18n/ru.po @@ -1941,7 +1941,7 @@ msgstr "Открытые проводки" #. module: account #: model:ir.actions.act_window,help:account.action_invoice_tree4 msgid "" -"A vendor refund is a credit note from your supplier indicating that he " +"A supplier refund is a credit note from your supplier indicating that he " "refunds part or totality of the invoice sent to you." msgstr "" diff --git a/addons/account/i18n/sk.po b/addons/account/i18n/sk.po index 3012a1d635e..4827885a5c6 100644 --- a/addons/account/i18n/sk.po +++ b/addons/account/i18n/sk.po @@ -1894,7 +1894,7 @@ msgstr "" #. module: account #: model:ir.actions.act_window,help:account.action_invoice_tree4 msgid "" -"A vendor refund is a credit note from your supplier indicating that he " +"A supplier refund is a credit note from your supplier indicating that he " "refunds part or totality of the invoice sent to you." msgstr "" diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po index 8ba637a204f..1a611aa49f3 100644 --- a/addons/account/i18n/sv.po +++ b/addons/account/i18n/sv.po @@ -1950,7 +1950,7 @@ msgstr "Open Entries" #. module: account #: model:ir.actions.act_window,help:account.action_invoice_tree4 msgid "" -"A vendor refund is a credit note from your supplier indicating that he " +"A supplier refund is a credit note from your supplier indicating that he " "refunds part or totality of the invoice sent to you." msgstr "" diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po index 51b1fc5968d..3da4ac9fa05 100644 --- a/addons/account/i18n/tr.po +++ b/addons/account/i18n/tr.po @@ -1948,7 +1948,7 @@ msgstr "Open Entries" #. module: account #: model:ir.actions.act_window,help:account.action_invoice_tree4 msgid "" -"A vendor refund is a credit note from your supplier indicating that he " +"A supplier refund is a credit note from your supplier indicating that he " "refunds part or totality of the invoice sent to you." msgstr "" diff --git a/addons/account/i18n/vi.po b/addons/account/i18n/vi.po index 3474f38ee38..6caee08f27d 100644 --- a/addons/account/i18n/vi.po +++ b/addons/account/i18n/vi.po @@ -1969,10 +1969,10 @@ msgstr "Open Entries" #. module: account #: model:ir.actions.act_window,help:account.action_invoice_tree4 msgid "" -"A vendor refund is a credit note from your supplier indicating that he " +"A supplier refund is a credit note from your supplier indicating that he " "refunds part or totality of the invoice sent to you." msgstr "" -"A vendor refund is a credit note from your supplier indicating that he " +"A supplier refund is a credit note from your supplier indicating that he " "refunds part or totality of the invoice sent to you." #. module: account diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po index 71adf8bf481..92e96143b04 100644 --- a/addons/account/i18n/zh_CN.po +++ b/addons/account/i18n/zh_CN.po @@ -1934,7 +1934,7 @@ msgstr "打开凭证" #. module: account #: model:ir.actions.act_window,help:account.action_invoice_tree4 msgid "" -"A vendor refund is a credit note from your supplier indicating that he " +"A supplier refund is a credit note from your supplier indicating that he " "refunds part or totality of the invoice sent to you." msgstr "" diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml index 02080a2bc2e..b93ad449e9e 100644 --- a/addons/account_budget/account_budget_view.xml +++ b/addons/account_budget/account_budget_view.xml @@ -45,7 +45,7 @@ - + diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml index d0543d72242..8966a6c88ac 100644 --- a/addons/account_payment/account_payment_view.xml +++ b/addons/account_payment/account_payment_view.xml @@ -39,7 +39,7 @@ - + payment.mode.search diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py index 0560e00f00b..9394863f0c8 100644 --- a/addons/account_voucher/account_voucher.py +++ b/addons/account_voucher/account_voucher.py @@ -449,6 +449,16 @@ class account_voucher(osv.osv): ids.reverse() moves = move_line_pool.browse(cr, uid, ids) + priority_moves = [] + unpriority_moves = [] + for line in moves: + original_amount = line.credit or line.debit or 0.0 + if original_amount == price: + priority_moves.append(line) + else: + unpriority_moves.append(line) + moves = priority_moves + unpriority_moves + company_currency = journal.company_id.currency_id.id if company_currency != currency_id and ttype == 'payment': total_debit = currency_pool.compute(cr, uid, currency_id, company_currency, total_debit) @@ -469,13 +479,13 @@ class account_voucher(osv.osv): if line.debit and line.reconcile_partial_id and ttype == 'payment': continue - orignal_amount = line.credit or line.debit or 0.0 + original_amount = line.credit or line.debit or 0.0 rs = { 'name':line.move_id.name, 'type': line.credit and 'dr' or 'cr', 'move_line_id':line.id, 'account_id':line.account_id.id, - 'amount_original':currency_pool.compute(cr, uid, company_currency, currency_id, orignal_amount), + 'amount_original':currency_pool.compute(cr, uid, company_currency, currency_id, original_amount), 'date_original':line.date, 'date_due':line.date_maturity, 'amount_unreconciled':currency_pool.compute(cr, uid, company_currency, currency_id, line.amount_unreconciled) @@ -499,7 +509,6 @@ class account_voucher(osv.osv): default['value']['pre_line'] = 1 elif ttype == 'receipt' and len(default['value']['line_dr_ids']) > 0: default['value']['pre_line'] = 1 - return default def onchange_date(self, cr, user, ids, date, context={}): diff --git a/addons/account_voucher/account_voucher_report.xml b/addons/account_voucher/account_voucher_report.xml index 785fd91df73..8af204efbbe 100644 --- a/addons/account_voucher/account_voucher_report.xml +++ b/addons/account_voucher/account_voucher_report.xml @@ -1,7 +1,7 @@ - + menu="True"/> --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Receiver's Signature - - - - - - - - - - - - - Authorised Signatory - - - - - - diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml index 0d960e72f96..3a0dbf40f4d 100644 --- a/addons/account_voucher/voucher_payment_receipt_view.xml +++ b/addons/account_voucher/voucher_payment_receipt_view.xml @@ -88,7 +88,7 @@
- + - + - + - + - Vendor Payment + Supplier Payment account.voucher form [('journal_id.type', 'in', ['bank', 'cash']), ('type','=','payment')] diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml index abb0d1d0b4a..16f44c6d45a 100644 --- a/addons/account_voucher/voucher_sales_purchase_view.xml +++ b/addons/account_voucher/voucher_sales_purchase_view.xml @@ -259,7 +259,9 @@