From a2acce64f64b45126c592545baaa51af15036f4f Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@tinyerp.com>
Date: Fri, 22 Aug 2008 14:27:08 +0530
Subject: [PATCH 1/2] added boolean field on journal and modify move object

bzr revid: mra@tinyerp.com-20080822085708-ijrakip4amwlgoy1
---
 addons/account/account.py       | 32 ++++++++++++++++++--------------
 addons/account/account_view.xml |  1 +
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 99e3bb9ee68..8b37e6431fd 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -139,7 +139,7 @@ class account_account(osv.osv):
             context=None, count=False):
         if context is None:
             context = {}
-        pos = 0        
+        pos = 0
         while pos<len(args):
             if args[pos][0]=='code' and args[pos][1] in ('like','ilike'):
                 args[pos][1]='=like'
@@ -156,7 +156,7 @@ class account_account(osv.osv):
                 ids1 = super(account_account,self).search(cr, uid, [('type','in',ids3)])
                 ids1 += map(lambda x: x.id, jour.account_control_ids)
                 args[pos] = ('id','in',ids1)
-            pos+=1        
+            pos+=1
         return super(account_account,self).search(cr, uid, args, offset, limit,
                 order, context=context, count=count)
 
@@ -346,7 +346,7 @@ class account_account(osv.osv):
             res.append((record['id'],name ))
         return res
 
-    def copy(self, cr, uid, id, default={}, context={}):        
+    def copy(self, cr, uid, id, default={}, context={}):
         account = self.browse(cr, uid, id, context=context)
         new_child_ids = []
         default['parent_id'] = False
@@ -423,6 +423,7 @@ class account_journal(osv.osv):
         'user_id': fields.many2one('res.users', 'User', help="The responsible user of this journal"),
         'groups_id': fields.many2many('res.groups', 'account_journal_group_rel', 'journal_id', 'group_id', 'Groups'),
         'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'),
+        'entry_posted': fields.boolean('Allow Entries in Posted'),
     }
     _defaults = {
         'active': lambda *a: 1,
@@ -715,10 +716,13 @@ class account_move(osv.osv):
                 vals['name'] = self.pool.get('ir.sequence').get_id(cr, uid, journal.sequence_id.id)
             else:
                 raise osv.except_osv(_('Error'), _('No sequence defined in the journal !'))
+        accnt_journal = self.pool.get('account.journal').browse(cr, uid, vals['journal_id'])
         if 'line_id' in vals:
             c = context.copy()
             c['novalidate'] = True
             result = super(account_move, self).create(cr, uid, vals, c)
+            if accnt_journal.entry_posted:
+                cr.execute('update account_move set state=%s where id in ('+','.join(map(str,[result]))+')', ('posted',))
             self.validate(cr, uid, [result], context)
         else:
             result = super(account_move, self).create(cr, uid, vals, context)
@@ -1782,7 +1786,7 @@ class account_chart_template(osv.osv):
 account_chart_template()
 
 class wizard_account_chart_duplicate(osv.osv_memory):
-    """    
+    """
     Create a new account chart for a new company.
     Wizards ask:
         * an accuont chart (parent_id,=,False)
@@ -1790,27 +1794,27 @@ class wizard_account_chart_duplicate(osv.osv_memory):
     Then, the wizard:
         * duplicates all accounts and assign to the right company
         * duplicates all taxes, changing account assignations
-        * duplicate all accounting properties and assign correctly                     
+        * duplicate all accounting properties and assign correctly
     """
     _name = 'wizard.account.chart.duplicate'
     _columns = {
         'name':fields.char('Name',size=64),
         'account_id':fields.many2one('account.account','Account Chart',required=True,domain=[('parent_id','=',False)]),
-        'company_id':fields.many2one('res.company','Company',required=True), 
-        
-    }    
-    
+        'company_id':fields.many2one('res.company','Company',required=True),
+
+    }
+
     def action_create(self, cr, uid,ids, context=None):
         res=self.read(cr,uid,ids)[0]
         if res.get('account_id',False) and res.get('company_id',False):
-            account_obj=self.pool.get('account.account') 
+            account_obj=self.pool.get('account.account')
             account_tax_obj=self.pool.get('account.tax')
             property_obj=self.pool.get('ir.property')
             # duplicate all accounts
             account_obj.copy(cr,uid,res['account_id'],default={'company_id':res['company_id']})
-            # duplicate all taxes 
+            # duplicate all taxes
             tax_ids=account_tax_obj.search(cr,uid,[])
-            for tax in account_tax_obj.browse(cr,uid,tax_ids):        
+            for tax in account_tax_obj.browse(cr,uid,tax_ids):
                 val={'company_id':res['company_id']}
                 if tax.account_collected_id:
                     new_invoice_account_ids=account_obj.search(cr,uid,[('name','=',tax.account_collected_id.name),('company_id','=',res['company_id'])])
@@ -1818,7 +1822,7 @@ class wizard_account_chart_duplicate(osv.osv_memory):
                 if tax.account_paid_id:
                     new_refund_account_ids=account_obj.search(cr,uid,[('name','=',tax.account_paid_id.name),('company_id','=',res['company_id'])])
                     val['account_paid_id']=len(new_refund_account_ids) and new_refund_account_ids[0] or False
-                account_tax_obj.copy(cr,uid,tax.id,default=val)            
+                account_tax_obj.copy(cr,uid,tax.id,default=val)
             # duplicate all accouting properties
             property_ids=property_obj.search(cr,uid,[('value','=like','account.account,%')])
             for property in property_obj.browse(cr,uid,property_ids):
@@ -1830,7 +1834,7 @@ class wizard_account_chart_duplicate(osv.osv_memory):
                                 'value':'account.account,'+str(new_account_ids[0]),
                                 'company_id':res['company_id']
                             })
-                    
+
         return {'type':'ir.actions.act_window_close'}
 
 wizard_account_chart_duplicate()
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 19937c9e40b..cc8c8e1f371 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -256,6 +256,7 @@
                             <newline/>
                             <field name="centralisation"/>
                             <field name="update_posted"/>
+                            <field name="entry_posted"/>
                         </page>
                         <page string="Entry Controls">
                             <separator colspan="4" string="Accounts Type Allowed (empty for no control)"/>

From 3f649972d9c045c53b5aecf0ed488216864a560d Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@tinyerp.com>
Date: Fri, 22 Aug 2008 17:23:40 +0530
Subject: [PATCH 2/2] modify button confirmation action

bzr revid: mra@tinyerp.com-20080822115340-9qi06s066v7igmhr
---
 addons/account/account_bank_statement.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 4b860a520c5..79c96359dcf 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -138,7 +138,7 @@ class account_bank_statement(osv.osv):
         'currency': fields.function(_currency, method=True, string='Currency',
             type='many2one', relation='res.currency'),
     }
-    
+
     _defaults = {
         'name': lambda self, cr, uid, context=None: \
                 self.pool.get('ir.sequence').get(cr, uid, 'account.bank.statement'),
@@ -289,6 +289,8 @@ class account_bank_statement(osv.osv):
                     except:
                         raise osv.except_osv(_('Error !'), _('Unable to reconcile entry "%s": %.2f') % (move.name, move.amount))
 
+                if st.journal_id.entry_posted:
+                    account_move_obj.write(cr, uid, [move_id], {'state':'posted'})
             done.append(st.id)
         self.write(cr, uid, done, {'state':'confirm'}, context=context)
         return True