diff --git a/account_payment_sale/README.rst b/account_payment_sale/README.rst new file mode 100644 index 000000000..456a589ee --- /dev/null +++ b/account_payment_sale/README.rst @@ -0,0 +1,81 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :alt: License: AGPL-3 + +Account Payment Sale +==================== + +This module should be used when the invoice is based on the sale order. + +This modules adds one field on sale orders: *Payment Mode*. +This field is copied from partner to sale order and then from sale order to +customer invoice. + +This module is similar to the *sale_payment* module; the main difference is +that it doesn't depend on the *account_payment_extension* module (it's not the +only module to conflict with *account_payment_extension*; all the SEPA +modules in the banking addons conflict with *account_payment_extension*. + +Installation +============ + +This module depends on : +* purchase +* account_payment_partner + +This module is part of the OCA/bank-payment suite. + +Configuration +============= + +There is nothing to configure. + +Usage +===== + +You are able to add a payment mode directly on a partner. +This payment mode is automatically associated to the sale order, then on related invoice. +This default value could be change in a draft sale order or draft invoice. +When you create an direct debit order, only invoices related to chosen payment mode are displayed. +Invoices without any payment mode are displayed to. + +For further information, please visit: + + * https://www.odoo.com/forum/help-1 + +Known issues / Roadmap +====================== + + * No known issues. + +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 +`here `_. + +Credits +======= + +Contributors +------------ + +* Pedro M. Baeza +* Alexis de Lattre +* Alexandre Fayolle +* Danimar Ribeiro +* Raphaël Valyi + +Maintainer +---------- + +.. image:: http://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: http://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 http://odoo-community.org. diff --git a/account_payment_sale/__init__.py b/account_payment_sale/__init__.py index 83c0dcfe2..11323c6e9 100644 --- a/account_payment_sale/__init__.py +++ b/account_payment_sale/__init__.py @@ -20,4 +20,4 @@ # ############################################################################## -from . import model +from . import models diff --git a/account_payment_sale/__openerp__.py b/account_payment_sale/__openerp__.py index 4ed156a33..99f2f3e90 100644 --- a/account_payment_sale/__openerp__.py +++ b/account_payment_sale/__openerp__.py @@ -22,34 +22,22 @@ { 'name': 'Account Payment Sale', - 'version': '1.0', + 'version': '8.0.1.0.0', 'category': 'Banking addons', 'license': 'AGPL-3', - 'summary': "Adds Payment Mode on Sale Orders", - 'description': """ -Account Payment Sale -==================== - -This modules adds one field on sale orders : *Payment Mode*. -This field is copied from partner to sale order and then from sale order to -customer invoice. - -This module is similar to the *sale_payment* module ; the main difference is -that it doesn't depend on the *account_payment_extension* module (it's not the -only module to conflict with *account_payment_extension* ; all the SEPA -modules in the banking addons conflict with *account_payment_extension*, cf -banking-addons-70/account_banking_payment_export/__openerp__.py). - -Please contact Alexis de Lattre from Akretion -for any help or question about this module. - """, - 'author': 'Akretion', - 'website': 'http://www.akretion.com', - 'depends': ['sale', 'account_payment_partner'], + 'summary': "Adds payment mode on sale orders", + 'author': "Akretion, " + "Serv. Tecnol. Avanzados - Pedro M. Baeza, " + "Odoo Community Association (OCA)", + 'website': 'https://github.com/OCA/bank-payment', + 'depends': [ + 'sale', + 'account_payment_partner' + ], 'conflicts': ['sale_payment'], 'data': [ - 'view/sale.xml', + 'views/sale_order_view.xml', ], 'installable': True, - 'active': False, + 'auto_install': True, } diff --git a/account_payment_sale/i18n/account_payment_sale.pot b/account_payment_sale/i18n/account_payment_sale.pot index 75c88ad87..c2d05ec68 100644 --- a/account_payment_sale/i18n/account_payment_sale.pot +++ b/account_payment_sale/i18n/account_payment_sale.pot @@ -1,13 +1,13 @@ -# Translation of OpenERP Server. +# Translation of Odoo Server. # This file contains the translation of the following modules: # * account_payment_sale # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 7.0\n" +"Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-09 23:24+0000\n" -"PO-Revision-Date: 2014-06-09 23:24+0000\n" +"POT-Creation-Date: 2014-10-31 23:00+0000\n" +"PO-Revision-Date: 2014-10-31 23:00+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/account_payment_sale/i18n/es.po b/account_payment_sale/i18n/es.po new file mode 100644 index 000000000..436919b1e --- /dev/null +++ b/account_payment_sale/i18n/es.po @@ -0,0 +1,27 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_sale +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-10-31 23:00+0000\n" +"PO-Revision-Date: 2014-10-31 23:00+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_sale +#: field:sale.order,payment_mode_id:0 +msgid "Payment Mode" +msgstr "Modo de pago" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +msgid "Sales Order" +msgstr "Pedido de venta" + diff --git a/account_payment_sale/i18n/pt_BR.po b/account_payment_sale/i18n/pt_BR.po new file mode 100644 index 000000000..9695a2b3c --- /dev/null +++ b/account_payment_sale/i18n/pt_BR.po @@ -0,0 +1,27 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_sale +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-10-31 23:00+0000\n" +"PO-Revision-Date: 2014-10-31 23:00+0000\n" +"Last-Translator: Danimar Ribeiro \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_sale +#: field:sale.order,payment_mode_id:0 +msgid "Payment Mode" +msgstr "Modo de Pagamento" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +msgid "Sales Order" +msgstr "Pedido de Venda" + diff --git a/account_payment_sale/model/__init__.py b/account_payment_sale/models/__init__.py similarity index 82% rename from account_payment_sale/model/__init__.py rename to account_payment_sale/models/__init__.py index 079ae1b71..814479106 100644 --- a/account_payment_sale/model/__init__.py +++ b/account_payment_sale/models/__init__.py @@ -1,10 +1,6 @@ # -*- encoding: utf-8 -*- ############################################################################## # -# Account Payment Sale 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 @@ -20,4 +16,4 @@ # ############################################################################## -from . import sale +from . import sale_order diff --git a/account_payment_sale/model/sale.py b/account_payment_sale/models/sale_order.py similarity index 54% rename from account_payment_sale/model/sale.py rename to account_payment_sale/models/sale_order.py index 5951f96af..d8ed2722f 100644 --- a/account_payment_sale/model/sale.py +++ b/account_payment_sale/models/sale_order.py @@ -20,36 +20,31 @@ # ############################################################################## -from openerp.osv import orm, fields +from openerp import models, fields, api -class sale_order(orm.Model): +class SaleOrder(models.Model): _inherit = "sale.order" - _columns = { - 'payment_mode_id': fields.many2one( - 'payment.mode', 'Payment Mode'), - } + payment_mode_id = fields.Many2one( + 'payment.mode', string='Payment Mode', + domain="[('sale_ok', '=', True)]") - def onchange_partner_id(self, cr, uid, ids, part, context=None): - res = super(sale_order, self).onchange_partner_id( - cr, uid, ids, part, context=context) - if part: - partner = self.pool['res.partner'].browse( - cr, uid, part, context=context) - res['value']['payment_mode_id'] = \ - partner.customer_payment_mode.id or False, + @api.multi + def onchange_partner_id(self, partner_id): + res = super(SaleOrder, self).onchange_partner_id(partner_id) + if partner_id: + partner = self.env['res.partner'].browse(partner_id) + res['value']['payment_mode_id'] = partner.customer_payment_mode.id else: res['value']['payment_mode_id'] = False return res - def _prepare_invoice(self, cr, uid, order, lines, context=None): + @api.model + def _prepare_invoice(self, order, lines): """Copy bank partner from sale order to invoice""" - invoice_vals = super(sale_order, self)._prepare_invoice( - cr, uid, order, lines, context=context) - invoice_vals.update({ - 'payment_mode_id': order.payment_mode_id.id or False, - 'partner_bank_id': order.payment_mode_id and - order.payment_mode_id.bank_id.id or False, - }) - return invoice_vals + vals = super(SaleOrder, self)._prepare_invoice(order, lines) + if order.payment_mode_id: + vals['payment_mode_id'] = order.payment_mode_id.id + vals['partner_bank_id'] = order.payment_mode_id.bank_id.id + return vals diff --git a/account_payment_sale/static/description/icon.png b/account_payment_sale/static/description/icon.png new file mode 100644 index 000000000..3a0328b51 Binary files /dev/null and b/account_payment_sale/static/description/icon.png differ diff --git a/account_payment_sale/view/sale.xml b/account_payment_sale/views/sale_order_view.xml similarity index 82% rename from account_payment_sale/view/sale.xml rename to account_payment_sale/views/sale_order_view.xml index 016598e09..c5f5c65d8 100644 --- a/account_payment_sale/view/sale.xml +++ b/account_payment_sale/views/sale_order_view.xml @@ -15,7 +15,9 @@ - +