Merge lp:~vauxoo/addons-vauxoo/7.0-account_analytic_required_invoice_line-dev_luis into lp:addons-vauxoo/7.0

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

Se agrego una validación para que cuando la cuenta colocada en las lineas de la factura tienen activado el campo que indica que requiere cuenta analitica, esta sea requerida.

[lp:~vauxoo/addons-vauxoo/7.0-account_analytic_required_invoice_line-dev_luis]

876. By Luis Torres - http://www.vauxoo.com on 2013-10-18

[IMP][account_analytic_required]Added onchange on invoices of supplier, and added super in function

[hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha)]

Revisado el codigo no he hecho prueba del modulo, me parece bien,

una sugerencia,

+ res = super(account_invoice_line, self).onchange_account_id(cr, uid, ids, product_id, partner_id, inv_type, fposition_id, account_id)

pasa tambien el context en el super,

Saludos.

review: Approve

[lp:~vauxoo/addons-vauxoo/7.0-account_analytic_required_invoice_line-dev_luis]

877. By Luis Torres - http://www.vauxoo.com on 2013-10-18

[REF][account_analytic_required]Added context in super

[Jose Antonio Morales Ponce(vauxoo) - - http://www.vauxoo.com (josemoralesp)]

Probanto esta propesta de merge me encuentro con el siguiente error:

http://awesomescreenshot.com/0d81uxzt27

review: Needs Fixing

[Jose Antonio Morales Ponce(vauxoo) - - http://www.vauxoo.com (josemoralesp)]

Por muy simple que sea el cambio se debe realizar su prueba, para confirmar que todo funcione bien

[lp:~vauxoo/addons-vauxoo/7.0-account_analytic_required_invoice_line-dev_luis]

878. By Luis Torres - http://www.vauxoo.com on 2013-10-23

[FIX][account_analytic_required]Removed context in function

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

Se elimino el context de la función

review: Needs Resubmitting

=== modified file 'account_analytic_required/account.py'
--- account_analytic_required/account.py	2013-07-22 16:24:09 +0000
+++ account_analytic_required/account.py	2013-10-23 19:58:53 +0000
@@ -35,7 +35,24 @@
         'this field is active, the journal items that used this account '\
         'should have an analytic account'),
     }
-
+    
+class account_invoice_line(osv.Model):
+    _inherit = 'account.invoice.line'
+    
+    _columns = {
+        'analytic_required': fields.boolean('Analytic Required', help='If this field is active, '\
+            'be required fill the field "account analytic"'),
+    }
+    
+    def onchange_account_id(self, cr, uid, ids, product_id=False, partner_id=False,\
+        inv_type=False, fposition_id=False, account_id=False):
+        res = super(account_invoice_line, self).onchange_account_id(cr, uid, ids, product_id,
+            partner_id, inv_type, fposition_id, account_id)
+        account_obj = self.pool.get('account.account')
+        if account_id:
+            analyt_req = account_obj.browse(cr, uid, account_id).analytic_required
+            res['value'].update({'analytic_required': analyt_req})
+        return res
 
 class account_move(osv.Model):
     _inherit = 'account.move'

=== modified file 'account_analytic_required/account_view.xml'
--- account_analytic_required/account_view.xml	2013-04-19 22:53:57 +0000
+++ account_analytic_required/account_view.xml	2013-10-23 19:58:53 +0000
@@ -11,5 +11,51 @@
                 </xpath>
             </field>
         </record>
+        
+        <record model="ir.ui.view" id="view_account_invoice_inherit_analytic_required_form">
+            <field name="name">view.account.invoice.inherit.analytic.required.form</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_form"/>
+            <field name="arch" type="xml">
+                <xpath 
+                    expr="//field[@name='invoice_line']/tree[@string='Invoice Lines']/field[@name='account_analytic_id']" 
+                    position="attributes">
+                        <attribute name="attrs">{'required': [('analytic_required', '=', True),]}</attribute>
+                </xpath>
+                <xpath 
+                    expr="//field[@name='invoice_line']/tree[@string='Invoice Lines']/field[@name='account_id']" 
+                    position="attributes">
+                        <attribute name="on_change">onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position, account_id)</attribute>
+                </xpath>
+                <xpath 
+                    expr="//field[@name='invoice_line']/tree[@string='Invoice Lines']/field[@name='account_analytic_id']" 
+                    position="after">
+                        <field name="analytic_required" invisible="1"/>
+                </xpath>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_account_invoice_supplier_inherit_analytic_required_form">
+            <field name="name">view.account.invoice.supplier.inherit.analytic.required.form</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_supplier_form"/>
+            <field name="arch" type="xml">
+                <xpath 
+                    expr="//field[@name='invoice_line']/tree[@string='Invoice lines']/field[@name='account_analytic_id']" 
+                    position="attributes">
+                        <attribute name="attrs">{'required': [('analytic_required', '=', True),]}</attribute>
+                </xpath>
+                <xpath 
+                    expr="//field[@name='invoice_line']/tree[@string='Invoice lines']/field[@name='account_id']" 
+                    position="attributes">
+                        <attribute name="on_change">onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position, account_id)</attribute>
+                </xpath>
+                <xpath 
+                    expr="//field[@name='invoice_line']/tree[@string='Invoice lines']/field[@name='account_analytic_id']" 
+                    position="after">
+                        <field name="analytic_required" invisible="1"/>
+                </xpath>
+            </field>
+        </record>
     </data>
 </openerp>