Merge lp:~openerp-dev/openobject-addons/trunk-bug-902440-jap into lp:openobject-addons

[Jagdish Panchal (Open ERP)]

Hello,

 Add constraint for view type account in account_analytic_line.py and Put the domain on stock valuation account in product category form. --fixes=lp:902440

Thanks
JAP

[Meera Trambadia (OpenERP) (mtr-openerp)]

Hello jagdish,

Also add the domain ('type','<>','consolidation') for stock valuation account.

Thanks,
Meera

review: Needs Fixing

[Jagdish Panchal (Open ERP) (jap-openerp)]

Hello,

Improve code as per your suggestion.

Thanks
JAP

review: Needs Resubmitting

[Meera Trambadia (OpenERP) (mtr-openerp)]

review: Approve

=== modified file 'analytic/analytic.py'
--- analytic/analytic.py	2011-12-08 15:26:58 +0000
+++ analytic/analytic.py	2011-12-19 08:43:29 +0000
@@ -301,6 +301,17 @@
     }
 
     _order = 'date desc'
+    
+    def _check_no_view(self, cr, uid, ids, context=None):
+        analytic_lines = self.browse(cr, uid, ids, context=context)
+        for line in analytic_lines:
+            if line.account_id.type == 'view':
+                return False
+        return True
+    
+    _constraints = [
+        (_check_no_view, 'You can not create analytic line on view account.', ['account_id']),
+    ]    
 
 account_analytic_line()
 

=== modified file 'stock/product_view.xml'
--- stock/product_view.xml	2011-12-11 09:14:42 +0000
+++ stock/product_view.xml	2011-12-19 08:43:29 +0000
@@ -27,7 +27,7 @@
                         <separator string="Accounting Stock Properties" colspan="2"/>
                         <field name="property_stock_account_input_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                         <field name="property_stock_account_output_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                        <field name="property_stock_valuation_account_id"/>
+                        <field name="property_stock_valuation_account_id" domain="[('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
                         <field name="property_stock_journal"/>
                     </group>
                 </form>