Merge lp:~openerp-dev/openobject-addons/trunk-bug-891532-bde into lp:openobject-addons

[Bharat Devnani (Open ERP)]

Hello Sir,

I have made copy method in hr_payroll_account/hr_payroll_account.py inorder to make move_id field false when the payslip is duplicated.

Thanks & Regards,
Devnani Bharat R.

=== modified file 'hr_payroll_account/hr_payroll_account.py'
--- hr_payroll_account/hr_payroll_account.py	2011-11-11 21:11:27 +0000
+++ hr_payroll_account/hr_payroll_account.py	2011-11-17 13:04:58 +0000
@@ -39,7 +39,16 @@
         'journal_id': fields.many2one('account.journal', 'Expense Journal',states={'draft': [('readonly', False)]}, readonly=True, required=True),
         'move_id': fields.many2one('account.move', 'Accounting Entry', readonly=True),
     }
-    
+
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        default = default.copy()
+        default.update({
+            'move_id': False
+        })
+        return super(hr_payslip, self).copy(cr, uid, id, default, context=context)
+
     def create(self, cr, uid, vals, context=None):
         if context is None:
             context = {}
@@ -95,9 +104,9 @@
                 partner_id = False
                 debit_account_id = line.salary_rule_id.account_debit.id
                 credit_account_id = line.salary_rule_id.account_credit.id
-                
+
                 if debit_account_id:
-                    
+
                     debit_line = (0, 0, {
                     'name': line.name,
                     'date': timenow,
@@ -113,9 +122,9 @@
                 })
                     line_ids.append(debit_line)
                     debit_sum += debit_line[2]['debit'] - debit_line[2]['credit']
-                
+
                 if credit_account_id:
-                    
+
                     credit_line = (0, 0, {
                     'name': line.name,
                     'date': timenow,
@@ -147,7 +156,7 @@
                     'credit': debit_sum - credit_sum,
                 })
                 line_ids.append(adjust_credit)
-                
+
             elif debit_sum < credit_sum:
                 acc_id = slip.journal_id.default_debit_account_id.id
                 if not acc_id: