Merge lp:~openerp-commiter/openobject-addons/NHOMAR_bug559747 into lp:openobject-addons/5.0

[Nhomar - Vauxoo]

Description:

https://bugs.launchpad.net/openobject-addons/+bug/559747

It was tested in our production enviroment, with all variants. We think is working fine.

[qdp (OpenERP) (qdp)]

Hi Nhomar,

heu? did you really intend to make this merge proposal on the addons v5 ? If yes, then i must say that we are only accepting bugfixes for stable version. This aint really one. I'm rejecting your merge proposal, please if you wanted to propose it for trunk, make a new one with the correct destination (after you checked it's still worth).

Thanks for you understanding,
Quentin

review: Needs Information

[Nhomar - Vauxoo (nhomar)]

Je. See date of the commit "2010-04-09" One YEar ago ;-)

review: Disapprove

Unmerged revisions

2698. By Nhomar Hernandez <nhomar@satelite> on 2010-04-10

[BUG] [account_voucher] Checking the amount for Openning Balance shows information not useful. Fixed the import _ too

=== modified file 'account_voucher/account.py'
--- account_voucher/account.py	2010-01-20 17:19:31 +0000
+++ account_voucher/account.py	2010-04-10 03:25:29 +0000
@@ -28,6 +28,7 @@
 import mx.DateTime
 from mx.DateTime import RelativeDateTime
 from tools import config
+from tools.translate import _
 
 class account_account(osv.osv):
     _inherit = "account.account"
@@ -115,7 +116,18 @@
                         move_line['credit'] = vals['open_bal'] or False
                     self.pool.get('account.move.line').create(cr,uid,move_line)
         return account_id
-
+    
+    def _check_moves_lines(self, cr, uid, ids, method, context):
+        moves = self.pool.get('account.move')
+        line_obj = self.pool.get('account.move.line')
+        account_ids = self.search(cr, uid, [('id', 'child_of', ids)])
+        if line_obj.search(cr, uid, [('account_id', 'in', account_ids),('move_id.journal_id.type','<>','situation')]):
+            
+            if method == 'write':
+                raise osv.except_osv(_('Error !'), _('You cannot load or change by this method the opening balance amount for an account with move lines. Please try editing the opening move.'))
+            elif method == 'unlink':
+                raise osv.except_osv(_('Error !'), _('You cannot do this action in an account with lines of moves!. Please try editing the openning move.'))
+            
     def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
         res_temp={}
         if vals.has_key('name'):
@@ -136,42 +148,45 @@
         if vals.has_key('open_bal'):
             self_obj= self.browse(cr,uid,ids)
             move_pool=self.pool.get('account.move')
+            move_pool_line=self.pool.get('account.move')
             if vals:
                 for obj in self_obj:
                     flg=0
-                    if obj.journal_id and obj.journal_id.type == 'situation':
-                        move=move_pool.search(cr,uid,[('journal_id','=',obj.journal_id.id)])
-                        if move:
-                            move_obj=move_pool.browse(cr,uid,move[0])
-                            move=move[0]
-                        else:
-                            name = self.pool.get('ir.sequence').get_id(cr, uid, obj.journal_id.sequence_id.id)
-                            move_data = {'name': name, 'journal_id': obj.journal_id.id}
-                            move=self.pool.get('account.move').create(cr,uid,move_data)
-                            move_obj=move_pool.browse(cr,uid,move)
-                        move_line_data={'name':obj.journal_id.name,
-                                               'debit':obj.debit or 0.0,
-                                               'credit':obj.credit or 0.0,
-                                               'account_id':obj.id,
-                                               'move_id':move,
-                                               'journal_id':obj.journal_id.id,
-                                               'period_id':move_obj.period_id.id,
-                                               }
-                        if obj.type1:
-                            if obj.type1 == 'dr':
-                                move_line_data['debit'] = obj.open_bal
-                            elif obj.type1 == 'cr':
-                                move_line_data['credit'] = obj.open_bal
-                        if move_obj and move:
-                            for move_line in move_obj.line_id:
-                                if move_line.account_id.id == obj.id:
-                                    if move_line_data['debit'] == 0.0 and move_line_data['credit']== 0.0:
-                                        self.pool.get('account.move.line').unlink(cr,uid,[move_line.id])
-                                    else:
-                                        self.pool.get('account.move.line').write(cr,uid,[move_line.id],move_line_data)
-                                    flg=1
-                            if not flg:
-                                self.pool.get('account.move.line').create(cr,uid,move_line_data)
+                    if obj.journal_id and obj.journal_id.type == 'situation':                         
+                            move=move_pool.search(cr,uid,[('journal_id','=',obj.journal_id.id)])
+                            self._check_moves_lines(cr, uid, ids, "write", context)
+                            #move_lines=move_pool_line.search(cr,uid,[('account_id','=',obj.id),('move_id','<>',move.id)])
+                            if move:
+                                move_obj=move_pool.browse(cr,uid,move[0])
+                                move=move[0]
+                            else:
+                                name = self.pool.get('ir.sequence').get_id(cr, uid, obj.journal_id.sequence_id.id)
+                                move_data = {'name': name, 'journal_id': obj.journal_id.id}
+                                move=self.pool.get('account.move').create(cr,uid,move_data)
+                                move_obj=move_pool.browse(cr,uid,move)
+                            move_line_data={'name':obj.journal_id.name,
+                                                   'debit':obj.debit or 0.0,
+                                                   'credit':obj.credit or 0.0,
+                                                   'account_id':obj.id,
+                                                   'move_id':move,
+                                                   'journal_id':obj.journal_id.id,
+                                                   'period_id':move_obj.period_id.id,
+                                                   }
+                            if obj.type1:
+                                if obj.type1 == 'dr':
+                                    move_line_data['debit'] = obj.open_bal
+                                elif obj.type1 == 'cr':
+                                    move_line_data['credit'] = obj.open_bal
+                            if move_obj and move:
+                                for move_line in move_obj.line_id:
+                                    if move_line.account_id.id == obj.id:
+                                        if move_line_data['debit'] == 0.0 and move_line_data['credit']== 0.0:
+                                            self.pool.get('account.move.line').unlink(cr,uid,[move_line.id])
+                                        else:
+                                            self.pool.get('account.move.line').write(cr,uid,[move_line.id],move_line_data)
+                                        flg=1
+                                if not flg:
+                                    self.pool.get('account.move.line').create(cr,uid,move_line_data)
         return True
 
     def onchange_type(self, cr, uid, ids,user_type,type1):