From 7222f5ecbddfe9e13116dac02482b78641d26ba6 Mon Sep 17 00:00:00 2001 From: Matthieu Dietrich Date: Mon, 2 May 2016 15:19:47 +0200 Subject: [PATCH 1/3] Remove module "account_advanced_reconcile_bank_statement" --- .../__init__.py | 23 ---- .../__openerp__.py | 45 -------- .../advanced_reconciliation.py | 81 ------------- .../easy_reconcile.py | 36 ------ .../easy_reconcile_view.xml | 19 ---- ...count_advanced_reconcile_bank_statement.po | 107 ------------------ .../i18n/fr.po | 103 ----------------- 7 files changed, 414 deletions(-) delete mode 100644 account_advanced_reconcile_bank_statement/__init__.py delete mode 100644 account_advanced_reconcile_bank_statement/__openerp__.py delete mode 100644 account_advanced_reconcile_bank_statement/advanced_reconciliation.py delete mode 100644 account_advanced_reconcile_bank_statement/easy_reconcile.py delete mode 100644 account_advanced_reconcile_bank_statement/easy_reconcile_view.xml delete mode 100644 account_advanced_reconcile_bank_statement/i18n/account_advanced_reconcile_bank_statement.po delete mode 100644 account_advanced_reconcile_bank_statement/i18n/fr.po diff --git a/account_advanced_reconcile_bank_statement/__init__.py b/account_advanced_reconcile_bank_statement/__init__.py deleted file mode 100644 index 0f9a7e4c..00000000 --- a/account_advanced_reconcile_bank_statement/__init__.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# Author: Matthieu Dietrich -# Copyright 2014 Camptocamp SA -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -from . import easy_reconcile -from . import advanced_reconciliation diff --git a/account_advanced_reconcile_bank_statement/__openerp__.py b/account_advanced_reconcile_bank_statement/__openerp__.py deleted file mode 100644 index 401ef821..00000000 --- a/account_advanced_reconcile_bank_statement/__openerp__.py +++ /dev/null @@ -1,45 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# Author: Matthieu Dietrich -# Copyright 2014 Camptocamp SA -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -{'name': 'Advanced Reconcile Bank Statement', - 'description': """ -Advanced reconciliation method for the module account_advanced_reconcile -======================================================================== -Reconcile rules with bank statement name. - -This will reconcile multiple credit move lines (bank statements) with -all the lines from a specific bank statement, debit or credit (to also -reconcile the commission with credit card imports). - -""", - 'version': '1.0.0', - 'author': "Camptocamp,Odoo Community Association (OCA)", - 'category': 'Finance', - 'website': 'http://www.camptocamp.com', - 'license': 'AGPL-3', - 'depends': ['account_advanced_reconcile'], - 'data': ['easy_reconcile_view.xml'], - 'demo': [], - 'test': [], - 'auto_install': False, - 'installable': False, - 'images': [] - } diff --git a/account_advanced_reconcile_bank_statement/advanced_reconciliation.py b/account_advanced_reconcile_bank_statement/advanced_reconciliation.py deleted file mode 100644 index 2eb77cbc..00000000 --- a/account_advanced_reconcile_bank_statement/advanced_reconciliation.py +++ /dev/null @@ -1,81 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# Author: Matthieu Dietrich. Copyright Camptocamp SA -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -from openerp.osv import orm - - -class easy_reconcile_advanced_bank_statement(orm.TransientModel): - - _name = 'easy.reconcile.advanced.bank_statement' - _inherit = 'easy.reconcile.advanced' - - def _base_columns(self, rec): - """ Mandatory columns for move lines queries - An extra column aliased as ``key`` should be defined - in each query.""" - aml_cols = super(easy_reconcile_advanced_bank_statement, self).\ - _base_columns(rec) - aml_cols += ['account_move_line.statement_id', - 'account_bank_statement.name as statement_name', - ] - return aml_cols - - def _from(self, rec, *args, **kwargs): - result = super(easy_reconcile_advanced_bank_statement, self).\ - _from(rec, *args, **kwargs) - result = result + ( - " INNER JOIN account_bank_statement " - "ON account_bank_statement.id = account_move_line.statement_id " - ) - return result - - def _skip_line(self, cr, uid, rec, move_line, context=None): - """ - When True is returned on some conditions, the credit move line - will be skipped for reconciliation. Can be inherited to - skip on some conditions. ie: ref or partner_id is empty. - """ - result = super(easy_reconcile_advanced_bank_statement, self).\ - _skip_line(cr, uid, rec, move_line, context=context) - if result: - return result - return not (move_line.get('ref') and - move_line.get('partner_id')) - - def _matchers(self, cr, uid, rec, move_line, context=None): - return (('partner_id', move_line['partner_id']), - ('ref', move_line['ref'].lower().strip())) - - def _opposite_matchers(self, cr, uid, rec, move_line, context=None): - yield ('partner_id', move_line['partner_id']) - yield ('ref', - (move_line['statement_name'] or '').lower().strip()) - - # Re-defined for this particular rule; since the commission line is a - # credit line inside of the target statement, it should also be considered - # as an opposite to be reconciled. - # And also, given some are refunds, debit lines can be "credit". - def _action_rec(self, cr, uid, rec, context=None): - credit_lines = self._query_credit(cr, uid, rec, context=context) - debit_lines = self._query_debit(cr, uid, rec, context=context) - return self._rec_auto_lines_advanced(cr, uid, rec, - credit_lines + debit_lines, - credit_lines + debit_lines, - context=context) diff --git a/account_advanced_reconcile_bank_statement/easy_reconcile.py b/account_advanced_reconcile_bank_statement/easy_reconcile.py deleted file mode 100644 index 53adbbb0..00000000 --- a/account_advanced_reconcile_bank_statement/easy_reconcile.py +++ /dev/null @@ -1,36 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# Author: Matthieu Dietrich -# Copyright 2014 Camptocamp SA -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -from openerp.osv import orm - - -class account_easy_reconcile_method(orm.Model): - - _inherit = 'account.easy.reconcile.method' - - def _get_all_rec_method(self, cr, uid, context=None): - methods = super(account_easy_reconcile_method, self).\ - _get_all_rec_method(cr, uid, context=context) - methods += [ - ('easy.reconcile.advanced.bank_statement', - 'Advanced. Partner and Bank Statement'), - ] - return methods diff --git a/account_advanced_reconcile_bank_statement/easy_reconcile_view.xml b/account_advanced_reconcile_bank_statement/easy_reconcile_view.xml deleted file mode 100644 index 72c0ad68..00000000 --- a/account_advanced_reconcile_bank_statement/easy_reconcile_view.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - account.easy.reconcile.form - account.easy.reconcile - - - - - - - - - - - diff --git a/account_advanced_reconcile_bank_statement/i18n/account_advanced_reconcile_bank_statement.po b/account_advanced_reconcile_bank_statement/i18n/account_advanced_reconcile_bank_statement.po deleted file mode 100644 index 5ede7195..00000000 --- a/account_advanced_reconcile_bank_statement/i18n/account_advanced_reconcile_bank_statement.po +++ /dev/null @@ -1,107 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_advanced_reconcile_bank_statement -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 7.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-27 08:36+0000\n" -"PO-Revision-Date: 2014-05-27 08:36+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" - -#. module: account_advanced_reconcile_bank_statement -#: field:easy.reconcile.advanced.bank_statement,filter:0 -#: model:ir.model.fields,field_description:account_advanced_reconcile_bank_statement.field_easy_reconcile_advanced_bank_statement_filter -msgid "Filter" -msgstr "" - -#. module: account_advanced_reconcile_bank_statement -#: field:easy.reconcile.advanced.bank_statement,account_id:0 -#: model:ir.model.fields,field_description:account_advanced_reconcile_bank_statement.field_easy_reconcile_advanced_bank_statement_account_id -msgid "Account" -msgstr "" - -#. module: account_advanced_reconcile_bank_statement -#: field:easy.reconcile.advanced.bank_statement,partner_ids:0 -#: model:ir.model.fields,field_description:account_advanced_reconcile_bank_statement.field_easy_reconcile_advanced_bank_statement_partner_ids -msgid "Restrict on partners" -msgstr "" - -#. module: account_advanced_reconcile_bank_statement -#: code:_description:0 -#: model:ir.model,name:account_advanced_reconcile_bank_statement.model_easy_reconcile_advanced_bank_statement -#, python-format -msgid "easy.reconcile.advanced.bank_statement" -msgstr "" - -#. module: account_advanced_reconcile_bank_statement -#: view:account.easy.reconcile:0 -msgid "Match multiple debit vs multiple credit entries. Allow partial reconciliation. The lines should have the partner, the credit entry reference is matched vs the debit entry bank statement name." -msgstr "" - -#. module: account_advanced_reconcile_bank_statement -#: field:easy.reconcile.advanced.bank_statement,journal_id:0 -#: model:ir.model.fields,field_description:account_advanced_reconcile_bank_statement.field_easy_reconcile_advanced_bank_statement_journal_id -msgid "Journal" -msgstr "" - -#. module: account_advanced_reconcile_bank_statement -#: field:easy.reconcile.advanced.bank_statement,account_profit_id:0 -#: model:ir.model.fields,field_description:account_advanced_reconcile_bank_statement.field_easy_reconcile_advanced_bank_statement_account_profit_id -msgid "Account Profit" -msgstr "" - -#. module: account_advanced_reconcile_bank_statement -#: field:easy.reconcile.advanced.bank_statement,analytic_account_id:0 -#: model:ir.model.fields,field_description:account_advanced_reconcile_bank_statement.field_easy_reconcile_advanced_bank_statement_analytic_account_id -msgid "Analytic Account" -msgstr "" - -#. module: account_advanced_reconcile_bank_statement -#: code:_description:0 -#: model:ir.model,name:account_advanced_reconcile_bank_statement.model_account_easy_reconcile_method -#, python-format -msgid "reconcile method for account_easy_reconcile" -msgstr "" - -#. module: account_advanced_reconcile_bank_statement -#: field:easy.reconcile.advanced.bank_statement,date_base_on:0 -#: model:ir.model.fields,field_description:account_advanced_reconcile_bank_statement.field_easy_reconcile_advanced_bank_statement_date_base_on -msgid "Date of reconciliation" -msgstr "" - -#. module: account_advanced_reconcile_bank_statement -#: help:easy.reconcile.advanced.bank_statement,analytic_account_id:0 -msgid "Analytic account for the write-off" -msgstr "" - -#. module: account_advanced_reconcile_bank_statement -#: view:account.easy.reconcile:0 -msgid "Advanced. Partner and Bank Statement" -msgstr "" - -#. module: account_advanced_reconcile_bank_statement -#: code:_description:0 -#: model:ir.model,name:account_advanced_reconcile_bank_statement.model_easy_reconcile_advanced -#, python-format -msgid "easy.reconcile.advanced" -msgstr "" - -#. module: account_advanced_reconcile_bank_statement -#: field:easy.reconcile.advanced.bank_statement,account_lost_id:0 -#: model:ir.model.fields,field_description:account_advanced_reconcile_bank_statement.field_easy_reconcile_advanced_bank_statement_account_lost_id -msgid "Account Lost" -msgstr "" - -#. module: account_advanced_reconcile_bank_statement -#: field:easy.reconcile.advanced.bank_statement,write_off:0 -#: model:ir.model.fields,field_description:account_advanced_reconcile_bank_statement.field_easy_reconcile_advanced_bank_statement_write_off -msgid "Write off allowed" -msgstr "" - diff --git a/account_advanced_reconcile_bank_statement/i18n/fr.po b/account_advanced_reconcile_bank_statement/i18n/fr.po deleted file mode 100644 index 63124f07..00000000 --- a/account_advanced_reconcile_bank_statement/i18n/fr.po +++ /dev/null @@ -1,103 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_advanced_reconcile_bank_statement -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 7.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-27 08:36+0000\n" -"PO-Revision-Date: 2014-05-27 08:36+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" - -#. module: account_advanced_reconcile_bank_statement -#: field:easy.reconcile.advanced.bank_statement,filter:0 -#: model:ir.model.fields,field_description:account_advanced_reconcile_bank_statement.field_easy_reconcile_advanced_bank_statement_filter -msgid "Filter" -msgstr "Filtre" - -#. module: account_advanced_reconcile_bank_statement -#: field:easy.reconcile.advanced.bank_statement,account_id:0 -#: model:ir.model.fields,field_description:account_advanced_reconcile_bank_statement.field_easy_reconcile_advanced_bank_statement_account_id -msgid "Account" -msgstr "Compte" - -#. module: account_advanced_reconcile_bank_statement -#: field:easy.reconcile.advanced.bank_statement,partner_ids:0 -#: model:ir.model.fields,field_description:account_advanced_reconcile_bank_statement.field_easy_reconcile_advanced_bank_statement_partner_ids -msgid "Restrict on partners" -msgstr "Restriction sur les partenaires" - -#. module: account_advanced_reconcile_bank_statement -#: code:_description:0 -#: model:ir.model,name:account_advanced_reconcile_bank_statement.model_easy_reconcile_advanced_bank_statement -#, python-format -msgid "easy.reconcile.advanced.bank_statement" -msgstr "easy.reconcile.advanced.bank_statement" - -#. module: account_advanced_reconcile_bank_statement -#: view:account.easy.reconcile:0 -msgid "" -"Match multiple debit vs multiple credit entries. Allow partial " -"reconciliation. The lines should have the partner, the credit entry " -"reference is matched vs the debit entry bank statement name." -msgstr "" -"Le lettrage peut s'effectuer sur plusieurs écritures de débit et crédit. Le " -"lettrage partiel est autorisé. Les écritures doivent avoir le même " -"partenaire et la référence sur les écritures de crédit doit se retrouver -"dans le nom du relevé bancaire des écritures de débit." - -#. module: account_advanced_reconcile_bank_statement -#: field:easy.reconcile.advanced.bank_statement,journal_id:0 -#: model:ir.model.fields,field_description:account_advanced_reconcile_bank_statement.field_easy_reconcile_advanced_bank_statement_journal_id -msgid "Journal" -msgstr "Journal" - -#. module: account_advanced_reconcile_bank_statement -#: field:easy.reconcile.advanced.bank_statement,account_profit_id:0 -#: model:ir.model.fields,field_description:account_advanced_reconcile_bank_statement.field_easy_reconcile_advanced_bank_statement_account_profit_id -msgid "Account Profit" -msgstr "Compte de produit" - -#. module: account_advanced_reconcile_bank_statement -#: code:_description:0 -#: model:ir.model,name:account_advanced_reconcile_bank_statement.model_account_easy_reconcile_method -#, python-format -msgid "reconcile method for account_easy_reconcile" -msgstr "Méthode de lettrage pour le module account_easy_reconcile" - -#. module: account_advanced_reconcile_bank_statement -#: field:easy.reconcile.advanced.bank_statement,date_base_on:0 -#: model:ir.model.fields,field_description:account_advanced_reconcile_bank_statement.field_easy_reconcile_advanced_bank_statement_date_base_on -msgid "Date of reconciliation" -msgstr "Date de lettrage" - -#. module: account_advanced_reconcile_bank_statement -#: view:account.easy.reconcile:0 -msgid "Advanced. Partner and Bank Statement" -msgstr "Avancé. Partenaire et Relevé Bancaire" - -#. module: account_advanced_reconcile_bank_statement -#: code:_description:0 -#: model:ir.model,name:account_advanced_reconcile_bank_statement.model_easy_reconcile_advanced -#, python-format -msgid "easy.reconcile.advanced" -msgstr "easy.reconcile.advanced" - -#. module: account_advanced_reconcile_bank_statement -#: field:easy.reconcile.advanced.bank_statement,account_lost_id:0 -#: model:ir.model.fields,field_description:account_advanced_reconcile_bank_statement.field_easy_reconcile_advanced_bank_statement_account_lost_id -msgid "Account Lost" -msgstr "Compte de charge" - -#. module: account_advanced_reconcile_bank_statement -#: field:easy.reconcile.advanced.bank_statement,write_off:0 -#: model:ir.model.fields,field_description:account_advanced_reconcile_bank_statement.field_easy_reconcile_advanced_bank_statement_write_off -msgid "Write off allowed" -msgstr "Ecart autorisé" - From 2bfb5e8eb5b82d2c5879e429339ec8648783d385 Mon Sep 17 00:00:00 2001 From: Matthieu Dietrich Date: Mon, 2 May 2016 15:20:44 +0200 Subject: [PATCH 2/3] Rename and migrate to 9.0 "account_advanced_reconcile_transaction_ref" --- .../__init__.py | 23 ---- .../__openerp__.py | 40 ------- .../advanced_reconciliation.py | 66 ----------- .../base_advanced_reconciliation.py | 35 ------ .../easy_reconcile.py | 38 ------- .../easy_reconcile_view.xml | 24 ---- ...unt_advanced_reconcile_transaction_ref.pot | 97 ---------------- .../i18n/es.po | 105 ----------------- .../i18n/fr.po | 106 ------------------ .../README.rst | 51 +++++++++ .../__init__.py | 4 + .../__openerp__.py | 23 ++++ ...account_mass_reconcile_transaction_ref.pot | 97 ++++++++++++++++ .../i18n/es.po | 105 +++++++++++++++++ .../i18n/fr.po | 106 ++++++++++++++++++ .../models/__init__.py | 6 + .../models/advanced_reconciliation.py | 55 +++++++++ .../models/base_advanced_reconciliation.py | 17 +++ .../models/mass_reconcile.py | 21 ++++ .../views/mass_reconcile_view.xml | 22 ++++ 20 files changed, 507 insertions(+), 534 deletions(-) delete mode 100644 account_advanced_reconcile_transaction_ref/__init__.py delete mode 100644 account_advanced_reconcile_transaction_ref/__openerp__.py delete mode 100644 account_advanced_reconcile_transaction_ref/advanced_reconciliation.py delete mode 100644 account_advanced_reconcile_transaction_ref/base_advanced_reconciliation.py delete mode 100644 account_advanced_reconcile_transaction_ref/easy_reconcile.py delete mode 100644 account_advanced_reconcile_transaction_ref/easy_reconcile_view.xml delete mode 100644 account_advanced_reconcile_transaction_ref/i18n/account_advanced_reconcile_transaction_ref.pot delete mode 100644 account_advanced_reconcile_transaction_ref/i18n/es.po delete mode 100644 account_advanced_reconcile_transaction_ref/i18n/fr.po create mode 100644 account_mass_reconcile_transaction_ref/README.rst create mode 100644 account_mass_reconcile_transaction_ref/__init__.py create mode 100644 account_mass_reconcile_transaction_ref/__openerp__.py create mode 100644 account_mass_reconcile_transaction_ref/i18n/account_mass_reconcile_transaction_ref.pot create mode 100644 account_mass_reconcile_transaction_ref/i18n/es.po create mode 100644 account_mass_reconcile_transaction_ref/i18n/fr.po create mode 100644 account_mass_reconcile_transaction_ref/models/__init__.py create mode 100644 account_mass_reconcile_transaction_ref/models/advanced_reconciliation.py create mode 100644 account_mass_reconcile_transaction_ref/models/base_advanced_reconciliation.py create mode 100644 account_mass_reconcile_transaction_ref/models/mass_reconcile.py create mode 100644 account_mass_reconcile_transaction_ref/views/mass_reconcile_view.xml diff --git a/account_advanced_reconcile_transaction_ref/__init__.py b/account_advanced_reconcile_transaction_ref/__init__.py deleted file mode 100644 index e19ad65a..00000000 --- a/account_advanced_reconcile_transaction_ref/__init__.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# Author: Romain Deheele. Copyright Camptocamp SA -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -from . import easy_reconcile -from . import base_advanced_reconciliation -from . import advanced_reconciliation diff --git a/account_advanced_reconcile_transaction_ref/__openerp__.py b/account_advanced_reconcile_transaction_ref/__openerp__.py deleted file mode 100644 index 2acd93d2..00000000 --- a/account_advanced_reconcile_transaction_ref/__openerp__.py +++ /dev/null @@ -1,40 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# Author: Romain Deheele. Copyright Camptocamp SA -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -{'name': 'Advanced Reconcile Transaction Ref', - 'description': """ -Advanced reconciliation method for the module account_advanced_reconcile -======================================================================== -Reconcile rules with transaction_ref - -""", - 'version': '1.0.1', - 'author': "Camptocamp,Odoo Community Association (OCA)", - 'category': 'Finance', - 'website': 'http://www.camptocamp.com', - 'license': 'AGPL-3', - 'depends': ['account_advanced_reconcile'], - 'data': ['easy_reconcile_view.xml'], - 'demo': [], - 'test': [], # To be ported or migrate to unit tests or scenarios - 'auto_install': False, - 'installable': False, - 'images': [] - } diff --git a/account_advanced_reconcile_transaction_ref/advanced_reconciliation.py b/account_advanced_reconcile_transaction_ref/advanced_reconciliation.py deleted file mode 100644 index cf875ff4..00000000 --- a/account_advanced_reconcile_transaction_ref/advanced_reconciliation.py +++ /dev/null @@ -1,66 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# Author: Romain Deheele. Copyright Camptocamp SA -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -from openerp.osv import orm - - -class easy_reconcile_advanced_transaction_ref(orm.TransientModel): - - _name = 'easy.reconcile.advanced.transaction_ref' - _inherit = 'easy.reconcile.advanced' - - def _skip_line(self, cr, uid, rec, move_line, context=None): - """ - When True is returned on some conditions, the credit move line - will be skipped for reconciliation. Can be inherited to - skip on some conditions. ie: ref or partner_id is empty. - """ - return not (move_line.get('transaction_ref') and - move_line.get('partner_id')) - - def _matchers(self, cr, uid, rec, move_line, context=None): - return (('partner_id', move_line['partner_id']), - ('ref', move_line['transaction_ref'].lower().strip())) - - def _opposite_matchers(self, cr, uid, rec, move_line, context=None): - yield ('partner_id', move_line['partner_id']) - yield ('ref', (move_line['transaction_ref'] or '').lower().strip()) - - -class easy_reconcile_advanced_transaction_ref_vs_ref(orm.TransientModel): - - _name = 'easy.reconcile.advanced.trans_ref_vs_ref' - _inherit = 'easy.reconcile.advanced' - - def _skip_line(self, cr, uid, rec, move_line, context=None): - """ - When True is returned on some conditions, the credit move line - will be skipped for reconciliation. Can be inherited to - skip on some conditions. ie: ref or partner_id is empty. - """ - return not (move_line.get('ref') and move_line.get('partner_id')) - - def _matchers(self, cr, uid, rec, move_line, context=None): - return (('partner_id', move_line['partner_id']), - ('ref', move_line['ref'].lower().strip())) - - def _opposite_matchers(self, cr, uid, rec, move_line, context=None): - yield ('partner_id', move_line['partner_id']) - yield ('ref', (move_line['transaction_ref'] or '').lower().strip()) diff --git a/account_advanced_reconcile_transaction_ref/base_advanced_reconciliation.py b/account_advanced_reconcile_transaction_ref/base_advanced_reconciliation.py deleted file mode 100644 index 240df83d..00000000 --- a/account_advanced_reconcile_transaction_ref/base_advanced_reconciliation.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# Author: Romain Deheele -# Copyright 2013 Camptocamp SA -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -from openerp.osv import orm - - -class EasyReconcileAdvanced(orm.AbstractModel): - - _inherit = 'easy.reconcile.advanced' - - def _base_columns(self, rec): - """ Mandatory columns for move lines queries - An extra column aliased as ``key`` should be defined - in each query.""" - aml_cols = super(EasyReconcileAdvanced, self)._base_columns(rec) - aml_cols.append('account_move_line.transaction_ref') - return aml_cols diff --git a/account_advanced_reconcile_transaction_ref/easy_reconcile.py b/account_advanced_reconcile_transaction_ref/easy_reconcile.py deleted file mode 100644 index 07d43df2..00000000 --- a/account_advanced_reconcile_transaction_ref/easy_reconcile.py +++ /dev/null @@ -1,38 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# Author: Romain Deheele -# Copyright 2013 Camptocamp SA -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -from openerp.osv import orm - - -class account_easy_reconcile_method(orm.Model): - - _inherit = 'account.easy.reconcile.method' - - def _get_all_rec_method(self, cr, uid, context=None): - methods = super(account_easy_reconcile_method, self).\ - _get_all_rec_method(cr, uid, context=context) - methods += [ - ('easy.reconcile.advanced.transaction_ref', - 'Advanced. Partner and Transaction Ref.'), - ('easy.reconcile.advanced.trans_ref_vs_ref', - 'Advanced. Partner and Transaction Ref. vs Ref.'), - ] - return methods diff --git a/account_advanced_reconcile_transaction_ref/easy_reconcile_view.xml b/account_advanced_reconcile_transaction_ref/easy_reconcile_view.xml deleted file mode 100644 index 9d0745d4..00000000 --- a/account_advanced_reconcile_transaction_ref/easy_reconcile_view.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - account.easy.reconcile.form - account.easy.reconcile - - - - - - - - - - - - - - diff --git a/account_advanced_reconcile_transaction_ref/i18n/account_advanced_reconcile_transaction_ref.pot b/account_advanced_reconcile_transaction_ref/i18n/account_advanced_reconcile_transaction_ref.pot deleted file mode 100644 index 92297c0e..00000000 --- a/account_advanced_reconcile_transaction_ref/i18n/account_advanced_reconcile_transaction_ref.pot +++ /dev/null @@ -1,97 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_advanced_reconcile_transaction_ref -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 7.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-21 11:55+0000\n" -"PO-Revision-Date: 2014-01-21 11:55+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" - -#. module: account_advanced_reconcile_transaction_ref -#: field:easy.reconcile.advanced.transaction_ref,partner_ids:0 -msgid "Restrict on partners" -msgstr "" - -#. module: account_advanced_reconcile_transaction_ref -#: field:easy.reconcile.advanced.transaction_ref,account_id:0 -msgid "Account" -msgstr "" - -#. module: account_advanced_reconcile_transaction_ref -#: view:account.easy.reconcile:0 -msgid "Advanced. Partner and Transaction Ref" -msgstr "" - -#. module: account_advanced_reconcile_transaction_ref -#: view:account.easy.reconcile:0 -msgid "Match multiple debit vs multiple credit entries. Allow partial reconciliation. The lines should have the partner, the credit entry transaction ref. is matched vs the debit entry transaction ref. or name." -msgstr "" - -#. module: account_advanced_reconcile_transaction_ref -#: model:ir.model,name:account_advanced_reconcile_transaction_ref.model_easy_reconcile_advanced_transaction_ref -msgid "easy.reconcile.advanced.transaction_ref" -msgstr "" - -#. module: account_advanced_reconcile_transaction_ref -#: field:account.move.line,transaction_ref:0 -msgid "Transaction Ref." -msgstr "" - -#. module: account_advanced_reconcile_transaction_ref -#: field:easy.reconcile.advanced.transaction_ref,journal_id:0 -msgid "Journal" -msgstr "" - -#. module: account_advanced_reconcile_transaction_ref -#: field:easy.reconcile.advanced.transaction_ref,account_profit_id:0 -msgid "Account Profit" -msgstr "" - -#. module: account_advanced_reconcile_transaction_ref -#: model:ir.model,name:account_advanced_reconcile_transaction_ref.model_account_bank_statement -msgid "Bank Statement" -msgstr "" - -#. module: account_advanced_reconcile_transaction_ref -#: field:easy.reconcile.advanced.transaction_ref,filter:0 -msgid "Filter" -msgstr "" - -#. module: account_advanced_reconcile_transaction_ref -#: model:ir.model,name:account_advanced_reconcile_transaction_ref.model_account_easy_reconcile_method -msgid "reconcile method for account_easy_reconcile" -msgstr "" - -#. module: account_advanced_reconcile_transaction_ref -#: field:easy.reconcile.advanced.transaction_ref,date_base_on:0 -msgid "Date of reconciliation" -msgstr "" - -#. module: account_advanced_reconcile_transaction_ref -#: model:ir.model,name:account_advanced_reconcile_transaction_ref.model_account_move_line -msgid "Journal Items" -msgstr "" - -#. module: account_advanced_reconcile_transaction_ref -#: model:ir.model,name:account_advanced_reconcile_transaction_ref.model_easy_reconcile_advanced -msgid "easy.reconcile.advanced" -msgstr "" - -#. module: account_advanced_reconcile_transaction_ref -#: field:easy.reconcile.advanced.transaction_ref,account_lost_id:0 -msgid "Account Lost" -msgstr "" - -#. module: account_advanced_reconcile_transaction_ref -#: field:easy.reconcile.advanced.transaction_ref,write_off:0 -msgid "Write off allowed" -msgstr "" - diff --git a/account_advanced_reconcile_transaction_ref/i18n/es.po b/account_advanced_reconcile_transaction_ref/i18n/es.po deleted file mode 100644 index 4d622e3b..00000000 --- a/account_advanced_reconcile_transaction_ref/i18n/es.po +++ /dev/null @@ -1,105 +0,0 @@ -# Spanish translation for banking-addons -# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 -# This file is distributed under the same license as the banking-addons package. -# FIRST AUTHOR , 2014. -# -msgid "" -msgstr "" -"Project-Id-Version: banking-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2014-01-21 11:55+0000\n" -"PO-Revision-Date: 2014-06-05 22:39+0000\n" -"Last-Translator: Pedro Manuel Baeza \n" -"Language-Team: Spanish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-06-06 06:36+0000\n" -"X-Generator: Launchpad (build 17031)\n" - -#. module: account_advanced_reconcile_transaction_ref -#: field:easy.reconcile.advanced.transaction_ref,partner_ids:0 -msgid "Restrict on partners" -msgstr "Restringir a las empresas" - -#. module: account_advanced_reconcile_transaction_ref -#: field:easy.reconcile.advanced.transaction_ref,account_id:0 -msgid "Account" -msgstr "Cuenta" - -#. module: account_advanced_reconcile_transaction_ref -#: view:account.easy.reconcile:0 -msgid "Advanced. Partner and Transaction Ref" -msgstr "Avanzada. Empresa y referencia de transacción" - -#. module: account_advanced_reconcile_transaction_ref -#: view:account.easy.reconcile:0 -msgid "" -"Match multiple debit vs multiple credit entries. Allow partial " -"reconciliation. The lines should have the partner, the credit entry " -"transaction ref. is matched vs the debit entry transaction ref. or name." -msgstr "" -"Casa múltiples líneas del debe con múltiples líneas del haber. Permite " -"conciliación parcial. Las líneas deben tener la empresa, la referencia de la " -"transacción de la línea del haber se casa contra la referencia de la " -"transacción de la línea del debe o el nombre." - -#. module: account_advanced_reconcile_transaction_ref -#: model:ir.model,name:account_advanced_reconcile_transaction_ref.model_easy_reconcile_advanced_transaction_ref -msgid "easy.reconcile.advanced.transaction_ref" -msgstr "easy.reconcile.advanced.transaction_ref" - -#. module: account_advanced_reconcile_transaction_ref -#: field:account.move.line,transaction_ref:0 -msgid "Transaction Ref." -msgstr "Referencia de transacción" - -#. module: account_advanced_reconcile_transaction_ref -#: field:easy.reconcile.advanced.transaction_ref,journal_id:0 -msgid "Journal" -msgstr "Diario" - -#. module: account_advanced_reconcile_transaction_ref -#: field:easy.reconcile.advanced.transaction_ref,account_profit_id:0 -msgid "Account Profit" -msgstr "Cuenta de ganancias" - -#. module: account_advanced_reconcile_transaction_ref -#: model:ir.model,name:account_advanced_reconcile_transaction_ref.model_account_bank_statement -msgid "Bank Statement" -msgstr "Extracto bancario" - -#. module: account_advanced_reconcile_transaction_ref -#: field:easy.reconcile.advanced.transaction_ref,filter:0 -msgid "Filter" -msgstr "Filtro" - -#. module: account_advanced_reconcile_transaction_ref -#: model:ir.model,name:account_advanced_reconcile_transaction_ref.model_account_easy_reconcile_method -msgid "reconcile method for account_easy_reconcile" -msgstr "método de conciliación para account_easy_reconcile" - -#. module: account_advanced_reconcile_transaction_ref -#: field:easy.reconcile.advanced.transaction_ref,date_base_on:0 -msgid "Date of reconciliation" -msgstr "Fecha de conciliación" - -#. module: account_advanced_reconcile_transaction_ref -#: model:ir.model,name:account_advanced_reconcile_transaction_ref.model_account_move_line -msgid "Journal Items" -msgstr "Apuntes contables" - -#. module: account_advanced_reconcile_transaction_ref -#: model:ir.model,name:account_advanced_reconcile_transaction_ref.model_easy_reconcile_advanced -msgid "easy.reconcile.advanced" -msgstr "easy.reconcile.advanced" - -#. module: account_advanced_reconcile_transaction_ref -#: field:easy.reconcile.advanced.transaction_ref,account_lost_id:0 -msgid "Account Lost" -msgstr "Cuenta de pérdidas" - -#. module: account_advanced_reconcile_transaction_ref -#: field:easy.reconcile.advanced.transaction_ref,write_off:0 -msgid "Write off allowed" -msgstr "Desajuste permitido" diff --git a/account_advanced_reconcile_transaction_ref/i18n/fr.po b/account_advanced_reconcile_transaction_ref/i18n/fr.po deleted file mode 100644 index c44ae45c..00000000 --- a/account_advanced_reconcile_transaction_ref/i18n/fr.po +++ /dev/null @@ -1,106 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_advanced_reconcile_transaction_ref -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 7.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-21 11:55+0000\n" -"PO-Revision-Date: 2014-03-21 15:25+0000\n" -"Last-Translator: Vincent Renaville@camptocamp " -"\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-05-22 06:49+0000\n" -"X-Generator: Launchpad (build 17017)\n" - -#. module: account_advanced_reconcile_transaction_ref -#: field:easy.reconcile.advanced.transaction_ref,partner_ids:0 -msgid "Restrict on partners" -msgstr "Restriction sur les partenaires" - -#. module: account_advanced_reconcile_transaction_ref -#: field:easy.reconcile.advanced.transaction_ref,account_id:0 -msgid "Account" -msgstr "Compte" - -#. module: account_advanced_reconcile_transaction_ref -#: view:account.easy.reconcile:0 -msgid "Advanced. Partner and Transaction Ref" -msgstr "Avancé. Partenaire et Référence de transaction" - -#. module: account_advanced_reconcile_transaction_ref -#: view:account.easy.reconcile:0 -msgid "" -"Match multiple debit vs multiple credit entries. Allow partial " -"reconciliation. The lines should have the partner, the credit entry " -"transaction ref. is matched vs the debit entry transaction ref. or name." -msgstr "" -"Le lettrage peut s'effectuer sur plusieurs écritures de débit et crédit. Le " -"Lettrage partiel est autorisé. Les écritures doivent avoir le même " -"partenaire et la même référence de transaction sur les écritures de crédit " -"doit se retrouver dans la référence de transaction ou la description sur les " -"écritures de débit." - -#. module: account_advanced_reconcile_transaction_ref -#: model:ir.model,name:account_advanced_reconcile_transaction_ref.model_easy_reconcile_advanced_transaction_ref -msgid "easy.reconcile.advanced.transaction_ref" -msgstr "easy.reconcile.advanced.transaction_ref" - -#. module: account_advanced_reconcile_transaction_ref -#: field:account.move.line,transaction_ref:0 -msgid "Transaction Ref." -msgstr "Réf. de transaction" - -#. module: account_advanced_reconcile_transaction_ref -#: field:easy.reconcile.advanced.transaction_ref,journal_id:0 -msgid "Journal" -msgstr "Journal" - -#. module: account_advanced_reconcile_transaction_ref -#: field:easy.reconcile.advanced.transaction_ref,account_profit_id:0 -msgid "Account Profit" -msgstr "Compte de produit" - -#. module: account_advanced_reconcile_transaction_ref -#: model:ir.model,name:account_advanced_reconcile_transaction_ref.model_account_bank_statement -msgid "Bank Statement" -msgstr "Relevé bancaire" - -#. module: account_advanced_reconcile_transaction_ref -#: field:easy.reconcile.advanced.transaction_ref,filter:0 -msgid "Filter" -msgstr "Filtre" - -#. module: account_advanced_reconcile_transaction_ref -#: model:ir.model,name:account_advanced_reconcile_transaction_ref.model_account_easy_reconcile_method -msgid "reconcile method for account_easy_reconcile" -msgstr "Méthode de lettrage pour le module account_easy_reconcile" - -#. module: account_advanced_reconcile_transaction_ref -#: field:easy.reconcile.advanced.transaction_ref,date_base_on:0 -msgid "Date of reconciliation" -msgstr "Date de lettrage" - -#. module: account_advanced_reconcile_transaction_ref -#: model:ir.model,name:account_advanced_reconcile_transaction_ref.model_account_move_line -msgid "Journal Items" -msgstr "Écritures comptables" - -#. module: account_advanced_reconcile_transaction_ref -#: model:ir.model,name:account_advanced_reconcile_transaction_ref.model_easy_reconcile_advanced -msgid "easy.reconcile.advanced" -msgstr "easy.reconcile.advanced" - -#. module: account_advanced_reconcile_transaction_ref -#: field:easy.reconcile.advanced.transaction_ref,account_lost_id:0 -msgid "Account Lost" -msgstr "Compte de charge" - -#. module: account_advanced_reconcile_transaction_ref -#: field:easy.reconcile.advanced.transaction_ref,write_off:0 -msgid "Write off allowed" -msgstr "Ecart autorisé" diff --git a/account_mass_reconcile_transaction_ref/README.rst b/account_mass_reconcile_transaction_ref/README.rst new file mode 100644 index 00000000..5a24bc99 --- /dev/null +++ b/account_mass_reconcile_transaction_ref/README.rst @@ -0,0 +1,51 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +============================== +Mass Reconcile Transaction Ref +============================== + +This module extends the functionality of account_mass_reconcile +to use the 'transaction_ref' field defined in base_transaction_id. + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/98/9.0 + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smashing it by providing a detailed and welcomed feedback. + +Credits +======= + +Images +------ + +* Odoo Community Association: `Icon `_. + +Contributors +------------ + +* Romain Deheele +* Matthieu Dietrich + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/account_mass_reconcile_transaction_ref/__init__.py b/account_mass_reconcile_transaction_ref/__init__.py new file mode 100644 index 00000000..17ba6139 --- /dev/null +++ b/account_mass_reconcile_transaction_ref/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# © 2013-2016 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) +from . import models diff --git a/account_mass_reconcile_transaction_ref/__openerp__.py b/account_mass_reconcile_transaction_ref/__openerp__.py new file mode 100644 index 00000000..d2bc5357 --- /dev/null +++ b/account_mass_reconcile_transaction_ref/__openerp__.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +# © 2013-2016 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) +{ + 'name': 'Mass Reconcile Transaction Ref', + 'version': '9.0.1.0.0', + 'author': "Camptocamp,Odoo Community Association (OCA)", + 'category': 'Finance', + 'website': 'http://www.camptocamp.com', + 'license': 'AGPL-3', + 'depends': [ + 'account_mass_reconcile', + 'base_transaction_id' + ], + 'data': [ + 'views/mass_reconcile_view.xml' + ], + 'demo': [], + 'test': [], + 'auto_install': False, + 'installable': True, + 'images': [] +} diff --git a/account_mass_reconcile_transaction_ref/i18n/account_mass_reconcile_transaction_ref.pot b/account_mass_reconcile_transaction_ref/i18n/account_mass_reconcile_transaction_ref.pot new file mode 100644 index 00000000..80180837 --- /dev/null +++ b/account_mass_reconcile_transaction_ref/i18n/account_mass_reconcile_transaction_ref.pot @@ -0,0 +1,97 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * account_mass_reconcile_transaction_ref +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 7.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-01-21 11:55+0000\n" +"PO-Revision-Date: 2014-01-21 11:55+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: account_mass_reconcile_transaction_ref +#: field:mass.reconcile.advanced.transaction_ref,partner_ids:0 +msgid "Restrict on partners" +msgstr "" + +#. module: account_mass_reconcile_transaction_ref +#: field:mass.reconcile.advanced.transaction_ref,account_id:0 +msgid "Account" +msgstr "" + +#. module: account_mass_reconcile_transaction_ref +#: view:account.mass.reconcile:0 +msgid "Advanced. Partner and Transaction Ref" +msgstr "" + +#. module: account_mass_reconcile_transaction_ref +#: view:account.mass.reconcile:0 +msgid "Match multiple debit vs multiple credit entries. Allow partial reconciliation. The lines should have the partner, the credit entry transaction ref. is matched vs the debit entry transaction ref. or name." +msgstr "" + +#. module: account_mass_reconcile_transaction_ref +#: model:ir.model,name:account_mass_reconcile_transaction_ref.model_easy_reconcile_advanced_transaction_ref +msgid "mass.reconcile.advanced.transaction_ref" +msgstr "" + +#. module: account_mass_reconcile_transaction_ref +#: field:account.move.line,transaction_ref:0 +msgid "Transaction Ref." +msgstr "" + +#. module: account_mass_reconcile_transaction_ref +#: field:mass.reconcile.advanced.transaction_ref,journal_id:0 +msgid "Journal" +msgstr "" + +#. module: account_mass_reconcile_transaction_ref +#: field:mass.reconcile.advanced.transaction_ref,account_profit_id:0 +msgid "Account Profit" +msgstr "" + +#. module: account_mass_reconcile_transaction_ref +#: model:ir.model,name:account_mass_reconcile_transaction_ref.model_account_move +msgid "Account Move" +msgstr "" + +#. module: account_mass_reconcile_transaction_ref +#: field:mass.reconcile.advanced.transaction_ref,filter:0 +msgid "Filter" +msgstr "" + +#. module: account_mass_reconcile_transaction_ref +#: model:ir.model,name:account_mass_reconcile_transaction_ref.model_account_mass_reconcile_method +msgid "reconcile method for account_mass_reconcile" +msgstr "" + +#. module: account_mass_reconcile_transaction_ref +#: field:mass.reconcile.advanced.transaction_ref,date_base_on:0 +msgid "Date of reconciliation" +msgstr "" + +#. module: account_mass_reconcile_transaction_ref +#: model:ir.model,name:account_mass_reconcile_transaction_ref.model_account_move_line +msgid "Journal Items" +msgstr "" + +#. module: account_mass_reconcile_transaction_ref +#: model:ir.model,name:account_mass_reconcile_transaction_ref.model_easy_reconcile_advanced +msgid "mass.reconcile.advanced" +msgstr "" + +#. module: account_mass_reconcile_transaction_ref +#: field:mass.reconcile.advanced.transaction_ref,account_lost_id:0 +msgid "Account Lost" +msgstr "" + +#. module: account_mass_reconcile_transaction_ref +#: field:mass.reconcile.advanced.transaction_ref,write_off:0 +msgid "Write off allowed" +msgstr "" + diff --git a/account_mass_reconcile_transaction_ref/i18n/es.po b/account_mass_reconcile_transaction_ref/i18n/es.po new file mode 100644 index 00000000..617e9f9d --- /dev/null +++ b/account_mass_reconcile_transaction_ref/i18n/es.po @@ -0,0 +1,105 @@ +# Spanish translation for banking-addons +# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 +# This file is distributed under the same license as the banking-addons package. +# FIRST AUTHOR , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: banking-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2014-01-21 11:55+0000\n" +"PO-Revision-Date: 2014-06-05 22:39+0000\n" +"Last-Translator: Pedro Manuel Baeza \n" +"Language-Team: Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2014-06-06 06:36+0000\n" +"X-Generator: Launchpad (build 17031)\n" + +#. module: account_mass_reconcile_transaction_ref +#: field:mass.reconcile.advanced.transaction_ref,partner_ids:0 +msgid "Restrict on partners" +msgstr "Restringir a las empresas" + +#. module: account_mass_reconcile_transaction_ref +#: field:mass.reconcile.advanced.transaction_ref,account_id:0 +msgid "Account" +msgstr "Cuenta" + +#. module: account_mass_reconcile_transaction_ref +#: view:account.mass.reconcile:0 +msgid "Advanced. Partner and Transaction Ref" +msgstr "Avanzada. Empresa y referencia de transacción" + +#. module: account_mass_reconcile_transaction_ref +#: view:account.mass.reconcile:0 +msgid "" +"Match multiple debit vs multiple credit entries. Allow partial " +"reconciliation. The lines should have the partner, the credit entry " +"transaction ref. is matched vs the debit entry transaction ref. or name." +msgstr "" +"Casa múltiples líneas del debe con múltiples líneas del haber. Permite " +"conciliación parcial. Las líneas deben tener la empresa, la referencia de la " +"transacción de la línea del haber se casa contra la referencia de la " +"transacción de la línea del debe o el nombre." + +#. module: account_mass_reconcile_transaction_ref +#: model:ir.model,name:account_mass_reconcile_transaction_ref.model_mass_reconcile_advanced_transaction_ref +msgid "mass.reconcile.advanced.transaction_ref" +msgstr "mass.reconcile.advanced.transaction_ref" + +#. module: account_mass_reconcile_transaction_ref +#: field:account.move.line,transaction_ref:0 +msgid "Transaction Ref." +msgstr "Referencia de transacción" + +#. module: account_mass_reconcile_transaction_ref +#: field:mass.reconcile.advanced.transaction_ref,journal_id:0 +msgid "Journal" +msgstr "Diario" + +#. module: account_mass_reconcile_transaction_ref +#: field:mass.reconcile.advanced.transaction_ref,account_profit_id:0 +msgid "Account Profit" +msgstr "Cuenta de ganancias" + +#. module: account_mass_reconcile_transaction_ref +#: model:ir.model,name:account_mass_reconcile_transaction_ref.model_account_bank_statement +msgid "Bank Statement" +msgstr "Extracto bancario" + +#. module: account_mass_reconcile_transaction_ref +#: field:mass.reconcile.advanced.transaction_ref,filter:0 +msgid "Filter" +msgstr "Filtro" + +#. module: account_mass_reconcile_transaction_ref +#: model:ir.model,name:account_mass_reconcile_transaction_ref.model_account_mass_reconcile_method +msgid "reconcile method for account_mass_reconcile" +msgstr "método de conciliación para account_mass_reconcile" + +#. module: account_mass_reconcile_transaction_ref +#: field:mass.reconcile.advanced.transaction_ref,date_base_on:0 +msgid "Date of reconciliation" +msgstr "Fecha de conciliación" + +#. module: account_mass_reconcile_transaction_ref +#: model:ir.model,name:account_mass_reconcile_transaction_ref.model_account_move_line +msgid "Journal Items" +msgstr "Apuntes contables" + +#. module: account_mass_reconcile_transaction_ref +#: model:ir.model,name:account_mass_reconcile_transaction_ref.model_mass_reconcile_advanced +msgid "mass.reconcile.advanced" +msgstr "mass.reconcile.advanced" + +#. module: account_mass_reconcile_transaction_ref +#: field:mass.reconcile.advanced.transaction_ref,account_lost_id:0 +msgid "Account Lost" +msgstr "Cuenta de pérdidas" + +#. module: account_mass_reconcile_transaction_ref +#: field:mass.reconcile.advanced.transaction_ref,write_off:0 +msgid "Write off allowed" +msgstr "Desajuste permitido" diff --git a/account_mass_reconcile_transaction_ref/i18n/fr.po b/account_mass_reconcile_transaction_ref/i18n/fr.po new file mode 100644 index 00000000..603199b6 --- /dev/null +++ b/account_mass_reconcile_transaction_ref/i18n/fr.po @@ -0,0 +1,106 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * account_mass_reconcile_transaction_ref +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 7.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-01-21 11:55+0000\n" +"PO-Revision-Date: 2014-03-21 15:25+0000\n" +"Last-Translator: Vincent Renaville@camptocamp " +"\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2014-05-22 06:49+0000\n" +"X-Generator: Launchpad (build 17017)\n" + +#. module: account_mass_reconcile_transaction_ref +#: field:mass.reconcile.advanced.transaction_ref,partner_ids:0 +msgid "Restrict on partners" +msgstr "Restriction sur les partenaires" + +#. module: account_mass_reconcile_transaction_ref +#: field:mass.reconcile.advanced.transaction_ref,account_id:0 +msgid "Account" +msgstr "Compte" + +#. module: account_mass_reconcile_transaction_ref +#: view:account.mass.reconcile:0 +msgid "Advanced. Partner and Transaction Ref" +msgstr "Avancé. Partenaire et Référence de transaction" + +#. module: account_mass_reconcile_transaction_ref +#: view:account.mass.reconcile:0 +msgid "" +"Match multiple debit vs multiple credit entries. Allow partial " +"reconciliation. The lines should have the partner, the credit entry " +"transaction ref. is matched vs the debit entry transaction ref. or name." +msgstr "" +"Le lettrage peut s'effectuer sur plusieurs écritures de débit et crédit. Le " +"Lettrage partiel est autorisé. Les écritures doivent avoir le même " +"partenaire et la même référence de transaction sur les écritures de crédit " +"doit se retrouver dans la référence de transaction ou la description sur les " +"écritures de débit." + +#. module: account_mass_reconcile_transaction_ref +#: model:ir.model,name:account_mass_reconcile_transaction_ref.model_mass_reconcile_advanced_transaction_ref +msgid "mass.reconcile.advanced.transaction_ref" +msgstr "mass.reconcile.advanced.transaction_ref" + +#. module: account_mass_reconcile_transaction_ref +#: field:account.move.line,transaction_ref:0 +msgid "Transaction Ref." +msgstr "Réf. de transaction" + +#. module: account_mass_reconcile_transaction_ref +#: field:mass.reconcile.advanced.transaction_ref,journal_id:0 +msgid "Journal" +msgstr "Journal" + +#. module: account_mass_reconcile_transaction_ref +#: field:mass.reconcile.advanced.transaction_ref,account_profit_id:0 +msgid "Account Profit" +msgstr "Compte de produit" + +#. module: account_mass_reconcile_transaction_ref +#: model:ir.model,name:account_mass_reconcile_transaction_ref.model_account_bank_statement +msgid "Bank Statement" +msgstr "Relevé bancaire" + +#. module: account_mass_reconcile_transaction_ref +#: field:mass.reconcile.advanced.transaction_ref,filter:0 +msgid "Filter" +msgstr "Filtre" + +#. module: account_mass_reconcile_transaction_ref +#: model:ir.model,name:account_mass_reconcile_transaction_ref.model_account_mass_reconcile_method +msgid "reconcile method for account_mass_reconcile" +msgstr "Méthode de lettrage pour le module account_mass_reconcile" + +#. module: account_mass_reconcile_transaction_ref +#: field:mass.reconcile.advanced.transaction_ref,date_base_on:0 +msgid "Date of reconciliation" +msgstr "Date de lettrage" + +#. module: account_mass_reconcile_transaction_ref +#: model:ir.model,name:account_mass_reconcile_transaction_ref.model_account_move_line +msgid "Journal Items" +msgstr "Écritures comptables" + +#. module: account_mass_reconcile_transaction_ref +#: model:ir.model,name:account_mass_reconcile_transaction_ref.model_mass_reconcile_advanced +msgid "mass.reconcile.advanced" +msgstr "mass.reconcile.advanced" + +#. module: account_mass_reconcile_transaction_ref +#: field:mass.reconcile.advanced.transaction_ref,account_lost_id:0 +msgid "Account Lost" +msgstr "Compte de charge" + +#. module: account_mass_reconcile_transaction_ref +#: field:mass.reconcile.advanced.transaction_ref,write_off:0 +msgid "Write off allowed" +msgstr "Ecart autorisé" diff --git a/account_mass_reconcile_transaction_ref/models/__init__.py b/account_mass_reconcile_transaction_ref/models/__init__.py new file mode 100644 index 00000000..bd54b1d4 --- /dev/null +++ b/account_mass_reconcile_transaction_ref/models/__init__.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +# © 2013-2016 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) +from . import mass_reconcile +from . import base_advanced_reconciliation +from . import advanced_reconciliation diff --git a/account_mass_reconcile_transaction_ref/models/advanced_reconciliation.py b/account_mass_reconcile_transaction_ref/models/advanced_reconciliation.py new file mode 100644 index 00000000..d35b816d --- /dev/null +++ b/account_mass_reconcile_transaction_ref/models/advanced_reconciliation.py @@ -0,0 +1,55 @@ +# -*- coding: utf-8 -*- +# © 2013-2016 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) +from openerp import api, models + + +class MassReconcileAdvancedTransactionRef(models.TransientModel): + + _name = 'mass.reconcile.advanced.transaction.ref' + _inherit = 'mass.reconcile.advanced' + + @api.multi + def _skip_line(self, move_line): + """ + When True is returned on some conditions, the credit move line + will be skipped for reconciliation. Can be inherited to + skip on some conditions. ie: ref or partner_id is empty. + """ + return not (move_line.get('transaction_ref') and + move_line.get('partner_id')) + + @api.multi + def _matchers(self, move_line): + return (('partner_id', move_line['partner_id']), + ('ref', move_line['transaction_ref'].lower().strip())) + + @api.multi + def _opposite_matchers(self, move_line): + yield ('partner_id', move_line['partner_id']) + yield ('ref', (move_line['transaction_ref'] or '').lower().strip()) + + +class MassReconcileAdvancedTransactionRefVsRef(models.TransientModel): + + _name = 'mass.reconcile.advanced.transaction.ref.vs.ref' + _inherit = 'mass.reconcile.advanced' + + @api.multi + def _skip_line(self, move_line): + """ + When True is returned on some conditions, the credit move line + will be skipped for reconciliation. Can be inherited to + skip on some conditions. ie: ref or partner_id is empty. + """ + return not (move_line.get('ref') and move_line.get('partner_id')) + + @api.multi + def _matchers(self, move_line): + return (('partner_id', move_line['partner_id']), + ('ref', move_line['ref'].lower().strip())) + + @api.multi + def _opposite_matchers(self, move_line): + yield ('partner_id', move_line['partner_id']) + yield ('ref', (move_line['transaction_ref'] or '').lower().strip()) diff --git a/account_mass_reconcile_transaction_ref/models/base_advanced_reconciliation.py b/account_mass_reconcile_transaction_ref/models/base_advanced_reconciliation.py new file mode 100644 index 00000000..cd40b758 --- /dev/null +++ b/account_mass_reconcile_transaction_ref/models/base_advanced_reconciliation.py @@ -0,0 +1,17 @@ +# -*- coding: utf-8 -*- +# © 2013-2016 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) +from openerp import models + + +class MassReconcileAdvanced(models.AbstractModel): + + _inherit = 'mass.reconcile.advanced' + + def _base_columns(self): + """ Mandatory columns for move lines queries + An extra column aliased as ``key`` should be defined + in each query.""" + aml_cols = super(MassReconcileAdvanced, self)._base_columns() + aml_cols.append('account_move_line.transaction_ref') + return aml_cols diff --git a/account_mass_reconcile_transaction_ref/models/mass_reconcile.py b/account_mass_reconcile_transaction_ref/models/mass_reconcile.py new file mode 100644 index 00000000..e02bab3b --- /dev/null +++ b/account_mass_reconcile_transaction_ref/models/mass_reconcile.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# © 2013-2016 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) +from openerp import api, models + + +class AccountMassReconcileMethod(models.Model): + + _inherit = 'account.easy.reconcile.method' + + @api.model + def _get_all_rec_method(self): + _super = super(AccountMassReconcileMethod, self) + methods = _super._get_all_rec_method() + methods += [ + ('easy.reconcile.advanced.transaction_ref', + 'Advanced. Partner and Transaction Ref.'), + ('easy.reconcile.advanced.trans_ref_vs_ref', + 'Advanced. Partner and Transaction Ref. vs Ref.'), + ] + return methods diff --git a/account_mass_reconcile_transaction_ref/views/mass_reconcile_view.xml b/account_mass_reconcile_transaction_ref/views/mass_reconcile_view.xml new file mode 100644 index 00000000..817159ef --- /dev/null +++ b/account_mass_reconcile_transaction_ref/views/mass_reconcile_view.xml @@ -0,0 +1,22 @@ + + + + account.mass.reconcile.form + account.mass.reconcile + + + + + + + + + + + + + From cf65419ad69eff6ddbc227fe7d0d84d8fdbf0510 Mon Sep 17 00:00:00 2001 From: Matthieu Dietrich Date: Thu, 6 Aug 2015 14:24:00 +0200 Subject: [PATCH 3/3] Rename and migrate to 9.0 "account_advanced_reconcile_ref_deep_search" --- .../README.rst | 51 ++++++++++++++++ .../__init__.py | 4 ++ .../__openerp__.py | 19 ++++++ .../models/__init__.py | 5 ++ .../models/advanced_reconciliation.py | 58 +++++++++++++++++++ .../models/mass_reconcile.py | 19 ++++++ .../views/mass_reconcile_view.xml | 17 ++++++ .../models/mass_reconcile.py | 6 +- 8 files changed, 176 insertions(+), 3 deletions(-) create mode 100644 account_mass_reconcile_ref_deep_search/README.rst create mode 100644 account_mass_reconcile_ref_deep_search/__init__.py create mode 100644 account_mass_reconcile_ref_deep_search/__openerp__.py create mode 100644 account_mass_reconcile_ref_deep_search/models/__init__.py create mode 100644 account_mass_reconcile_ref_deep_search/models/advanced_reconciliation.py create mode 100644 account_mass_reconcile_ref_deep_search/models/mass_reconcile.py create mode 100644 account_mass_reconcile_ref_deep_search/views/mass_reconcile_view.xml diff --git a/account_mass_reconcile_ref_deep_search/README.rst b/account_mass_reconcile_ref_deep_search/README.rst new file mode 100644 index 00000000..f89c953d --- /dev/null +++ b/account_mass_reconcile_ref_deep_search/README.rst @@ -0,0 +1,51 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +============================== +Mass Reconcile Ref Deep Search +============================== + +This module extends the functionality of account_mass_reconcile +and allows to search the credit entry ref inside the debit entry ref, +instead of an exact match. + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/98/9.0 + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smashing it by providing a detailed and welcomed feedback. + +Credits +======= + +Images +------ + +* Odoo Community Association: `Icon `_. + +Contributors +------------ + +* Matthieu Dietrich + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/account_mass_reconcile_ref_deep_search/__init__.py b/account_mass_reconcile_ref_deep_search/__init__.py new file mode 100644 index 00000000..e1b56ad6 --- /dev/null +++ b/account_mass_reconcile_ref_deep_search/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# © 2015-2016 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) +from . import models diff --git a/account_mass_reconcile_ref_deep_search/__openerp__.py b/account_mass_reconcile_ref_deep_search/__openerp__.py new file mode 100644 index 00000000..c233bfa4 --- /dev/null +++ b/account_mass_reconcile_ref_deep_search/__openerp__.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# © 2015-2016 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) +{ + 'name': 'Mass Reconcile Ref Deep Search', + 'version': '9.0.1.0.0', + 'author': "Camptocamp,Odoo Community Association (OCA)", + 'category': 'Finance', + 'website': 'http://www.camptocamp.com', + 'depends': ['account_mass_reconcile'], + 'data': [ + 'views/mass_reconcile_view.xml' + ], + 'demo': [], + 'test': [], + 'auto_install': False, + 'installable': True, + 'images': [] +} diff --git a/account_mass_reconcile_ref_deep_search/models/__init__.py b/account_mass_reconcile_ref_deep_search/models/__init__.py new file mode 100644 index 00000000..b07ffa54 --- /dev/null +++ b/account_mass_reconcile_ref_deep_search/models/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# © 2015-2016 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) +from . import mass_reconcile +from . import advanced_reconciliation diff --git a/account_mass_reconcile_ref_deep_search/models/advanced_reconciliation.py b/account_mass_reconcile_ref_deep_search/models/advanced_reconciliation.py new file mode 100644 index 00000000..d47b795b --- /dev/null +++ b/account_mass_reconcile_ref_deep_search/models/advanced_reconciliation.py @@ -0,0 +1,58 @@ +# -*- coding: utf-8 -*- +# © 2015-2016 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) +from openerp import _, models +from itertools import product + + +class MassReconciledAdvancedRefDeepSearch(models.TransientModel): + + _name = 'mass.reconcile.advanced.ref.deep.search' + _inherit = 'mass.reconcile.advanced.ref' + + @staticmethod + def _compare_values(key, value, opposite_value): + """Can be inherited to modify the equality condition + specifically according to the matcher key (maybe using + a like operator instead of equality on 'ref' as instance) + """ + # consider that empty vals are not valid matchers + # it can still be inherited for some special cases + # where it would be allowed + if not (value and opposite_value): + return False + + if value == opposite_value or \ + (key == 'ref' and value in opposite_value): + return True + return False + + @staticmethod + def _compare_matcher_values(key, values, opposite_values): + """ Compare every values from a matcher vs an opposite matcher + and return True if it matches + """ + for value, ovalue in product(values, opposite_values): + # we do not need to compare all values, if one matches + # we are done + if MassReconciledAdvancedRefDeepSearch._compare_values( + key, value, ovalue): + return True + return False + + @staticmethod + def _compare_matchers(matcher, opposite_matcher): + """ + Prepare and check the matchers to compare + """ + mkey, mvalue = matcher + omkey, omvalue = opposite_matcher + assert mkey == omkey, \ + (_("A matcher %s is compared with a matcher %s, the _matchers and " + "_opposite_matchers are probably wrong") % (mkey, omkey)) + if not isinstance(mvalue, (list, tuple)): + mvalue = mvalue, + if not isinstance(omvalue, (list, tuple)): + omvalue = omvalue, + return MassReconciledAdvancedRefDeepSearch.\ + _compare_matcher_values(mkey, mvalue, omvalue) diff --git a/account_mass_reconcile_ref_deep_search/models/mass_reconcile.py b/account_mass_reconcile_ref_deep_search/models/mass_reconcile.py new file mode 100644 index 00000000..ac13ec58 --- /dev/null +++ b/account_mass_reconcile_ref_deep_search/models/mass_reconcile.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# © 2015-2016 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) +from openerp import api, models + + +class AccountMassReconcileMethod(models.Model): + + _inherit = 'account.mass.reconcile.method' + + @api.model + def _get_all_rec_method(self): + _super = super(AccountMassReconcileMethod, self) + methods = _super.get_all_rec_method() + methods += [ + ('mass.reconcile.advanced.ref.deep.search', + 'Advanced. Partner and Ref. Deep Search'), + ] + return methods diff --git a/account_mass_reconcile_ref_deep_search/views/mass_reconcile_view.xml b/account_mass_reconcile_ref_deep_search/views/mass_reconcile_view.xml new file mode 100644 index 00000000..41c30174 --- /dev/null +++ b/account_mass_reconcile_ref_deep_search/views/mass_reconcile_view.xml @@ -0,0 +1,17 @@ + + + + account.mass.reconcile.form + account.mass.reconcile + + + + + + + + + + diff --git a/account_mass_reconcile_transaction_ref/models/mass_reconcile.py b/account_mass_reconcile_transaction_ref/models/mass_reconcile.py index e02bab3b..cc152d44 100644 --- a/account_mass_reconcile_transaction_ref/models/mass_reconcile.py +++ b/account_mass_reconcile_transaction_ref/models/mass_reconcile.py @@ -6,16 +6,16 @@ from openerp import api, models class AccountMassReconcileMethod(models.Model): - _inherit = 'account.easy.reconcile.method' + _inherit = 'account.mass.reconcile.method' @api.model def _get_all_rec_method(self): _super = super(AccountMassReconcileMethod, self) methods = _super._get_all_rec_method() methods += [ - ('easy.reconcile.advanced.transaction_ref', + ('mass.reconcile.advanced.transaction_ref', 'Advanced. Partner and Transaction Ref.'), - ('easy.reconcile.advanced.trans_ref_vs_ref', + ('mass.reconcile.advanced.trans_ref_vs_ref', 'Advanced. Partner and Transaction Ref. vs Ref.'), ] return methods