From 11a2a077af09327800da88de33bde0e213e8a42e Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 22 Jun 2010 11:31:08 +0530
Subject: [PATCH 01/22] [Add] product_expiry: Add the security rules

bzr revid: sbh@tinyerp.com-20100622060108-vb39jarhk3uoulfv
---
 addons/product_expiry/__terp__.py                  | 6 +++++-
 addons/product_expiry/security/ir.model.access.csv | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 addons/product_expiry/security/ir.model.access.csv

diff --git a/addons/product_expiry/__terp__.py b/addons/product_expiry/__terp__.py
index 2e44f2c6462..fd95b310ad1 100644
--- a/addons/product_expiry/__terp__.py
+++ b/addons/product_expiry/__terp__.py
@@ -31,7 +31,11 @@
  - removal date
  - alert date
 Used, for example, in food industries.''',
-    "update_xml" : ["product_expiry_view.xml", "report/report_stock_view.xml", "wizard/stock_partial_view.xml"],
+    "update_xml" : [
+                    'security/ir.model.access.csv',
+                     "product_expiry_view.xml",
+                     "report/report_stock_view.xml", 
+                     "wizard/stock_partial_view.xml"],
     "active": False,
     "installable": True
 }
diff --git a/addons/product_expiry/security/ir.model.access.csv b/addons/product_expiry/security/ir.model.access.csv
new file mode 100644
index 00000000000..76e47953190
--- /dev/null
+++ b/addons/product_expiry/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_stock_report_prodlots1_manager","stock.report.prodlots1","model_stock_report_prodlots1","product.group_product_manager",1,1,1,1
+"access_stock_report_prodlots1_user","stock.report.prodlots1","model_stock_report_prodlots1","base.group_user",1,0,0,0

From bcc7299d52afb3d02f944a08085d53e287706d15 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 22 Jun 2010 11:38:59 +0530
Subject: [PATCH 02/22] [IMP] product_expiry: rename the __terp__.py  to
 __openerp__.py

bzr revid: sbh@tinyerp.com-20100622060859-9jt7eub0ik1sc0pl
---
 addons/product_expiry/{__terp__.py => __openerp__.py} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename addons/product_expiry/{__terp__.py => __openerp__.py} (100%)

diff --git a/addons/product_expiry/__terp__.py b/addons/product_expiry/__openerp__.py
similarity index 100%
rename from addons/product_expiry/__terp__.py
rename to addons/product_expiry/__openerp__.py

From 8e1638cbec5f1cd9e4ba3f745cbd944025eec49b Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 22 Jun 2010 12:15:50 +0530
Subject: [PATCH 03/22] [Fix] product_expiry: Fix the xpath for split_in_lots

bzr revid: sbh@tinyerp.com-20100622064550-hxv2ctsl083q5dka
---
 addons/product_expiry/wizard/stock_partial_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/product_expiry/wizard/stock_partial_view.xml b/addons/product_expiry/wizard/stock_partial_view.xml
index b42ea07ba40..d48a95c189c 100644
--- a/addons/product_expiry/wizard/stock_partial_view.xml
+++ b/addons/product_expiry/wizard/stock_partial_view.xml
@@ -9,10 +9,10 @@
              <field name="inherit_id" ref="stock.view_split_in_lots"/>
               <field name="arch" type="xml">
               <data>
-                <xpath expr="//form/group/field[@name='line_ids']/tree/field[@name='name']"  position="replace">
+                <xpath expr="//form/group/group/field[@name='line_ids']/tree/field[@name='name']"  position="replace">
                   <field name="name" on_change="on_change_product(parent.product_id)"/>
                 </xpath>
-                <xpath expr="//form/group/field[@name='line_ids']/tree/field[@name='quantity']"  position="after">
+                <xpath expr="//form//group/group/field[@name='line_ids']/tree/field[@name='quantity']"  position="after">
                   <field name="date"/>
                 </xpath>
               </data>

From 752bce134a250f48701c6b7f9832011014cd1a80 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 22 Jun 2010 12:27:06 +0530
Subject: [PATCH 04/22] [Fix] product_margin: Add security file

bzr revid: sbh@tinyerp.com-20100622065706-0luisuoaildqmil3
---
 addons/product_margin/__openerp__.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/product_margin/__openerp__.py b/addons/product_margin/__openerp__.py
index 7607c499add..e80f14ae490 100644
--- a/addons/product_margin/__openerp__.py
+++ b/addons/product_margin/__openerp__.py
@@ -31,7 +31,10 @@ the report has several options to help you get the data you need.
 """,
     'author': 'Tiny',
     'depends': ['base', 'product', 'account'],
-    'update_xml': ['wizard/product_margin_view.xml','product_margin_view.xml'],
+    'update_xml': [
+                   'security/ir.model.access.csv',
+                   'wizard/product_margin_view.xml',
+                   'product_margin_view.xml'],
     'demo_xml': [],
     'installable': True,
     'active': False,

From bf774ceea2867eb41762cf747c6cdd1bd512d02a Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 22 Jun 2010 12:33:20 +0530
Subject: [PATCH 05/22] [Add] stock: Add the security rules for
 stock_picking_report

bzr revid: sbh@tinyerp.com-20100622070320-808un5lxuu0srgo6
---
 addons/stock/security/ir.model.access.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index 7ecb0b833e9..9255c8967dd 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -53,3 +53,4 @@
 "access_stock_ups_upload","stock.ups.upload","model_stock_ups_upload","stock.group_stock_user",1,1,1,1
 "access_stock_split_into","stock.split.into","model_stock_split_into","stock.group_stock_user",1,1,1,0
 "access_stock_split_into_manager","stock.split.into","model_stock_split_into","stock.group_stock_manager",1,1,1,1
+"access_report_stock_picking","report.stock.picking","model_report_stock_picking","stock.group_stock_manager",1,1,1,1

From f174d10f88d1d252676267128d1c99fee1cda798 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 22 Jun 2010 13:00:24 +0530
Subject: [PATCH 06/22] [IMP] stock_planning: Improve the view

bzr revid: sbh@tinyerp.com-20100622073024-yz0zt7sbsol9qlwn
---
 addons/stock_planning/stock_planning_view.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 49b384794f2..bb63cd6973b 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -152,7 +152,9 @@
                             <field name="product_amt" on_change="product_amt_change( product_amt, product_uom)" />
                             <field name="product_qty"  />
                             <field name="state"/>
-                            <button name="action_validate" icon="gtk-apply" string="Validate" states="draft" type="object" colspan = "2"/>
+                            <label string = ""/>
+                            <button name="action_validate" icon="gtk-apply" string="Validate" states="draft" type="object" colspan = "1"/>
+
                 </group>
                     </group>
                     <separator colspan ="4" string="Sales history"/>
@@ -161,6 +163,7 @@
                         <label string = "Per User :"/>
                         <label string = "Per Department :"/>
                         <label string = "Per Warehouse :"/>
+                        <label string = ""/>
                         <label string = "Periods :"/>
                         <field name="analyzed_user_id" nolabel = "1" domain = "[('company_id','=',company_id)] "/>
                         <field name="analyzed_dept_id" nolabel = "1" domain = "[('company_id','=',company_id)] " />

From d5ba08370e947611dc83b337b8cf252c9e9d1ae4 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 22 Jun 2010 14:15:41 +0530
Subject: [PATCH 07/22] [Fix] account_coda: fix the period_id problem

bzr revid: sbh@tinyerp.com-20100622084541-43s0n0xew83a1rzl
---
 addons/account_coda/wizard/coda_import.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/account_coda/wizard/coda_import.py b/addons/account_coda/wizard/coda_import.py
index 7fb1e2d005e..ee0aa60e8d1 100644
--- a/addons/account_coda/wizard/coda_import.py
+++ b/addons/account_coda/wizard/coda_import.py
@@ -101,6 +101,8 @@ def _coda_parsing(self, cr, uid, data, context):
     pool = pooler.get_pool(cr.dbname)
     codafile = data['form']['coda']
     journal_code = pool.get('account.journal').browse(cr, uid, data['form']['journal_id'], context).code
+    account_period_obj = pool.get('account.period')
+    period = account_period_obj.find(cr, uid, context=context)[0]
     def_pay_acc = data['form']['def_payable']
     def_rec_acc = data['form']['def_receivable']
 
@@ -113,12 +115,13 @@ def _coda_parsing(self, cr, uid, data, context):
     str_not1=''
 
     bank_statements=[]
+    bank_statement = {}
     recordlist = base64.decodestring(codafile).split('\n')
     recordlist.pop()
     for line in recordlist:
         if line[0] == '0':
             # header data
-            bank_statement = {}
+           
             bank_statement["bank_statement_line"]={}
             bank_statement_lines = {}
             bank_statement['date'] = str2date(line[5:11])
@@ -213,6 +216,7 @@ def _coda_parsing(self, cr, uid, data, context):
 
         elif line[0]=='9':
             # footer record
+            
             bank_statements.append(bank_statement)
     #end for
     bkst_list=[]
@@ -221,7 +225,7 @@ def _coda_parsing(self, cr, uid, data, context):
             bk_st_id = pool.get('account.bank.statement').create(cr,uid,{
                 'journal_id': statement['journal_id'],
                 'date':time.strftime('%Y-%m-%d',time.strptime(statement['date'],"%y/%m/%d")),
-                'period_id':statement['period_id'],
+                'period_id':statement['period_id'] or period,
                 'balance_start': statement["balance_start"],
                 'balance_end_real': statement["balance_end_real"],
                 'state': 'draft',

From 7c8457aabd2fc9a1feb72b91998a51ca7daf7ce0 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 22 Jun 2010 16:35:43 +0530
Subject: [PATCH 08/22] [IMP] account_coda: Rename the file and convert the
 wizard into osv_memory

bzr revid: sbh@tinyerp.com-20100622110543-c418p8e3f5pyy2cj
---
 addons/account_coda/__openerp__.py            |   4 +-
 .../{coda_demo.xml => account_coda_demo.xml}  |   0
 .../{coda_view.xml => account_coda_view.xml}  |   4 +-
 addons/account_coda/wizard/__init__.py        |   2 +-
 .../wizard/account_coda_import.py             | 291 +++++++++++++++
 .../wizard/account_coda_import.xml            |  66 ++++
 addons/account_coda/wizard/coda_import.py     | 345 ------------------
 7 files changed, 363 insertions(+), 349 deletions(-)
 rename addons/account_coda/{coda_demo.xml => account_coda_demo.xml} (100%)
 rename addons/account_coda/{coda_view.xml => account_coda_view.xml} (93%)
 create mode 100644 addons/account_coda/wizard/account_coda_import.py
 create mode 100644 addons/account_coda/wizard/account_coda_import.xml
 delete mode 100644 addons/account_coda/wizard/coda_import.py

diff --git a/addons/account_coda/__openerp__.py b/addons/account_coda/__openerp__.py
index 306098d137b..c22da993912 100644
--- a/addons/account_coda/__openerp__.py
+++ b/addons/account_coda/__openerp__.py
@@ -30,7 +30,9 @@
     "depends":["base", "account"],
     "demo_xml":["coda_demo.xml"],
     "init_xml":[],
-    "update_xml" : ["security/ir.model.access.csv","coda_wizard.xml","coda_view.xml"],
+    "update_xml" : ["security/ir.model.access.csv",
+                    "wizard/account_coda_import.xml",
+                    "account_coda_view.xml"],
     "active":False,
     "installable":True,
 
diff --git a/addons/account_coda/coda_demo.xml b/addons/account_coda/account_coda_demo.xml
similarity index 100%
rename from addons/account_coda/coda_demo.xml
rename to addons/account_coda/account_coda_demo.xml
diff --git a/addons/account_coda/coda_view.xml b/addons/account_coda/account_coda_view.xml
similarity index 93%
rename from addons/account_coda/coda_view.xml
rename to addons/account_coda/account_coda_view.xml
index 0a61c36d5a8..b7f03ba9a6d 100644
--- a/addons/account_coda/coda_view.xml
+++ b/addons/account_coda/account_coda_view.xml
@@ -48,8 +48,8 @@
 
 	<menuitem name="Coda Statements" parent="account.menu_finance_reporting" id="menu_account_coda" action="action_account_coda" sequence="12"/>
 
-	<menuitem name="Import Coda Statements" action="wizard_account_coda_import" parent="account.menu_finance_periodical_processing"
-	type="wizard"  id="menu_account_coda_wizard" sequence="15"/>
+	<menuitem name="Import Coda Statements" action="action_account_coda_import" parent="account.menu_finance_periodical_processing"
+	 id="menu_account_coda_import" sequence="15"/>
 
 	<act_window name="Coda File"
 		domain="[('statement_ids', 'in', [active_id])]"
diff --git a/addons/account_coda/wizard/__init__.py b/addons/account_coda/wizard/__init__.py
index 72d3b950cf7..e9214ee1e44 100644
--- a/addons/account_coda/wizard/__init__.py
+++ b/addons/account_coda/wizard/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import coda_import
+import account_coda_import
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account_coda/wizard/account_coda_import.py b/addons/account_coda/wizard/account_coda_import.py
new file mode 100644
index 00000000000..f7945084f03
--- /dev/null
+++ b/addons/account_coda/wizard/account_coda_import.py
@@ -0,0 +1,291 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import netsvc
+from osv import osv,fields
+from tools.translate import _
+from mx import DateTime
+import time
+import base64
+
+def str2date(date_str):
+    return time.strftime("%y/%m/%d",time.strptime(date_str,"%d%m%y"))
+
+def str2float(str):
+    try:
+        return float(str)
+    except:
+        return 0.0
+
+def list2float(lst):
+    try:
+        return str2float((lambda s : s[:-3] + '.' + s[-3:])(lst))
+    except:
+        return 0.0
+    
+class account_coda_import(osv.osv_memory):
+    _name = 'account.coda.import'
+    _description = 'Account Coda Import'
+    _columns = {
+            'journal_id': fields.many2one('account.journal', 'Bank Journal', required=True),
+            'def_payable': fields.many2one('account.account', 'Default Payable Account',domain=[('type','=','payable')],required=True,help= 'Set here the payable account that will be used, by default, if the partner is not found'),
+            'def_receivable': fields.many2one('account.account', 'Default receivable Account',domain=[('type','=','receivable')],required=True,help= 'Set here the receivable account that will be used, by default, if the partner is not found',),
+            'awaiting_account': fields.many2one('account.account', 'Default Account for Unrecognized Movement',required=True,help= 'Set here the default account that will be used, if the partner is found but does not have the bank account , or if he is domiciled',),
+            'coda': fields.binary('Coda File', required=True),   
+            'note':fields.text('Log'),       
+    }
+    def coda_parsing(self, cr, uid, ids, context):
+        
+      
+        journal_obj=self.pool.get('account.journal')
+        account_period_obj = self.pool.get('account.period')   
+        partner_bank_obj=self.pool.get('res.partner.bank')   
+        bank_statement_obj=self.pool.get('account.bank.statement')
+        move_line_obj=self.pool.get('account.move.line')
+        bank_statement_line_obj=self.pool.get('account.bank.statement.line')
+        statement_reconcile_obj=self.pool.get('account.bank.statement.reconcile')
+        account_coda_obj=self.pool.get('account.coda')
+        mod_obj = self.pool.get('ir.model.data')
+        
+        data = self.read(cr, uid, ids)[0]
+        
+        
+        codafile = data['coda']
+        journal_code = journal_obj.browse(cr, uid, data['journal_id'], context).code
+      
+        period = account_period_obj.find(cr, uid, context=context)[0]
+        def_pay_acc = data['def_payable']
+        def_rec_acc = data['def_receivable']
+    
+        str_log = ""
+        err_log = "Errors:\n------\n"
+        nb_err=0
+        std_log=''
+        str_log1 = "Coda File is Imported  :  "
+        str_not=''
+        str_not1=''
+    
+        bank_statements=[]
+        bank_statement = {}
+        recordlist = base64.decodestring(codafile).split('\n')
+        recordlist.pop()
+        for line in recordlist:
+            if line[0] == '0':
+                # header data
+               
+                bank_statement["bank_statement_line"]={}
+                bank_statement_lines = {}
+                bank_statement['date'] = str2date(line[5:11])
+                bank_statement['journal_id']=data['journal_id']
+                period_id = account_period_obj.search(cr, uid, [('date_start','<=',time.strftime('%Y-%m-%d',time.strptime(bank_statement['date'],"%y/%m/%d"))),('date_stop','>=',time.strftime('%Y-%m-%d',time.strptime(bank_statement['date'],"%y/%m/%d")))])
+                bank_statement['period_id'] = period_id and period_id[0] or False
+                bank_statement['state']='draft'
+            elif line[0] == '1':
+                # old balance data
+                bal_start = list2float(line[43:58])
+                if line[42] == '1':
+                    bal_start = - bal_start
+                bank_statement["balance_start"]= bal_start
+                bank_statement["acc_number"]=line[5:17]
+                bank_statement["acc_holder"]=line[64:90]
+                bank_statement['name'] = journal_code + ' ' + str(line[2:5])
+    
+            elif line[0]=='2':
+                # movement data record 2
+                if line[1]=='1':
+                    # movement data record 2.1
+                    if bank_statement_lines.has_key(line[2:6]):
+                        continue
+                    st_line = {}
+                    st_line['extra_note'] = ''
+                    st_line['statement_id']=0
+                    st_line['ref'] = line[2:10]
+                    st_line['date'] = time.strftime('%Y-%m-%d',time.strptime(str2date(line[115:121]),"%y/%m/%d")),
+                    st_line_amt = list2float(line[32:47])
+    
+                    if line[61]=='1':
+                        st_line['toreconcile'] = True
+                        st_line['name']=line[65:77]
+                    else:
+                        st_line['toreconcile'] = False
+                        st_line['name']=line[62:115]
+    
+                    st_line['free_comm'] = st_line['name']
+                    st_line['val_date']=time.strftime('%Y-%m-%d',time.strptime(str2date(line[47:53]),"%y/%m/%d")),
+                    st_line['entry_date']=time.strftime('%Y-%m-%d',time.strptime(str2date(line[115:121]),"%y/%m/%d")),
+                    st_line['partner_id']=0
+                    if line[31] == '1':
+                        st_line_amt = - st_line_amt
+                        st_line['account_id'] = def_pay_acc
+                    else:
+                        st_line['account_id'] = def_rec_acc
+                    st_line['amount'] = st_line_amt
+                    bank_statement_lines[line[2:6]]=st_line
+                    bank_statement["bank_statement_line"]=bank_statement_lines
+                elif line[1] == '2':
+                    st_line_name = line[2:6]
+                    bank_statement_lines[st_line_name].update({'account_id': data['awaiting_account']})
+    
+                elif line[1] == '3':
+                    # movement data record 3.1
+                    st_line_name = line[2:6]
+                    st_line_partner_acc = str(line[10:47]).strip()
+                    cntry_number=line[10:47].strip()
+                    contry_name=line[47:125].strip()
+                    bank_ids = partner_bank_obj.search(cr, uid, [('acc_number','=',st_line_partner_acc)])
+                    bank_statement_lines[st_line_name].update({'cntry_number': cntry_number, 'contry_name': contry_name})
+                    if bank_ids:
+                        bank = partner_bank_obj.browse(cr, uid, bank_ids[0], context)
+                        if line and bank.partner_id:
+                            bank_statement_lines[st_line_name].update({'partner_id': bank.partner_id.id})
+                            if bank_statement_lines[st_line_name]['amount'] < 0 :
+                                bank_statement_lines[st_line_name].update({'account_id': bank.partner_id.property_account_payable.id})
+                            else :
+                                bank_statement_lines[st_line_name].update({'account_id': bank.partner_id.property_account_receivable.id})
+                    else:
+                        nb_err += 1
+                        err_log += _('The bank account %s is not defined for the partner %s.\n')%(cntry_number,contry_name)
+                        bank_statement_lines[st_line_name].update({'account_id': data['awaiting_account']})
+    
+                    bank_statement["bank_statement_line"]=bank_statement_lines
+            elif line[0]=='3':
+                if line[1] == '1':
+                    st_line_name = line[2:6]
+                    bank_statement_lines[st_line_name]['extra_note'] += '\n' + line[40:113]
+                elif line[1] == '2':
+                    st_line_name = line[2:6]
+                    bank_statement_lines[st_line_name]['extra_note'] += '\n' + line[10:115]
+                elif line[1] == '3':
+                    st_line_name = line[2:6]
+                    bank_statement_lines[st_line_name]['extra_note'] += '\n' + line[10:100]
+            elif line[0]=='8':
+                # new balance record
+                bal_end = list2float(line[42:57])
+                if line[41] == '1':
+                    bal_end = - bal_end
+                bank_statement["balance_end_real"]= bal_end
+    
+            elif line[0]=='9':
+                # footer record
+                
+                bank_statements.append(bank_statement)
+        #end for
+        bkst_list=[]
+        for statement in bank_statements:
+            try:
+                bk_st_id =bank_statement_obj.create(cr,uid,{
+                    'journal_id': statement['journal_id'],
+                    'date':time.strftime('%Y-%m-%d',time.strptime(statement['date'],"%y/%m/%d")),
+                    'period_id':statement['period_id'] or period,
+                    'balance_start': statement["balance_start"],
+                    'balance_end_real': statement["balance_end_real"],
+                    'state': 'draft',
+                    'name': statement['name'],
+                })
+                lines=statement["bank_statement_line"]
+                for value in lines:
+                    line=lines[value]
+                    reconcile_id = False
+                    if line['toreconcile']:
+                        rec_id = move_line_obj.search(cr, uid, [('name','=',line['name']),('reconcile_id','=',False),('account_id.reconcile','=',True)])
+                        if rec_id:
+                            reconcile_id = statement_reconcile_obj.create(cr, uid, {
+                                'line_ids': [(6, 0, rec_id)]
+                                }, context=context)
+                    str_not1 = ''
+                    if line.has_key('contry_name') and line.has_key('cntry_number'):
+                        str_not1="Partner name:%s \n Partner Account Number:%s \n Communication:%s \n Value Date:%s \n Entry Date:%s \n"%(line["contry_name"],line["cntry_number"],line["free_comm"]+line['extra_note'],line["val_date"][0],line["entry_date"][0])
+                    id=bank_statement_line_obj.create(cr,uid,{
+                               'name':line['name'],
+                               'date': line['date'],
+                               'amount': line['amount'],
+                               'partner_id':line['partner_id'] or 0,
+                               'account_id':line['account_id'],
+                               'statement_id': bk_st_id,
+                               'reconcile_id': reconcile_id,
+                               'note':str_not1,
+                               'ref':line['ref'],
+                               })
+    
+                str_not= "\n \n Account Number: %s \n Account Holder Name: %s " %(statement["acc_number"],statement["acc_holder"])
+                std_log += "\nStatement : %s , Date  : %s, Starting Balance :  %.2f , Ending Balance : %.2f \n"\
+                          %(statement['name'], statement['date'], float(statement["balance_start"]), float(statement["balance_end_real"]))
+                bkst_list.append(bk_st_id)
+    
+            except osv.except_osv, e:
+                cr.rollback()
+                nb_err+=1
+                err_log += '\n Application Error : ' + str(e)
+                raise # REMOVEME
+    
+            except Exception, e:
+                cr.rollback()
+                nb_err+=1
+                err_log += '\n System Error : '+str(e)
+                raise # REMOVEME
+            except :
+                cr.rollback()
+                nb_err+=1
+                err_log += '\n Unknown Error'
+                raise
+        err_log += '\n\nNumber of statements : '+ str(len(bkst_list))
+        err_log += '\nNumber of error :'+ str(nb_err) +'\n'
+    
+        account_coda_obj.create(cr, uid, {
+            'name':codafile,
+            'statement_ids': [(6, 0, bkst_list,)],
+            'note':str_log1+str_not+std_log+err_log,
+            'journal_id':data['journal_id'],
+            'date':time.strftime("%Y-%m-%d"),
+            'user_id':uid,
+            })
+        test='' 
+        test=str_log1 + std_log + err_log
+        self.write(cr, uid,ids, {'note':test}, context=context)
+        extraction= { 'statment_ids':bkst_list}
+        context.update({ 'statment_ids':bkst_list})
+        model_data_ids = mod_obj.search(cr, uid, [('model', '=', 'ir.ui.view'),('name', '=', 'account_coda_note_view')], context=context)
+        resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+        return {
+                'name': _('Result'),
+                'res_id': ids[0],                
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'account.coda.import',
+                'view_id': False,
+                'target':'new',
+                'views': [(resource_id,'form')],
+                'context': context,
+                'type': 'ir.actions.act_window',
+        }
+    def action_open_window(self, cr, uid,data,  context):
+        return {
+            'domain':"[('id','in',%s)]"%(context.get('statment_ids',False)),
+            'name': 'Statement',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'account.bank.statement',
+            'view_id': False,
+            'type': 'ir.actions.act_window',
+        }
+
+account_coda_import()
\ No newline at end of file
diff --git a/addons/account_coda/wizard/account_coda_import.xml b/addons/account_coda/wizard/account_coda_import.xml
new file mode 100644
index 00000000000..fcfa580d077
--- /dev/null
+++ b/addons/account_coda/wizard/account_coda_import.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" ?>
+<openerp>
+<data>
+        <record id="account_coda_import_view" model="ir.ui.view">
+             <field name="name">Import Coda Statement</field>
+             <field name="model">account.coda.import</field>
+             <field name="type">form</field>
+             <field name="arch" type="xml">
+				<form string="Import Coda Statement">
+				<separator colspan="4" string="Select your bank journal :" />
+				    <field name="journal_id" colspan="1" domain="[('type','=','cash')]" />
+				    <newline />
+				    <field name="def_payable" />
+				    <newline />
+				    <field name="def_receivable" />
+				    <newline />
+				    <field name="awaiting_account" />
+				    <separator string="Click on 'New' to select your file :" colspan="4"/>
+				    <field name="coda"/>
+				    <newline/>
+					<group colspan="4" col="6">
+                       	<separator colspan="6"/>
+     					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+               			<button name="coda_parsing" string="Ok" type="object" icon="gtk-apply"/>
+ 					</group>				    
+				</form>
+			</field>
+		</record>
+		
+		<record id="account_coda_note_view" model="ir.ui.view">
+	         <field name="name">Import Coda Statement</field>
+	         <field name="model">account.coda.import</field>
+	         <field name="type">form</field>
+	         <field name="arch" type="xml">
+				<form string="Import Coda Statement">
+					<separator colspan="4" string="Results :" />
+			    	<field name="note" colspan="4" nolabel="1" width="500"/>
+			    	<newline/>
+					<separator colspan="6"/>
+					<button special="cancel" string="Close" icon="gtk-cancel"/>
+					<button name="action_open_window" string="Open Statement" type="object" icon="gtk-apply"/>		    	
+		    	</form>
+	    	</field>
+	   	</record>
+	   	
+	   	<record id="action_account_coda_import" model="ir.actions.act_window">
+            <field name="name">Import Coda Statement</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.coda.import</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+   			<field name="view_id" ref="account_coda_import_view"/>            
+        </record>
+<!--       	 
+       	 <record id="action_account_coda_import" model="ir.actions.act_window">
+            <field name="name">Import Coda Statement</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.coda.import</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+   			<field name="view_id" ref="account_coda_note_view"/>            
+        </record>-->
+</data>
+</openerp>
diff --git a/addons/account_coda/wizard/coda_import.py b/addons/account_coda/wizard/coda_import.py
deleted file mode 100644
index ee0aa60e8d1..00000000000
--- a/addons/account_coda/wizard/coda_import.py
+++ /dev/null
@@ -1,345 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import pooler
-import time
-import datetime
-import wizard
-import netsvc
-import base64
-from osv import osv
-from tools.translate import _
-
-codawiz_form = """<?xml version="1.0"?>
-<form string="Import Coda Statement">
-<separator colspan="4" string="Select your bank journal :" />
-    <field name="journal_id" colspan="1" domain="[('type','=','cash')]" />
-    <newline />
-    <field name="def_payable" />
-    <newline />
-    <field name="def_receivable" />
-    <newline />
-    <field name="awaiting_account" />
-    <separator string="Click on 'New' to select your file :" colspan="4"/>
-    <field name="coda"/>
-</form>
-"""
-
-codawiz_fields = {
-    'journal_id' : {
-        'string':'Bank Journal',
-        'type':'many2one',
-        'relation':'account.journal',
-        'required':True,
-
-    },
-    'coda' : {
-        'string':'Coda File',
-        'type':'binary',
-        'required':True,
-    },
-    'def_payable' : {
-        'string' : 'Default Payable Account',
-        'type' : 'many2one',
-        'relation': 'account.account',
-        'required':True,
-        'domain':[('type','=','payable')],
-        'help': 'Set here the payable account that will be used, by default, if the partner is not found',
-    },
-    'def_receivable' : {
-        'string' : 'Default receivable Account',
-        'type' : 'many2one',
-        'relation': 'account.account',
-        'required':True,
-        'domain':[('type','=','receivable')],
-        'help': 'Set here the receivable account that will be used, by default, if the partner is not found',
-    },
-    'awaiting_account' : {
-        'string' : 'Default Account for Unrecognized Movement',
-        'type' : 'many2one',
-        'relation': 'account.account',
-        'required':True,
-        'help': 'Set here the default account that will be used, if the partner is found but does not have the bank account , or if he is domiciled',
-
-    }
-
-}
-
-result_form = """<?xml version="1.0"?>
-<form string="Import Coda Statement">
-<separator colspan="4" string="Results :" />
-    <field name="note" colspan="4" nolabel="1" width="500"/>
-</form>
-"""
-
-result_fields = {
-
-    'note' : {'string':'Log','type':'text'}
-
-}
-
-
-def _coda_parsing(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    codafile = data['form']['coda']
-    journal_code = pool.get('account.journal').browse(cr, uid, data['form']['journal_id'], context).code
-    account_period_obj = pool.get('account.period')
-    period = account_period_obj.find(cr, uid, context=context)[0]
-    def_pay_acc = data['form']['def_payable']
-    def_rec_acc = data['form']['def_receivable']
-
-    str_log = ""
-    err_log = "Errors:\n------\n"
-    nb_err=0
-    std_log=''
-    str_log1 = "Coda File is Imported  :  "
-    str_not=''
-    str_not1=''
-
-    bank_statements=[]
-    bank_statement = {}
-    recordlist = base64.decodestring(codafile).split('\n')
-    recordlist.pop()
-    for line in recordlist:
-        if line[0] == '0':
-            # header data
-           
-            bank_statement["bank_statement_line"]={}
-            bank_statement_lines = {}
-            bank_statement['date'] = str2date(line[5:11])
-            bank_statement['journal_id']=data['form']['journal_id']
-            period_id = pool.get('account.period').search(cr, uid, [('date_start','<=',time.strftime('%Y-%m-%d',time.strptime(bank_statement['date'],"%y/%m/%d"))),('date_stop','>=',time.strftime('%Y-%m-%d',time.strptime(bank_statement['date'],"%y/%m/%d")))])
-            bank_statement['period_id'] = period_id and period_id[0] or False
-            bank_statement['state']='draft'
-        elif line[0] == '1':
-            # old balance data
-            bal_start = list2float(line[43:58])
-            if line[42] == '1':
-                bal_start = - bal_start
-            bank_statement["balance_start"]= bal_start
-            bank_statement["acc_number"]=line[5:17]
-            bank_statement["acc_holder"]=line[64:90]
-            bank_statement['name'] = journal_code + ' ' + str(line[2:5])
-
-        elif line[0]=='2':
-            # movement data record 2
-            if line[1]=='1':
-                # movement data record 2.1
-                if bank_statement_lines.has_key(line[2:6]):
-                    continue
-                st_line = {}
-                st_line['extra_note'] = ''
-                st_line['statement_id']=0
-                st_line['ref'] = line[2:10]
-                st_line['date'] = time.strftime('%Y-%m-%d',time.strptime(str2date(line[115:121]),"%y/%m/%d")),
-                st_line_amt = list2float(line[32:47])
-
-                if line[61]=='1':
-                    st_line['toreconcile'] = True
-                    st_line['name']=line[65:77]
-                else:
-                    st_line['toreconcile'] = False
-                    st_line['name']=line[62:115]
-
-                st_line['free_comm'] = st_line['name']
-                st_line['val_date']=time.strftime('%Y-%m-%d',time.strptime(str2date(line[47:53]),"%y/%m/%d")),
-                st_line['entry_date']=time.strftime('%Y-%m-%d',time.strptime(str2date(line[115:121]),"%y/%m/%d")),
-                st_line['partner_id']=0
-                if line[31] == '1':
-                    st_line_amt = - st_line_amt
-                    st_line['account_id'] = def_pay_acc
-                else:
-                    st_line['account_id'] = def_rec_acc
-                st_line['amount'] = st_line_amt
-                bank_statement_lines[line[2:6]]=st_line
-                bank_statement["bank_statement_line"]=bank_statement_lines
-            elif line[1] == '2':
-                st_line_name = line[2:6]
-                bank_statement_lines[st_line_name].update({'account_id': data['form']['awaiting_account']})
-
-            elif line[1] == '3':
-                # movement data record 3.1
-                st_line_name = line[2:6]
-                st_line_partner_acc = str(line[10:47]).strip()
-                cntry_number=line[10:47].strip()
-                contry_name=line[47:125].strip()
-                bank_ids = pool.get('res.partner.bank').search(cr, uid, [('acc_number','=',st_line_partner_acc)])
-                bank_statement_lines[st_line_name].update({'cntry_number': cntry_number, 'contry_name': contry_name})
-                if bank_ids:
-                    bank = pool.get('res.partner.bank').browse(cr, uid, bank_ids[0], context)
-                    if line and bank.partner_id:
-                        bank_statement_lines[st_line_name].update({'partner_id': bank.partner_id.id})
-                        if bank_statement_lines[st_line_name]['amount'] < 0 :
-                            bank_statement_lines[st_line_name].update({'account_id': bank.partner_id.property_account_payable.id})
-                        else :
-                            bank_statement_lines[st_line_name].update({'account_id': bank.partner_id.property_account_receivable.id})
-                else:
-                    nb_err += 1
-                    err_log += _('The bank account %s is not defined for the partner %s.\n')%(cntry_number,contry_name)
-                    bank_statement_lines[st_line_name].update({'account_id': data['form']['awaiting_account']})
-
-                bank_statement["bank_statement_line"]=bank_statement_lines
-        elif line[0]=='3':
-            if line[1] == '1':
-                st_line_name = line[2:6]
-                bank_statement_lines[st_line_name]['extra_note'] += '\n' + line[40:113]
-            elif line[1] == '2':
-                st_line_name = line[2:6]
-                bank_statement_lines[st_line_name]['extra_note'] += '\n' + line[10:115]
-            elif line[1] == '3':
-                st_line_name = line[2:6]
-                bank_statement_lines[st_line_name]['extra_note'] += '\n' + line[10:100]
-        elif line[0]=='8':
-            # new balance record
-            bal_end = list2float(line[42:57])
-            if line[41] == '1':
-                bal_end = - bal_end
-            bank_statement["balance_end_real"]= bal_end
-
-        elif line[0]=='9':
-            # footer record
-            
-            bank_statements.append(bank_statement)
-    #end for
-    bkst_list=[]
-    for statement in bank_statements:
-        try:
-            bk_st_id = pool.get('account.bank.statement').create(cr,uid,{
-                'journal_id': statement['journal_id'],
-                'date':time.strftime('%Y-%m-%d',time.strptime(statement['date'],"%y/%m/%d")),
-                'period_id':statement['period_id'] or period,
-                'balance_start': statement["balance_start"],
-                'balance_end_real': statement["balance_end_real"],
-                'state': 'draft',
-                'name': statement['name'],
-            })
-            lines=statement["bank_statement_line"]
-            for value in lines:
-                line=lines[value]
-                reconcile_id = False
-                if line['toreconcile']:
-                    rec_id = pool.get('account.move.line').search(cr, uid, [('name','=',line['name']),('reconcile_id','=',False),('account_id.reconcile','=',True)])
-                    if rec_id:
-                        reconcile_id = pool.get('account.bank.statement.reconcile').create(cr, uid, {
-                            'line_ids': [(6, 0, rec_id)]
-                            }, context=context)
-                str_not1 = ''
-                if line.has_key('contry_name') and line.has_key('cntry_number'):
-                    str_not1="Partner name:%s \n Partner Account Number:%s \n Communication:%s \n Value Date:%s \n Entry Date:%s \n"%(line["contry_name"],line["cntry_number"],line["free_comm"]+line['extra_note'],line["val_date"][0],line["entry_date"][0])
-                id=pool.get('account.bank.statement.line').create(cr,uid,{
-                           'name':line['name'],
-                           'date': line['date'],
-                           'amount': line['amount'],
-                           'partner_id':line['partner_id'] or 0,
-                           'account_id':line['account_id'],
-                           'statement_id': bk_st_id,
-                           'reconcile_id': reconcile_id,
-                           'note':str_not1,
-                           'ref':line['ref'],
-                           })
-
-            str_not= "\n \n Account Number: %s \n Account Holder Name: %s " %(statement["acc_number"],statement["acc_holder"])
-            std_log += "\nStatement : %s , Date  : %s, Starting Balance :  %.2f , Ending Balance : %.2f \n"\
-                      %(statement['name'], statement['date'], float(statement["balance_start"]), float(statement["balance_end_real"]))
-            bkst_list.append(bk_st_id)
-
-        except osv.except_osv, e:
-            cr.rollback()
-            nb_err+=1
-            err_log += '\n Application Error : ' + str(e)
-            raise # REMOVEME
-
-        except Exception, e:
-            cr.rollback()
-            nb_err+=1
-            err_log += '\n System Error : '+str(e)
-            raise # REMOVEME
-        except :
-            cr.rollback()
-            nb_err+=1
-            err_log += '\n Unknown Error'
-            raise
-    err_log += '\n\nNumber of statements : '+ str(len(bkst_list))
-    err_log += '\nNumber of error :'+ str(nb_err) +'\n'
-
-    pool.get('account.coda').create(cr, uid, {
-        'name':codafile,
-        'statement_ids': [(6, 0, bkst_list,)],
-        'note':str_log1+str_not+std_log+err_log,
-        'journal_id':data['form']['journal_id'],
-        'date':time.strftime("%Y-%m-%d"),
-        'user_id':uid,
-        })
-
-    return {'note':str_log1 + std_log + err_log ,'journal_id': data['form']['journal_id'], 'coda': data['form']['coda'],'statment_ids':bkst_list}
-
-
-def str2date(date_str):
-    return time.strftime("%y/%m/%d",time.strptime(date_str,"%d%m%y"))
-
-def str2float(str):
-    try:
-        return float(str)
-    except:
-        return 0.0
-
-def list2float(lst):
-    try:
-        return str2float((lambda s : s[:-3] + '.' + s[-3:])(lst))
-    except:
-        return 0.0
-
-class coda_import(wizard.interface):
-    def _action_open_window(self, cr, uid, data, context):
-        form=data['form']
-        return {
-            'domain':"[('id','in',%s)]"%(form['statment_ids']),
-            'name': 'Statement',
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'res_model': 'account.bank.statement',
-            'view_id': False,
-            'type': 'ir.actions.act_window',
-        }
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'form',
-                    'arch' : codawiz_form,
-                    'fields' : codawiz_fields,
-                    'state' : [('end', '_Close'),('extraction', '_Ok') ]}
-        },
-        'extraction' : {
-            'actions' : [_coda_parsing],
-            'result' : {'type' : 'form',
-                    'arch' : result_form,
-                    'fields' : result_fields,
-                    'state' : [('end', '_Close'),('open', '_Open Statement')]}
-        },
-        'open': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _action_open_window, 'state': 'end'}
-
-            },
-
-    }
-coda_import("account.coda_import")
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 50d95cbe2cc2148e923d6985b72eac3c7367995f Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 22 Jun 2010 17:08:41 +0530
Subject: [PATCH 09/22] [IMP] account_coda: Remove the unused file, add the
 search view,improve the view

bzr revid: sbh@tinyerp.com-20100622113841-bqn0f5bk0h5tdsa7
---
 addons/account_coda/__openerp__.py            |  2 +-
 addons/account_coda/account_coda_view.xml     | 33 ++++++++++++++++---
 addons/account_coda/coda_wizard.xml           | 13 --------
 .../wizard/account_coda_import.py             |  2 +-
 .../wizard/account_coda_import.xml            | 13 ++------
 5 files changed, 33 insertions(+), 30 deletions(-)
 delete mode 100644 addons/account_coda/coda_wizard.xml

diff --git a/addons/account_coda/__openerp__.py b/addons/account_coda/__openerp__.py
index c22da993912..3fca0c34440 100644
--- a/addons/account_coda/__openerp__.py
+++ b/addons/account_coda/__openerp__.py
@@ -28,7 +28,7 @@
     bank statements from coda files.
     """,
     "depends":["base", "account"],
-    "demo_xml":["coda_demo.xml"],
+    "demo_xml":["account_coda_demo.xml"],
     "init_xml":[],
     "update_xml" : ["security/ir.model.access.csv",
                     "wizard/account_coda_import.xml",
diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml
index b7f03ba9a6d..50540e31e65 100644
--- a/addons/account_coda/account_coda_view.xml
+++ b/addons/account_coda/account_coda_view.xml
@@ -24,7 +24,6 @@
 		</field>
 	</record>
 
-
 	<record model="ir.ui.view" id="view_account_coda_tree">
 		<field name="name">account.coda.tree</field>
 		<field name="model">account.coda</field>
@@ -34,22 +33,48 @@
 				<field name="journal_id" />
 				<field name="date" />
 				<field name="user_id" />
+				<field name="statement_ids"/>
 			</tree>
 		</field>
 	</record>
 
+      <record id="view_aaccount_coda_filter" model="ir.ui.view">
+            <field name="name">account.coda.select</field>
+            <field name="model">account.coda</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Coda">
+                   <group col="10" colspan="4">
+                        <field name="journal_id"/>
+                        <field name="date"/>
+                        <field name="user_id" default="uid"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
+                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="User" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
+                    </group>
+               </search>
+            </field>
+        </record>
+
 	<record model="ir.actions.act_window" id="action_account_coda">
 		<field name="name">Coda import</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="res_model">account.coda</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
+		<field name="search_view_id" ref="view_aaccount_coda_filter"/>
 	</record>
 
-	<menuitem name="Coda Statements" parent="account.menu_finance_reporting" id="menu_account_coda" action="action_account_coda" sequence="12"/>
+	<menuitem name="Coda Statements" parent="account.menu_finance_periodical_processing" id="menu_account_coda"  sequence="12"/>
+	
+	<menuitem name="Coda Statements" parent="menu_account_coda" id="menu_account_coda_statement" action="action_account_coda" sequence="15"/>
 
-	<menuitem name="Import Coda Statements" action="action_account_coda_import" parent="account.menu_finance_periodical_processing"
-	 id="menu_account_coda_import" sequence="15"/>
+	<menuitem name="Import Coda Statements" action="action_account_coda_import" parent="menu_account_coda"
+	 id="menu_account_coda_import" sequence="13"/>
 
 	<act_window name="Coda File"
 		domain="[('statement_ids', 'in', [active_id])]"
diff --git a/addons/account_coda/coda_wizard.xml b/addons/account_coda/coda_wizard.xml
deleted file mode 100644
index ecd8eb65913..00000000000
--- a/addons/account_coda/coda_wizard.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-	<data>
-
-		<wizard
-		string="Import Coda File"
-		model="account.bank.statement"
-		name="account.coda_import"
-		id="wizard_account_coda_import"
-		menu="False"
-		/>
-	</data>
-</openerp>
diff --git a/addons/account_coda/wizard/account_coda_import.py b/addons/account_coda/wizard/account_coda_import.py
index f7945084f03..b5331eacf45 100644
--- a/addons/account_coda/wizard/account_coda_import.py
+++ b/addons/account_coda/wizard/account_coda_import.py
@@ -48,7 +48,7 @@ class account_coda_import(osv.osv_memory):
     _columns = {
             'journal_id': fields.many2one('account.journal', 'Bank Journal', required=True),
             'def_payable': fields.many2one('account.account', 'Default Payable Account',domain=[('type','=','payable')],required=True,help= 'Set here the payable account that will be used, by default, if the partner is not found'),
-            'def_receivable': fields.many2one('account.account', 'Default receivable Account',domain=[('type','=','receivable')],required=True,help= 'Set here the receivable account that will be used, by default, if the partner is not found',),
+            'def_receivable': fields.many2one('account.account', 'Default Receivable Account',domain=[('type','=','receivable')],required=True,help= 'Set here the receivable account that will be used, by default, if the partner is not found',),
             'awaiting_account': fields.many2one('account.account', 'Default Account for Unrecognized Movement',required=True,help= 'Set here the default account that will be used, if the partner is found but does not have the bank account , or if he is domiciled',),
             'coda': fields.binary('Coda File', required=True),   
             'note':fields.text('Log'),       
diff --git a/addons/account_coda/wizard/account_coda_import.xml b/addons/account_coda/wizard/account_coda_import.xml
index fcfa580d077..0eb06d90b86 100644
--- a/addons/account_coda/wizard/account_coda_import.xml
+++ b/addons/account_coda/wizard/account_coda_import.xml
@@ -7,7 +7,7 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
 				<form string="Import Coda Statement">
-				<separator colspan="4" string="Select your bank journal :" />
+				<separator colspan="4" string="Select your Bank journal :" />
 				    <field name="journal_id" colspan="1" domain="[('type','=','cash')]" />
 				    <newline />
 				    <field name="def_payable" />
@@ -52,15 +52,6 @@
             <field name="target">new</field>
    			<field name="view_id" ref="account_coda_import_view"/>            
         </record>
-<!--       	 
-       	 <record id="action_account_coda_import" model="ir.actions.act_window">
-            <field name="name">Import Coda Statement</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.coda.import</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-   			<field name="view_id" ref="account_coda_note_view"/>            
-        </record>-->
+
 </data>
 </openerp>

From 797b81734a70c2c4b31328f9ae9fa444ce584a06 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 22 Jun 2010 17:12:41 +0530
Subject: [PATCH 10/22] [IMP] account_coda: Rename the file and improve the
 view

bzr revid: sbh@tinyerp.com-20100622114241-i0nzqnlc37q8h7l4
---
 addons/account_coda/__init__.py                    | 2 +-
 addons/account_coda/{coda.py => account_coda.py}   | 0
 addons/account_coda/wizard/account_coda_import.xml | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename addons/account_coda/{coda.py => account_coda.py} (100%)

diff --git a/addons/account_coda/__init__.py b/addons/account_coda/__init__.py
index af866f5dc70..8f76e8912b4 100644
--- a/addons/account_coda/__init__.py
+++ b/addons/account_coda/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import coda
+import account_coda
 import wizard
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account_coda/coda.py b/addons/account_coda/account_coda.py
similarity index 100%
rename from addons/account_coda/coda.py
rename to addons/account_coda/account_coda.py
diff --git a/addons/account_coda/wizard/account_coda_import.xml b/addons/account_coda/wizard/account_coda_import.xml
index 0eb06d90b86..9b29e849994 100644
--- a/addons/account_coda/wizard/account_coda_import.xml
+++ b/addons/account_coda/wizard/account_coda_import.xml
@@ -7,7 +7,7 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
 				<form string="Import Coda Statement">
-				<separator colspan="4" string="Select your Bank journal :" />
+				<separator colspan="4" string="Select Your Bank journal :" />
 				    <field name="journal_id" colspan="1" domain="[('type','=','cash')]" />
 				    <newline />
 				    <field name="def_payable" />

From a396b855c5bfc484733241b1e4e0fede00eb21ae Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 22 Jun 2010 17:36:27 +0530
Subject: [PATCH 11/22] [IMP] account_coda: Add the security rules

bzr revid: sbh@tinyerp.com-20100622120627-dwffov8vsxmpow1i
---
 addons/account_coda/security/ir.model.access.csv | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/account_coda/security/ir.model.access.csv b/addons/account_coda/security/ir.model.access.csv
index 9c1e0a486dc..3ab8dccd4ad 100644
--- a/addons/account_coda/security/ir.model.access.csv
+++ b/addons/account_coda/security/ir.model.access.csv
@@ -1,3 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_account_coda","account.coda","model_account_coda","account.group_account_user",1,0,0,0
-"access_account_coda_manager","account.coda","model_account_coda","account.group_account_manager",1,1,1,1
\ No newline at end of file
+"access_account_coda_manager","account.coda","model_account_coda","account.group_account_manager",1,1,1,1
+"access_account_coda_import_manager","account.coda.import","model_account_coda_import","account.group_account_manager",1,1,1,1
+"access_account_coda_import_user","account.coda","model_account_coda","account.group_account_user",1,0,0,0

From 93d70319d698b008da53bd79499513ef4bd301cb Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 22 Jun 2010 17:44:41 +0530
Subject: [PATCH 12/22] [IMP] Stock_location: Rename the file

bzr revid: sbh@tinyerp.com-20100622121441-oam867wwjp75vrqg
---
 addons/stock_location/__init__.py                               | 2 +-
 addons/stock_location/__openerp__.py                            | 2 +-
 addons/stock_location/{stock.py => stock_location.py}           | 0
 .../stock_location/{stock_view.xml => stock_location_view.xml}  | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename addons/stock_location/{stock.py => stock_location.py} (100%)
 rename addons/stock_location/{stock_view.xml => stock_location_view.xml} (100%)

diff --git a/addons/stock_location/__init__.py b/addons/stock_location/__init__.py
index 7a3970f9f44..08f3f214ba0 100644
--- a/addons/stock_location/__init__.py
+++ b/addons/stock_location/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import stock
+import stock_location
 import mrp_pull
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index 8c58fcc2c13..96e5bfe41ba 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -39,7 +39,7 @@ This module may be useful for different purposes:
     'author': 'Tiny',
     'depends': ['procurement','stock'],
     'init_xml': [],
-    'update_xml': ['stock_view.xml', 'security/ir.model.access.csv', 'mrp_pull_workflow.xml'],
+    'update_xml': ['stock_location_view.xml', 'security/ir.model.access.csv', 'mrp_pull_workflow.xml'],
     'demo_xml': [],
     'installable': True,
     'test':[
diff --git a/addons/stock_location/stock.py b/addons/stock_location/stock_location.py
similarity index 100%
rename from addons/stock_location/stock.py
rename to addons/stock_location/stock_location.py
diff --git a/addons/stock_location/stock_view.xml b/addons/stock_location/stock_location_view.xml
similarity index 100%
rename from addons/stock_location/stock_view.xml
rename to addons/stock_location/stock_location_view.xml

From 68be6643ee04312ed59ea832af620008e407ecdc Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 22 Jun 2010 18:16:49 +0530
Subject: [PATCH 13/22] [IMP] product: add the access rule in missing object

bzr revid: sbh@tinyerp.com-20100622124649-adoptz0pdbmssjwt
---
 addons/product/security/ir.model.access.csv | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/product/security/ir.model.access.csv b/addons/product/security/ir.model.access.csv
index f1c24509ac9..1c66711a122 100644
--- a/addons/product/security/ir.model.access.csv
+++ b/addons/product/security/ir.model.access.csv
@@ -28,4 +28,5 @@
 "access_product_pricelist_item_user","product.pricelist.item.user","model_product_pricelist_item","base.group_user",1,0,0,0
 "access_product_pricelist_type_partner_manager","product.pricelist.type partner manager","model_product_pricelist_type","base.group_partner_manager",1,0,0,0
 "access_product_pricelist_partner_manager","product.pricelist partner manager","model_product_pricelist","base.group_partner_manager",1,0,0,0
-"access_ir_property_group_product_manager","ir_property group_product_manager","base.model_ir_property",product.group_product_manager,1,1,1,1
+"access_ir_property_group_product_manager","ir_property group_product_manager","base.model_ir_property","product.group_product_manager",1,1,1,1
+"access_product_price_list","product.price_list","model_product_price_list","base.group_user",1,0,0,0

From fc46dc75d163d57d205732197a910d04d6aa869e Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 22 Jun 2010 18:28:41 +0530
Subject: [PATCH 14/22] stock: Remove the duplicate action for report

bzr revid: sbh@tinyerp.com-20100622125841-jq32zx6g6xfgn3gp
---
 addons/stock/stock_report.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/stock/stock_report.xml b/addons/stock/stock_report.xml
index 417eaa7694e..3084e8527a7 100644
--- a/addons/stock/stock_report.xml
+++ b/addons/stock/stock_report.xml
@@ -3,7 +3,6 @@
     <data>
         <report auto="False" id="report_product_history" model="product.product" name="stock.product.history" string="Future Stock Forecast"/>
         <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Picking list" rml="stock/report/picking.rml"/>
-        <report id="report_packing_list" model="stock.picking" name="stock.packing.list2" string="Packing list" rml="stock/report/packing.rml"/>
         <report id="report_move_labels" model="stock.move" name="stock.move.label" string="Item Labels" xml="stock/report/lot_move_label.xml" xsl="stock/report/lot_move_label.xsl"/>
         <report auto="False"  id="report_location_overview" model="stock.location" name="lot.stock.overview" string="Location Overview" rml="stock/report/lot_overview.rml" groups="base.group_extended"/>
         <report auto="False" id="report_lot_location" model="stock.location" name="lot.location" rml="stock/report/lot_location.rml" string="Lots by location"/>

From e705a201ae0cf73fa425c7634c89873b69fa656a Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 23 Jun 2010 11:35:16 +0530
Subject: [PATCH 15/22] [Fix] sale : remove the security rule remove object

bzr revid: sbh@tinyerp.com-20100623060516-8o8jme4ldyhgzl3d
---
 addons/sale/security/ir.model.access.csv | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index f412826cf44..a1b2b31b73b 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -27,7 +27,3 @@
 "access_sale_account_journal","account.journal sale order.user","account.model_account_journal","group_sale_user",1,0,0,0
 "access_sale_make_invoice_user","sale.make.invoice","model_sale_make_invoice","group_sale_user",1,0,0,0
 "access_sale_make_invoice_manager","sale.make.invoice","model_sale_make_invoice","group_sale_manager",1,1,1,1
-"access_sale_order_by_clients_user","sale.order.by.clients","model_sale_order_by_clients","group_sale_user",1,0,0,0
-"access_sale_order_by_clients_manager","sale.order.by.clients","model_sale_order_by_clients","group_sale_manager",1,1,1,1
-"access_sales_by_regions_user ","sales.by.regions","model_sales_by_regions","group_sale_user",1,0,0,0
-"access_sales_by_regions_manager","sales.by.regions","model_sales_by_regions","group_sale_manager",1,1,1,1

From 9cbea50d858336ee5ddc2be029ba9d1aae7b9359 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 23 Jun 2010 12:30:51 +0530
Subject: [PATCH 16/22] [IMP] account_coda: improve the search view, add
 default user_id

bzr revid: sbh@tinyerp.com-20100623070051-02axueb8ml7al0in
---
 addons/account_coda/account_coda_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml
index 50540e31e65..1b3dc1b3eb4 100644
--- a/addons/account_coda/account_coda_view.xml
+++ b/addons/account_coda/account_coda_view.xml
@@ -52,7 +52,7 @@
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
-                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                         <separator orientation="vertical"/>
                         <filter string="User" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                     </group>
@@ -66,6 +66,7 @@
 		<field name="res_model">account.coda</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
+        <field name="context">{"search_default_user_id":uid}</field>		
 		<field name="search_view_id" ref="view_aaccount_coda_filter"/>
 	</record>
 

From ddc4ae0eb9cdb5607c70cc03dd7ae5525c27e128 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 23 Jun 2010 12:45:34 +0530
Subject: [PATCH 17/22] [IMP] account_coda: improve the view set height and
 width, imporve the messgae

bzr revid: sbh@tinyerp.com-20100623071534-82y9zv1oxcdmtd16
---
 addons/account_coda/account_coda_view.xml      |  2 +-
 .../wizard/account_coda_import.xml             | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml
index 1b3dc1b3eb4..0eb15a7674e 100644
--- a/addons/account_coda/account_coda_view.xml
+++ b/addons/account_coda/account_coda_view.xml
@@ -74,7 +74,7 @@
 	
 	<menuitem name="Coda Statements" parent="menu_account_coda" id="menu_account_coda_statement" action="action_account_coda" sequence="15"/>
 
-	<menuitem name="Import Coda Statements" action="action_account_coda_import" parent="menu_account_coda"
+	<menuitem name="Coda Statements" action="action_account_coda_import" parent="menu_account_coda"
 	 id="menu_account_coda_import" sequence="13"/>
 
 	<act_window name="Coda File"
diff --git a/addons/account_coda/wizard/account_coda_import.xml b/addons/account_coda/wizard/account_coda_import.xml
index 9b29e849994..e382f5adf03 100644
--- a/addons/account_coda/wizard/account_coda_import.xml
+++ b/addons/account_coda/wizard/account_coda_import.xml
@@ -7,7 +7,7 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
 				<form string="Import Coda Statement">
-				<separator colspan="4" string="Select Your Bank journal :" />
+				<separator colspan="4" string="Configure Your Bank journal :" />
 				    <field name="journal_id" colspan="1" domain="[('type','=','cash')]" />
 				    <newline />
 				    <field name="def_payable" />
@@ -21,7 +21,7 @@
 					<group colspan="4" col="6">
                        	<separator colspan="6"/>
      					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-               			<button name="coda_parsing" string="Ok" type="object" icon="gtk-apply"/>
+               			<button name="coda_parsing" string="Import" type="object" icon="gtk-ok"/>
  					</group>				    
 				</form>
 			</field>
@@ -33,12 +33,14 @@
 	         <field name="type">form</field>
 	         <field name="arch" type="xml">
 				<form string="Import Coda Statement">
-					<separator colspan="4" string="Results :" />
-			    	<field name="note" colspan="4" nolabel="1" width="500"/>
-			    	<newline/>
-					<separator colspan="6"/>
-					<button special="cancel" string="Close" icon="gtk-cancel"/>
-					<button name="action_open_window" string="Open Statement" type="object" icon="gtk-apply"/>		    	
+					<group width="500" height="420">
+						<separator colspan="4" string="Results :" />
+				    	<field name="note" colspan="4" nolabel="1" width="500"/>
+				    	<newline/>
+						<separator colspan="6"/>
+						<button special="cancel" string="Close" icon="gtk-cancel"/>
+						<button name="action_open_window" string="Open Statements" type="object" icon="gtk-apply"/>
+					</group>		    	
 		    	</form>
 	    	</field>
 	   	</record>

From d0e7a291e858c50526f478edee941a724c21bd9d Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 23 Jun 2010 12:49:45 +0530
Subject: [PATCH 18/22] [IMP] account_coda:Change the string name on view

bzr revid: sbh@tinyerp.com-20100623071945-uv7qg2g5gt97c367
---
 addons/account_coda/wizard/account_coda_import.py  | 3 ++-
 addons/account_coda/wizard/account_coda_import.xml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/account_coda/wizard/account_coda_import.py b/addons/account_coda/wizard/account_coda_import.py
index b5331eacf45..aa7ee66e88b 100644
--- a/addons/account_coda/wizard/account_coda_import.py
+++ b/addons/account_coda/wizard/account_coda_import.py
@@ -287,5 +287,6 @@ class account_coda_import(osv.osv_memory):
             'view_id': False,
             'type': 'ir.actions.act_window',
         }
+account_coda_import()
 
-account_coda_import()
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_coda/wizard/account_coda_import.xml b/addons/account_coda/wizard/account_coda_import.xml
index e382f5adf03..47560d4cf0c 100644
--- a/addons/account_coda/wizard/account_coda_import.xml
+++ b/addons/account_coda/wizard/account_coda_import.xml
@@ -32,7 +32,7 @@
 	         <field name="model">account.coda.import</field>
 	         <field name="type">form</field>
 	         <field name="arch" type="xml">
-				<form string="Import Coda Statement">
+				<form string="Result of Imported Coda Statements">
 					<group width="500" height="420">
 						<separator colspan="4" string="Results :" />
 				    	<field name="note" colspan="4" nolabel="1" width="500"/>

From 410a1b0e7b9ee87b4233675104b68c8e277dd7e0 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 23 Jun 2010 13:02:30 +0530
Subject: [PATCH 19/22] [IMP] account_coda: Add the tooltips on some field

bzr revid: sbh@tinyerp.com-20100623073230-9oj9r2d2v1cej0pf
---
 addons/account_coda/account_coda.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account_coda/account_coda.py b/addons/account_coda/account_coda.py
index a9321b43906..dfc7a37c8ad 100644
--- a/addons/account_coda/account_coda.py
+++ b/addons/account_coda/account_coda.py
@@ -26,11 +26,11 @@ class account_coda(osv.osv):
     _name = "account.coda"
     _description = "coda for an Account"
     _columns = {
-        'name': fields.binary('Coda file', readonly=True),
+        'name': fields.binary('Coda file', readonly=True ,help="Store the detail of  bank statements"),
         'statement_ids': fields.one2many('account.bank.statement','coda_id','Generated Bank Statements', readonly=True),
         'note': fields.text('Import log', readonly=True),
-        'journal_id': fields.many2one('account.journal','Bank Journal', readonly=True, select=True),
-        'date': fields.date('Import Date', readonly=True, select=True),
+        'journal_id': fields.many2one('account.journal','Journal', readonly=True, select=True,help="Bank Journal"),
+        'date': fields.date('Date', readonly=True, select=True, help="Import Date"),
         'user_id': fields.many2one('res.users','User', readonly=True, select=True),
     }
     _defaults = {

From 3b490a9223006ec0eec0d3133b902f31bc453858 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 23 Jun 2010 13:18:35 +0530
Subject: [PATCH 20/22] [IMP] account_coda: Change the import statement

bzr revid: sbh@tinyerp.com-20100623074835-14l0dhpeiljwvsll
---
 addons/account_coda/wizard/account_coda_import.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/addons/account_coda/wizard/account_coda_import.py b/addons/account_coda/wizard/account_coda_import.py
index aa7ee66e88b..c81ae1e5156 100644
--- a/addons/account_coda/wizard/account_coda_import.py
+++ b/addons/account_coda/wizard/account_coda_import.py
@@ -20,13 +20,17 @@
 #
 ##############################################################################
 
-import netsvc
-from osv import osv,fields
-from tools.translate import _
-from mx import DateTime
 import time
+from mx import DateTime
 import base64
 
+from osv import fields
+from osv import osv
+from tools.translate import _
+
+
+
+
 def str2date(date_str):
     return time.strftime("%y/%m/%d",time.strptime(date_str,"%d%m%y"))
 

From dddbd426f045453210cd29855a814ccf4819cae4 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 23 Jun 2010 13:21:00 +0530
Subject: [PATCH 21/22] [IMP] account_coda: Improve the code

bzr revid: sbh@tinyerp.com-20100623075100-s7acd8n18huo35dr
---
 addons/account_coda/account_coda.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_coda/account_coda.py b/addons/account_coda/account_coda.py
index dfc7a37c8ad..1cfd75ffb63 100644
--- a/addons/account_coda/account_coda.py
+++ b/addons/account_coda/account_coda.py
@@ -34,7 +34,7 @@ class account_coda(osv.osv):
         'user_id': fields.many2one('res.users','User', readonly=True, select=True),
     }
     _defaults = {
-        'date': lambda *a: time.strftime('%Y-%m-%d'),
+        'date': time.strftime('%Y-%m-%d'),
         'user_id': lambda self,cr,uid,context: uid,
     }
 account_coda()

From 59f9649ba1c3e7053ca73d72b1efedfba62ab1ff Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 23 Jun 2010 14:07:15 +0530
Subject: [PATCH 22/22] [IMP] account_coda: Improve the message

bzr revid: sbh@tinyerp.com-20100623083715-bfkqucglducnts96
---
 addons/account_coda/account_coda_view.xml          | 4 ++--
 addons/account_coda/wizard/account_coda_import.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml
index 0eb15a7674e..7008f13067b 100644
--- a/addons/account_coda/account_coda_view.xml
+++ b/addons/account_coda/account_coda_view.xml
@@ -61,7 +61,7 @@
         </record>
 
 	<record model="ir.actions.act_window" id="action_account_coda">
-		<field name="name">Coda import</field>
+		<field name="name">Coda Statements</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="res_model">account.coda</field>
 		<field name="view_type">form</field>
@@ -74,7 +74,7 @@
 	
 	<menuitem name="Coda Statements" parent="menu_account_coda" id="menu_account_coda_statement" action="action_account_coda" sequence="15"/>
 
-	<menuitem name="Coda Statements" action="action_account_coda_import" parent="menu_account_coda"
+	<menuitem name="Import Coda Statements" action="action_account_coda_import" parent="menu_account_coda"
 	 id="menu_account_coda_import" sequence="13"/>
 
 	<act_window name="Coda File"
diff --git a/addons/account_coda/wizard/account_coda_import.xml b/addons/account_coda/wizard/account_coda_import.xml
index 47560d4cf0c..f344221c411 100644
--- a/addons/account_coda/wizard/account_coda_import.xml
+++ b/addons/account_coda/wizard/account_coda_import.xml
@@ -7,7 +7,7 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
 				<form string="Import Coda Statement">
-				<separator colspan="4" string="Configure Your Bank journal :" />
+				<separator colspan="4" string="Configure Your Journal and Account :" />
 				    <field name="journal_id" colspan="1" domain="[('type','=','cash')]" />
 				    <newline />
 				    <field name="def_payable" />