Merge lp:~vauxoo/openerp-mexico-localization/sale_payment_method_dev_luis into lp:openerp-mexico-localization

[Luis Torres - http://www.vauxoo.com]

Se agregaron los campos del número de cuenta y el metodo de pago a la sale, estos los toma de los datos del cliente

[Moisés López - http://www.vauxoo.com (moylop260)]

Luis,

En esta línea va a marcar error cuando no tenga sale asociada.
+ sale_id = self.browse(cursor, user, picking_id, context=context).sale_id.id
Cambiar por
+ sale_obj = self.browse(cursor, user, picking_id, context=context)
+ sale_id = sale_obj.sale_id and sale_obj.sale_id.id or False

Los write los puedes mandar a un solo write, solo para que quede más eficiente.
219 + invoice_obj.write(cursor, user, [invoice_id], {'acc_payment': acc_payment_id}, context=context)
220 + invoice_obj.write(cursor, user, [invoice_id], {'pay_method_id': payment_method_id}, context=context)

Cambiar a
219 + invoice_obj.write(cursor, user, [invoice_id], {'acc_payment': acc_payment_id, 'pay_method_id': payment_method_id}, context=context)

[lp:~vauxoo/openerp-mexico-localization/sale_payment_method_dev_luis]

209. By Luis Torres - http://www.vauxoo.com on 2012-10-23

[IMP][l10n_mx_sale_payment_method]Add a validation for False & improvement code

[Luis Torres - http://www.vauxoo.com (luis-cleto-)]

Se agrego una validacion para cuando no haya sale_order
y se recorto la linea de los write

review: Needs Resubmitting

[Moisés López - http://www.vauxoo.com (moylop260)]

mp applied in other mp

review: Disapprove

Unmerged revisions

209. By Luis Torres - http://www.vauxoo.com on 2012-10-23

[IMP][l10n_mx_sale_payment_method]Add a validation for False & improvement code

208. By Luis Torres - http://www.vauxoo.com on 2012-10-23

[ADD][l10n_mx_sale_payment_method]Add fields to acc_payment & payment_method in sale

=== added directory 'l10n_mx_sale_payment_method'
=== added file 'l10n_mx_sale_payment_method/__init__.py'
--- l10n_mx_sale_payment_method/__init__.py	1970-01-01 00:00:00 +0000
+++ l10n_mx_sale_payment_method/__init__.py	2012-10-23 23:08:19 +0000
@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2010 Vauxoo - http://www.vauxoo.com/
+#    All Rights Reserved.
+#    info Vauxoo ([e-mail])
+############################################################################
+#    Coded by: Luis Torres ([e-mail])
+############################################################################
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import sale
+import stock

=== added file 'l10n_mx_sale_payment_method/__openerp__.py'
--- l10n_mx_sale_payment_method/__openerp__.py	1970-01-01 00:00:00 +0000
+++ l10n_mx_sale_payment_method/__openerp__.py	2012-10-23 23:08:19 +0000
@@ -0,0 +1,46 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2010 Vauxoo - http://www.vauxoo.com/
+#    All Rights Reserved.
+#    info Vauxoo ([e-mail])
+############################################################################
+#    Coded by: Luis Torres ([e-mail])
+############################################################################
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    "name" : "Sale payment method",
+    "version" : "1.0",
+    "author" : "Vauxoo",
+    "category" : "Generic Modules",
+    "description" : """
+        This module add fields acc_payment & pay_method_id, and to the generate invoice adds
+    """,
+    "website" : "http://www.vauxoo.com/",
+    "license" : "AGPL-3",
+    "depends" : ["sale",
+        ],
+    "init_xml" : [],
+    "demo_xml" : [],
+    "update_xml" : [
+        "sale_view.xml",
+    ],
+    "installable" : True,
+    "active" : False,
+}

=== added file 'l10n_mx_sale_payment_method/sale.py'
--- l10n_mx_sale_payment_method/sale.py	1970-01-01 00:00:00 +0000
+++ l10n_mx_sale_payment_method/sale.py	2012-10-23 23:08:19 +0000
@@ -0,0 +1,56 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2010 Vauxoo - http://www.vauxoo.com/
+#    All Rights Reserved.
+#    info Vauxoo ([e-mail])
+############################################################################
+#    Coded by: Luis Torres ([e-mail])
+############################################################################
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import osv
+from osv import osv, fields
+
+class sale_order(osv.osv):
+    _inherit = 'sale.order'
+    
+    def onchange_partner_id(self, cr, uid, ids, part):
+        res=super(sale_order, self).onchange_partner_id(cr, uid, ids, part)
+        partner = self.pool.get('res.partner')
+        if part:
+            partner_bank_obj=self.pool.get('res.partner.bank')
+            bank_partner_id=partner_bank_obj.search(cr, uid, [('partner_id','=',part)])
+            pay_method_id=partner.browse(cr,uid,part).pay_method_id.id
+            res['value'].update({'acc_payment': bank_partner_id and bank_partner_id[0] or False,'pay_method_id':pay_method_id or False})
+        return res
+        
+    _columns = {
+        'acc_payment': fields.many2one ('res.partner.bank', 'Numero de cuenta', readonly=True, states={'draft':[('readonly',False)]},help = 'Es la cuenta con la que el cliente pagará la factura, si no se sabe con cual cuenta se va pagar dejarlo vacío y en el xml aparecerá "No identificado".'),
+        'pay_method_id': fields.many2one('pay.method', 'Metodo de Pago', readonly=True, states={'draft':[('readonly',False)]}, help = 'Indica la forma en que se pagó o se pagará la factura, donde las opciones pueden ser: cheque, transferencia bancaria, depósito en cuenta bancaria, tarjeta de crédito, efectivo etc. Si no se sabe como va ser pagada la factura, dejarlo vacío y en el xml aparecerá “No identificado”.'),
+    }
+    
+    def action_invoice_create(self, cr, uid, ids, grouped=False, states=['confirmed', 'done', 'exception'], date_inv = False, context=None):
+        res=super(sale_order,self).action_invoice_create(cr, uid, ids, grouped=grouped, states=states, date_inv = date_inv, context=context)
+        invoice_obj = self.pool.get('account.invoice')
+        sale_order_id=self.browse(cr, uid, ids, context=context)[0]
+        if sale_order_id:
+            acc_payment_id=sale_order_id.acc_payment and sale_order_id.acc_payment.id or False
+            payment_method_id=sale_order_id.pay_method_id and sale_order_id.pay_method_id.id or False
+            invoice_obj.write(cr, uid, [res], {'acc_payment': acc_payment_id, 'pay_method_id': payment_method_id}, context=context)
+sale_order()
+

=== added file 'l10n_mx_sale_payment_method/sale_view.xml'
--- l10n_mx_sale_payment_method/sale_view.xml	1970-01-01 00:00:00 +0000
+++ l10n_mx_sale_payment_method/sale_view.xml	2012-10-23 23:08:19 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="view_sale_order_inherit_bank_form">
+            <field name="name">view.sale.order.inherit.bank.form</field>
+            <field name="model">sale.order</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="sale.view_order_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page[@string='Sales Order']/field[@name='partner_shipping_id']" position="after">
+                    <field name="acc_payment"/>
+                    <field name="pay_method_id" widget="selection"/>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added file 'l10n_mx_sale_payment_method/stock.py'
--- l10n_mx_sale_payment_method/stock.py	1970-01-01 00:00:00 +0000
+++ l10n_mx_sale_payment_method/stock.py	2012-10-23 23:08:19 +0000
@@ -0,0 +1,50 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2010 Vauxoo - http://www.vauxoo.com/
+#    All Rights Reserved.
+#    info Vauxoo ([e-mail])
+############################################################################
+#    Coded by: Luis Torres ([e-mail])
+############################################################################
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import osv
+
+class stock_picking(osv.osv):
+    _inherit = 'stock.picking'
+
+    def action_invoice_create(self, cursor, user, ids, journal_id=False,
+            group=False, type='out_invoice', context=None):
+        if context is None:
+            context = {}
+        invoice_obj = self.pool.get('account.invoice')
+        sale_obj=self.pool.get('sale.order')
+        picking_id__invoice_id_dict = super(stock_picking, self).action_invoice_create(cursor, user,
+                ids, journal_id=journal_id, group=group, type=type,
+                context=context)
+        for picking_id in picking_id__invoice_id_dict.keys():
+            picking_obj = self.browse(cursor, user, picking_id)
+            invoice_id = picking_id__invoice_id_dict[ picking_id ]
+            sale_id = picking_obj.sale_id and picking_obj.sale_id.id or False
+            if sale_id:
+                sale_order_id=sale_obj.browse(cursor, user, sale_id)
+                acc_payment_id=sale_order_id.acc_payment and sale_order_id.acc_payment.id or False
+                payment_method_id=sale_order_id.pay_method_id and sale_order_id.pay_method_id.id or False
+                invoice_obj.write(cursor, user, [invoice_id], {'acc_payment': acc_payment_id, 'pay_method_id': payment_method_id}, context=context)
+        return picking_id__invoice_id_dict
+stock_picking()