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

[Bharat Devnani (Open ERP)]

Hello Sir,

I have applied the patch of Stéphane Bidoul, after applying the patch the Journal Entries can be duplicated.

Thanks & Regards,
Devnani Bharat R.

[qdp (OpenERP) (qdp)]

i reject the merge proposal, for the reasons explained in the bug.

thanks

[qdp (OpenERP) (qdp)]

mmhm i need to reconsider that merge prop

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

Bharat,

Try to follow python coding standard, declare pool variable at beginning of method and pass context in write method too.
Above changes will make your Merge proposal more consistent.

Thanks,
Mustufa

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/trunk-bug-871314-bde]

5324. By Bharat Devnani (Open ERP) on 2011-10-12

[IMP] account : improved the coding style, variable name and passed the context argument in write method of account/account.py

[Bharat Devnani (Open ERP) (bde-openerp)]

Hello Sir,

Thanks for your kind suggestion, i have improved the changes on the coding conventions, variable naming convention and also passed context argument in write methods.

Thanks & Regards,
Devnani Bharat R.

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

Seems good now.

Note: After comma there should be one space.

Thank you,
Mustufa

review: Approve

[lp:~openerp-dev/openobject-addons/trunk-bug-871314-bde]

5325. By Bharat Devnani (Open ERP) on 2011-10-12

[IMP] account : improved the useability in def onchange_journal_id and onchange_period_id of account/account.py

[qdp (OpenERP) (qdp)]

as explained on the bug report, i choosed another solution to fix the problem so i'm rejecting the merge prop.

thanks

Unmerged revisions

5325. By Bharat Devnani (Open ERP) on 2011-10-12

[IMP] account : improved the useability in def onchange_journal_id and onchange_period_id of account/account.py

5324. By Bharat Devnani (Open ERP) on 2011-10-12

[IMP] account : improved the coding style, variable name and passed the context argument in write method of account/account.py

5323. By Stéphane Bidoul on 2011-10-10

[FIX] account : cannot duplicate journal entries

=== modified file 'account/account.py'
--- account/account.py	2011-10-02 17:31:16 +0000
+++ account/account.py	2011-10-12 05:56:27 +0000
@@ -367,8 +367,8 @@
 
         move_obj = self.pool.get('account.move.line')
         move_id = move_obj.search(cr, uid, [
-            ('journal_id','=',jids[0]), 
-            ('period_id','=',pids[0]), 
+            ('journal_id','=',jids[0]),
+            ('period_id','=',pids[0]),
             ('account_id','=', account_id),
             (name,'>', 0.0),
             ('name','=', _('Opening Balance'))
@@ -930,7 +930,7 @@
     _sql_constraints = [
         ('name_company_uniq', 'unique(name, company_id)', 'The name of the period must be unique per company!'),
     ]
-    
+
     def _check_duration(self,cr,uid,ids,context=None):
         obj_period = self.browse(cr, uid, ids[0], context=context)
         if obj_period.date_stop < obj_period.date_start:
@@ -1564,6 +1564,22 @@
         valid_moves = [move.id for move in valid_moves]
         return len(valid_moves) > 0 and valid_moves or False
 
+    def onchange_journal_id(self, cr, uid, ids, journal_id, context=None):
+        account_move_line_obj = self.pool.get('account.move.line')
+        if journal_id:
+            for move in self.browse(cr, uid, ids, context=context):
+                line_ids = [line.id for line in move.line_id]
+                account_move_line_obj.write(cr, uid, line_ids, {'journal_id': journal_id}, context=context)
+        return {}
+
+    def onchange_period_id(self, cr, uid, ids, period_id, context=None):
+        account_move_line_obj = self.pool.get('account.move.line')
+        if period_id:
+            for move in self.browse(cr, uid, ids, context=context):
+                line_ids = [line.id for line in move.line_id]
+                account_move_line_obj.write(cr, uid, line_ids, {'period_id': period_id}, context=context)
+        return {}
+
 account_move()
 
 class account_move_reconcile(osv.osv):
@@ -2177,7 +2193,7 @@
                 entry['name'] = model.name%{'year':time.strftime('%Y'), 'month':time.strftime('%m'), 'date':time.strftime('%Y-%m')}
             except:
                 raise osv.except_osv(_('Wrong model !'), _('You have a wrong expression "%(...)s" in your model !'))
-                
+
             move_id = account_move_obj.create(cr, uid, {
                 'ref': entry['name'],
                 'period_id': period_id,

=== modified file 'account/account_view.xml'
--- account/account_view.xml	2011-10-11 14:03:35 +0000
+++ account/account_view.xml	2011-10-12 05:56:27 +0000
@@ -752,7 +752,7 @@
                     <group col="2" colspan="2">
                         <separator string="Reporting Configuration" colspan="4"/>
                         <field name="report_type" select="2"/>
-                        <field name="sign" />                        
+                        <field name="sign" />
                     </group>
                     <group col="2" colspan="2">
                         <separator string="Closing Method" colspan="4"/>
@@ -1318,8 +1318,8 @@
                         <field name="name" readonly="True"/>
                         <field name="ref"/>
                         <field name="to_check" groups="base.group_extended"/>
-                        <field name="journal_id"/>
-                        <field name="period_id"/>
+                        <field name="journal_id" on_change="onchange_journal_id(journal_id)"/>
+                        <field name="period_id" on_change="onchange_period_id(period_id)"/>
                         <field name="date"/>
                         <field name="company_id" required="1" groups="base.group_multi_company"/>
                         <field name="partner_id" invisible="1"/>