Merge lp:~agilebg/openobject-addons/7.0-bug-1111430-elbati into lp:openobject-addons/7.0

[Lorenzo Battistini]

Unmerged revisions

9306. By Lorenzo Battistini on 2013-07-22

[FIX] account.invoice.line fields_view_get is broken

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2013-06-12 15:38:14 +0000
+++ account/account_invoice.py	2013-07-22 12:21:17 +0000
@@ -1441,20 +1441,6 @@
         'account_id': _default_account_id,
     }
 
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        if context is None:
-            context = {}
-        res = super(account_invoice_line,self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
-        if context.get('type', False):
-            doc = etree.XML(res['arch'])
-            for node in doc.xpath("//field[@name='product_id']"):
-                if context['type'] in ('in_invoice', 'in_refund'):
-                    node.set('domain', "[('purchase_ok', '=', True)]")
-                else:
-                    node.set('domain', "[('sale_ok', '=', True)]")
-            res['arch'] = etree.tostring(doc)
-        return res
-
     def product_id_change(self, cr, uid, ids, product, uom_id, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, currency_id=False, context=None, company_id=None):
         if context is None:
             context = {}
 
=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2013-07-10 21:56:55 +0000
+++ purchase/purchase.py	2013-07-22 12:21:17 +0000
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import time
+from lxml import etree
 import pytz
 from openerp import SUPERUSER_ID
 from datetime import datetime
@@ -1224,4 +1225,17 @@
             wf_service.trg_validate(uid, 'purchase.order', context['default_res_id'], 'send_rfq', cr)
         return super(mail_compose_message, self).send_mail(cr, uid, ids, context=context)
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+class account_invoice_line(osv.Model):
+    _inherit = 'account.invoice.line'
+    
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        if context is None:
+            context = {}
+        res = super(account_invoice_line,self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
+        if context.get('type', False):
+            doc = etree.XML(res['arch'])
+            for node in doc.xpath("//field[@name='product_id']"):
+                if context['type'] in ('in_invoice', 'in_refund'):
+                    node.set('domain', "[('purchase_ok', '=', True)]")
+            res['arch'] = etree.tostring(doc)
+        return res
 
=== modified file 'sale/sale.py'
--- sale/sale.py	2013-06-07 11:38:29 +0000
+++ sale/sale.py	2013-07-22 12:21:17 +0000
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+from lxml import etree
 from datetime import datetime, timedelta
 from dateutil.relativedelta import relativedelta
 import time
@@ -1011,4 +1012,17 @@
                 wf_service.trg_validate(uid, 'account.invoice', id, 'invoice_cancel', cr)
         return super(account_invoice, self).unlink(cr, uid, ids, context=context)
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+class account_invoice_line(osv.Model):
+    _inherit = 'account.invoice.line'
+    
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        if context is None:
+            context = {}
+        res = super(account_invoice_line,self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
+        if context.get('type', False):
+            doc = etree.XML(res['arch'])
+            for node in doc.xpath("//field[@name='product_id']"):
+                if context['type'] in ('out_invoice', 'out_refund'):
+                    node.set('domain', "[('sale_ok', '=', True)]")
+            res['arch'] = etree.tostring(doc)
+        return res