From 66f95a64d8a6c11e786902efd51ede0fcd4086fb Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Wed, 10 Sep 2014 12:19:20 +0200 Subject: [PATCH] Initial adjustments for 8.0 repository --- account_payment_partner/__init__.py | 23 -------- account_payment_partner/__openerp__.py | 55 ------------------ account_payment_partner/demo/partner_demo.xml | 51 ---------------- .../i18n/account_payment_partner.pot | 57 ------------------ account_payment_partner/i18n/nl.po | 58 ------------------- account_payment_partner/model/__init__.py | 25 -------- .../model/account_invoice.py | 56 ------------------ account_payment_partner/model/partner.py | 44 -------------- .../model/payment_order_create.py | 39 ------------- .../view/account_invoice.xml | 38 ------------ account_payment_partner/view/partner.xml | 31 ---------- 11 files changed, 477 deletions(-) delete mode 100644 account_payment_partner/__init__.py delete mode 100644 account_payment_partner/__openerp__.py delete mode 100644 account_payment_partner/demo/partner_demo.xml delete mode 100644 account_payment_partner/i18n/account_payment_partner.pot delete mode 100644 account_payment_partner/i18n/nl.po delete mode 100644 account_payment_partner/model/__init__.py delete mode 100644 account_payment_partner/model/account_invoice.py delete mode 100644 account_payment_partner/model/partner.py delete mode 100644 account_payment_partner/model/payment_order_create.py delete mode 100644 account_payment_partner/view/account_invoice.xml delete mode 100644 account_payment_partner/view/partner.xml diff --git a/account_payment_partner/__init__.py b/account_payment_partner/__init__.py deleted file mode 100644 index 161123944..000000000 --- a/account_payment_partner/__init__.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# Account Payment Partner module for OpenERP -# Copyright (C) 2014 Akretion (http://www.akretion.com) -# @author Alexis de Lattre -# -# 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 model diff --git a/account_payment_partner/__openerp__.py b/account_payment_partner/__openerp__.py deleted file mode 100644 index 4e0217c98..000000000 --- a/account_payment_partner/__openerp__.py +++ /dev/null @@ -1,55 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# Account Payment Partner module for OpenERP -# Copyright (C) 2014 Akretion (http://www.akretion.com) -# @author Alexis de Lattre -# -# 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': 'Account Payment Partner', - 'version': '0.1', - 'category': 'Banking addons', - 'license': 'AGPL-3', - 'summary': 'Adds payment mode on partners and invoices', - 'description': """ -Account Payment Partner -======================= - -This module adds severals fields : - -* the *Supplier Payment Mode* and *Customer Payment Mode* on Partners, - -* the *Payment Mode* on Invoices. - -On a Payment Order, in the wizard *Select Invoices to Pay*, the invoices will -be filtered per Payment Mode. - -Please contact Alexis de Lattre from Akretion -for any help or question about this module. - """, - 'author': 'Akretion', - 'website': 'http://www.akretion.com', - 'depends': ['account_banking_payment_export'], - 'data': [ - 'view/partner.xml', - 'view/account_invoice.xml', - ], - 'demo': ['demo/partner_demo.xml'], - 'active': False, -} diff --git a/account_payment_partner/demo/partner_demo.xml b/account_payment_partner/demo/partner_demo.xml deleted file mode 100644 index 776058d44..000000000 --- a/account_payment_partner/demo/partner_demo.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - supplier_payment_mode_12 - - - - - - - - customer_payment_mode_12 - - - - - - - - - customer_payment_mode_2 - - - - - - - - - supplier_payment_mode_1 - - - - - - - - - diff --git a/account_payment_partner/i18n/account_payment_partner.pot b/account_payment_partner/i18n/account_payment_partner.pot deleted file mode 100644 index ca26e532d..000000000 --- a/account_payment_partner/i18n/account_payment_partner.pot +++ /dev/null @@ -1,57 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_payment_partner -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 7.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-09 23:22+0000\n" -"PO-Revision-Date: 2014-06-09 23:22+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_payment_partner -#: field:res.partner,customer_payment_mode:0 -msgid "Customer Payment Mode" -msgstr "" - -#. module: account_payment_partner -#: model:ir.model,name:account_payment_partner.model_account_invoice -msgid "Invoice" -msgstr "" - -#. module: account_payment_partner -#: model:ir.model,name:account_payment_partner.model_res_partner -msgid "Partner" -msgstr "" - -#. module: account_payment_partner -#: field:account.invoice,payment_mode_id:0 -msgid "Payment Mode" -msgstr "" - -#. module: account_payment_partner -#: help:res.partner,customer_payment_mode:0 -msgid "Select the default payment mode for this customer." -msgstr "" - -#. module: account_payment_partner -#: help:res.partner,supplier_payment_mode:0 -msgid "Select the default payment mode for this supplier." -msgstr "" - -#. module: account_payment_partner -#: field:res.partner,supplier_payment_mode:0 -msgid "Supplier Payment Mode" -msgstr "" - -#. module: account_payment_partner -#: model:ir.model,name:account_payment_partner.model_payment_order_create -msgid "payment.order.create" -msgstr "" - diff --git a/account_payment_partner/i18n/nl.po b/account_payment_partner/i18n/nl.po deleted file mode 100644 index 4c90fe776..000000000 --- a/account_payment_partner/i18n/nl.po +++ /dev/null @@ -1,58 +0,0 @@ -# Dutch 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-06-09 23:22+0000\n" -"PO-Revision-Date: 2014-06-26 14:13+0000\n" -"Last-Translator: Erwin van der Ploeg (BAS Solutions) \n" -"Language-Team: Dutch \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-27 07:13+0000\n" -"X-Generator: Launchpad (build 17077)\n" - -#. module: account_payment_partner -#: field:res.partner,customer_payment_mode:0 -msgid "Customer Payment Mode" -msgstr "Betaalwijze klant" - -#. module: account_payment_partner -#: model:ir.model,name:account_payment_partner.model_account_invoice -msgid "Invoice" -msgstr "Factuur" - -#. module: account_payment_partner -#: model:ir.model,name:account_payment_partner.model_res_partner -msgid "Partner" -msgstr "Relatie" - -#. module: account_payment_partner -#: field:account.invoice,payment_mode_id:0 -msgid "Payment Mode" -msgstr "Betaalwijze" - -#. module: account_payment_partner -#: help:res.partner,customer_payment_mode:0 -msgid "Select the default payment mode for this customer." -msgstr "Selecteer de standaard betaalwijze voor deze klant." - -#. module: account_payment_partner -#: help:res.partner,supplier_payment_mode:0 -msgid "Select the default payment mode for this supplier." -msgstr "Selecteer de standaard betaalwijze voor deze leverancier." - -#. module: account_payment_partner -#: field:res.partner,supplier_payment_mode:0 -msgid "Supplier Payment Mode" -msgstr "Betaalwijze leverancier" - -#. module: account_payment_partner -#: model:ir.model,name:account_payment_partner.model_payment_order_create -msgid "payment.order.create" -msgstr "payment.order.create" diff --git a/account_payment_partner/model/__init__.py b/account_payment_partner/model/__init__.py deleted file mode 100644 index 16ab8bc9e..000000000 --- a/account_payment_partner/model/__init__.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# Account Payment Partner module for OpenERP -# Copyright (C) 2014 Akretion (http://www.akretion.com) -# @author Alexis de Lattre -# -# 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 partner -from . import account_invoice -from . import payment_order_create diff --git a/account_payment_partner/model/account_invoice.py b/account_payment_partner/model/account_invoice.py deleted file mode 100644 index 607cda29a..000000000 --- a/account_payment_partner/model/account_invoice.py +++ /dev/null @@ -1,56 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# Account Payment Partner module for OpenERP -# Copyright (C) 2014 Akretion (http://www.akretion.com) -# @author Alexis de Lattre -# -# 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, fields - - -class account_invoice(orm.Model): - _inherit = 'account.invoice' - - _columns = { - 'payment_mode_id': fields.many2one( - 'payment.mode', 'Payment Mode'), - } - - def onchange_partner_id( - self, cr, uid, ids, type, partner_id, date_invoice=False, - payment_term=False, partner_bank_id=False, company_id=False): - res = super(account_invoice, self).onchange_partner_id( - cr, uid, ids, type, partner_id, date_invoice=date_invoice, - payment_term=payment_term, partner_bank_id=partner_bank_id, - company_id=company_id) - if partner_id: - partner = self.pool['res.partner'].browse(cr, uid, partner_id) - if type == 'in_invoice': - res['value']['payment_mode_id'] = \ - partner.supplier_payment_mode.id or False - elif type == 'out_invoice': - res['value'].update({ - 'payment_mode_id': - partner.customer_payment_mode.id or False, - 'partner_bank_id': - partner.customer_payment_mode and - partner.customer_payment_mode.bank_id.id or False, - }) - else: - res['value']['payment_mode_id'] = False - return res diff --git a/account_payment_partner/model/partner.py b/account_payment_partner/model/partner.py deleted file mode 100644 index 4bfe4c787..000000000 --- a/account_payment_partner/model/partner.py +++ /dev/null @@ -1,44 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# Account Payment Partner module for OpenERP -# Copyright (C) 2014 Akretion (http://www.akretion.com) -# @author Alexis de Lattre -# -# 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, fields - - -class res_partner(orm.Model): - _inherit = 'res.partner' - - _columns = { - 'supplier_payment_mode': fields.property( - 'payment.mode', type='many2one', relation='payment.mode', - string='Supplier Payment Mode', view_load=True, - help="Select the default payment mode for this supplier."), - 'customer_payment_mode': fields.property( - 'payment.mode', type='many2one', relation='payment.mode', - string='Customer Payment Mode', view_load=True, - help="Select the default payment mode for this customer."), - } - - def _commercial_fields(self, cr, uid, context=None): - res = super(res_partner, self)._commercial_fields( - cr, uid, context=context) - res += ['supplier_payment_mode', 'customer_payment_mode'] - return res diff --git a/account_payment_partner/model/payment_order_create.py b/account_payment_partner/model/payment_order_create.py deleted file mode 100644 index ea8b1ccb3..000000000 --- a/account_payment_partner/model/payment_order_create.py +++ /dev/null @@ -1,39 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# Account Payment Partner module for OpenERP -# Copyright (C) 2014 Akretion (http://www.akretion.com) -# @author Alexis de Lattre -# -# 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 payment_order_create(orm.TransientModel): - _inherit = 'payment.order.create' - - def extend_payment_order_domain( - self, cr, uid, payment_order, domain, context=None): - super(payment_order_create, self).extend_payment_order_domain( - cr, uid, payment_order, domain, context=context) - domain += [ - '|', '|', - ('invoice', '=', False), - ('invoice.payment_mode_id', '=', False), - ('invoice.payment_mode_id', '=', payment_order.mode.id) - ] - return True diff --git a/account_payment_partner/view/account_invoice.xml b/account_payment_partner/view/account_invoice.xml deleted file mode 100644 index 0bfd2d1f5..000000000 --- a/account_payment_partner/view/account_invoice.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - account_payment_partner.invoice_form - account.invoice - - - - - - - - - - - account_payment_partner.invoice_supplier_form - account.invoice - - - - - - - - - - - diff --git a/account_payment_partner/view/partner.xml b/account_payment_partner/view/partner.xml deleted file mode 100644 index 02eb8cc0f..000000000 --- a/account_payment_partner/view/partner.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - account_partner_payment.partner_form - res.partner - - - - - - - - - - - - - -