Merge lp:~openerp-dev/openobject-addons/trunk-bug-1192592-dja into lp:openobject-addons

[Dharmraj Zala(OpenERP)]

Hello ,

I've added domain in xml file and also overridden the create and write method of ORM to make sure that in Salary Rule form page accounting ,'Debit Account' and 'Credit Account' can not be an account of type view.

Thanks,
dja.

Unmerged revisions

9028. By Dharmraj Zala(OpenERP) on 2013-12-26

[FIX] debit or credit account should not be of view type

=== modified file 'hr_payroll_account/hr_payroll_account.py'
--- hr_payroll_account/hr_payroll_account.py	2013-10-27 12:31:04 +0000
+++ hr_payroll_account/hr_payroll_account.py	2013-12-26 11:50:16 +0000
@@ -196,6 +196,32 @@
         'account_debit': fields.many2one('account.account', 'Debit Account'),
         'account_credit': fields.many2one('account.account', 'Credit Account'),
     }
+    
+    def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {} 
+        acc_cr = vals.get('account_credit', False)
+        acc_db = vals.get('account_debit', False)
+        if acc_db:
+            if self.pool.get('account.account').browse(cr, uid, acc_db,context=context).type == 'view':
+                raise osv.except_osv(_('Error!'), _('You Can not set view type account to Debit Account!'))
+        if acc_cr:
+            if self.pool.get('account.account').browse(cr, uid, acc_cr,context=context).type == 'view':
+                raise osv.except_osv(_('Error!'), _('You Can not set view type account to Credit Account!'))
+        return super(hr_salary_rule, self).create(cr, uid, vals, context=context)
+        
+    def write(self, cr, uid, ids, vals, context=None):
+        if context is None:
+            context = {} 
+        acc_cr = vals.get('account_credit', False)
+        acc_db = vals.get('account_debit', False)
+        if acc_db:
+            if self.pool.get('account.account').browse(cr, uid, acc_db,context=context).type == 'view':
+                raise osv.except_osv(_('Error!'), _('You Can not set view type account to Debit Account!'))
+        if acc_cr:
+            if self.pool.get('account.account').browse(cr, uid, acc_cr,context=context).type == 'view':
+                raise osv.except_osv(_('Error!'), _('You Can not set view type account to Credit Account!'))
+        return super(hr_salary_rule, self).write(cr, uid, ids, vals, context=context)
 
 class hr_contract(osv.osv):
 

=== modified file 'hr_payroll_account/hr_payroll_account_view.xml'
--- hr_payroll_account/hr_payroll_account_view.xml	2012-11-29 22:26:45 +0000
+++ hr_payroll_account/hr_payroll_account_view.xml	2013-12-26 11:50:16 +0000
@@ -25,8 +25,8 @@
               <xpath expr="/form/notebook/page[@string='Child Rules']" position="after">
                     <page string="Accounting">
                         <group colspan="4">
-                            <field name="account_debit" />
-                            <field name="account_credit"/>
+                            <field name="account_debit" domain="[('type', '!=', 'view')]" />
+                            <field name="account_credit" domain="[('type', '!=', 'view')]" />
                             <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                             <field name="account_tax_id"/>
                         </group>