From f2087d57f3ca135493aeb89f180b939b2a607f29 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Wed, 23 Sep 2009 14:42:19 +0530
Subject: [PATCH 001/200] [IMP]quality_integration_server: quality log : add
 new option to specify qualitylog path to store html pages of log

bzr revid: hmo@tinyerp.com-20090923091219-owu6zi4jio20xt1f
---
 .../base_quality_interrogation.py             | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/bin/addons/quality_integration_server/base_quality_interrogation.py b/bin/addons/quality_integration_server/base_quality_interrogation.py
index f4e84f5194a..3f3010350f3 100755
--- a/bin/addons/quality_integration_server/base_quality_interrogation.py
+++ b/bin/addons/quality_integration_server/base_quality_interrogation.py
@@ -101,8 +101,9 @@ def import_translate(uri, user, pwd, dbname, translate_in):
                     state = res['state']                    
                 
         
-def check_quality(uri, user, pwd, dbname, modules):       
+def check_quality(uri, user, pwd, dbname, modules, quality_logs):       
     uid = login(uri, dbname, user, pwd)
+    quality_logs += 'quality-logs'
     if uid:
         conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/object')
         final = {}   
@@ -111,7 +112,7 @@ def check_quality(uri, user, pwd, dbname, modules):
             test_detail = {}              
             quality_result = execute(conn,'execute', dbname, uid, pwd,'module.quality.check','check_quality',module)
             detail_html = ''
-            html = '''<html><html><html><html><body><a name="TOP"></a>'''
+            html = '''<html><body><a name="TOP"></a>'''
             html +="<h1> Module : %s </h1>"%(quality_result['name'])   
             html += "<h2> Final score : %s</h2>"%(quality_result['final_score'])
             html += "<div id='tabs'>"
@@ -126,15 +127,21 @@ def check_quality(uri, user, pwd, dbname, modules):
                         detail['detail'] = '''<html><body><b>%s</b></body></html>'''%(detail.get('summary',''))
                 detail_html +="<div id=\"%s\"><h3>%s (Score : %s)</h3>%s</div>"%(test.replace(' ','-'),test,score,detail.get('detail',''))                
                 test_detail[test] = (score,msg,detail.get('detail',''))
-            html += "</ul>%s</body></html></html></html></html></html>"%(detail_html)
-            html += "</div>"
-            final[quality_result['name']] = (quality_result['final_score'],html,test_detail)
+            html += "</ul>"
+            html += "%s"%(detail_html)
+            html += "</div></body></html>"
+            if not os.path.isdir(quality_logs):
+                os.mkdir(quality_logs)
+            fp = open('%s/%s.html'%(quality_logs,module),'wb')
+            fp.write(str(html))
+            fp.close()
+            #final[quality_result['name']] = (quality_result['final_score'],html,test_detail)
 
-        fp = open('quality_log.pck','wb')
-        pck_obj = pickle.dump(final,fp)
-        fp.close()
-        print "LOG PATH%s"%(os.path.realpath('quality_log.pck'))
-        return final
+        #fp = open('quality_log.pck','wb')
+        #pck_obj = pickle.dump(final,fp)
+        #fp.close()
+        #print "LOG PATH%s"%(os.path.realpath('quality_log.pck'))
+        return True
     else:
         print 'Login Failed...'        
         clean()
@@ -273,6 +280,7 @@ parser = optparse.OptionParser(usage)
 parser.add_option("--modules", dest="modules",
                      help="specify modules to install or check quality")
 parser.add_option("--addons-path", dest="addons_path", help="specify the addons path")
+parser.add_option("--quality-logs", dest="quality_logs", help="specify the path of quality logs files which has to stores")
 parser.add_option("--root-path", dest="root_path", help="specify the root path")
 parser.add_option("-p", "--port", dest="port", help="specify the TCP port", type="int")
 parser.add_option("-d", "--database", dest="db_name", help="specify the database name")  
@@ -303,6 +311,7 @@ die(opt.translate_in and (not opt.db_name),
 
 options = {
     'addons-path' : opt.addons_path or 'addons',
+    'quality-logs' : opt.quality_logs or '',
     'root-path' : opt.root_path or '',
     'translate-in': [],
     'port' : opt.port or 8069,        
@@ -337,7 +346,7 @@ try:
     if command == 'upgrade-module': 
         upgrade_module(uri, options['database'], options['modules'], options['login'], options['pwd'])
     if command == 'check-quality':
-        check_quality(uri, options['login'], options['pwd'], options['database'], options['modules'])
+        check_quality(uri, options['login'], options['pwd'], options['database'], options['modules'], options['quality-logs'])
     if command == 'install-translation':        
         import_translate(uri, options['login'], options['pwd'], options['database'], options['translate-in'])
     clean()

From 244de09ee563f0e72fa6330c71f316415bb690ad Mon Sep 17 00:00:00 2001
From: "uco(OpenERP)" <>
Date: Thu, 24 Sep 2009 19:52:27 +0530
Subject: [PATCH 002/200] [FIX] Update Module : Float8 to float and numeric to
 float casting made possible

lp bug: https://launchpad.net/bugs/433886 fixed

bzr revid: jvo@tinyerp.com-20090924142227-qbx2y0a56r6d263n
---
 bin/osv/orm.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index cf215adf12e..812c5de3791 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1786,6 +1786,8 @@ class orm(orm_template):
                                 ('varchar', 'text', 'TEXT', ''),
                                 ('int4', 'float', get_pg_type(f)[1], '::'+get_pg_type(f)[1]),
                                 ('date', 'datetime', 'TIMESTAMP', '::TIMESTAMP'),
+                                ('numeric', 'float', get_pg_type(f)[1], '::'+get_pg_type(f)[1]),
+                                ('float8', 'float', get_pg_type(f)[1], '::'+get_pg_type(f)[1]),
                             ]
                             # !!! Avoid reduction of varchar field !!!
                             if f_pg_type == 'varchar' and f._type == 'char' and f_pg_size < f.size:
@@ -1798,13 +1800,15 @@ class orm(orm_template):
                                 cr.commit()
                             for c in casts:
                                 if (f_pg_type==c[0]) and (f._type==c[1]):
-                                    logger.notifyChannel('orm', netsvc.LOG_INFO, "column '%s' in table '%s' changed type to %s." % (k, self._table, c[1]))
-                                    ok = True
-                                    cr.execute('ALTER TABLE "%s" RENAME COLUMN "%s" TO temp_change_size' % (self._table, k))
-                                    cr.execute('ALTER TABLE "%s" ADD COLUMN "%s" %s' % (self._table, k, c[2]))
-                                    cr.execute(('UPDATE "%s" SET "%s"=temp_change_size'+c[3]) % (self._table, k))
-                                    cr.execute('ALTER TABLE "%s" DROP COLUMN temp_change_size CASCADE' % (self._table,))
-                                    cr.commit()
+                                    if f_pg_type != f_obj_type:
+                                        logger.notifyChannel('orm', netsvc.LOG_INFO, "column '%s' in table '%s' changed type to %s." % (k, self._table, c[1]))
+                                        ok = True
+                                        cr.execute('ALTER TABLE "%s" RENAME COLUMN "%s" TO temp_change_size' % (self._table, k))
+                                        cr.execute('ALTER TABLE "%s" ADD COLUMN "%s" %s' % (self._table, k, c[2]))
+                                        cr.execute(('UPDATE "%s" SET "%s"=temp_change_size'+c[3]) % (self._table, k))
+                                        cr.execute('ALTER TABLE "%s" DROP COLUMN temp_change_size CASCADE' % (self._table,))
+                                        cr.commit()
+                                    break
 
                             if f_pg_type != f_obj_type:
                                 if not ok:

From 369755e92a0f235901f13d114171839b2a379100 Mon Sep 17 00:00:00 2001
From: nch-openerp <>
Date: Fri, 25 Sep 2009 13:10:13 +0530
Subject: [PATCH 003/200] [FIX]quality_integration_server: ascci encoding
 problem in quality html log

bzr revid: hmo@tinyerp.com-20090925074013-dsnxc54vo7t7payg
---
 .../base_quality_interrogation.py                  | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/bin/addons/quality_integration_server/base_quality_interrogation.py b/bin/addons/quality_integration_server/base_quality_interrogation.py
index 3f3010350f3..aae89368a8f 100755
--- a/bin/addons/quality_integration_server/base_quality_interrogation.py
+++ b/bin/addons/quality_integration_server/base_quality_interrogation.py
@@ -37,6 +37,18 @@ waittime = 10
 wait_count = 0
 wait_limit = 12
 
+def to_decode(s):
+    try:
+        return s.encode('utf-8')
+    except UnicodeError:
+        try:
+            return s.encode('latin')
+        except UnicodeError:
+            try:
+                return s.decode('ascii')
+            except UnicodeError:
+                return s
+
 def start_server(root_path, port, addons_path):    
     os.system('python2.5 %sopenerp-server.py  --pidfile=openerp.pid  --port=%s --no-netrpc --addons-path=%s' %(root_path, str(port), addons_path))    
 def clean():
@@ -133,7 +145,7 @@ def check_quality(uri, user, pwd, dbname, modules, quality_logs):
             if not os.path.isdir(quality_logs):
                 os.mkdir(quality_logs)
             fp = open('%s/%s.html'%(quality_logs,module),'wb')
-            fp.write(str(html))
+            fp.write(to_decode(html))
             fp.close()
             #final[quality_result['name']] = (quality_result['final_score'],html,test_detail)
 

From a5d33505a8864949d73ad8200be86d5b291a4033 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Tue, 29 Sep 2009 18:09:23 +0530
Subject: [PATCH 004/200] [FIX] Export Translation : Warning on Non-existing
 record instead of breaking flow

lp bug: https://launchpad.net/bugs/437729 fixed

bzr revid: jvo@tinyerp.com-20090929123923-yw60232e0sgu5nbp
---
 bin/tools/translate.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/tools/translate.py b/bin/tools/translate.py
index 51966b992bc..62f48aaa3c6 100644
--- a/bin/tools/translate.py
+++ b/bin/tools/translate.py
@@ -424,14 +424,14 @@ def trans_generate(lang, modules, dbname=None):
         xml_name = "%s.%s" % (module, encode(xml_name))
 
         if not pool.get(model):
-            logger.notifyChannel("db", netsvc.LOG_ERROR, "unable to find object %r" % (model,))
+            logger.notifyChannel("db", netsvc.LOG_ERROR, "Unable to find object %r" % (model,))
             continue
         
-        try:
-            obj = pool.get(model).browse(cr, uid, res_id)
-        except BrowseRecordError:
-            logger.notifyChannel("db", netsvc.LOG_ERROR, "unable to find object %r with id %d" % (model, res_id))
+        exists = pool.get(model).exists(cr, uid, res_id)
+        if not exists:
+            logger.notifyChannel("db", netsvc.LOG_WARNING, "Unable to find object %r with id %d" % (model, res_id))
             continue
+        obj = pool.get(model).browse(cr, uid, res_id)
 
         if model=='ir.ui.view':
             d = xml.dom.minidom.parseString(encode(obj.arch))

From 92df67814c628cb475ebd5fd4921c4bed570f31b Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Wed, 30 Sep 2009 12:24:19 +0530
Subject: [PATCH 005/200] [IMP] base_quality_interrrogation: put message if the
 score of quality less then minimal and remove unit test condition

bzr revid: mra@tinyerp.com-20090930065419-23hlpso95d35z810
---
 .../base_quality_interrogation.py             | 165 +++++++++---------
 1 file changed, 81 insertions(+), 84 deletions(-)

diff --git a/bin/addons/quality_integration_server/base_quality_interrogation.py b/bin/addons/quality_integration_server/base_quality_interrogation.py
index aae89368a8f..ca9bbddc593 100755
--- a/bin/addons/quality_integration_server/base_quality_interrogation.py
+++ b/bin/addons/quality_integration_server/base_quality_interrogation.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution    
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -49,24 +49,24 @@ def to_decode(s):
             except UnicodeError:
                 return s
 
-def start_server(root_path, port, addons_path):    
-    os.system('python2.5 %sopenerp-server.py  --pidfile=openerp.pid  --port=%s --no-netrpc --addons-path=%s' %(root_path, str(port), addons_path))    
+def start_server(root_path, port, addons_path):
+    os.system('python2.5 %sopenerp-server.py  --pidfile=openerp.pid  --port=%s --no-netrpc --addons-path=%s' %(root_path, str(port), addons_path))
 def clean():
     if os.path.isfile('openerp.pid'):
-        ps = open('openerp.pid') 
+        ps = open('openerp.pid')
         if ps:
             pid = int(ps.read())
-            ps.close()  
-            if pid:    
+            ps.close()
+            if pid:
                 os.kill(pid,9)
 
 def execute(connector, method, *args):
-    global wait_count 
+    global wait_count
     res = False
-    try:        
+    try:
         res = getattr(connector,method)(*args)
-    except socket.error,e:        
-        if e.args[0] == 111:                                   
+    except socket.error,e:
+        if e.args[0] == 111:
             if wait_count > wait_limit:
                 print "Server is taking too long to start, it has exceeded the maximum limit of %d seconds."%(wait_limit)
                 clean()
@@ -78,23 +78,23 @@ def execute(connector, method, *args):
         else:
             raise e
     wait_count = 0
-    return res                    
+    return res
 
 def login(uri, dbname, user, pwd):
     conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/common')
-    uid = execute(conn,'login',dbname, user, pwd) 
+    uid = execute(conn,'login',dbname, user, pwd)
     return uid
 
-def import_translate(uri, user, pwd, dbname, translate_in):      
-    uid = login(uri, dbname, user, pwd)    
-    if uid:        
+def import_translate(uri, user, pwd, dbname, translate_in):
+    uid = login(uri, dbname, user, pwd)
+    if uid:
         conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/wizard')
         wiz_id = execute(conn,'create',dbname, uid, pwd, 'module.lang.import')
         for trans_in in translate_in:
-            lang,ext = os.path.splitext(trans_in.split('/')[-1])                
-            state = 'init'  
+            lang,ext = os.path.splitext(trans_in.split('/')[-1])
+            state = 'init'
             datas = {'form':{}}
-            while state!='end':                
+            while state!='end':
                 res = execute(conn,'execute',dbname, uid, pwd, wiz_id, datas, state, {})
                 if 'datas' in res:
                     datas['form'].update( res['datas'].get('form',{}) )
@@ -110,34 +110,31 @@ def import_translate(uri, user, pwd, dbname, translate_in):
                     })
                     trans_obj.close()
                 elif res['type']=='action':
-                    state = res['state']                    
-                
-        
-def check_quality(uri, user, pwd, dbname, modules, quality_logs):       
+                    state = res['state']
+
+
+def check_quality(uri, user, pwd, dbname, modules, quality_logs):
     uid = login(uri, dbname, user, pwd)
     quality_logs += 'quality-logs'
     if uid:
         conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/object')
-        final = {}   
-        for module in modules:   
+        final = {}
+        for module in modules:
             qualityresult = {}
-            test_detail = {}              
+            test_detail = {}
             quality_result = execute(conn,'execute', dbname, uid, pwd,'module.quality.check','check_quality',module)
             detail_html = ''
             html = '''<html><body><a name="TOP"></a>'''
-            html +="<h1> Module : %s </h1>"%(quality_result['name'])   
-            html += "<h2> Final score : %s</h2>"%(quality_result['final_score'])
+            html +="<h1> Module: %s </h1>"%(quality_result['name'])
+            html += "<h2> Final score: %s</h2>"%(quality_result['final_score'])
             html += "<div id='tabs'>"
             html += "<ul>"
-            for x,y,detail in quality_result['check_detail_ids']:                
+            for x,y,detail in quality_result['check_detail_ids']:
                 test = detail.get('name')
                 msg = detail.get('message','')
                 score = round(float(detail.get('score',0)),2)
                 html += "<li><a href=\"#%s\">%s</a></li>"%(test.replace(' ','-'),test)
-                if test == 'Unit Test':
-                    if not detail.get('detail',''):
-                        detail['detail'] = '''<html><body><b>%s</b></body></html>'''%(detail.get('summary',''))
-                detail_html +="<div id=\"%s\"><h3>%s (Score : %s)</h3>%s</div>"%(test.replace(' ','-'),test,score,detail.get('detail',''))                
+                detail_html +='''<div id=\"%s\"><h3>%s (Score : %s)</h3><font color=red><h5>%s</h5></font>%s</div>'''%(test.replace(' ', '-'), test, score, msg, detail.get('detail', ''))
                 test_detail[test] = (score,msg,detail.get('detail',''))
             html += "</ul>"
             html += "%s"%(detail_html)
@@ -155,9 +152,9 @@ def check_quality(uri, user, pwd, dbname, modules, quality_logs):
         #print "LOG PATH%s"%(os.path.realpath('quality_log.pck'))
         return True
     else:
-        print 'Login Failed...'        
+        print 'Login Failed...'
         clean()
-        sys.exit(1)     
+        sys.exit(1)
 
 
 
@@ -176,25 +173,25 @@ def create_db(uri, dbname, user='admin', pwd='admin', lang='en_US'):
     login_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/common')
     db_list = execute(conn, 'list')
     if dbname not in db_list:
-        id = execute(conn,'create',admin_passwd, dbname, True, lang) 
+        id = execute(conn,'create',admin_passwd, dbname, True, lang)
         wait(id,uri)
-    uid = login_conn.login(dbname, user, pwd)   
+    uid = login_conn.login(dbname, user, pwd)
 
     wiz_id = execute(wiz_conn,'create', dbname, uid, user, 'base_setup.base_setup')
 
     state = 'init'
     datas = {'form':{}}
 
-    while state!='config':        
+    while state!='config':
         res = execute(wiz_conn, 'execute', dbname, uid, pwd, wiz_id, datas, state, {})
         if state=='init':
             datas['form'].update( res['datas'] )
         if res['type']=='form':
-            for field in res['fields'].keys():               
+            for field in res['fields'].keys():
                 datas['form'][field] = datas['form'].get(field,False)
             state = res['state'][-1][0]
             datas['form'].update({
-                'profile': -1                
+                'profile': -1
             })
         elif res['type']=='state':
             state = res['state']
@@ -206,71 +203,71 @@ def drop_db(uri, dbname):
     conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/db')
     db_list = execute(conn,'list')
     if dbname in db_list:
-        execute(conn, 'drop', admin_passwd, dbname)    
+        execute(conn, 'drop', admin_passwd, dbname)
     return True
-    
+
 def make_links(uri, uid, dbname, source, destination, module, user, pwd):
     if module in ('base','quality_integration_server'):
-        return True  
-    if not os.path.islink(destination + '/' + module): 
-        if not os.path.isdir(destination + '/' + module):    
+        return True
+    if not os.path.islink(destination + '/' + module):
+        if not os.path.isdir(destination + '/' + module):
             for path in source:
                 if os.path.isdir(path + '/' + module):
                     os.symlink(path + '/' + module, destination + '/' + module)
                     obj_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/object')
                     execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'update_list')
                     module_ids = execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'search', [('name','=',module)])
-                    if len(module_ids):    
+                    if len(module_ids):
                         data = execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'read', module_ids[0],['name','dependencies_id'])
                         dep_datas = execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module.dependency', 'read', data['dependencies_id'],['name'])
-                        for dep_data in dep_datas:    
+                        for dep_data in dep_datas:
                             make_links(uri, uid, dbname, source, destination, dep_data['name'], user, pwd)
-                    return True    
-    return False    
+                    return True
+    return False
 
 def install_module(uri, dbname, modules, addons='', extra_addons='',  user='admin', pwd='admin'):
     uid = login(uri, dbname, user, pwd)
     if extra_addons:
         extra_addons = extra_addons.split(',')
-    if uid: 
+    if uid:
         if addons and extra_addons:
-            for module in modules:  
-                make_links(uri, uid, dbname, extra_addons, addons, module, user, pwd) 
+            for module in modules:
+                make_links(uri, uid, dbname, extra_addons, addons, module, user, pwd)
 
         obj_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/object')
         wizard_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/wizard')
         module_ids = execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'search', [('name','in',modules)])
-        execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'button_install', module_ids)           
+        execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'button_install', module_ids)
         wiz_id = execute(wizard_conn, 'create', dbname, uid, pwd, 'module.upgrade.simple')
         state = 'init'
         datas = {}
         #while state!='menu':
-        while state!='end':                
-            res = execute(wizard_conn, 'execute', dbname, uid, pwd, wiz_id, datas, state, {})                
+        while state!='end':
+            res = execute(wizard_conn, 'execute', dbname, uid, pwd, wiz_id, datas, state, {})
             if state == 'init':
                 state = 'start'
             elif state == 'start':
-                state = 'end'                                  
+                state = 'end'
     return True
 
 def upgrade_module(uri, dbname, modules, user='admin', pwd='admin'):
     uid = login(uri, dbname, user, pwd)
-    if uid: 
+    if uid:
         obj_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/object')
-        wizard_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/wizard')        
-        module_ids = execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'search', [('name','in',modules)])  
-        execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'button_upgrade', module_ids)           
+        wizard_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/wizard')
+        module_ids = execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'search', [('name','in',modules)])
+        execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'button_upgrade', module_ids)
         wiz_id = execute(wizard_conn, 'create', dbname, uid, pwd, 'module.upgrade.simple')
         state = 'init'
         datas = {}
         #while state!='menu':
-        while state!='end':                
-            res = execute(wizard_conn, 'execute', dbname, uid, pwd, wiz_id, datas, state, {})                
+        while state!='end':
+            res = execute(wizard_conn, 'execute', dbname, uid, pwd, wiz_id, datas, state, {})
             if state == 'init':
                 state = 'start'
             elif state == 'start':
-                state = 'end'                                  
-                            
+                state = 'end'
+
     return True
 
 
@@ -283,21 +280,21 @@ Basic Commands:
     start-server         Start Server
     create-db            Create new database
     drop-db              Drop database
-    install-module       Install module 
+    install-module       Install module
     upgrade-module       Upgrade module
     install-translation  Install translation file
     check-quality        Calculate quality and dump quality result into quality_log.pck using pickle
 """
-parser = optparse.OptionParser(usage)            
+parser = optparse.OptionParser(usage)
 parser.add_option("--modules", dest="modules",
                      help="specify modules to install or check quality")
 parser.add_option("--addons-path", dest="addons_path", help="specify the addons path")
 parser.add_option("--quality-logs", dest="quality_logs", help="specify the path of quality logs files which has to stores")
 parser.add_option("--root-path", dest="root_path", help="specify the root path")
 parser.add_option("-p", "--port", dest="port", help="specify the TCP port", type="int")
-parser.add_option("-d", "--database", dest="db_name", help="specify the database name")  
-parser.add_option("--login", dest="login", help="specify the User Login") 
-parser.add_option("--password", dest="pwd", help="specify the User Password")  
+parser.add_option("-d", "--database", dest="db_name", help="specify the database name")
+parser.add_option("--login", dest="login", help="specify the User Login")
+parser.add_option("--password", dest="pwd", help="specify the User Password")
 parser.add_option("--translate-in", dest="translate_in",
                      help="specify .po files to import translation terms")
 parser.add_option("--extra-addons", dest="extra_addons",
@@ -308,7 +305,7 @@ if len(args) != 1:
     parser.error("incorrect number of arguments")
 command = args[0]
 if command not in ('start-server','create-db','drop-db','install-module','upgrade-module','check-quality','install-translation'):
-    parser.error("incorrect command")    
+    parser.error("incorrect command")
 
 def die(cond, msg):
     if cond:
@@ -326,7 +323,7 @@ options = {
     'quality-logs' : opt.quality_logs or '',
     'root-path' : opt.root_path or '',
     'translate-in': [],
-    'port' : opt.port or 8069,        
+    'port' : opt.port or 8069,
     'database': opt.db_name or 'terp',
     'modules' : opt.modules or [],
     'login' : opt.login or 'admin',
@@ -337,33 +334,33 @@ options = {
 options['modules'] = opt.modules and map(lambda m: m.strip(), opt.modules.split(',')) or []
 # Hint:i18n-import=purchase:ar_AR.po+sale:fr_FR.po,nl_BE.po
 if opt.translate_in:
-    translate = opt.translate_in     
-    for module_name,po_files in map(lambda x:tuple(x.split(':')),translate.split('+')):                          
-        for po_file in po_files.split(','):                   
+    translate = opt.translate_in
+    for module_name,po_files in map(lambda x:tuple(x.split(':')),translate.split('+')):
+        for po_file in po_files.split(','):
             po_link = '%s/%s/i18n/%s'%(options['addons-path'], module_name, po_file)
-            options['translate-in'].append(po_link) 
-           
+            options['translate-in'].append(po_link)
+
 uri = 'http://localhost:' + str(options['port'])
 
 server_thread = threading.Thread(target=start_server,
                 args=(options['root-path'], options['port'], options['addons-path']))
-try:    
-    server_thread.start()       
-    if command == 'create-db': 
+try:
+    server_thread.start()
+    if command == 'create-db':
         create_db(uri, options['database'], options['login'], options['pwd'])
-    if command == 'drop-db': 
+    if command == 'drop-db':
         drop_db(uri, options['database'])
-    if command == 'install-module': 
+    if command == 'install-module':
         install_module(uri, options['database'], options['modules'],options['addons-path'],options['extra-addons'],options['login'], options['pwd'])
-    if command == 'upgrade-module': 
+    if command == 'upgrade-module':
         upgrade_module(uri, options['database'], options['modules'], options['login'], options['pwd'])
     if command == 'check-quality':
         check_quality(uri, options['login'], options['pwd'], options['database'], options['modules'], options['quality-logs'])
-    if command == 'install-translation':        
+    if command == 'install-translation':
         import_translate(uri, options['login'], options['pwd'], options['database'], options['translate-in'])
     clean()
     sys.exit(0)
-    
+
 except xmlrpclib.Fault, e:
     print e.faultString
     clean()
@@ -372,7 +369,7 @@ except Exception, e:
     print e
     clean()
     sys.exit(1)
-    
+
 
 
 

From 22bb413066964ad4a1aafe66da52e8e3a3451e15 Mon Sep 17 00:00:00 2001
From: "uco(Open ERP)" <>
Date: Thu, 1 Oct 2009 16:36:41 +0530
Subject: [PATCH 006/200] [FIX] Allowing sql keywords as fields(don't use them
 in order by clause)

lp bug: https://launchpad.net/bugs/430728 fixed

bzr revid: jvo@tinyerp.com-20091001110641-jks9s9pntnmewvgm
---
 bin/osv/orm.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 812c5de3791..f46788bcf88 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1773,7 +1773,7 @@ class orm(orm_template):
                         f_pg_notnull = f_pg_def['attnotnull']
                         if isinstance(f, fields.function) and not f.store:
                             logger.notifyChannel('orm', netsvc.LOG_INFO, 'column %s (%s) in table %s removed: converted to a function !\n' % (k, f.string, self._table))
-                            cr.execute('ALTER TABLE %s DROP COLUMN %s'% (self._table, k))
+                            cr.execute('ALTER TABLE "%s" DROP COLUMN "%s"'% (self._table, k))
                             cr.commit()
                             f_obj_type = None
                         else:
@@ -1821,7 +1821,7 @@ class orm(orm_template):
                                     default = self._defaults[k](self, cr, 1, {})
                                     if (default is not None):
                                         ss = self._columns[k]._symbol_set
-                                        query = 'UPDATE "%s" SET "%s"=%s WHERE %s is NULL' % (self._table, k, ss[0], k)
+                                        query = 'UPDATE "%s" SET "%s"=%s WHERE "%s" is NULL' % (self._table, k, ss[0], k)
                                         cr.execute(query, (ss[1](default),))
                                 # add the NOT NULL constraint
                                 cr.commit()

From 1b607549a7281cba356e71492737284ff9da15bb Mon Sep 17 00:00:00 2001
From: Christophe Simonis <christophe@tinyerp.com>
Date: Fri, 2 Oct 2009 18:00:07 +0200
Subject: [PATCH 007/200] [IMP] cron: check the arguments to avoid security
 issues [IMP] cron: failed jobs are logged [IMP] cron: clean code

lp bug: https://launchpad.net/bugs/433395 fixed

bzr revid: christophe@tinyerp.com-20091002160007-mw7a55oy0l6bp5xd
---
 bin/addons/base/ir/ir_cron.py | 69 +++++++++++++++++++++--------------
 1 file changed, 42 insertions(+), 27 deletions(-)

diff --git a/bin/addons/base/ir/ir_cron.py b/bin/addons/base/ir/ir_cron.py
index 166a5781d44..0ef23a6c423 100644
--- a/bin/addons/base/ir/ir_cron.py
+++ b/bin/addons/base/ir/ir_cron.py
@@ -27,6 +27,9 @@ import tools
 import pooler
 from osv import fields,osv
 
+def str2tuple(s):
+    return eval('tuple(%s)' % s)
+
 _intervalTypes = {
     'work_days': lambda interval: DateTime.RelativeDateTime(days=interval),
     'days': lambda interval: DateTime.RelativeDateTime(days=interval),
@@ -65,25 +68,39 @@ class ir_cron(osv.osv, netsvc.Agent):
         'doall' : lambda *a: 1
     }
 
+    def _check_args(self, cr, uid, ids, context=None):
+        try:
+            for this in self.browse(cr, uid, ids, context):
+                str2tuple(this.args)
+        except:
+            return False
+        return True
+    
+    _constraints= [
+        (_check_args, 'Invalid arguments', ['args']),
+    ]
+
     def _callback(self, cr, uid, model, func, args):
-        args = (args or []) and eval(args)
-        m=self.pool.get(model)
+        args = str2tuple(args)
+        m = self.pool.get(model)
         if m and hasattr(m, func):
             f = getattr(m, func)
-            f(cr, uid, *args)
+            try:
+                f(cr, uid, *args)
+            except Exception, e:
+                self._logger.notifyChannel('timers', netsvc.LOG_ERROR, "Job call of self.pool.get('%s').%s(cr, uid, *%r) failed" % (model, func, args))
+                self._logger.notifyChannel('timers', netsvc.LOG_ERROR, tools.exception_to_unicode(e))
+
 
     def _poolJobs(self, db_name, check=False):        
         try:
             db, pool = pooler.get_db_and_pool(db_name)
         except:
             return False        
-        if pool._init:
-            # retry in a few minutes
-            next_call = 600
-        else:
-            now = DateTime.now()
-            try:
-                cr = db.cursor()
+        try:
+            cr = db.cursor()
+            if not pool._init:
+                now = DateTime.now()
                 cr.execute('select * from ir_cron where numbercall<>0 and active and nextcall<=now() order by priority')
                 for job in cr.dictfetchall():
                     nextcall = DateTime.strptime(job['nextcall'], '%Y-%m-%d %H:%M:%S')
@@ -103,24 +120,22 @@ class ir_cron(osv.osv, netsvc.Agent):
                         addsql = ', active=False'
                     cr.execute("update ir_cron set nextcall=%s, numbercall=%s"+addsql+" where id=%s", (nextcall.strftime('%Y-%m-%d %H:%M:%S'), numbercall, job['id']))
                     cr.commit()
-            finally:
-                cr.commit()
-                cr.close()
 
-        #
-        # Can be improved to do at the min(min(nextcalls), time()+next_call)
-        # But is this an improvement ?
-        # 
-        cr = db.cursor()
-        cr.execute('select min(nextcall) as min_next_call from ir_cron where numbercall<>0 and active and nextcall>=now()')
-        next_call = cr.dictfetchone()['min_next_call']  
-        cr.close()                 
-        if next_call:                
-            next_call = time.mktime(time.strptime(next_call, '%Y-%m-%d %H:%M:%S'))
-        else:
-            next_call = int(time.time()) + 3600   # if do not find active cron job from database, it will run again after 1 day
-        if not check:
-            self.setAlarm(self._poolJobs, next_call, db_name, db_name)
+
+            cr.execute('select min(nextcall) as min_next_call from ir_cron where numbercall<>0 and active and nextcall>=now()')
+            next_call = cr.dictfetchone()['min_next_call']  
+            if next_call:                
+                next_call = time.mktime(time.strptime(next_call, '%Y-%m-%d %H:%M:%S'))
+            else:
+                next_call = int(time.time()) + 3600   # if do not find active cron job from database, it will run again after 1 day
+        
+            if not check:
+                self.setAlarm(self._poolJobs, next_call, db_name, db_name)
+        
+        finally:
+            cr.commit()
+            cr.close()
+
             
     def create(self, cr, uid, vals, context=None):
         res = super(ir_cron, self).create(cr, uid, vals, context=context)        

From f822efa07454eb09f52216d1408f3b55739de85b Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Sat, 3 Oct 2009 15:18:58 +0530
Subject: [PATCH 008/200] [FIX] Name_search() is having now record limit to be
 80 instead of None

lp bug: https://launchpad.net/bugs/430133 fixed

bzr revid: jvo@tinyerp.com-20091003094858-njohqhj91rc6is6n
---
 bin/osv/orm.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index f46788bcf88..e4f36a041bd 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1332,7 +1332,7 @@ class orm_template(object):
     def name_get(self, cr, user, ids, context=None):
         raise _('The name_get method is not implemented on this object !')
 
-    def name_search(self, cr, user, name='', args=None, operator='ilike', context=None, limit=None):
+    def name_search(self, cr, user, name='', args=None, operator='ilike', context=None, limit=80):
         raise _('The name_search method is not implemented on this object !')
 
     def copy(self, cr, uid, id, default=None, context=None):
@@ -2880,7 +2880,7 @@ class orm(orm_template):
         return [(r['id'], tools.ustr(r[self._rec_name])) for r in self.read(cr, user, ids,
             [self._rec_name], context, load='_classic_write')]
 
-    def name_search(self, cr, user, name='', args=None, operator='ilike', context=None, limit=None):
+    def name_search(self, cr, user, name='', args=None, operator='ilike', context=None, limit=80):
         if not args:
             args = []
         if not context:

From f590b743189f5d20068905a3dfd5581f11ac2006 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Mon, 5 Oct 2009 17:40:29 +0530
Subject: [PATCH 009/200] [FIX] Import : Context of the action/screen
 passed,taken into consideration while importing

bzr revid: jvo@tinyerp.com-20091005121029-6sy1k3uvkpi2i8of
---
 bin/addons/base/ir/ir_model.py | 25 +++++++++++++------------
 bin/osv/orm.py                 |  3 ++-
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index 2fe3375d0a0..d69688bf6fc 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -445,10 +445,11 @@ class ir_model_data(osv.osv):
             id = False
         return id
 
-    def _update(self,cr, uid, model, module, values, xml_id=False, store=True, noupdate=False, mode='init', res_id=False):
+    def _update(self,cr, uid, model, module, values, xml_id=False, store=True, noupdate=False, mode='init', res_id=False, context=None):
         warning = True
         model_obj = self.pool.get(model)
-        context = {}
+        if not context:
+            context = {}
         if xml_id and ('.' in xml_id):
             assert len(xml_id.split('.'))==2, _('"%s" contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id') % (xml_id)
             warning = False
@@ -471,12 +472,12 @@ class ir_model_data(osv.osv):
                     res_id,action_id = res_id2,action_id2
 
         if action_id and res_id:
-            model_obj.write(cr, uid, [res_id], values)
+            model_obj.write(cr, uid, [res_id], values, context=context)
             self.write(cr, uid, [action_id], {
                 'date_update': time.strftime('%Y-%m-%d %H:%M:%S'),
-                })
+                },context=context)
         elif res_id:
-            model_obj.write(cr, uid, [res_id], values)
+            model_obj.write(cr, uid, [res_id], values, context=context)
             if xml_id:
                 self.create(cr, uid, {
                     'name': xml_id,
@@ -484,21 +485,21 @@ class ir_model_data(osv.osv):
                     'module':module,
                     'res_id':res_id,
                     'noupdate': noupdate,
-                    })
+                    },context=context)
                 if model_obj._inherits:
                     for table in model_obj._inherits:
                         inherit_id = model_obj.browse(cr, uid,
-                                res_id)[model_obj._inherits[table]]
+                                res_id,context=context)[model_obj._inherits[table]]
                         self.create(cr, uid, {
                             'name': xml_id + '_' + table.replace('.', '_'),
                             'model': table,
                             'module': module,
                             'res_id': inherit_id,
                             'noupdate': noupdate,
-                            })
+                            },context=context)
         else:
             if mode=='init' or (mode=='update' and xml_id):
-                res_id = model_obj.create(cr, uid, values)
+                res_id = model_obj.create(cr, uid, values, context=context)
                 if xml_id:
                     self.create(cr, uid, {
                         'name': xml_id,
@@ -506,18 +507,18 @@ class ir_model_data(osv.osv):
                         'module': module,
                         'res_id': res_id,
                         'noupdate': noupdate
-                        })
+                        },context=context)
                     if model_obj._inherits:
                         for table in model_obj._inherits:
                             inherit_id = model_obj.browse(cr, uid,
-                                    res_id)[model_obj._inherits[table]]
+                                    res_id,context=context)[model_obj._inherits[table]]
                             self.create(cr, uid, {
                                 'name': xml_id + '_' + table.replace('.', '_'),
                                 'model': table,
                                 'module': module,
                                 'res_id': inherit_id,
                                 'noupdate': noupdate,
-                                })
+                                },context=context)
         if xml_id:
             if res_id:
                 self.loads[(module, xml_id)] = (model, res_id)
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index e4f36a041bd..f9a62a02f18 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -577,6 +577,7 @@ class orm_template(object):
                     raise Exception(_('Please check that all your lines have %d columns.') % (len(fields),))
                 if not line[i]:
                     continue
+                    
                 field = fields[i]
                 if (len(field)==len(prefix)+1) and field[len(prefix)].endswith(':db_id'):
                         # Database ID
@@ -811,7 +812,7 @@ class orm_template(object):
             try:
                 id = ir_model_data_obj._update(cr, uid, self._name,
                      current_module, res, xml_id=data_id, mode=mode,
-                     noupdate=noupdate, res_id=res_id)
+                     noupdate=noupdate, res_id=res_id, context=context)
             except Exception, e:
                 import psycopg2
                 if isinstance(e,psycopg2.IntegrityError):

From 3b60f632f14668b8b3e031111c08314335b41cb9 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 5 Oct 2009 19:46:55 +0200
Subject: [PATCH 010/200] [FIX] default context

bzr revid: fp@tinyerp.com-20091005174655-cq9b2q92ww4onets
---
 bin/osv/orm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index cf215adf12e..b4ceeed1342 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1535,7 +1535,7 @@ class orm_memory(orm_template):
 
         # get the default values from the context
         for key in context or {}:
-            if key.startswith('default_'):
+            if key.startswith('default_') and (key[8:] in fieds_list):
                 value[key[8:]] = context[key]
         return value
 

From 1996f293d8808e54084380af47cba8458fc21872 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Wed, 7 Oct 2009 17:34:53 +0530
Subject: [PATCH 011/200] [FIX] Audittrail : Assigned Access Rights to
 non-admin user.

lp bug: https://launchpad.net/bugs/401035 fixed

bzr revid: jvo@tinyerp.com-20091007120453-2zp66ob2ria9r9tc
---
 addons/audittrail/security/ir.model.access.csv | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/audittrail/security/ir.model.access.csv b/addons/audittrail/security/ir.model.access.csv
index 90895f202c4..ac367182f26 100644
--- a/addons/audittrail/security/ir.model.access.csv
+++ b/addons/audittrail/security/ir.model.access.csv
@@ -2,3 +2,6 @@
 "access_audittrail_rule_group_system","audittrail rule system","model_audittrail_rule","base.group_system",1,1,1,1
 "access_audittrail_log_group_system","audittrail log system","model_audittrail_log","base.group_system",1,1,1,1
 "access_audittrail_logline_group_system","audittrail log line system","model_audittrail_log_line","base.group_system",1,1,1,1
+"access_audittrail_rule_all_users","audittrail rule all","model_audittrail_rule","base.group_user",1,0,0,0
+"access_audittrail_log_all_users","audittrail log all","model_audittrail_log","base.group_user",1,0,1,0
+"access_audittrail_log_line_all_users","audittrail log line all","model_audittrail_log_line","base.group_user",1,0,1,0

From 3c28a101b9c353973a7516c710134405ba55baca Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Wed, 7 Oct 2009 14:38:07 +0200
Subject: [PATCH 012/200] [FIX] Use an alternative for the locale.RADIXCHAR if
 this one doesn't exist

lp bug: https://launchpad.net/bugs/400614 fixed

bzr revid: stephane@openerp.com-20091007123807-qsn2uk6jarosd7nz
---
 bin/report/render/rml2pdf/utils.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/bin/report/render/rml2pdf/utils.py b/bin/report/render/rml2pdf/utils.py
index 59724d7d1b4..8e747f5b02a 100644
--- a/bin/report/render/rml2pdf/utils.py
+++ b/bin/report/render/rml2pdf/utils.py
@@ -42,6 +42,7 @@ import reportlab
 from lxml import etree
 import copy
 import tools
+import locale
 
 _regex = re.compile('\[\[(.+?)\]\]')
 
@@ -133,6 +134,15 @@ units = [
 def unit_get(size):
     global units
     if size:
+        if size.find('.') == -1:
+            decimal_point = '.'
+            try:
+                decimal_point = locale.RADIXCHAR
+            except:
+                decimal_point = locale.localeconv()['decimal_point']
+
+            size = size.replace(decimal_point, '.')
+
         for unit in units:
             res = unit[0].search(size, 0)
             if res:

From 7b6f176319214ceb1070eacb56785abab14371c8 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Wed, 7 Oct 2009 20:08:23 +0530
Subject: [PATCH 013/200] [FIX] Stock-MRP : Split production wizard made
 individual to mrp if mrp is not installed

lp bug: https://launchpad.net/bugs/383057 fixed

bzr revid: jvo@tinyerp.com-20091007143823-l2hx2mjzth33hv1z
---
 addons/mrp/mrp_wizard.xml                |   7 ++
 addons/mrp/wizard/__init__.py            |   1 +
 addons/mrp/wizard/wizard_track_line.py   | 131 +++++++++++++++++++++++
 addons/stock/wizard/wizard_track_line.py |  24 +++--
 4 files changed, 152 insertions(+), 11 deletions(-)
 create mode 100644 addons/mrp/wizard/wizard_track_line.py

diff --git a/addons/mrp/mrp_wizard.xml b/addons/mrp/mrp_wizard.xml
index 94d7f663e01..d88ea321ac9 100644
--- a/addons/mrp/mrp_wizard.xml
+++ b/addons/mrp/mrp_wizard.xml
@@ -27,6 +27,13 @@
         name="product.product.procurement"
         keyword="client_action_multi"
         id="product_procurement_wizard"/>
+    
+    <wizard
+        id="stock.track_line"
+        model="stock.move"
+        multi="True"
+        name="mrp.stock.move.track"
+        string="Track line"/>    
 
     </data>
 </openerp>
diff --git a/addons/mrp/wizard/__init__.py b/addons/mrp/wizard/__init__.py
index 232b4f9f00b..1fcb7406959 100644
--- a/addons/mrp/wizard/__init__.py
+++ b/addons/mrp/wizard/__init__.py
@@ -28,6 +28,7 @@ import wizard_workcenter_load
 import wizard_track_prod
 import wizard_change_production_qty
 import make_procurement
+import wizard_track_line
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/mrp/wizard/wizard_track_line.py b/addons/mrp/wizard/wizard_track_line.py
new file mode 100644
index 00000000000..26236c55e13
--- /dev/null
+++ b/addons/mrp/wizard/wizard_track_line.py
@@ -0,0 +1,131 @@
+# -*- 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 wizard
+import netsvc
+import pooler
+
+import time
+from osv import osv
+from tools.translate import _
+
+track_form = '''<?xml version="1.0"?>
+<form string="Tracking a move">
+ <field name="tracking_prefix"/>
+ <newline/>
+ <field name="quantity"/>
+</form>
+'''
+fields = {
+        'tracking_prefix': {
+            'string': 'Tracking prefix',
+            'type': 'char',
+            'size': 64,
+        },
+        'quantity': {
+            'string': 'Quantity per lot',
+            'type': 'float',
+            'default': 1,
+        }
+}
+
+def _track_lines(self, cr, uid, data, context):
+    move_id = data['id']
+
+    pool = pooler.get_pool(cr.dbname)
+    prodlot_obj = pool.get('stock.production.lot')
+    move_obj = pool.get('stock.move')
+    production_obj = pool.get('mrp.production')
+    ir_sequence_obj = pool.get('ir.sequence')
+
+    sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
+    if not sequence:
+        raise wizard.except_wizard(_('Error!'), _('No production sequence defined'))
+    if data['form']['tracking_prefix']:
+        sequence=data['form']['tracking_prefix']+'/'+(sequence or '')
+
+    move = move_obj.browse(cr, uid, [move_id])[0]
+    quantity=data['form']['quantity']
+    if quantity <= 0 or move.product_qty == 0:
+        return {}
+    uos_qty=quantity/move.product_qty*move.product_uos_qty
+
+    quantity_rest = move.product_qty%quantity
+    uos_qty_rest = quantity_rest/move.product_qty*move.product_uos_qty
+
+    update_val = {
+        'product_qty': quantity,
+        'product_uos_qty': uos_qty,
+    }
+    new_move = []
+    production_ids = []
+    for idx in range(int(move.product_qty//quantity)):
+        if idx:
+            current_move = move_obj.copy(cr, uid, move.id, {'state': move.state, 'production_id': move.production_id.id})
+            new_move.append(current_move)
+        else:
+            current_move = move.id
+        new_prodlot = prodlot_obj.create(cr, uid, {'name': sequence, 'ref': '%d'%idx}, {'product_id': move.product_id.id})
+        update_val['prodlot_id'] = new_prodlot
+        move_obj.write(cr, uid, [current_move], update_val)
+        production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
+    
+    if quantity_rest > 0:
+        idx = int(move.product_qty//quantity)
+        update_val['product_qty']=quantity_rest
+        update_val['product_uos_qty']=uos_qty_rest
+        if idx:
+            current_move = move_obj.copy(cr, uid, move.id, {'state': move.state, 'production_id': move.production_id.id})
+            current_move = move_obj.copy(cr, uid, move.id, {'state': move.state})
+            new_move.append(current_move)
+        else:
+            current_move = move.id
+        new_prodlot = prodlot_obj.create(cr, uid, {'name': sequence, 'ref': '%d'%idx}, {'product_id': move.product_id.id})
+        update_val['prodlot_id'] = new_prodlot
+        move_obj.write(cr, uid, [current_move], update_val)
+
+    products = production_obj.read(cr, uid, production_ids, ['move_lines'])
+    for p in products:
+        for new in new_move:
+            if new not in p['move_lines']:
+                p['move_lines'].append(new)
+        production_obj.write(cr, uid, [p['id']], {'move_lines': [(6, 0, p['move_lines'])]})
+
+    return {}
+
+class wizard_track_move(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type': 'form', 'arch': track_form, 'fields': fields, 'state': [('end', 'Cancel', 'gtk-cancel'), ('track', 'Ok', 'gtk-ok')]},
+            },
+        'track': {
+            'actions': [_track_lines],
+            'result': {'type':'state', 'state':'end'}
+        }
+    }
+
+wizard_track_move('mrp.stock.move.track')
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/stock/wizard/wizard_track_line.py b/addons/stock/wizard/wizard_track_line.py
index 1aeeb0ad215..79c105b962b 100644
--- a/addons/stock/wizard/wizard_track_line.py
+++ b/addons/stock/wizard/wizard_track_line.py
@@ -54,7 +54,7 @@ def _track_lines(self, cr, uid, data, context):
     pool = pooler.get_pool(cr.dbname)
     prodlot_obj = pool.get('stock.production.lot')
     move_obj = pool.get('stock.move')
-    production_obj = pool.get('mrp.production')
+#    production_obj = pool.get('mrp.production')
     ir_sequence_obj = pool.get('ir.sequence')
 
     sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
@@ -77,24 +77,26 @@ def _track_lines(self, cr, uid, data, context):
         'product_uos_qty': uos_qty,
     }
     new_move = []
-    production_ids = []
+#    production_ids = []
     for idx in range(int(move.product_qty//quantity)):
         if idx:
-            current_move = move_obj.copy(cr, uid, move.id, {'state': move.state, 'production_id': move.production_id.id})
+#            current_move = move_obj.copy(cr, uid, move.id, {'state': move.state, 'production_id': move.production_id.id})
+            current_move = move_obj.copy(cr, uid, move.id, {'state': move.state})
             new_move.append(current_move)
         else:
             current_move = move.id
         new_prodlot = prodlot_obj.create(cr, uid, {'name': sequence, 'ref': '%d'%idx}, {'product_id': move.product_id.id})
         update_val['prodlot_id'] = new_prodlot
         move_obj.write(cr, uid, [current_move], update_val)
-        production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
+#        production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
     
     if quantity_rest > 0:
         idx = int(move.product_qty//quantity)
         update_val['product_qty']=quantity_rest
         update_val['product_uos_qty']=uos_qty_rest
         if idx:
-            current_move = move_obj.copy(cr, uid, move.id, {'state': move.state, 'production_id': move.production_id.id})
+#            current_move = move_obj.copy(cr, uid, move.id, {'state': move.state, 'production_id': move.production_id.id})
+            current_move = move_obj.copy(cr, uid, move.id, {'state': move.state})
             new_move.append(current_move)
         else:
             current_move = move.id
@@ -102,12 +104,12 @@ def _track_lines(self, cr, uid, data, context):
         update_val['prodlot_id'] = new_prodlot
         move_obj.write(cr, uid, [current_move], update_val)
 
-    products = production_obj.read(cr, uid, production_ids, ['move_lines'])
-    for p in products:
-        for new in new_move:
-            if new not in p['move_lines']:
-                p['move_lines'].append(new)
-        production_obj.write(cr, uid, [p['id']], {'move_lines': [(6, 0, p['move_lines'])]})
+#    products = production_obj.read(cr, uid, production_ids, ['move_lines'])
+#    for p in products:
+#        for new in new_move:
+#            if new not in p['move_lines']:
+#                p['move_lines'].append(new)
+#        production_obj.write(cr, uid, [p['id']], {'move_lines': [(6, 0, p['move_lines'])]})
 
     return {}
 

From bebd7fd223a96b390558211ce92b753ab8dff955 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Thu, 8 Oct 2009 11:03:44 +0530
Subject: [PATCH 014/200] [FIX] Improved Previous bad commit for pagelayout
 error

bzr revid: jvo@tinyerp.com-20091008053344-rkh1m6oaxw2kjlwd
---
 bin/report/render/rml2pdf/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/report/render/rml2pdf/utils.py b/bin/report/render/rml2pdf/utils.py
index 8e747f5b02a..07bbbbcd05e 100644
--- a/bin/report/render/rml2pdf/utils.py
+++ b/bin/report/render/rml2pdf/utils.py
@@ -137,7 +137,7 @@ def unit_get(size):
         if size.find('.') == -1:
             decimal_point = '.'
             try:
-                decimal_point = locale.RADIXCHAR
+                decimal_point = locale.nl_langinfo(locale.RADIXCHAR)
             except:
                 decimal_point = locale.localeconv()['decimal_point']
 

From 7b7c6250cdb222963f886da6e89b6fbe95882af8 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Thu, 8 Oct 2009 11:33:06 +0530
Subject: [PATCH 015/200] [FIX] Stock: Picking report correction

lp bug: https://launchpad.net/bugs/445547 fixed

bzr revid: jvo@tinyerp.com-20091008060306-ppamofraaq3hlr3b
---
 addons/stock/report/picking.rml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 8de93045b84..1540357c590 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -132,7 +132,9 @@
         </td>
         <td>
           <para style="terp_default_9">[[ (picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.title) or '' ]] [[ picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.name ]]</para>
-          <para style="terp_default_9">[[ picking.address_id and picking.address_id.street or '' ]][[ picking.address_id and picking.address_id.zip or '' ]]</para>
+          <para style="terp_default_9">[[ picking.address_id and picking.address_id.street or '' ]]</para>
+          <para style="terp_default_9">[[ picking.address_id and picking.address_id.zip or '' ]] [[ picking.address_id and picking.address_id.city or '']]</para>
+          
           <para style="terp_default_2">
             <font color="white"> </font>
           </para>
@@ -190,7 +192,7 @@
           <para style="terp_tblheader_General_Centre">Expected Shipping Date </para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">weight</para>
+          <para style="terp_tblheader_General_Centre">Weight</para>
         </td>
       </tr>
     </blockTable>

From 3de195d3730638334f30e9d665f903ccad28a417 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Thu, 8 Oct 2009 11:49:24 +0530
Subject: [PATCH 016/200] [FIX] Base_vat : Spanish numbers validation corrected

lp bug: https://launchpad.net/bugs/366944 fixed

bzr revid: jvo@tinyerp.com-20091008061924-3malnmzjrtc44ryn
---
 addons/base_vat/partner.py | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/addons/base_vat/partner.py b/addons/base_vat/partner.py
index ca91ab33562..e470244e5e4 100644
--- a/addons/base_vat/partner.py
+++ b/addons/base_vat/partner.py
@@ -378,10 +378,10 @@ class res_partner(osv.osv):
             22: 'K',
             23: 'E',
         }
-
-        if vat[0] in ('A', 'B', 'C', 'D', 'E', 'F', 'G', 'H'):
+        #Legal persons with profit aim
+        if vat[0] in ('A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'J', 'U', 'V'):
             try:
-                int(vat[1:])
+                int(vat[1:8])
             except:
                 return False
             sum = mult_add(2, int(vat[1])) + int(vat[2]) + \
@@ -391,10 +391,11 @@ class res_partner(osv.osv):
             check = 10 - (sum % 10)
             if check == 10:
                 check = 0
-            if check != int(vat[8]):
-                return False
+#            if check != int(vat[8]):
+#                return False
             return True
-        elif vat[0] in ('N', 'P', 'Q', 'S'):
+        #Legal persons with non-profit aim
+        elif vat[0] in ('N', 'P', 'Q', 'R', 'S', 'W'):
             try:
                 int(vat[1:8])
             except:
@@ -408,17 +409,26 @@ class res_partner(osv.osv):
             if check != vat[8]:
                 return False
             return True
-        elif vat[0] in ('K', 'L', 'M', 'X'):
+        #Foreign natural persons, under age 14 or non-residents
+        elif vat[0] in ('K', 'L', 'M', 'X', 'Y', 'Z'):
+            if vat[0] == 'Y':
+                check_value = '1' + vat[1:8]
+            elif vat[0] == 'Z':
+                check_value = '2' + vat[1:8]
+            else:
+                check_value = vat[1:8]
+
             try:
-                int(vat[1:8])
+                int(check_value)
             except:
                 return False
-            check = 1 + (int(vat[1:8]) % 23)
+            check = 1 + (int(check_value) % 23)
 
             check = conv[check]
             if check != vat[8]:
                 return False
             return True
+        #Spanish natural persons
         else:
             try:
                 int(vat[:8])

From 90d81da72bf57b7ed2acfb750ddc32cf27c76afb Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Thu, 8 Oct 2009 13:23:35 +0530
Subject: [PATCH 017/200] [FIX] Domain was getting failed when trying to work
 upon M2M,O2M field of object

lp bug: https://launchpad.net/bugs/420507 fixed

bzr revid: jvo@tinyerp.com-20091008075335-obo9xs9usni3ey4n
---
 bin/osv/expression.py | 93 +++++++++++++++++++++++++++++++++----------
 1 file changed, 71 insertions(+), 22 deletions(-)

diff --git a/bin/osv/expression.py b/bin/osv/expression.py
index 3c330aaaa1a..23ac071e6dd 100644
--- a/bin/osv/expression.py
+++ b/bin/osv/expression.py
@@ -44,14 +44,25 @@ class expression(object):
            and (((not internal) and element[1] in OPS) \
                 or (internal and element[1] in INTERNAL_OPS))
 
-    def __execute_recursive_in(self, cr, s, f, w, ids):
+    def __execute_recursive_in(self, cr, s, f, w, ids, op, type):
         res = []
-        for i in range(0, len(ids), cr.IN_MAX):
-            subids = ids[i:i+cr.IN_MAX]
-            cr.execute('SELECT "%s"'    \
-                       '  FROM "%s"'    \
-                       ' WHERE "%s" in (%s)' % (s, f, w, ','.join(['%s']*len(subids))),
-                       subids)
+        if ids:
+            if op in ['<','>','>=','<=']:
+                cr.execute('SELECT "%s"'    \
+                               '  FROM "%s"'    \
+                               ' WHERE "%s" %s %s' % (s, f, w, op, ids[0]))
+                res.extend([r[0] for r in cr.fetchall()])
+            else:
+                for i in range(0, len(ids), cr.IN_MAX):
+                    subids = ids[i:i+cr.IN_MAX]
+                    cr.execute('SELECT "%s"'    \
+                               '  FROM "%s"'    \
+                               ' WHERE "%s" in (%s)' % (s, f, w, ','.join(['%s']*len(subids))),
+                               subids)
+                    res.extend([r[0] for r in cr.fetchall()])
+        else:
+            cr.execute('SELECT distinct("%s")'    \
+                           '  FROM "%s" where "%s" is not null'  % (s, f, s)),
             res.extend([r[0] for r in cr.fetchall()])
         return res
 
@@ -101,7 +112,6 @@ class expression(object):
             if self._is_operator(e) or e == self.__DUMMY_LEAF:
                 continue
             left, operator, right = e
-
             working_table = table
             main_table = table
             fargs = left.split('.', 1)
@@ -154,14 +164,32 @@ class expression(object):
 
 
             elif field._type == 'one2many':
-                if isinstance(right, basestring):
-                    ids2 = [x[0] for x in field_obj.name_search(cr, uid, right, [], operator, limit=None)]
-                else:
-                    ids2 = list(right)
-                if not ids2:
-                    self.__exp[i] = ('id', '=', '0')
-                else:
-                    self.__exp[i] = ('id', 'in', self.__execute_recursive_in(cr, field._fields_id, field_obj._table, 'id', ids2))
+                call_null = True
+                
+                if right:
+                    if isinstance(right, basestring):
+                        ids2 = [x[0] for x in field_obj.name_search(cr, uid, right, [], operator, limit=None)]
+                        operator = 'in' 
+                    else:
+                        if not isinstance(right,list):
+                            ids2 = [right]
+                        else:
+                            ids2 = right    
+                    if not ids2:
+                        call_null = True
+                        operator = 'in' # operator changed because ids are directly related to main object
+                    else:
+                        call_null = False
+                        o2m_op = 'in'
+                        if operator in  ['not like','not ilike','not in','<>','!=']:
+                            o2m_op = 'not in'
+                        self.__exp[i] = ('id', o2m_op, self.__execute_recursive_in(cr, field._fields_id, field_obj._table, 'id', ids2, operator, field._type))
+                
+                if call_null:
+                    o2m_op = 'not in'
+                    if operator in  ['not like','not ilike','not in','<>','!=']:
+                        o2m_op = 'in'                         
+                    self.__exp[i] = ('id', o2m_op, self.__execute_recursive_in(cr, field._fields_id, field_obj._table, 'id', [], operator, field._type) or [0])      
 
             elif field._type == 'many2many':
                 #FIXME
@@ -174,17 +202,38 @@ class expression(object):
                     def _rec_convert(ids):
                         if field_obj == table:
                             return ids
-                        return self.__execute_recursive_in(cr, field._id1, field._rel, field._id2, ids)
+                        return self.__execute_recursive_in(cr, field._id1, field._rel, field._id2, ids, operator, field._type)
 
                     dom = _rec_get(ids2, field_obj)
                     ids2 = field_obj.search(cr, uid, dom, context=context)
                     self.__exp[i] = ('id', 'in', _rec_convert(ids2))
                 else:
-                    if isinstance(right, basestring):
-                        res_ids = [x[0] for x in field_obj.name_search(cr, uid, right, [], operator)]
-                    else:
-                        res_ids = list(right)
-                    self.__exp[i] = ('id', 'in', self.__execute_recursive_in(cr, field._id1, field._rel, field._id2, res_ids) or [0])
+                    call_null_m2m = True
+                    if right:
+                        if isinstance(right, basestring):
+                            res_ids = [x[0] for x in field_obj.name_search(cr, uid, right, [], operator)]
+                            operator = 'in'
+                        else:
+                            if not isinstance(right, list):
+                                res_ids = [right]
+                            else:
+                                res_ids = right
+                        if not res_ids:
+                            call_null_m2m = True
+                            operator = 'in' # operator changed because ids are directly related to main object
+                        else:
+                            call_null_m2m = False
+                            m2m_op = 'in'        
+                            if operator in  ['not like','not ilike','not in','<>','!=']:
+                                m2m_op = 'not in'
+                            
+                            self.__exp[i] = ('id', m2m_op, self.__execute_recursive_in(cr, field._id1, field._rel, field._id2, res_ids, operator, field._type) or [0])
+                    if call_null_m2m:
+                        m2m_op = 'not in'
+                        if operator in  ['not like','not ilike','not in','<>','!=']:
+                            m2m_op = 'in'                         
+                        self.__exp[i] = ('id', m2m_op, self.__execute_recursive_in(cr, field._id1, field._rel, field._id2, [], operator,  field._type) or [0])
+                        
             elif field._type == 'many2one':
                 if operator == 'child_of':
                     if isinstance(right, basestring):

From bf46b6e10585084c9393c3113afac9b03453c69e Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Thu, 8 Oct 2009 14:20:16 +0530
Subject: [PATCH 018/200] [FIX] Mrp_subproduct : Wrong calculation of QTYs
 corrected(Product qty,UOS qty)

lp bug: https://launchpad.net/bugs/445267 fixed

bzr revid: jvo@tinyerp.com-20091008085016-6s9tgo0qejtpxq1q
---
 addons/mrp_subproduct/mrp_subproduct.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mrp_subproduct/mrp_subproduct.py b/addons/mrp_subproduct/mrp_subproduct.py
index b45d3e6424a..92622845818 100644
--- a/addons/mrp_subproduct/mrp_subproduct.py
+++ b/addons/mrp_subproduct/mrp_subproduct.py
@@ -68,9 +68,9 @@ class mrp_production(osv.osv):
                  qty2 = production.product_uos and production.product_uos_qty or False
                  if sub_product.subproduct_type=='variable':
                     if production.product_qty:
-                        qty1 *= production.product_qty / (sub_product.product_qty or 1.0)
+                        qty1 *= production.product_qty / (production.bom_id.product_qty or 1.0)
                     if production.product_uos_qty:
-                        qty2 *= production.product_uos_qty / (sub_product.product_qty or 1.0)
+                        qty2 *= production.product_uos_qty / (production.bom_id.product_uos_qty or 1.0)
                  data = {
                     'name':'PROD:'+production.name,
                     'date_planned': production.date_planned,

From fbee346b9261dc633c438e1335656f5f7cfd43f6 Mon Sep 17 00:00:00 2001
From: "YSA(OpenERP)" <>
Date: Thu, 8 Oct 2009 15:14:57 +0530
Subject: [PATCH 019/200] [FIX] Import made successful when field is O2M and it
 has relation under that.

lp bug: https://launchpad.net/bugs/430805 fixed

bzr revid: jvo@tinyerp.com-20091008094457-3ta5gkrhqspiiqyr
---
 bin/osv/orm.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index f9a62a02f18..8c87b1bccf1 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -579,6 +579,9 @@ class orm_template(object):
                     continue
                     
                 field = fields[i]
+                if prefix and not prefix[0] in field:
+                    continue
+                
                 if (len(field)==len(prefix)+1) and field[len(prefix)].endswith(':db_id'):
                         # Database ID
                         res = False
@@ -635,7 +638,7 @@ class orm_template(object):
                             id = ir_model_data_obj._get_id(cr, uid, module, xml_id)
                             res_id = ir_model_data_obj.read(cr, uid, [id],
                                     ['res_id'])[0]['res_id']
-                    row[field[0][:-3]] = res_id or False
+                    row[field[-1][:-3]] = res_id or False
                     continue
                 if (len(field) == len(prefix)+1) and \
                         len(field[len(prefix)].split(':lang=')) == 2:
@@ -671,7 +674,7 @@ class orm_template(object):
                         try:                            
                             _check_db_id(self, model_name, line[i])
                             data_res_id = is_db_id = int(line[i])
-                        except Exception,e:                                    
+                        except Exception,e:
                             warning += [tools.exception_to_unicode(e)]
                             logger.notifyChannel("import", netsvc.LOG_ERROR,
                                       tools.exception_to_unicode(e))

From 9a0d6aa9471287f7e43b567eb2de560587fc0e4d Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Thu, 8 Oct 2009 15:30:57 +0200
Subject: [PATCH 020/200] [MERGE] Backport:
 http://bazaar.launchpad.net/~openobject-training/+junk/server/revision/1821
 [FIX] Workflow button desactivation regarding user roles

bzr revid: stephane@openerp.com-20091008133057-3htx9jwebv9pprgd
---
 bin/osv/orm.py | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 8c87b1bccf1..7c2c6718915 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1062,19 +1062,37 @@ class orm_template(object):
 
         buttons = (n for n in node.getElementsByTagName('button') if n.getAttribute('type') != 'object')
         for button in buttons:
-            ok = True
+            can_click = True
             if user != 1:   # admin user has all roles
                 user_roles = usersobj.read(cr, user, [user], ['roles_id'])[0]['roles_id']
-                cr.execute("select role_id from wkf_transition where signal=%s", (button.getAttribute('name'),))
+                # TODO handle the case of more than one workflow for a model
+                cr.execute("""SELECT DISTINCT t.role_id 
+                                FROM wkf 
+                          INNER JOIN wkf_activity a ON a.wkf_id = wkf.id 
+                          INNER JOIN wkf_transition t ON (t.act_to = a.id)
+                               WHERE wkf.osv = %s
+                                 AND t.signal = %s
+                           """, (self._name, button.getAttribute('name'),))
                 roles = cr.fetchall()
-                for role in roles:
-                    if role[0]:
-                        ok = ok and rolesobj.check(cr, user, user_roles, role[0])
+                
+                # draft -> valid = signal_next (role X)
+                # draft -> cancel = signal_cancel (no role)
+                #
+                # valid -> running = signal_next (role Y)
+                # valid -> cancel = signal_cancel (role Z)
+                #
+                # running -> done = signal_next (role Z)
+                # running -> cancel = signal_cancel (role Z)
+                
 
-            if not ok:
-                button.setAttribute('readonly', '1')
-            else:
-                button.setAttribute('readonly', '0')
+                # As we don't know the object state, in this scenario, 
+                #   the button "signal_cancel" will be always shown as there is no restriction to cancel in draft
+                #   the button "signal_next" will be show if the user has any of the roles (X Y or Z)
+                # The verification will be made later in workflow process...
+                if roles:
+                    can_click = any((not role) or rolesobj.check(cr, user, user_roles, role) for (role,) in roles)
+            
+            button.setAttribute('readonly', str(int(not can_click)))
 
         arch = node.toxml(encoding="utf-8").replace('\t', '')
         fields = self.fields_get(cr, user, fields_def.keys(), context)

From 1052e1213dd405fb9050ac6e9e3b5e25d68b4e61 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Thu, 8 Oct 2009 15:32:35 +0200
Subject: [PATCH 021/200] [MERGE] Backport:
 http://bazaar.launchpad.net/~openobject-training/+junk/server/revision/1822
 [IMP] Allow to specify the view via the context

bzr revid: stephane@openerp.com-20091008133235-3ogpljqem67ae032
---
 bin/osv/orm.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 7c2c6718915..73015dffbde 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1230,6 +1230,15 @@ class orm_template(object):
         model = True
         sql_res = False
         while ok:
+            view_ref = context.get(view_type + '_view_ref', False)
+            if view_ref:
+                if '.' in view_ref:
+                    module, view_ref = view_ref.split('.', 1)
+                    cr.execute("SELECT res_id FROM ir_model_data WHERE model='ir.ui.view' AND module=%s AND name=%s", (module, view_ref))
+                    view_ref_res = cr.fetchone()
+                    if view_ref_res:
+                        view_id = view_ref_res[0]
+
             if view_id:
                 where = (model and (" and model='%s'" % (self._name,))) or ''
                 cr.execute('SELECT arch,name,field_parent,id,type,inherit_id FROM ir_ui_view WHERE id=%s'+where, (view_id,))

From f895d6718c6ff02fc98c455011f5af4484913ddc Mon Sep 17 00:00:00 2001
From: "Niels(Red15)" <>
Date: Thu, 8 Oct 2009 19:10:36 +0530
Subject: [PATCH 022/200] [FIX] CRM : Mailgate script has host as parameter now
 onwards

lp bug: https://launchpad.net/bugs/446205 fixed

bzr revid: jvo@tinyerp.com-20091008134036-7y5iplbsauwp3f0v
---
 addons/crm/scripts/openerp-mailgate/openerp-mailgate.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/crm/scripts/openerp-mailgate/openerp-mailgate.py b/addons/crm/scripts/openerp-mailgate/openerp-mailgate.py
index 6901fde7a14..f363d6f7df6 100755
--- a/addons/crm/scripts/openerp-mailgate/openerp-mailgate.py
+++ b/addons/crm/scripts/openerp-mailgate/openerp-mailgate.py
@@ -62,8 +62,8 @@ class rpc_proxy(object):
         return self.rpc.execute(self.dbname, self.user_id, self.passwd, *request)
 
 class email_parser(object):
-    def __init__(self, uid, password, section, email, email_default, dbname):
-        self.rpc = rpc_proxy(uid, password, dbname=dbname)
+    def __init__(self, uid, password, section, email, email_default, dbname, host):
+        self.rpc = rpc_proxy(uid, password, host=host, dbname=dbname)
         try:
             self.section_id = int(section)
         except:
@@ -315,9 +315,11 @@ if __name__ == '__main__':
     parser.add_option("-s", "--section", dest="section", help="ID or code of the case section", default="support")
     parser.add_option("-m", "--default", dest="default", help="Default eMail in case of any trouble.", default=None)
     parser.add_option("-d", "--dbname", dest="dbname", help="Database name (default: terp)", default='terp')
+    parser.add_option("-h", "--host", dest="host", help="Hostname of the Open ERP Server", default="localhost")
+
 
     (options, args) = parser.parse_args()
-    parser = email_parser(options.userid, options.password, options.section, options.email, options.default, dbname=options.dbname)
+    parser = email_parser(options.userid, options.password, options.section, options.email, options.default, dbname=options.dbname, host=options.host)
 
     msg_txt = email.message_from_file(sys.stdin)
 

From 829dee02d85ed51c4d2203a8cdc658e0296323e4 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Fri, 9 Oct 2009 10:51:00 +0530
Subject: [PATCH 023/200] [FIX] CRM : Mailgate script added option -he was
 conflicting,improved

bzr revid: jvo@tinyerp.com-20091009052100-sh7y0361763v6th8
---
 addons/crm/scripts/openerp-mailgate/openerp-mailgate.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/scripts/openerp-mailgate/openerp-mailgate.py b/addons/crm/scripts/openerp-mailgate/openerp-mailgate.py
index f363d6f7df6..e0bb8c2eae7 100755
--- a/addons/crm/scripts/openerp-mailgate/openerp-mailgate.py
+++ b/addons/crm/scripts/openerp-mailgate/openerp-mailgate.py
@@ -315,7 +315,7 @@ if __name__ == '__main__':
     parser.add_option("-s", "--section", dest="section", help="ID or code of the case section", default="support")
     parser.add_option("-m", "--default", dest="default", help="Default eMail in case of any trouble.", default=None)
     parser.add_option("-d", "--dbname", dest="dbname", help="Database name (default: terp)", default='terp')
-    parser.add_option("-h", "--host", dest="host", help="Hostname of the Open ERP Server", default="localhost")
+    parser.add_option("--host", dest="host", help="Hostname of the Open ERP Server", default="localhost")
 
 
     (options, args) = parser.parse_args()

From 811dea54b48b2830c2d001b0385b03dee4793f92 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Fri, 9 Oct 2009 13:12:53 +0530
Subject: [PATCH 024/200] [FIX]: [account_followup] wrong sender for email

lp bug: https://launchpad.net/bugs/446520 fixed

bzr revid: mga@tinyerp.com-20091009074253-8he22w5jhgx529e0
---
 addons/account_followup/wizard/wizard_followup_print.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_followup/wizard/wizard_followup_print.py b/addons/account_followup/wizard/wizard_followup_print.py
index 7729d267365..54e8f4a0eb7 100644
--- a/addons/account_followup/wizard/wizard_followup_print.py
+++ b/addons/account_followup/wizard/wizard_followup_print.py
@@ -162,7 +162,7 @@ class followup_all_print(wizard.interface):
                         if (not dest) and adr.type=='default':
                             if adr.email:
                                 dest = [adr.email]
-                src = tools.config.options['smtp_user']
+                src = tools.config.options['email_from']
                 if not data['form']['partner_lang']:
                     body = data['form']['email_body']
                 else:

From 58a4fff0dd2af0561fe7c731e2b8d0ed631e995c Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Fri, 9 Oct 2009 14:29:36 +0530
Subject: [PATCH 025/200] [FIX] Account : Refund wuzard malfunctioned with
 modify invoice option

lp bug: https://launchpad.net/bugs/446681 fixed

bzr revid: jvo@tinyerp.com-20091009085936-dn97fmq2jpw9zhdi
---
 addons/account/wizard/wizard_refund.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/wizard/wizard_refund.py b/addons/account/wizard/wizard_refund.py
index 39d92b58a35..2f93b0e3459 100644
--- a/addons/account/wizard/wizard_refund.py
+++ b/addons/account/wizard/wizard_refund.py
@@ -152,10 +152,10 @@ class wiz_refund(wizard.interface):
                     invoice = invoice[0]
                     del invoice['id']
                     invoice_lines = pool.get('account.invoice.line').read(cr, uid, invoice['invoice_line'])
-                    invoice_lines = pool.get('account.invoice')._refund_cleanup_lines(invoice_lines)
+                    invoice_lines = pool.get('account.invoice')._refund_cleanup_lines(cr, uid, invoice_lines)
                     tax_lines = pool.get('account.invoice.tax').read(
                         cr, uid, invoice['tax_line'])
-                    tax_lines = pool.get('account.invoice')._refund_cleanup_lines(tax_lines)
+                    tax_lines = pool.get('account.invoice')._refund_cleanup_lines(cr, uid, tax_lines)
 
                     invoice.update({
                         'type': inv.type,

From dcf275be04ff1c1733cca09613fda61e6d241e32 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Fri, 9 Oct 2009 16:03:54 +0530
Subject: [PATCH 026/200] [FIX]:<seq> problem Report Engine

bzr revid: nch@tinyerp.com-20091009103354-u2z9v03jc864yekh
---
 bin/report/render/rml2pdf/trml2pdf.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index f4b70a2da27..b3585254eb3 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -455,10 +455,10 @@ class _rml_flowable(object):
                 if key in ('rml_except', 'rml_loop', 'rml_tag'):
                     del txt_n.attrib[key]
             if True or not self._textual(n).isspace():
-                txt_n.text = utils.xml2str(self._textual(n))
-                txt_n.tail = ''
+                if not n.tag == 'bullet':
+                    txt_n.text = utils.xml2str(self._textual(n))
+                txt_n.tail = n.tail and utils._process_text(self, n.tail.replace('\n','')) or ''
                 rc1 += etree.tostring(txt_n)
-        #rc1 += utils._process_text(self, node.tail or '')
         return rc1
 
     def _table(self, node):

From efc0d3b001b9252b367d1b1f1dd7b088ff6395d7 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Fri, 9 Oct 2009 16:15:47 +0530
Subject: [PATCH 027/200] [REF]:notified channel when there is an exception in
 eval()

bzr revid: nch@tinyerp.com-20091009104547-t88ktqax7p5q57bz
---
 bin/report/render/rml2pdf/utils.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/bin/report/render/rml2pdf/utils.py b/bin/report/render/rml2pdf/utils.py
index 07bbbbcd05e..abc421a0f2f 100644
--- a/bin/report/render/rml2pdf/utils.py
+++ b/bin/report/render/rml2pdf/utils.py
@@ -43,6 +43,8 @@ from lxml import etree
 import copy
 import tools
 import locale
+import netsvc
+import traceback, sys
 
 _regex = re.compile('\[\[(.+?)\]\]')
 
@@ -108,9 +110,13 @@ def _process_text(self, txt):
             result += self.localcontext.get('translate', lambda x:x)(sps.pop(0))
             if sps:
                 try:
-                    txt = eval(sps.pop(0),self.localcontext)
-                except:
-                    pass
+                    expr = sps.pop(0)
+                    txt = eval(expr,self.localcontext)
+                except Exception,e:
+                    tb_s = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                    netsvc.Logger().notifyChannel('report', netsvc.LOG_ERROR,
+                            'report :\n%s\n%s\nexpr: %s' % (tb_s, str(e),
+                                expr.encode('utf-8')))
                 if type(txt)==type('') or type(txt)==type(u''):
                     txt2 = str2xml(txt)
                     result += tools.ustr(txt2)
@@ -173,7 +179,7 @@ def attr_get(node, attrs, dict={}):
                 res[key] = int(node.get(key))
             elif dict[key]=='unit':
                 res[key] = unit_get(node.get(key))
-            elif dict[key] == 'float' : 
+            elif dict[key] == 'float' :
                 res[key] = float(node.get(key))
     return res
 

From 3d08c9c6f049ffce39bd91382cb096e846e90b18 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Fri, 9 Oct 2009 13:48:16 +0200
Subject: [PATCH 028/200] [FIX] Specify the name of the argument for the
 context, to avoir a critical bug

bzr revid: stephane@openerp.com-20091009114816-5n518p74cm1k2pj1
---
 bin/addons/base/module/report/ir_module_reference_print.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/module/report/ir_module_reference_print.py b/bin/addons/base/module/report/ir_module_reference_print.py
index 92029014bac..69de9ab9a09 100644
--- a/bin/addons/base/module/report/ir_module_reference_print.py
+++ b/bin/addons/base/module/report/ir_module_reference_print.py
@@ -25,7 +25,7 @@ from report import report_sxw
 
 class ir_module_reference_print(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(ir_module_reference_print, self).__init__(cr, uid, name, context)
+        super(ir_module_reference_print, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
             'findobj': self._object_find,

From 25f727dd7b2d3e4917a3bc1816fa5e131c88890f Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Fri, 9 Oct 2009 13:49:00 +0200
Subject: [PATCH 029/200] [FIX] Specify the name of the argument for the
 context, to avoir a critical bug

bzr revid: stephane@openerp.com-20091009114900-r4j49l7dmmw5sze5
---
 addons/account/project/report/account_journal.py              | 2 +-
 addons/account/project/report/analytic_balance.py             | 2 +-
 addons/account/project/report/analytic_check.py               | 2 +-
 addons/account/project/report/analytic_journal.py             | 2 +-
 addons/account/project/report/cost_ledger.py                  | 2 +-
 addons/account/project/report/inverted_analytic_balance.py    | 2 +-
 addons/account/project/report/quantity_cost_ledger.py         | 3 +--
 addons/account/report/account_balance.py                      | 2 +-
 addons/account/report/account_journal.py                      | 2 +-
 addons/account/report/account_tax_code.py                     | 2 +-
 addons/account/report/aged_trial_balance.py                   | 2 +-
 addons/account/report/central_journal.py                      | 2 +-
 addons/account/report/general_journal.py                      | 2 +-
 addons/account/report/general_ledger.py                       | 2 +-
 addons/account/report/general_ledger_landscape.py             | 2 +-
 addons/account/report/invoice.py                              | 2 +-
 addons/account/report/partner_balance.py                      | 2 +-
 addons/account/report/rml_parse.py                            | 2 +-
 addons/account/report/tax_report.py                           | 2 +-
 addons/account/report/third_party_ledger.py                   | 2 +-
 addons/account_analytic_plans/report/crossovered_analytic.py  | 2 +-
 addons/account_balance/report/account_balance.py              | 2 +-
 addons/account_balance/report/account_balance_landscape.py    | 2 +-
 addons/account_balance/report/rml_parse.py                    | 2 +-
 .../account_budget/report/analytic_account_budget_report.py   | 2 +-
 addons/account_budget/report/budget_report.py                 | 2 +-
 addons/account_budget/report/crossovered_budget_report.py     | 2 +-
 addons/account_followup/report/report_followup_print.py       | 2 +-
 .../report/report_account_invoice_layout.py                   | 2 +-
 .../account_invoice_layout/report/special_message_invoice.py  | 2 +-
 addons/account_payment/report/payment_order.py                | 2 +-
 addons/account_report/report/accounting_report.py             | 2 +-
 addons/account_report/report/print_indicator.py               | 2 +-
 addons/account_reporting/report/account_report_bs.py          | 2 +-
 addons/account_voucher/report/report_voucher.py               | 2 +-
 addons/account_voucher/report/report_voucher_amount.py        | 4 ++--
 addons/account_voucher/report/rml_parse.py                    | 2 +-
 addons/auction/report/auction_artists.py                      | 2 +-
 addons/auction/report/auction_bids.py                         | 2 +-
 addons/auction/report/auction_buyer_result.py                 | 2 +-
 addons/auction/report/auction_catelog.py                      | 2 +-
 addons/auction/report/auction_objects.py                      | 2 +-
 addons/auction/report/auction_result.py                       | 2 +-
 addons/auction/report/auction_total_rml.py                    | 2 +-
 addons/auction/report/bids_lots.py                            | 2 +-
 addons/auction/report/bids_phones_details.py                  | 2 +-
 addons/auction/report/buyer_form_report.py                    | 2 +-
 addons/auction/report/buyer_list.py                           | 2 +-
 addons/auction/report/catelogwithpictures.py                  | 2 +-
 addons/auction/report/deposit_seller.py                       | 2 +-
 addons/auction/report/lots_list.py                            | 2 +-
 addons/auction/report/lots_list_inventory.py                  | 2 +-
 addons/auction/report/lots_list_landscape.py                  | 2 +-
 addons/auction/report/report_lot_bar_code.py                  | 2 +-
 addons/auction/report/seller_form_report.py                   | 2 +-
 addons/hr_attendance/report/attendance_errors.py              | 2 +-
 addons/hr_expense/report/expense.py                           | 2 +-
 addons/hr_timesheet_invoice/report/account_analytic_profit.py | 2 +-
 addons/hr_timesheet_invoice/report/cost_ledger.py             | 2 +-
 addons/l10n_ch/report/bvr.py                                  | 2 +-
 addons/l10n_fr/report/base_report.py                          | 2 +-
 addons/mrp/report/order.py                                    | 2 +-
 addons/mrp_operations/report/mrp_code_barcode.py              | 2 +-
 addons/mrp_operations/report/mrp_wc_barcode.py                | 2 +-
 addons/mrp_repair/report/order.py                             | 2 +-
 addons/point_of_sale/report/pos_details.py                    | 2 +-
 addons/point_of_sale/report/pos_details_summary.py            | 2 +-
 addons/point_of_sale/report/pos_invoice.py                    | 2 +-
 addons/point_of_sale/report/pos_lines.py                      | 2 +-
 addons/point_of_sale/report/pos_receipt.py                    | 2 +-
 addons/product/report/product_pricelist.py                    | 2 +-
 addons/purchase/report/order.py                               | 2 +-
 addons/purchase/report/request_quotation.py                   | 2 +-
 addons/report_intrastat/report/invoice.py                     | 2 +-
 addons/sale/report/order.py                                   | 2 +-
 addons/sale/report/sale_prepare_allot.py                      | 2 +-
 addons/sale_delivery_report/report/shipping.py                | 2 +-
 addons/stock/report/lot_location.py                           | 2 +-
 addons/stock/report/lot_overview.py                           | 2 +-
 addons/stock/report/lot_overview_all.py                       | 2 +-
 addons/stock/report/picking.py                                | 2 +-
 81 files changed, 82 insertions(+), 83 deletions(-)

diff --git a/addons/account/project/report/account_journal.py b/addons/account/project/report/account_journal.py
index 2f46abaceda..a732c88a969 100644
--- a/addons/account/project/report/account_journal.py
+++ b/addons/account/project/report/account_journal.py
@@ -37,7 +37,7 @@ class journal_print(report_sxw.rml_parse):
         self.cr.execute('select sum(amount) from account_analytic_line where journal_id=%s', (journal_id,))
         return self.cr.fetchone()[0] or 0.0
     def __init__(self, cr, uid, name, context):
-        super(journal_print, self).__init__(cr, uid, name, context)
+        super(journal_print, self).__init__(cr, uid, name, context=context)
         self.localcontext = {
             'time': time,
             'lines': self.lines,
diff --git a/addons/account/project/report/analytic_balance.py b/addons/account/project/report/analytic_balance.py
index 0c7b0cda761..9e96dfdd1bd 100644
--- a/addons/account/project/report/analytic_balance.py
+++ b/addons/account/project/report/analytic_balance.py
@@ -27,7 +27,7 @@ from report import report_sxw
 
 class account_analytic_balance(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(account_analytic_balance, self).__init__(cr, uid, name, context)
+        super(account_analytic_balance, self).__init__(cr, uid, name, context=context)
         self.localcontext.update( {
             'time': time,
             'get_objects': self._get_objects,
diff --git a/addons/account/project/report/analytic_check.py b/addons/account/project/report/analytic_check.py
index 6e794b35d87..5a300966840 100644
--- a/addons/account/project/report/analytic_check.py
+++ b/addons/account/project/report/analytic_check.py
@@ -26,7 +26,7 @@ from report import report_sxw
 
 class account_analytic_analytic_check(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(account_analytic_analytic_check, self).__init__(cr, uid, name, context)
+        super(account_analytic_analytic_check, self).__init__(cr, uid, name, context=context)
         self.sum_gen_deb = 0.0
         self.sum_gen_cred = 0.0
         self.sum_ana_deb = 0.0
diff --git a/addons/account/project/report/analytic_journal.py b/addons/account/project/report/analytic_journal.py
index 30faa18fecc..621d6139ab5 100644
--- a/addons/account/project/report/analytic_journal.py
+++ b/addons/account/project/report/analytic_journal.py
@@ -28,7 +28,7 @@ from report import report_sxw
 #
 class account_analytic_journal(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(account_analytic_journal, self).__init__(cr, uid, name, context)
+        super(account_analytic_journal, self).__init__(cr, uid, name, context=context)
         self.localcontext.update( {
             'time': time,
             'lines': self._lines,
diff --git a/addons/account/project/report/cost_ledger.py b/addons/account/project/report/cost_ledger.py
index 0641cfe2ba3..5c18b51d113 100644
--- a/addons/account/project/report/cost_ledger.py
+++ b/addons/account/project/report/cost_ledger.py
@@ -26,7 +26,7 @@ from report import report_sxw
 
 class account_analytic_cost_ledger(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(account_analytic_cost_ledger, self).__init__(cr, uid, name, context)
+        super(account_analytic_cost_ledger, self).__init__(cr, uid, name, context=context)
         self.localcontext.update( {
             'time': time,
             'lines_g': self._lines_g,
diff --git a/addons/account/project/report/inverted_analytic_balance.py b/addons/account/project/report/inverted_analytic_balance.py
index 345f60619d0..ada30ef567e 100644
--- a/addons/account/project/report/inverted_analytic_balance.py
+++ b/addons/account/project/report/inverted_analytic_balance.py
@@ -26,7 +26,7 @@ from report import report_sxw
 
 class account_inverted_analytic_balance(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(account_inverted_analytic_balance, self).__init__(cr, uid, name, context)
+        super(account_inverted_analytic_balance, self).__init__(cr, uid, name, context=context)
         self.localcontext.update( {
             'time': time,
             'lines_g': self._lines_g,
diff --git a/addons/account/project/report/quantity_cost_ledger.py b/addons/account/project/report/quantity_cost_ledger.py
index 5e79e16c1ed..9942bb96b26 100644
--- a/addons/account/project/report/quantity_cost_ledger.py
+++ b/addons/account/project/report/quantity_cost_ledger.py
@@ -26,8 +26,7 @@ from report import report_sxw
 
 class account_analytic_quantity_cost_ledger(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(account_analytic_quantity_cost_ledger, self).__init__(cr, uid,
-                name, context)
+        super(account_analytic_quantity_cost_ledger, self).__init__(cr, uid, name, context=context)
         self.localcontext.update( {
             'time': time,
             'lines_g': self._lines_g,
diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index ebf12dd9b08..49910b086a9 100644
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -30,7 +30,7 @@ from report import report_sxw
 class account_balance(report_sxw.rml_parse):
         _name = 'report.account.account.balance'
         def __init__(self, cr, uid, name, context):
-            super(account_balance, self).__init__(cr, uid, name, context)
+            super(account_balance, self).__init__(cr, uid, name, context=context)
             self.sum_debit = 0.00
             self.sum_credit = 0.00
             self.date_lst = []
diff --git a/addons/account/report/account_journal.py b/addons/account/report/account_journal.py
index f3c87ca1603..869b04b5dfd 100644
--- a/addons/account/report/account_journal.py
+++ b/addons/account/report/account_journal.py
@@ -29,7 +29,7 @@ from report import report_sxw
 #
 class journal_print(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(journal_print, self).__init__(cr, uid, name, context)
+        super(journal_print, self).__init__(cr, uid, name, context=context)
         self.localcontext.update( {
             'time': time,
             'lines': self.lines,
diff --git a/addons/account/report/account_tax_code.py b/addons/account/report/account_tax_code.py
index 773e9541d79..f3c3fb75e47 100644
--- a/addons/account/report/account_tax_code.py
+++ b/addons/account/report/account_tax_code.py
@@ -30,7 +30,7 @@ class account_tax_code_report(rml_parse.rml_parse):
     #_name = 'report.account.tax.code.entries'
     
     def __init__(self, cr, uid, name, context):
-        super(account_tax_code_report, self).__init__(cr, uid, name, context)
+        super(account_tax_code_report, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
             'get_line':self.get_line,
diff --git a/addons/account/report/aged_trial_balance.py b/addons/account/report/aged_trial_balance.py
index 652929e187d..4477e2a1561 100644
--- a/addons/account/report/aged_trial_balance.py
+++ b/addons/account/report/aged_trial_balance.py
@@ -28,7 +28,7 @@ from report import report_sxw
 class aged_trial_report(rml_parse.rml_parse):
 
 	def __init__(self, cr, uid, name, context):
-		super(aged_trial_report, self).__init__(cr, uid, name, context)
+		super(aged_trial_report, self).__init__(cr, uid, name, context=context)
 		self.line_query = ''
 		self.total_account = []
 
diff --git a/addons/account/report/central_journal.py b/addons/account/report/central_journal.py
index 2db5c6fe971..762282a3f90 100644
--- a/addons/account/report/central_journal.py
+++ b/addons/account/report/central_journal.py
@@ -28,7 +28,7 @@ from report import report_sxw
 #
 class journal_print(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(journal_print, self).__init__(cr, uid, name, context)
+        super(journal_print, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
             'lines': self.lines,
diff --git a/addons/account/report/general_journal.py b/addons/account/report/general_journal.py
index 926c3603e49..eb330134873 100644
--- a/addons/account/report/general_journal.py
+++ b/addons/account/report/general_journal.py
@@ -29,7 +29,7 @@ from report import report_sxw
 #
 class journal_print(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(journal_print, self).__init__(cr, uid, name, context)
+        super(journal_print, self).__init__(cr, uid, name, context=context)
         self.localcontext.update( {
             'time': time,
             'lines': self.lines,
diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py
index 534b4d52e67..f8712ea4863 100644
--- a/addons/account/report/general_ledger.py
+++ b/addons/account/report/general_ledger.py
@@ -53,7 +53,7 @@ class general_ledger(rml_parse.rml_parse):
         super(general_ledger, self).set_context(objects, data, new_ids, report_type)
 
     def __init__(self, cr, uid, name, context):
-        super(general_ledger, self).__init__(cr, uid, name, context)
+        super(general_ledger, self).__init__(cr, uid, name, context=context)
         self.date_borne = {}
         self.query = ""
         self.child_ids = ""
diff --git a/addons/account/report/general_ledger_landscape.py b/addons/account/report/general_ledger_landscape.py
index c63c4281173..0879a464f26 100644
--- a/addons/account/report/general_ledger_landscape.py
+++ b/addons/account/report/general_ledger_landscape.py
@@ -52,7 +52,7 @@ class general_ledger_landscape(rml_parse.rml_parse):
         super(general_ledger_landscape, self).set_context(objects, data, new_ids,report_type)
 
     def __init__(self, cr, uid, name, context):
-        super(general_ledger_landscape, self).__init__(cr, uid, name, context)
+        super(general_ledger_landscape, self).__init__(cr, uid, name, context=context)
         self.date_borne = {}
         self.query = ""
         self.child_ids = ""
diff --git a/addons/account/report/invoice.py b/addons/account/report/invoice.py
index 3ca850a148b..f125ab47b8b 100644
--- a/addons/account/report/invoice.py
+++ b/addons/account/report/invoice.py
@@ -25,7 +25,7 @@ from report import report_sxw
 
 class account_invoice(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(account_invoice, self).__init__(cr, uid, name, context)
+        super(account_invoice, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
         })
diff --git a/addons/account/report/partner_balance.py b/addons/account/report/partner_balance.py
index ddd6ad1ecb4..78067a3346a 100755
--- a/addons/account/report/partner_balance.py
+++ b/addons/account/report/partner_balance.py
@@ -28,7 +28,7 @@ from report import report_sxw
 
 class partner_balance(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(partner_balance, self).__init__(cr, uid, name, context)
+        super(partner_balance, self).__init__(cr, uid, name, context=context)
         self.date_lst = []
         self.date_lst_string = ''
         self.account_ids = ''
diff --git a/addons/account/report/rml_parse.py b/addons/account/report/rml_parse.py
index e0c41e8f286..02a5a266236 100644
--- a/addons/account/report/rml_parse.py
+++ b/addons/account/report/rml_parse.py
@@ -32,7 +32,7 @@ import sys
 
 class rml_parse(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(rml_parse, self).__init__(cr, uid, name, context=None)
+        super(rml_parse, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'comma_me': self.comma_me,
             'format_date': self._get_and_change_date_format_for_swiss,
diff --git a/addons/account/report/tax_report.py b/addons/account/report/tax_report.py
index 1f0332d2906..c4f8fdeb1f3 100644
--- a/addons/account/report/tax_report.py
+++ b/addons/account/report/tax_report.py
@@ -31,7 +31,7 @@ import re
 class tax_report(rml_parse.rml_parse):
 	_name = 'report.account.vat.declaration'
 	def __init__(self, cr, uid, name, context):
-		super(tax_report, self).__init__(cr, uid, name, context)
+		super(tax_report, self).__init__(cr, uid, name, context=context)
 		self.localcontext.update({
 			'time': time,
 			'get_period': self._get_period,
diff --git a/addons/account/report/third_party_ledger.py b/addons/account/report/third_party_ledger.py
index 9828fdfbd63..47407a31392 100644
--- a/addons/account/report/third_party_ledger.py
+++ b/addons/account/report/third_party_ledger.py
@@ -31,7 +31,7 @@ class third_party_ledger(rml_parse.rml_parse):
 	def __init__(self, cr, uid, name, context):
 		self.date_lst = []
 		self.date_lst_string = ''
-		super(third_party_ledger, self).__init__(cr, uid, name, context)
+		super(third_party_ledger, self).__init__(cr, uid, name, context=context)
 		self.localcontext.update( {
 			'time': time,
 			'lines': self.lines,
diff --git a/addons/account_analytic_plans/report/crossovered_analytic.py b/addons/account_analytic_plans/report/crossovered_analytic.py
index 2fab914fb64..951e147d7a8 100644
--- a/addons/account_analytic_plans/report/crossovered_analytic.py
+++ b/addons/account_analytic_plans/report/crossovered_analytic.py
@@ -26,7 +26,7 @@ from report import report_sxw
 
 class crossovered_analytic(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(crossovered_analytic, self).__init__(cr, uid, name, context)
+        super(crossovered_analytic, self).__init__(cr, uid, name, context=context)
         self.localcontext.update( {
             'time': time,
             'lines': self._lines,
diff --git a/addons/account_balance/report/account_balance.py b/addons/account_balance/report/account_balance.py
index 4fe498ac147..d67efab75a2 100644
--- a/addons/account_balance/report/account_balance.py
+++ b/addons/account_balance/report/account_balance.py
@@ -35,7 +35,7 @@ parents = {
 
 class account_balance(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(account_balance, self).__init__(cr, uid, name, context)
+        super(account_balance, self).__init__(cr, uid, name, context=context)
         self.flag=1
         self.dr_total= 0.00
         self.cr_total= 0.00
diff --git a/addons/account_balance/report/account_balance_landscape.py b/addons/account_balance/report/account_balance_landscape.py
index 372fdf2c441..925494f6021 100644
--- a/addons/account_balance/report/account_balance_landscape.py
+++ b/addons/account_balance/report/account_balance_landscape.py
@@ -36,7 +36,7 @@ parents = {
 
 class account_balance_landscape(rml_parse.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(account_balance_landscape, self).__init__(cr, uid, name, context)
+        super(account_balance_landscape, self).__init__(cr, uid, name, context=context)
         self.flag=1
         self.dr_total= 0.00
         self.cr_total= 0.00
diff --git a/addons/account_balance/report/rml_parse.py b/addons/account_balance/report/rml_parse.py
index c5eceb5bcd1..37bb0add89e 100644
--- a/addons/account_balance/report/rml_parse.py
+++ b/addons/account_balance/report/rml_parse.py
@@ -32,7 +32,7 @@ import sys
 
 class rml_parse(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(rml_parse, self).__init__(cr, uid, name, context=None)
+        super(rml_parse, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'comma_me': self.comma_me,
             'format_date': self._get_and_change_date_format_for_swiss,
diff --git a/addons/account_budget/report/analytic_account_budget_report.py b/addons/account_budget/report/analytic_account_budget_report.py
index a22195cfc76..a35fc3b15f4 100644
--- a/addons/account_budget/report/analytic_account_budget_report.py
+++ b/addons/account_budget/report/analytic_account_budget_report.py
@@ -26,7 +26,7 @@ import datetime
 
 class analytic_account_budget_report(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(analytic_account_budget_report, self).__init__(cr, uid, name, context)
+        super(analytic_account_budget_report, self).__init__(cr, uid, name, context=context)
         self.localcontext.update( {
             'funct': self.funct,
             'funct_total': self.funct_total,
diff --git a/addons/account_budget/report/budget_report.py b/addons/account_budget/report/budget_report.py
index 102707a14c7..c9c6c0750e4 100644
--- a/addons/account_budget/report/budget_report.py
+++ b/addons/account_budget/report/budget_report.py
@@ -27,7 +27,7 @@ import operator
 
 class budget_report(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(budget_report, self).__init__(cr, uid, name, context)
+        super(budget_report, self).__init__(cr, uid, name, context=context)
         self.localcontext.update( {
             'lines': self.lines,
             'budget_total': self.budget_total,
diff --git a/addons/account_budget/report/crossovered_budget_report.py b/addons/account_budget/report/crossovered_budget_report.py
index 3e46c1196f5..8b607e98cf1 100644
--- a/addons/account_budget/report/crossovered_budget_report.py
+++ b/addons/account_budget/report/crossovered_budget_report.py
@@ -29,7 +29,7 @@ import osv
 
 class budget_report(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(budget_report, self).__init__(cr, uid, name, context)
+        super(budget_report, self).__init__(cr, uid, name, context=context)
         self.localcontext.update( {
             'funct': self.funct,
             'funct_total': self.funct_total,
diff --git a/addons/account_followup/report/report_followup_print.py b/addons/account_followup/report/report_followup_print.py
index 53ad5ce2572..0c9768f45de 100644
--- a/addons/account_followup/report/report_followup_print.py
+++ b/addons/account_followup/report/report_followup_print.py
@@ -28,7 +28,7 @@ from report import report_sxw
 
 class report_rappel(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(report_rappel, self).__init__(cr, uid, name, context)
+        super(report_rappel, self).__init__(cr, uid, name, context=context)
         self.localcontext.update( {
             'time' : time,
             'ids_to_objects': self._ids_to_objects,
diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.py b/addons/account_invoice_layout/report/report_account_invoice_layout.py
index a577f7d656a..77221a54e81 100644
--- a/addons/account_invoice_layout/report/report_account_invoice_layout.py
+++ b/addons/account_invoice_layout/report/report_account_invoice_layout.py
@@ -25,7 +25,7 @@ from report import report_sxw
 
 class account_invoice_1(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(account_invoice_1, self).__init__(cr, uid, name, context)
+        super(account_invoice_1, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
             'invoice_lines': self.invoice_lines,
diff --git a/addons/account_invoice_layout/report/special_message_invoice.py b/addons/account_invoice_layout/report/special_message_invoice.py
index 38fe8739142..94dff32a54e 100644
--- a/addons/account_invoice_layout/report/special_message_invoice.py
+++ b/addons/account_invoice_layout/report/special_message_invoice.py
@@ -26,7 +26,7 @@ import pooler
 
 class account_invoice_with_message(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(account_invoice_with_message, self).__init__(cr, uid, name, context)
+        super(account_invoice_with_message, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
             'spcl_msg': self.spcl_msg,
diff --git a/addons/account_payment/report/payment_order.py b/addons/account_payment/report/payment_order.py
index 4767c63ba31..dec5c031f98 100644
--- a/addons/account_payment/report/payment_order.py
+++ b/addons/account_payment/report/payment_order.py
@@ -26,7 +26,7 @@ from report import report_sxw
 
 class payment_order(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(payment_order, self).__init__(cr, uid, name, context)
+        super(payment_order, self).__init__(cr, uid, name, context=context)
         self.localcontext.update( {
             'time': time,
 
diff --git a/addons/account_report/report/accounting_report.py b/addons/account_report/report/accounting_report.py
index c489d99ca62..52f1a02221d 100644
--- a/addons/account_report/report/accounting_report.py
+++ b/addons/account_report/report/accounting_report.py
@@ -28,7 +28,7 @@ from report import report_sxw
 class accounting_report(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(accounting_report, self).__init__(cr, uid, name, context)
+        super(accounting_report, self).__init__(cr, uid, name, context=context)
         self.ret_list = []
         self.localcontext.update({
             'time': time,
diff --git a/addons/account_report/report/print_indicator.py b/addons/account_report/report/print_indicator.py
index 9d4fa4673f4..53f59919b91 100644
--- a/addons/account_report/report/print_indicator.py
+++ b/addons/account_report/report/print_indicator.py
@@ -76,7 +76,7 @@ import os
 class accounting_report_indicator(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(accounting_report_indicator, self).__init__(cr, uid, name, context)
+        super(accounting_report_indicator, self).__init__(cr, uid, name, context=context)
         self.ret_list = []
         self.localcontext.update({
             'time': time,
diff --git a/addons/account_reporting/report/account_report_bs.py b/addons/account_reporting/report/account_report_bs.py
index 955e4c12c6f..c741b0d2ff0 100644
--- a/addons/account_reporting/report/account_report_bs.py
+++ b/addons/account_reporting/report/account_report_bs.py
@@ -36,7 +36,7 @@ parents = {
 
 class account_report_bs(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(account_report_bs, self).__init__(cr, uid, name, context)
+        super(account_report_bs, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
             'lines': self.lines,
diff --git a/addons/account_voucher/report/report_voucher.py b/addons/account_voucher/report/report_voucher.py
index 27ba2efd488..9f40c6ad920 100755
--- a/addons/account_voucher/report/report_voucher.py
+++ b/addons/account_voucher/report/report_voucher.py
@@ -32,7 +32,7 @@ from tools import amount_to_text_en
 
 class report_voucher(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(report_voucher, self).__init__(cr, uid, name, context)
+        super(report_voucher, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
             'convert':self.convert,
diff --git a/addons/account_voucher/report/report_voucher_amount.py b/addons/account_voucher/report/report_voucher_amount.py
index 3b67ff7a9ac..246782e433e 100755
--- a/addons/account_voucher/report/report_voucher_amount.py
+++ b/addons/account_voucher/report/report_voucher_amount.py
@@ -32,7 +32,7 @@ from tools import amount_to_text_en
 
 class report_voucher_amount(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(report_voucher_amount, self).__init__(cr, uid, name, context)
+        super(report_voucher_amount, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
             'convert':self.convert
@@ -48,4 +48,4 @@ report_sxw.report_sxw(
     'account.voucher',
     'addons/account_voucher/report/report_voucher_amount.rml',
     parser=report_voucher_amount,header=False
-)
\ No newline at end of file
+)
diff --git a/addons/account_voucher/report/rml_parse.py b/addons/account_voucher/report/rml_parse.py
index 31bd26617cd..9f4b8e6bfb9 100644
--- a/addons/account_voucher/report/rml_parse.py
+++ b/addons/account_voucher/report/rml_parse.py
@@ -32,7 +32,7 @@ import sys
 
 class rml_parse(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(rml_parse, self).__init__(cr, uid, name, context=None)
+        super(rml_parse, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'comma_me': self.comma_me,
             'format_date': self._get_and_change_date_format_for_swiss,
diff --git a/addons/auction/report/auction_artists.py b/addons/auction/report/auction_artists.py
index 91843906dff..c66531938f4 100644
--- a/addons/auction/report/auction_artists.py
+++ b/addons/auction/report/auction_artists.py
@@ -28,7 +28,7 @@ from report import report_sxw
 
 class auction_artists(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(auction_artists, self).__init__(cr, uid, name, context)
+        super(auction_artists, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
 
diff --git a/addons/auction/report/auction_bids.py b/addons/auction/report/auction_bids.py
index 560160ac008..2153d246428 100644
--- a/addons/auction/report/auction_bids.py
+++ b/addons/auction/report/auction_bids.py
@@ -28,7 +28,7 @@ from report import report_sxw
 
 class auction_bids(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(auction_bids, self).__init__(cr, uid, name, context)
+        super(auction_bids, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
         })
diff --git a/addons/auction/report/auction_buyer_result.py b/addons/auction/report/auction_buyer_result.py
index 97ab54cc056..017f62eb5d0 100644
--- a/addons/auction/report/auction_buyer_result.py
+++ b/addons/auction/report/auction_buyer_result.py
@@ -28,7 +28,7 @@ from report import report_sxw
 
 class auction_buyer_result(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(auction_buyer_result, self).__init__(cr, uid, name, context)
+        super(auction_buyer_result, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
 
diff --git a/addons/auction/report/auction_catelog.py b/addons/auction/report/auction_catelog.py
index 70b2b6db917..b9b8dad2dc7 100644
--- a/addons/auction/report/auction_catelog.py
+++ b/addons/auction/report/auction_catelog.py
@@ -28,7 +28,7 @@ from report import report_sxw
 
 class auction_catelog(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(auction_catelog, self).__init__(cr, uid, name, context)
+        super(auction_catelog, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
 
diff --git a/addons/auction/report/auction_objects.py b/addons/auction/report/auction_objects.py
index 879b407c184..0879c7770e5 100644
--- a/addons/auction/report/auction_objects.py
+++ b/addons/auction/report/auction_objects.py
@@ -26,7 +26,7 @@ from report import report_sxw
 
 class auction_objects(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(auction_objects, self).__init__(cr, uid, name, context)
+        super(auction_objects, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
             #'lines': self.lines
diff --git a/addons/auction/report/auction_result.py b/addons/auction/report/auction_result.py
index 48f21d73669..77ba88b9486 100644
--- a/addons/auction/report/auction_result.py
+++ b/addons/auction/report/auction_result.py
@@ -28,7 +28,7 @@ from report import report_sxw
 
 class auction_result(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(auction_result, self).__init__(cr, uid, name, context)
+        super(auction_result, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
 
diff --git a/addons/auction/report/auction_total_rml.py b/addons/auction/report/auction_total_rml.py
index cc103e7c250..82c068bce26 100644
--- a/addons/auction/report/auction_total_rml.py
+++ b/addons/auction/report/auction_total_rml.py
@@ -29,7 +29,7 @@ from report import report_sxw
 class auction_total_rml(report_sxw.rml_parse):
     total_obj=[]
     def __init__(self, cr, uid, name, context):
-        super(auction_total_rml, self).__init__(cr, uid, name, context)
+        super(auction_total_rml, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
             'sum_taxes':self.sum_taxes,
diff --git a/addons/auction/report/bids_lots.py b/addons/auction/report/bids_lots.py
index 8358e76ea2a..e77d7948c92 100644
--- a/addons/auction/report/bids_lots.py
+++ b/addons/auction/report/bids_lots.py
@@ -28,7 +28,7 @@ from report import report_sxw
 
 class bids_lots(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(bids_lots, self).__init__(cr, uid, name, context)
+        super(bids_lots, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
         })
diff --git a/addons/auction/report/bids_phones_details.py b/addons/auction/report/bids_phones_details.py
index bf5e5343074..73899f957cd 100644
--- a/addons/auction/report/bids_phones_details.py
+++ b/addons/auction/report/bids_phones_details.py
@@ -28,7 +28,7 @@ from report import report_sxw
 
 class bids_phones_details(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(bids_phones_details, self).__init__(cr, uid, name, context)
+        super(bids_phones_details, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
         })
diff --git a/addons/auction/report/buyer_form_report.py b/addons/auction/report/buyer_form_report.py
index 20d93cef754..291be748930 100644
--- a/addons/auction/report/buyer_form_report.py
+++ b/addons/auction/report/buyer_form_report.py
@@ -30,7 +30,7 @@ class buyer_form_report(report_sxw.rml_parse):
     count=0
     c=0
     def __init__(self, cr, uid, name, context):
-        super(buyer_form_report, self).__init__(cr, uid, name, context)
+        super(buyer_form_report, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
             'sum_taxes': self.sum_taxes,
diff --git a/addons/auction/report/buyer_list.py b/addons/auction/report/buyer_list.py
index eaa44f22c0c..83799ba5169 100644
--- a/addons/auction/report/buyer_list.py
+++ b/addons/auction/report/buyer_list.py
@@ -34,7 +34,7 @@ class buyer_list(report_sxw.rml_parse):
     sum_buyer_price_val=0.0
     sum_lot_val=0.0
     def __init__(self, cr, uid, name, context):
-        super(buyer_list, self).__init__(cr, uid, name, context)
+        super(buyer_list, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
             'lines_lots_from_auction' : self.lines_lots_from_auction,
diff --git a/addons/auction/report/catelogwithpictures.py b/addons/auction/report/catelogwithpictures.py
index f3f954a2908..4063f884ad2 100644
--- a/addons/auction/report/catelogwithpictures.py
+++ b/addons/auction/report/catelogwithpictures.py
@@ -26,7 +26,7 @@ from report import report_sxw
 
 class catelogwithpictures(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(catelogwithpictures, self).__init__(cr, uid, name, context)
+        super(catelogwithpictures, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
 
diff --git a/addons/auction/report/deposit_seller.py b/addons/auction/report/deposit_seller.py
index 4e0a184ffc7..f39fd6b5596 100644
--- a/addons/auction/report/deposit_seller.py
+++ b/addons/auction/report/deposit_seller.py
@@ -28,7 +28,7 @@ from report import report_sxw
 
 class deposit_seller(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(deposit_seller, self).__init__(cr, uid, name, context)
+        super(deposit_seller, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
 
diff --git a/addons/auction/report/lots_list.py b/addons/auction/report/lots_list.py
index 32d23accb90..ad5e678c2f3 100644
--- a/addons/auction/report/lots_list.py
+++ b/addons/auction/report/lots_list.py
@@ -26,7 +26,7 @@ from report import report_sxw
 
 class lots_list(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(lots_list, self).__init__(cr, uid, name, context)
+        super(lots_list, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
             'bid_line' : self.bid_line
diff --git a/addons/auction/report/lots_list_inventory.py b/addons/auction/report/lots_list_inventory.py
index 42a993ccc7a..329591cf3ac 100644
--- a/addons/auction/report/lots_list_inventory.py
+++ b/addons/auction/report/lots_list_inventory.py
@@ -26,7 +26,7 @@ from report import report_sxw
 
 class lots_list_inventory(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(lots_list_inventory, self).__init__(cr, uid, name, context)
+        super(lots_list_inventory, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
             'bid_line' : self.bid_line
diff --git a/addons/auction/report/lots_list_landscape.py b/addons/auction/report/lots_list_landscape.py
index b638c6e54c4..99760d78715 100644
--- a/addons/auction/report/lots_list_landscape.py
+++ b/addons/auction/report/lots_list_landscape.py
@@ -26,7 +26,7 @@ from report import report_sxw
 
 class lots_list_llandscape(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(lots_list_landscape, self).__init__(cr, uid, name, context)
+        super(lots_list_landscape, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
 
diff --git a/addons/auction/report/report_lot_bar_code.py b/addons/auction/report/report_lot_bar_code.py
index 3d9f8df4330..4767fe68c28 100644
--- a/addons/auction/report/report_lot_bar_code.py
+++ b/addons/auction/report/report_lot_bar_code.py
@@ -26,7 +26,7 @@ from report import report_sxw
 
 class auction_code_produit(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(auction_code_produit, self).__init__(cr, uid, name, context)
+        super(auction_code_produit, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
         })
diff --git a/addons/auction/report/seller_form_report.py b/addons/auction/report/seller_form_report.py
index a64759b2547..d0febfde712 100644
--- a/addons/auction/report/seller_form_report.py
+++ b/addons/auction/report/seller_form_report.py
@@ -28,7 +28,7 @@ from osv import osv
 
 class seller_form_report(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(seller_form_report, self).__init__(cr, uid, name, context)
+        super(seller_form_report, self).__init__(cr, uid, name, context=context)
         lot=self.pool.get('auction.lots').browse(cr,uid,uid)
         #address=lot.bord_vnd_id.address_get(self.cr,self.uid,[partner.id])
     #   partner=lot.bord_vnd_id.partner_id
diff --git a/addons/hr_attendance/report/attendance_errors.py b/addons/hr_attendance/report/attendance_errors.py
index ef3317e27da..58553cd5e83 100644
--- a/addons/hr_attendance/report/attendance_errors.py
+++ b/addons/hr_attendance/report/attendance_errors.py
@@ -28,7 +28,7 @@ import datetime
 
 class attendance_print(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(attendance_print, self).__init__(cr, uid, name, context)
+        super(attendance_print, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
             'lst': self._lst,
diff --git a/addons/hr_expense/report/expense.py b/addons/hr_expense/report/expense.py
index 0c35a035a38..376b5e6c16a 100644
--- a/addons/hr_expense/report/expense.py
+++ b/addons/hr_expense/report/expense.py
@@ -26,7 +26,7 @@ import datetime
 
 class expense(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(expense, self).__init__(cr, uid, name, context)
+        super(expense, self).__init__(cr, uid, name, context=context)
         self.localcontext.update( {
             'time': time,
         })
diff --git a/addons/hr_timesheet_invoice/report/account_analytic_profit.py b/addons/hr_timesheet_invoice/report/account_analytic_profit.py
index a767eba946a..600535ee027 100644
--- a/addons/hr_timesheet_invoice/report/account_analytic_profit.py
+++ b/addons/hr_timesheet_invoice/report/account_analytic_profit.py
@@ -25,7 +25,7 @@ import pooler
 
 class account_analytic_profit(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(account_analytic_profit, self).__init__(cr, uid, name, context)
+        super(account_analytic_profit, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'lines': self._lines,
             'user_ids': self._user_ids,
diff --git a/addons/hr_timesheet_invoice/report/cost_ledger.py b/addons/hr_timesheet_invoice/report/cost_ledger.py
index 5e588f11e06..584ea3c6acd 100644
--- a/addons/hr_timesheet_invoice/report/cost_ledger.py
+++ b/addons/hr_timesheet_invoice/report/cost_ledger.py
@@ -27,7 +27,7 @@ from report import report_sxw
 
 class account_analytic_cost_ledger(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(account_analytic_cost_ledger, self).__init__(cr, uid, name, context)
+        super(account_analytic_cost_ledger, self).__init__(cr, uid, name, context=context)
         self.sum_revenue={}
         self.account_sum_revenue={}
         self.localcontext.update( {
diff --git a/addons/l10n_ch/report/bvr.py b/addons/l10n_ch/report/bvr.py
index c71c62a0da2..8804f6c876a 100755
--- a/addons/l10n_ch/report/bvr.py
+++ b/addons/l10n_ch/report/bvr.py
@@ -39,7 +39,7 @@ from mx.DateTime import *
 class account_invoice_bvr(report_sxw.rml_parse):
 	"""Report class that Allows to print BVR payement vector"""
 	def __init__(self, cr, uid, name, context):
-		super(account_invoice_bvr, self).__init__(cr, uid, name, context)
+		super(account_invoice_bvr, self).__init__(cr, uid, name, context=context)
 		self.localcontext.update({
 			'time': time,
 			'user':self.pool.get("res.users").browse(cr,uid,uid),
diff --git a/addons/l10n_fr/report/base_report.py b/addons/l10n_fr/report/base_report.py
index 488f36304c5..52eb99154a6 100644
--- a/addons/l10n_fr/report/base_report.py
+++ b/addons/l10n_fr/report/base_report.py
@@ -31,7 +31,7 @@ from report import report_sxw
 
 class base_report(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(base_report, self).__init__(cr, uid, name, context)
+        super(base_report, self).__init__(cr, uid, name, context=context)
         self.localcontext.update( {
             'time': time,
             '_load': self._load,
diff --git a/addons/mrp/report/order.py b/addons/mrp/report/order.py
index 5fc82b9f7f0..02526d88a64 100644
--- a/addons/mrp/report/order.py
+++ b/addons/mrp/report/order.py
@@ -27,7 +27,7 @@ import pooler
 
 class order(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(order, self).__init__(cr, uid, name, context)
+        super(order, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
         })
diff --git a/addons/mrp_operations/report/mrp_code_barcode.py b/addons/mrp_operations/report/mrp_code_barcode.py
index a4431e55b57..336a46ba546 100755
--- a/addons/mrp_operations/report/mrp_code_barcode.py
+++ b/addons/mrp_operations/report/mrp_code_barcode.py
@@ -26,7 +26,7 @@ from report import report_sxw
 
 class code_barcode(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(code_barcode, self).__init__(cr, uid, name, context)
+        super(code_barcode, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
         })
diff --git a/addons/mrp_operations/report/mrp_wc_barcode.py b/addons/mrp_operations/report/mrp_wc_barcode.py
index bc4fe4976ee..6725f95a95d 100755
--- a/addons/mrp_operations/report/mrp_wc_barcode.py
+++ b/addons/mrp_operations/report/mrp_wc_barcode.py
@@ -26,7 +26,7 @@ from report import report_sxw
 
 class workcenter_code(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(workcenter_code, self).__init__(cr, uid, name, context)
+        super(workcenter_code, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
         })
diff --git a/addons/mrp_repair/report/order.py b/addons/mrp_repair/report/order.py
index be6897d8c2e..b7f3d0bc19d 100644
--- a/addons/mrp_repair/report/order.py
+++ b/addons/mrp_repair/report/order.py
@@ -27,7 +27,7 @@ import pooler
 
 class order(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(order, self).__init__(cr, uid, name, context)
+        super(order, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
             'total': self.total,
diff --git a/addons/point_of_sale/report/pos_details.py b/addons/point_of_sale/report/pos_details.py
index 1e5962c6586..6a6b9420255 100644
--- a/addons/point_of_sale/report/pos_details.py
+++ b/addons/point_of_sale/report/pos_details.py
@@ -112,7 +112,7 @@ class pos_details(report_sxw.rml_parse):
             return '%s - %s' % (min_date, max_date)
 
     def __init__(self, cr, uid, name, context):
-        super(pos_details, self).__init__(cr, uid, name, context)
+        super(pos_details, self).__init__(cr, uid, name, context=context)
         self.total = 0.0
         self.localcontext.update({
             'time': time,
diff --git a/addons/point_of_sale/report/pos_details_summary.py b/addons/point_of_sale/report/pos_details_summary.py
index 826844effd6..dc625aee62e 100644
--- a/addons/point_of_sale/report/pos_details_summary.py
+++ b/addons/point_of_sale/report/pos_details_summary.py
@@ -109,7 +109,7 @@ class pos_details_summary(report_sxw.rml_parse):
             return '%s - %s' % (min_date, max_date)
 
     def __init__(self, cr, uid, name, context):
-        super(pos_details_summary, self).__init__(cr, uid, name, context)
+        super(pos_details_summary, self).__init__(cr, uid, name, context=context)
         self.total = 0.0
         self.localcontext.update({
             'time': time,
diff --git a/addons/point_of_sale/report/pos_invoice.py b/addons/point_of_sale/report/pos_invoice.py
index 54423775614..1d2749b46ef 100644
--- a/addons/point_of_sale/report/pos_invoice.py
+++ b/addons/point_of_sale/report/pos_invoice.py
@@ -29,7 +29,7 @@ from tools.translate import _
 class pos_invoice(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(pos_invoice, self).__init__(cr, uid, name, context)
+        super(pos_invoice, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
         })
diff --git a/addons/point_of_sale/report/pos_lines.py b/addons/point_of_sale/report/pos_lines.py
index 1abec66dc80..66f9754f412 100644
--- a/addons/point_of_sale/report/pos_lines.py
+++ b/addons/point_of_sale/report/pos_lines.py
@@ -27,7 +27,7 @@ from report import report_sxw
 class pos_lines(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(pos_lines, self).__init__(cr, uid, name, context)
+        super(pos_lines, self).__init__(cr, uid, name, context=context)
         self.total = 0.0
         self.localcontext.update({
                 'time': time,
diff --git a/addons/point_of_sale/report/pos_receipt.py b/addons/point_of_sale/report/pos_receipt.py
index 69f4bd706c2..15d8f177582 100644
--- a/addons/point_of_sale/report/pos_receipt.py
+++ b/addons/point_of_sale/report/pos_receipt.py
@@ -29,7 +29,7 @@ import pooler
 class order(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(order, self).__init__(cr, uid, name, context)
+        super(order, self).__init__(cr, uid, name, context=context)
 
         user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid)
         partner = user.company_id.partner_id
diff --git a/addons/product/report/product_pricelist.py b/addons/product/report/product_pricelist.py
index 3e232f7413c..dc3a1c3512c 100644
--- a/addons/product/report/product_pricelist.py
+++ b/addons/product/report/product_pricelist.py
@@ -27,7 +27,7 @@ import pooler
 
 class product_pricelist(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(product_pricelist, self).__init__(cr, uid, name, context)
+        super(product_pricelist, self).__init__(cr, uid, name, context=context)
         self.pricelist=False
         self.quantity=[]
         self.localcontext.update({
diff --git a/addons/purchase/report/order.py b/addons/purchase/report/order.py
index 52aaa1ae865..66ba383141d 100644
--- a/addons/purchase/report/order.py
+++ b/addons/purchase/report/order.py
@@ -27,7 +27,7 @@ import pooler
 
 class order(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(order, self).__init__(cr, uid, name, context)
+        super(order, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
             'get_line_tax': self._get_line_tax,
diff --git a/addons/purchase/report/request_quotation.py b/addons/purchase/report/request_quotation.py
index 9acf4309264..0e920e2039d 100644
--- a/addons/purchase/report/request_quotation.py
+++ b/addons/purchase/report/request_quotation.py
@@ -27,7 +27,7 @@ import pooler
 
 class request_quotation(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(request_quotation, self).__init__(cr, uid, name, context)
+        super(request_quotation, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
             'user': self.pool.get('res.users').browse(cr, uid, uid, context)
diff --git a/addons/report_intrastat/report/invoice.py b/addons/report_intrastat/report/invoice.py
index 692b33d0095..7afdd1c180e 100644
--- a/addons/report_intrastat/report/invoice.py
+++ b/addons/report_intrastat/report/invoice.py
@@ -26,7 +26,7 @@ import pooler
 
 class account_invoice_intrastat(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(account_invoice_intrastat, self).__init__(cr, uid, name, context)
+        super(account_invoice_intrastat, self).__init__(cr, uid, name, context=context)
         self.total=0
         self.localcontext.update({
             'time': time,
diff --git a/addons/sale/report/order.py b/addons/sale/report/order.py
index cb239b62f2a..ef33a9509f8 100644
--- a/addons/sale/report/order.py
+++ b/addons/sale/report/order.py
@@ -26,7 +26,7 @@ from osv import osv
 
 class order(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(order, self).__init__(cr, uid, name, context)
+        super(order, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
         })
diff --git a/addons/sale/report/sale_prepare_allot.py b/addons/sale/report/sale_prepare_allot.py
index ef59da50d7d..30f643d63f3 100644
--- a/addons/sale/report/sale_prepare_allot.py
+++ b/addons/sale/report/sale_prepare_allot.py
@@ -25,7 +25,7 @@ from report import report_sxw
 
 class sale_prepare(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(sale_prepare, self).__init__(cr, uid, name, context)
+        super(sale_prepare, self).__init__(cr, uid, name, context=context)
         self.localcontext.update( {
             'allotment': self._allotment,
         })
diff --git a/addons/sale_delivery_report/report/shipping.py b/addons/sale_delivery_report/report/shipping.py
index 63aeba6c10c..13ea8e754da 100644
--- a/addons/sale_delivery_report/report/shipping.py
+++ b/addons/sale_delivery_report/report/shipping.py
@@ -27,7 +27,7 @@ import pooler
 
 class shipping(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(shipping, self).__init__(cr, uid, name, context)
+        super(shipping, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
 #            'get_address': self._get_address,
diff --git a/addons/stock/report/lot_location.py b/addons/stock/report/lot_location.py
index e20f89bb81f..a44ae876a9e 100644
--- a/addons/stock/report/lot_location.py
+++ b/addons/stock/report/lot_location.py
@@ -25,7 +25,7 @@ from report import report_sxw
 
 class lot_location(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(lot_location, self).__init__(cr, uid, name, context)
+        super(lot_location, self).__init__(cr, uid, name, context=context)
         self.grand_total = 0.0
 
         self.localcontext.update({
diff --git a/addons/stock/report/lot_overview.py b/addons/stock/report/lot_overview.py
index 3ecd26476df..f8442d7f3f6 100644
--- a/addons/stock/report/lot_overview.py
+++ b/addons/stock/report/lot_overview.py
@@ -25,7 +25,7 @@ from report import report_sxw
 
 class lot_overview(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(lot_overview, self).__init__(cr, uid, name, context)
+        super(lot_overview, self).__init__(cr, uid, name, context=context)
         self.price_total = 0.0
         self.grand_total = 0.0
         self.localcontext.update({
diff --git a/addons/stock/report/lot_overview_all.py b/addons/stock/report/lot_overview_all.py
index 2f349d9bd93..addd7a9009f 100644
--- a/addons/stock/report/lot_overview_all.py
+++ b/addons/stock/report/lot_overview_all.py
@@ -25,7 +25,7 @@ from report import report_sxw
 
 class lot_overview_all(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(lot_overview_all, self).__init__(cr, uid, name, context)
+        super(lot_overview_all, self).__init__(cr, uid, name, context=context)
         self.price_total = 0.0
         self.grand_total = 0.0
         self.localcontext.update({
diff --git a/addons/stock/report/picking.py b/addons/stock/report/picking.py
index 5a0746b80e8..0182ef3ba54 100644
--- a/addons/stock/report/picking.py
+++ b/addons/stock/report/picking.py
@@ -27,7 +27,7 @@ import pooler
 
 class picking(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(picking, self).__init__(cr, uid, name, context)
+        super(picking, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
         })

From 6f68bf76ff2e7c669c0afecb41ec7dc78b70adc3 Mon Sep 17 00:00:00 2001
From: "HDA (OpenERP)" <hda@tinyerp.com>
Date: Mon, 12 Oct 2009 15:53:33 +0530
Subject: [PATCH 030/200] Module:account_voucher Removed (tlh_TLH)Klingon
 translation file

bzr revid: hda@tinyerp.com-20091012102333-tcvpvl11p43skegs
---
 addons/account_voucher/i18n/tlh_TLH.po | 598 -------------------------
 1 file changed, 598 deletions(-)
 delete mode 100644 addons/account_voucher/i18n/tlh_TLH.po

diff --git a/addons/account_voucher/i18n/tlh_TLH.po b/addons/account_voucher/i18n/tlh_TLH.po
deleted file mode 100644
index 40cccd6da7f..00000000000
--- a/addons/account_voucher/i18n/tlh_TLH.po
+++ /dev/null
@@ -1,598 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_voucher
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:36+0000\n"
-"PO-Revision-Date: 2009-05-19 17:10+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-08-28 11:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_account_acount_move_line_open1
-msgid "Opening Balance Entry"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.ui.menu,name:account_voucher.menu_action_receipt_bakreceipt_voucher_list
-msgid "Bank Receipts"
-msgstr ""
-
-#. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "Particulars"
-msgstr ""
-
-#. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "State :"
-msgstr ""
-
-#. module: account_voucher
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "Ref. :"
-msgstr ""
-
-#. module: account_voucher
-#: selection:account.move,voucher_type:0
-#: selection:account.voucher,type:0
-#: selection:account.voucher.open,init,type:0
-#: model:ir.actions.act_window,name:account_voucher.action_view_cont_voucher_form
-#: model:ir.ui.menu,name:account_voucher.menu_action_view_cont_voucher_form
-msgid "Contra Voucher"
-msgstr ""
-
-#. module: account_voucher
-#: field:account.voucher,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: account_voucher
-#: selection:account.move,voucher_type:0
-#: selection:account.voucher,type:0
-#: model:ir.actions.act_window,name:account_voucher.action_view_jour_voucher_form
-#: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_voucher_form
-msgid "Journal Voucher"
-msgstr ""
-
-#. module: account_voucher
-#: rml:voucher.cash_receipt.drcr:0
-msgid ","
-msgstr ""
-
-#. module: account_voucher
-#: view:account.voucher:0
-msgid "Set to Draft"
-msgstr ""
-
-#. module: account_voucher
-#: wizard_button:account.voucher.open,init,open:0
-msgid "Open Voucher Entries"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.model,name:account_voucher.model_account_voucher_line
-msgid "Voucher Line"
-msgstr ""
-
-#. module: account_voucher
-#: view:account.move:0
-msgid "Total Credit"
-msgstr ""
-
-#. module: account_voucher
-#: field:account.voucher,account_id:0
-#: field:account.voucher.line,account_id:0
-msgid "Account"
-msgstr ""
-
-#. module: account_voucher
-#: rml:voucher.cash_amount:0
-msgid "D"
-msgstr ""
-
-#. module: account_voucher
-#: field:account.account,level:0
-msgid "Level"
-msgstr ""
-
-#. module: account_voucher
-#: view:account.move:0
-msgid "Account Entry Line"
-msgstr ""
-
-#. module: account_voucher
-#: view:account.move:0
-msgid "Total Debit"
-msgstr ""
-
-#. module: account_voucher
-#: field:account.voucher,amount:0
-#: field:account.voucher.line,amount:0
-#: rml:voucher.cash_amount:0
-msgid "Amount"
-msgstr ""
-
-#. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "Receiver's Signature"
-msgstr ""
-
-#. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "No."
-msgstr ""
-
-#. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "Amount (in words) :"
-msgstr ""
-
-#. module: account_voucher
-#: field:account.voucher.line,account_analytic_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: account_voucher
-#: selection:account.move,voucher_type:0
-#: selection:account.voucher,type:0
-#: selection:account.voucher.open,init,type:0
-#: model:ir.actions.act_window,name:account_voucher.action_view_jour_sale_voucher_form
-#: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_sale_voucher_form
-msgid "Journal Sale Voucher"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_receipt_vou_voucher_list
-#: model:ir.ui.menu,name:account_voucher.menu_action_receipt_vou_voucher_list
-msgid "Receipt Vouchers"
-msgstr ""
-
-#. module: account_voucher
-#: rml:voucher.cash_amount:0
-msgid "Account :"
-msgstr ""
-
-#. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "On Account of :"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_payments_bankpay_voucher_list
-#: model:ir.actions.act_window,name:account_voucher.action_payments_cashpay_voucher_list
-#: model:ir.actions.act_window,name:account_voucher.action_payments_voucher_list
-#: model:ir.ui.menu,name:account_voucher.menu_action_payments_voucher_list
-msgid "Payment Vouchers"
-msgstr ""
-
-#. module: account_voucher
-#: view:account.voucher:0
-msgid "Create"
-msgstr ""
-
-#. module: account_voucher
-#: selection:account.account,type1:0
-#: selection:account.account.template,type1:0
-msgid "None"
-msgstr ""
-
-#. module: account_voucher
-#: field:account.voucher,number:0
-msgid "Number"
-msgstr ""
-
-#. module: account_voucher
-#: view:account.move:0
-#: field:account.voucher,state:0
-#: wizard_field:account.voucher.open,init,state:0
-msgid "State"
-msgstr ""
-
-#. module: account_voucher
-#: selection:account.account,type1:0
-#: selection:account.account.template,type1:0
-#: selection:account.voucher.line,type:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "Debit"
-msgstr ""
-
-#. module: account_voucher
-#: field:account.voucher,type:0
-#: field:account.voucher.line,type:0
-msgid "Type"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.ui.menu,name:account_voucher.menu_action_voucher_list
-msgid "Voucher Entries"
-msgstr ""
-
-#. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "Authorised Signatory"
-msgstr ""
-
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_voucher_list
-msgid "Vouchers"
-msgstr ""
-
-#. module: account_voucher
-#: view:account.voucher:0
-#: field:account.voucher.line,voucher_id:0
-#: model:res.request.link,name:account_voucher.req_link_voucher
-msgid "Voucher"
-msgstr ""
-
-#. module: account_voucher
-#: wizard_view:account.voucher.open,init:0
-#: model:ir.ui.menu,name:account_voucher.menu_wizard_account_voucher_open
-msgid "Open Vouchers"
-msgstr ""
-
-#. module: account_voucher
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "Dated :"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.ui.menu,name:account_voucher.menu_action_receipt_cashreceipt_voucher_list
-msgid "Cash Receipts"
-msgstr ""
-
-#. module: account_voucher
-#: field:account.voucher,partner_id:0
-#: field:account.voucher.line,partner_id:0
-msgid "Partner"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.ui.menu,name:account_voucher.menu_action_view_bank_pay_voucher_form
-msgid "New Bank Payment"
-msgstr ""
-
-#. module: account_voucher
-#: view:account.voucher:0
-#: field:account.voucher,payment_ids:0
-msgid "Voucher Lines"
-msgstr ""
-
-#. module: account_voucher
-#: field:account.voucher,currency_id:0
-msgid "Currency"
-msgstr ""
-
-#. module: account_voucher
-#: view:account.move:0
-#: field:account.move,narration:0
-#: view:account.voucher:0
-#: field:account.voucher,narration:0
-msgid "Narration"
-msgstr ""
-
-#. module: account_voucher
-#: field:account.voucher,reference:0
-msgid "Voucher Reference"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.ui.menu,name:account_voucher.menu_action_view_cash_rec_voucher_form
-msgid "New Cash Receipt"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.report.xml,name:account_voucher.report_account_voucher_amt
-msgid "Voucher Report"
-msgstr ""
-
-#. module: account_voucher
-#: field:account.account,open_bal:0
-msgid "Opening Balance"
-msgstr ""
-
-#. module: account_voucher
-#: selection:account.voucher,state:0
-#: selection:account.voucher.open,init,state:0
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "Draft"
-msgstr ""
-
-#. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "PRO-FORMA"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_receipt_cashreceipt_voucher_list
-msgid "Cash Receipt"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.ui.menu,name:account_voucher.menu_action_view_cash_pay_voucher_form
-msgid "New Cash Payment"
-msgstr ""
-
-#. module: account_voucher
-#: view:account.move:0
-msgid "Optional Information"
-msgstr ""
-
-#. module: account_voucher
-#: view:account.voucher:0
-msgid "General Entries"
-msgstr ""
-
-#. module: account_voucher
-#: field:account.voucher,date:0
-msgid "Date"
-msgstr ""
-
-#. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid ":"
-msgstr ""
-
-#. module: account_voucher
-#: field:account.account,type1:0
-#: field:account.account.template,type1:0
-msgid "Dr/Cr"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.report.xml,name:account_voucher.report_account_voucher
-msgid "Voucher Report (Cr/Dr)"
-msgstr ""
-
-#. module: account_voucher
-#: field:account.move,voucher_type:0
-#: wizard_field:account.voucher.open,init,type:0
-msgid "Voucher Type"
-msgstr ""
-
-#. module: account_voucher
-#: selection:account.account,type1:0
-#: selection:account.account.template,type1:0
-#: selection:account.voucher.line,type:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "Credit"
-msgstr ""
-
-#. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "Through :"
-msgstr ""
-
-#. module: account_voucher
-#: field:account.voucher,reference_type:0
-msgid "Reference Type"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.model,name:account_voucher.model_account_voucher
-msgid "Accounting Voucher"
-msgstr ""
-
-#. module: account_voucher
-#: field:account.voucher,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.ui.menu,name:account_voucher.menu_action_payments_bankpay_voucher_list
-msgid "Bank Payments"
-msgstr ""
-
-#. module: account_voucher
-#: view:account.move:0
-msgid "General Information"
-msgstr ""
-
-#. module: account_voucher
-#: wizard_field:account.voucher.open,init,period_ids:0
-msgid "Periods"
-msgstr ""
-
-#. module: account_voucher
-#: view:account.voucher:0
-#: selection:account.voucher,state:0
-#: wizard_button:account.voucher.open,init,end:0
-#: selection:account.voucher.open,init,state:0
-msgid "Cancel"
-msgstr ""
-
-#. module: account_voucher
-#: view:account.voucher:0
-#: selection:account.voucher,state:0
-#: selection:account.voucher.open,init,state:0
-msgid "Pro-forma"
-msgstr ""
-
-#. module: account_voucher
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: account_voucher
-#: view:account.voucher:0
-msgid "Other Info"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.module.module,shortdesc:account_voucher.module_meta_information
-msgid "Accounting Voucher Entries"
-msgstr ""
-
-#. module: account_voucher
-#: field:res.currency,sub_name:0
-msgid "Sub Currency"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_other_voucher_list
-#: model:ir.ui.menu,name:account_voucher.menu_action_other_voucher_list
-msgid "Other Vouchers"
-msgstr ""
-
-#. module: account_voucher
-#: field:account.voucher.line,name:0
-msgid "Description"
-msgstr ""
-
-#. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "Canceled"
-msgstr ""
-
-#. module: account_voucher
-#: selection:account.move,voucher_type:0
-#: selection:account.voucher,type:0
-#: selection:account.voucher.open,init,type:0
-#: model:ir.actions.act_window,name:account_voucher.action_view_cash_pay_voucher_form
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "Cash Payment Voucher"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_receipt_bakreceipt_voucher_list
-msgid "Bank Receipt"
-msgstr ""
-
-#. module: account_voucher
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "-"
-msgstr ""
-
-#. module: account_voucher
-#: selection:account.move,voucher_type:0
-#: selection:account.voucher,type:0
-#: selection:account.voucher.open,init,type:0
-#: model:ir.actions.act_window,name:account_voucher.action_view_jour_pur_voucher_form
-#: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_pur_voucher_form
-msgid "Journal Purchase Voucher"
-msgstr ""
-
-#. module: account_voucher
-#: view:account.account:0
-msgid "Closing Balance"
-msgstr ""
-
-#. module: account_voucher
-#: field:account.voucher.line,ref:0
-msgid "Ref."
-msgstr ""
-
-#. module: account_voucher
-#: selection:account.voucher,state:0
-#: selection:account.voucher.open,init,state:0
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "Posted"
-msgstr ""
-
-#. module: account_voucher
-#: field:account.voucher,name:0
-msgid "Name"
-msgstr ""
-
-#. module: account_voucher
-#: field:account.voucher,move_ids:0
-msgid "Real Entry"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.wizard,name:account_voucher.wizard_account_voucher_open
-msgid "Open a Voucher Entry"
-msgstr ""
-
-#. module: account_voucher
-#: field:account.voucher,move_id:0
-msgid "Account Entry"
-msgstr ""
-
-#. module: account_voucher
-#: view:account.voucher:0
-msgid "Entry Lines"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.ui.menu,name:account_voucher.menu_action_view_bank_rec_voucher_form
-msgid "New Bank Receipt"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.ui.menu,name:account_voucher.menu_action_payments_cashpay_voucher_list
-msgid "Cash Payments"
-msgstr ""
-
-#. module: account_voucher
-#: selection:account.move,voucher_type:0
-#: selection:account.voucher,type:0
-#: selection:account.voucher.open,init,type:0
-#: model:ir.actions.act_window,name:account_voucher.action_view_cash_rec_voucher_form
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "Cash Receipt Voucher"
-msgstr ""
-
-#. module: account_voucher
-#: selection:account.move,voucher_type:0
-#: selection:account.voucher,type:0
-#: selection:account.voucher.open,init,type:0
-#: model:ir.actions.act_window,name:account_voucher.action_view_bank_pay_voucher_form
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "Bank Payment Voucher"
-msgstr ""
-
-#. module: account_voucher
-#: selection:account.move,voucher_type:0
-#: selection:account.voucher,type:0
-#: selection:account.voucher.open,init,type:0
-#: model:ir.actions.act_window,name:account_voucher.action_view_bank_rec_voucher_form
-#: rml:voucher.cash_amount:0
-#: rml:voucher.cash_receipt.drcr:0
-msgid "Bank Receipt Voucher"
-msgstr ""
-
-#. module: account_voucher
-#: field:account.account,journal_id:0
-#: field:account.voucher,journal_id:0
-msgid "Journal"
-msgstr ""

From 2a2bb45c5e57a950258887422c637e06a6d2e368 Mon Sep 17 00:00:00 2001
From: "GPA(OpenERP)" <>
Date: Mon, 12 Oct 2009 18:03:10 +0530
Subject: [PATCH 031/200] [FIX] Project_timesheet : Wrong synchro on analytic
 line creation fro tasks(for name).

lp bug: https://launchpad.net/bugs/447402 fixed

bzr revid: jvo@tinyerp.com-20091012123310-gih8iz51zuxmlxs4
---
 addons/project_timesheet/project_timesheet.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 71c3542c010..f914faec86f 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -84,7 +84,7 @@ class project_work(osv.osv):
         if line_id in list_avail_ids:
             obj = self.pool.get('hr.analytic.timesheet')
             if 'name' in vals:
-                vals_line['name'] = '%s: %s' % (tools.ustr(task.name), tools.ustr(vals['name']) or '/')
+                vals_line['name'] = '%s: %s' % (tools.ustr(task.task_id.name), tools.ustr(vals['name']) or '/')
             if 'user_id' in vals:
                 vals_line['user_id'] = vals['user_id']
             if 'date' in vals:

From cbea7944ca8514adc3f1b1465c4f2769fb4c95d2 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 12 Oct 2009 23:13:39 +0200
Subject: [PATCH 032/200] [FIX] bugfix residual computation and
 multi-currencies

bzr revid: fp@tinyerp.com-20091012211339-nsgw8uawrjj8qmot
---
 addons/account/invoice.py | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 559f0a88156..10a54e8bb37 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -103,15 +103,23 @@ class account_invoice(osv.osv):
     def _amount_residual(self, cr, uid, ids, name, args, context=None):
         res = {}
         data_inv = self.browse(cr, uid, ids)
+        cur_obj = self.pool.get('res.currency')
         for inv in data_inv:
-            paid_amt = 0.0
-            to_pay = inv.amount_total
+            debit = credit = 0.0
             for lines in inv.move_lines:
-                if lines.amount_currency and lines.currency_id:
-                    paid_amt += lines.amount_currency
+                if lines.account_id.company_currency_id.id <> inv.currency_id.id:
+                    if lines.debit:
+                        debit += cur_obj.compute(cr, uid, lines.account_id.company_currency_id.id, inv.currency_id.id, lines.debit)
+                    if lines.credit:
+                        credit += cur_obj.compute(cr, uid, lines.account_id.company_currency_id.id, inv.currency_id.id, lines.credit)
                 else:
-                    paid_amt += lines.credit + lines.debit
-            res[inv.id] = round(to_pay - abs(paid_amt),int(config['price_accuracy']))
+                    debit += lines.debit
+                    credit += lines.credit
+            if inv.type in ('out_invoice','in_refund'):
+                result = inv.amount_total * (1.0 - credit / (debit + inv.amount_total))
+            else:
+                result = inv.amount_total * (1.0 - debit / (credit + inv.amount_total))
+            res[inv.id] = round(result,int(config['price_accuracy']))
         return res
 
     def _get_lines(self, cr, uid, ids, name, arg, context=None):

From f28d004d3a8afb50c2911088b860e7b504b547aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= <>
Date: Tue, 13 Oct 2009 13:01:44 +0530
Subject: [PATCH 033/200] added pruchase link in product view

bzr revid: hda@tinyerp.com-20091013073144-w5g0xgos6czko872
---
 addons/purchase/purchase_view.xml | 8 ++++++++
 addons/sale/sale.py               | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 2d020bd6180..9e3eda61554 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -233,5 +233,13 @@
             name="Purchase orders"
             res_model="purchase.order"
             src_model="res.partner"/>
+
+        <act_window
+            domain="[('product_id','=',active_id)]" 
+            id="action_purchase_line_product_tree"
+            name="Product purchases"
+            res_model="purchase.order.line" 
+            src_model="product.product"/> 
+                     
     </data>
 </openerp>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 0f13e8051d9..30c24f7af25 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -225,7 +225,7 @@ class sale_order(osv.osv):
         'project_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True, states={'draft': [('readonly', False)]}),
 
         'order_line': fields.one2many('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft': [('readonly', False)]}),
-        'invoice_ids': fields.many2many('account.invoice', 'sale_order_invoice_rel', 'order_id', 'invoice_id', 'Invoice', help="This is the list of invoices that have been generated for this sale order. The same sale order may have been invoiced in several times (by line for example)."),
+        'invoice_ids': fields.many2many('account.invoice', 'sale_order_invoice_rel', 'order_id', 'invoice_id', 'Invoices', help="This is the list of invoices that have been generated for this sale order. The same sale order may have been invoiced in several times (by line for example)."),
         'picking_ids': fields.one2many('stock.picking', 'sale_id', 'Related Packing', readonly=True, help="This is the list of picking list that have been generated for this invoice"),
         'shipped': fields.boolean('Picked', readonly=True),
         'picked_rate': fields.function(_picked_rate, method=True, string='Picked', type='float'),

From 6b9040ca8d0be10f1aa65078e0e9da1776c07211 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@tinyerp.com>
Date: Tue, 13 Oct 2009 16:34:10 +0200
Subject: [PATCH 034/200] [FIX] account: avoid ZeroDivisionError

bzr revid: chs@tinyerp.com-20091013143410-sz59hp38dvv1ufor
---
 addons/account/invoice.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 10a54e8bb37..10a49230480 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -115,7 +115,10 @@ class account_invoice(osv.osv):
                 else:
                     debit += lines.debit
                     credit += lines.credit
-            if inv.type in ('out_invoice','in_refund'):
+
+            if not inv.amount_total:
+                result = 0.0
+            elif inv.type in ('out_invoice','in_refund'):
                 result = inv.amount_total * (1.0 - credit / (debit + inv.amount_total))
             else:
                 result = inv.amount_total * (1.0 - debit / (credit + inv.amount_total))

From e25cb298e097ee0449accc94d0f3b3956d8d59f6 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Tue, 13 Oct 2009 20:15:38 +0530
Subject: [PATCH 035/200] [FIX] Sale : Better error message when account is
 missing from SOL for Invioce

lp bug: https://launchpad.net/bugs/449583 fixed

bzr revid: jvo@tinyerp.com-20091013144538-2k7w8zug6xvf3nsd
---
 addons/sale/sale.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 30c24f7af25..6a9572b547c 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -818,6 +818,9 @@ class sale_order_line(osv.osv):
                             int(config['price_accuracy']))
                 fpos = line.order_id.fiscal_position or False
                 a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, a)
+                if not a:
+                    raise osv.except_osv(_('Error !'),
+                                _('There is no income category account defined in default Properties for Product Category or Fiscal Position is not defined !'))
                 inv_id = self.pool.get('account.invoice.line').create(cr, uid, {
                     'name': line.name,
                     'origin': line.order_id.name,

From e92ddd29994f8cd915f4604c3e19f4afc69d9179 Mon Sep 17 00:00:00 2001
From: Quentin De Paoli <qdp@cyan>
Date: Tue, 13 Oct 2009 16:50:16 +0200
Subject: [PATCH 036/200] [FIX] hr_expense: corrected error message

bzr revid: qdp@cyan-20091013145016-xagtk35k93ip97y7
---
 addons/hr_expense/hr_expense.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 0523dcb687c..f0fda12c6c5 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -139,7 +139,7 @@ class hr_expense_expense(osv.osv):
                     'account_analytic_id': l.analytic_account.id,
                 }))
             if not exp.employee_id.address_id:
-                raise osv.except_osv(_('Error !'), _('The employee must have a contact address'))
+                raise osv.except_osv(_('Error !'), _('The employee must have a working address'))
             acc = exp.employee_id.address_id.partner_id.property_account_payable.id
             payment_term_id = exp.employee_id.address_id.partner_id.property_payment_term.id
             inv = {

From 95ec254f709f55e64e50190554fa5004c63aa459 Mon Sep 17 00:00:00 2001
From: "Christophe Chauvet(OpenERP)" <>
Date: Tue, 13 Oct 2009 20:42:18 +0530
Subject: [PATCH 037/200] [FIX] Base_report_creator : Allowing to use current
 userid

lp bug: https://launchpad.net/bugs/446391 fixed

bzr revid: jvo@tinyerp.com-20091013151218-o1vdbejzd6djq6bt
---
 addons/base_report_creator/base_report_creator.py          | 4 ++--
 addons/base_report_creator/base_report_creator_view.xml    | 2 ++
 addons/base_report_creator/wizard/wiz_set_filter_fields.py | 6 +++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/addons/base_report_creator/base_report_creator.py b/addons/base_report_creator/base_report_creator.py
index bcca40a153e..79824d227c6 100644
--- a/addons/base_report_creator/base_report_creator.py
+++ b/addons/base_report_creator/base_report_creator.py
@@ -259,8 +259,8 @@ class report_creator(osv.osv):
                 ret_str = ret_str[0:len(ret_str)-3]
             if ret_str.endswith('or'):
                 ret_str = ret_str[0:len(ret_str)-2]
-            ret_str = ret_str.strip()    
-        return ret_str
+            ret_str = ret_str.strip()
+        return ret_str % {'uid' : uid}
 
     def _id_get(self, cr, uid, id, context):
 #       return 'min(sale_order_line.id)'
diff --git a/addons/base_report_creator/base_report_creator_view.xml b/addons/base_report_creator/base_report_creator_view.xml
index 7ae858012ed..6c2df4466d6 100644
--- a/addons/base_report_creator/base_report_creator_view.xml
+++ b/addons/base_report_creator/base_report_creator_view.xml
@@ -86,6 +86,8 @@
                             <field name="condition"/>
                         </form>
                     </field>
+                    <separator string="Legend" colspan="4"/>
+					<label string="Use %(uid)s to filter by the connected user" align="0.0"/>
                 </page><page string="Security">
                     <separator string="Authorized Groups (empty for all)" colspan="4"/>
                     <field name="group_ids" colspan="4" nolabel="1"/>
diff --git a/addons/base_report_creator/wizard/wiz_set_filter_fields.py b/addons/base_report_creator/wizard/wiz_set_filter_fields.py
index a97be887803..0303bea8d3f 100644
--- a/addons/base_report_creator/wizard/wiz_set_filter_fields.py
+++ b/addons/base_report_creator/wizard/wiz_set_filter_fields.py
@@ -129,6 +129,10 @@ def _set_filter_value(self, cr, uid, data, context):
                 value_data = 'true'
             else:
                 value_data = 'false'
+
+        if field_type in ['float','integer']:
+            value_data =  value_data or 0
+        
         if field_type == 'many2many' and value_data and len(value_data):
             fields_list = set_field_operator(self,table_name+"."+field_data['name'],field_data['ttype'],form_data['operator'],value_data[0][2])
         else:
@@ -136,7 +140,7 @@ def _set_filter_value(self, cr, uid, data, context):
         if fields_list:
             create_dict = {
                            'name':model_name + "/" +field_data['field_description'] +" "+ mapping_fields[form_data['operator']] + " " + str(fields_list[2]) + " ",
-                           'expression':' '.join(fields_list),
+                           'expression':' '.join(map(str,fields_list)),
                            'report_id':data['id'],
                            'condition' : form_data['condition']
                            }

From be09477845ef513e4efb88870214b3edf25fb462 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 13 Oct 2009 19:58:13 +0200
Subject: [PATCH 038/200] [IMP] default value for module

bzr revid: fp@tinyerp.com-20091013175813-vlqi304leu84x0wx
---
 bin/addons/base/ir/ir_model.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index 2fe3375d0a0..c8a60d2b1bf 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -415,7 +415,8 @@ class ir_model_data(osv.osv):
     _defaults = {
         'date_init': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'date_update': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
-        'noupdate': lambda *a: False
+        'noupdate': lambda *a: False,
+        'module': lambda *a: ''
     }
     _sql_constraints = [
         ('module_name_uniq', 'unique(name, module)', 'You can not have multiple records with the same id for the same module'),

From a7991fe257c5db23140b6f7c02b9577b4e7a7e9a Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Wed, 14 Oct 2009 17:16:10 +0530
Subject: [PATCH 039/200] [FIX] Base_Report_Creator : xml record was malformed,
 corrected

bzr revid: jvo@tinyerp.com-20091014114610-2pwwhn9bok5cw3pr
---
 addons/base_report_creator/base_report_creator_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/base_report_creator/base_report_creator_view.xml b/addons/base_report_creator/base_report_creator_view.xml
index 6c2df4466d6..b5ee6227bb2 100644
--- a/addons/base_report_creator/base_report_creator_view.xml
+++ b/addons/base_report_creator/base_report_creator_view.xml
@@ -87,7 +87,7 @@
                         </form>
                     </field>
                     <separator string="Legend" colspan="4"/>
-					<label string="Use %(uid)s to filter by the connected user" align="0.0"/>
+					<label string="Use %%(uid)s to filter by the connected user" align="0.0"/>
                 </page><page string="Security">
                     <separator string="Authorized Groups (empty for all)" colspan="4"/>
                     <field name="group_ids" colspan="4" nolabel="1"/>
@@ -99,6 +99,7 @@
         </field>
     </record>
     <record model="ir.actions.act_window" id="base_report_creator_action">
+    	<field name="name">Custom Report</field>
         <field name="res_model">base_report_creator.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>

From 32d9623c38e3019aaf621d447332a78c1eb99c08 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Thu, 15 Oct 2009 19:41:27 +0530
Subject: [PATCH 040/200] [REF] Account : Invoice view(mainor edit)

lp bug: https://launchpad.net/bugs/451310 fixed

bzr revid: jvo@tinyerp.com-20091015141127-uxt73xvgpuqhh4rf
---
 addons/account/account_invoice_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 8822568ef00..add20bc4636 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -209,7 +209,7 @@
                             <field name="date_invoice"/>
                             <field name="period_id"/>
                             <label align="0.0" colspan="2" string="(keep empty to use the current period)"/>
-                            <separator colspan="4" string="Additionnal Information"/>
+                            <separator colspan="4" string="Additional Information"/>
                             <field colspan="4" name="comment" nolabel="1"/>
                         </page>
                         <page string="Payments">

From df9f5fb23c9649fb07f5757dcc94bc76405db808 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Thu, 15 Oct 2009 20:21:25 +0530
Subject: [PATCH 041/200] [FIX] Hr_timesheet_invoice : Wrong domain was sent
 for opening invoices created

lp bug: https://launchpad.net/bugs/450180 fixed

bzr revid: jvo@tinyerp.com-20091015145125-98o562uxoafp7m3t
---
 .../hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 6a7d878d1ae..65ca5c31a07 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -173,7 +173,7 @@ class invoice_create(wizard.interface):
         mod_id = mod_obj.search(cr, uid, [('name', '=', 'action_invoice_tree1')])[0]
         res_id = mod_obj.read(cr, uid, mod_id, ['res_id'])['res_id']
         act_win = act_obj.read(cr, uid, res_id, [])
-        act_win['domain'] = [('id','in',[(','.join(map(str,invoices)))]),('type','=','out_invoice')]
+        act_win['domain'] = [('id','in',invoices),('type','=','out_invoice')]
         act_win['name'] = _('Invoices')
         return act_win
         

From ae7912f0c41c7b2cb9c443c11d806e1972b9103a Mon Sep 17 00:00:00 2001
From: "nicolas.bessi@camptocamp.com" <>
Date: Fri, 16 Oct 2009 13:25:20 +0200
Subject: [PATCH 042/200] l10n_ch improvments

bzr revid: nicolas.bessi@camptocamp.com-20091016112520-ji2oa9krhae9yy0b
---
 addons/l10n_ch/__terp__.py            |  82 +--
 addons/l10n_ch/account_move_line.py   |  62 +-
 addons/l10n_ch/bank.py                |  25 +-
 addons/l10n_ch/bank_view.xml          |  26 +
 addons/l10n_ch/company.py             |  22 +-
 addons/l10n_ch/dta.py                 | 106 +--
 addons/l10n_ch/invoice.py             | 324 ++++-----
 addons/l10n_ch/partner.py             | 102 ++-
 addons/l10n_ch/payment.py             |  10 +-
 addons/l10n_ch/report/bvr.py          | 134 ++--
 addons/l10n_ch/report/bvr.rml         |  53 +-
 addons/l10n_ch/report/invoice.rml     |  63 +-
 addons/l10n_ch/report/tiny_sxw2rml.py | 342 ---------
 addons/l10n_ch/wizard/bvr_import.py   | 374 +++++-----
 addons/l10n_ch/wizard/dta_wizard.py   | 992 +++++++++++++-------------
 15 files changed, 1221 insertions(+), 1496 deletions(-)
 delete mode 100755 addons/l10n_ch/report/tiny_sxw2rml.py

diff --git a/addons/l10n_ch/__terp__.py b/addons/l10n_ch/__terp__.py
index a7fdbb86511..5e49fda0641 100755
--- a/addons/l10n_ch/__terp__.py
+++ b/addons/l10n_ch/__terp__.py
@@ -31,8 +31,8 @@
 #
 ##############################################################################
 {
-	"name" : "Switzerland localisation corrected by Camptocamp",
-	"description" : """
+    "name" : "Switzerland localisation corrected by Camptocamp",
+    "description" : """
 Swiss localisation :
  - DTA generation for a lot of paiment types
  - BVR management (number generation, report, etc..)
@@ -43,9 +43,9 @@ You can also add with this module one of the following account plan:
  - l10n_ch_c2c_pcg
 
 
-	
+    
 ------------------------------------------------------------------------
-	
+    
 Module incluant la localisation Suisse de TinyERP revu et corrigé par Camptocamp. Cette nouvelle version 
 comprend la gestion et l'émissionde BVR, le paiement électronique via DTA (pour les banques, le système postal est en développement) 
 et l'import du relevé de compte depuis la banque de manière automatisée. 
@@ -66,45 +66,39 @@ TODO :
 
 
 """,
-	"version" : "5.0",
-	"author" : "Camptocamp SA",
-	"category" : "Localisation/Europe",
-	"website": "http://www.camptocamp.com",
-	
-	"depends" : [
-		"base", 
-		"account", 
-		"base_vat", 
-		"base_iban",
-		"account_payment",
-		"account_tax_include", 
-	],
-	"init_xml" : [
-		"dta_data.xml",
-		"vaudtax_data.xml",
-        #these data will soon be part of an other modules but if you want 
-        #them now uncomment the two lines
-		#"zip_code_default.xml",
-		#"bank_ch.xml",
-	],
-	"demo_xml" : [
-		"demo/vaudtax_data_demo.xml",
-	],
-	"update_xml" : [
-		"dta_view.xml",
-		"dta_wizard.xml",
-		#this file as been move to the account chart 
-        # "account_vat.xml",
-		"bvr_report.xml",
-		"bvr_wizard.xml",
-		"bvr_view.xml",
-		"company_view.xml",
-		"account_invoice.xml",
-		"bank_view.xml",
-		"account_journal_view.xml",
-		"security/ir.model.access.csv",
-	],
-	"active": False,
-	"installable": True,
+    "version" : "5.0",
+    "author" : "Camptocamp SA",
+    "category" : "Localisation/Europe",
+    "website": "http://www.camptocamp.com",
+    
+    "depends" : [
+        "base", 
+        "account", 
+        "base_vat", 
+        "base_iban",
+        "account_payment",
+        "account_tax_include", 
+    ],
+    "init_xml" : [
+        "dta_data.xml",
+        "vaudtax_data.xml",
+    ],
+    "demo_xml" : [
+        "demo/vaudtax_data_demo.xml",
+    ],
+    "update_xml" : [
+        "dta_view.xml",
+        "dta_wizard.xml",
+        "bvr_report.xml",
+        "bvr_wizard.xml",
+        "bvr_view.xml",
+        "company_view.xml",
+        "account_invoice.xml",
+        "bank_view.xml",
+        "account_journal_view.xml",
+        "security/ir.model.access.csv",
+    ],
+    "active": False,
+    "installable": True,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ch/account_move_line.py b/addons/l10n_ch/account_move_line.py
index e602d6bbdb8..a245d60d0eb 100755
--- a/addons/l10n_ch/account_move_line.py
+++ b/addons/l10n_ch/account_move_line.py
@@ -33,39 +33,39 @@
 from osv import fields, osv
 
 class AccountMoveLine(osv.osv):
-	""" Inherit account.move.line in order to add a custom link 
-		between supplier invoice line and bank. The original link 
-		was defined in account_payment between line """
+    """ Inherit account.move.line in order to add a custom link 
+        between supplier invoice line and bank. The original link 
+        was defined in account_payment between line """
 
-	_inherit = 'account.move.line'
+    _inherit = 'account.move.line'
 
-	## @param self The object pointer.
-	## @param cr a psycopg cursor
-	## @param uid res.user.id that is currently loged
-	## @param payment_type manual 
-	## @parma context a standard dict 
-	## @return a dict  who has the account move line id as key and the bank id as value
-	def line2bank(self, cr, uid, ids, payment_type='manual', context=None):
-		"""add a link to account.move.line in order to link 
-		supplier invoice line and bank. The original link 
-		was defined in account_payment"""
-		payment_mode_obj = self.pool.get('payment.mode')
-		line2bank = {}
-		if not ids:
-			return {}
-		bank_type = payment_mode_obj.suitable_bank_types(cr, uid, payment_type,
-				context=context)
-		for line in self.browse(cr, uid, ids, context=context):
-			if line.invoice and line.invoice.partner_bank:
-				line2bank[line.id] = line.invoice.partner_bank.id
-			elif line.partner:
-				for bank in line.partner.bank_ids:
-					if bank.state in bank_type:
-						line2bank[line.id] = bank.id
-						break
-				if line.id not in line2bank and line.partner.bank_ids:
-					line2bank[line.id] = line.partner.bank_ids[0].id
-		return line2bank
+    ## @param self The object pointer.
+    ## @param cr a psycopg cursor
+    ## @param uid res.user.id that is currently loged
+    ## @param payment_type manual 
+    ## @parma context a standard dict 
+    ## @return a dict  who has the account move line id as key and the bank id as value
+    def line2bank(self, cr, uid, ids, payment_type='manual', context=None):
+        """add a link to account.move.line in order to link 
+        supplier invoice line and bank. The original link 
+        was defined in account_payment"""
+        payment_mode_obj = self.pool.get('payment.mode')
+        line2bank = {}
+        if not ids:
+            return {}
+        bank_type = payment_mode_obj.suitable_bank_types(cr, uid, payment_type,
+                context=context)
+        for line in self.browse(cr, uid, ids, context=context):
+            if line.invoice and line.invoice.partner_bank:
+                line2bank[line.id] = line.invoice.partner_bank.id
+            elif line.partner_id:
+                for bank in line.partner_id.bank_ids:
+                    if bank.state in bank_type:
+                        line2bank[line.id] = bank.id
+                        break
+                if line.id not in line2bank and line.partner_id.bank_ids:
+                    line2bank[line.id] = line.partner_id.bank_ids[0].id
+        return line2bank
 
 AccountMoveLine()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ch/bank.py b/addons/l10n_ch/bank.py
index 32310eb00ee..adee4b3a702 100755
--- a/addons/l10n_ch/bank.py
+++ b/addons/l10n_ch/bank.py
@@ -33,14 +33,23 @@ from osv import fields, osv
 
 
 class Bank(osv.osv):
-	"""Inherit res.bank class in order to add swiss specific field"""
-	_inherit = 'res.bank'
-	_columns = {
-		###Swiss unik bank identifier also use in IBAN number
-		'clearing': fields.char('Clearing number', size=64),
-		### city of the bank
-		'city': fields.char('City', size=128, select=1),
-	}
+    """Inherit res.bank class in order to add swiss specific field"""
+    _inherit = 'res.bank'
+    _columns = {
+        ###Swiss unik bank identifier also use in IBAN number
+        'clearing': fields.char('Clearing number', size=64),
+        ### city of the bank
+        'city': fields.char('City', size=128, select=1),
+    }
 
 Bank()
+
+class bvr_checkbox(osv.osv):
+    """ Add function to generate function """
+    _inherit = "res.partner.bank"
+    _columns = {
+        'printBank' : fields.boolean('Print Bank on BVR'),
+        'printAccount' : fields.boolean('Print Account Number on BVR'),
+        }
+bvr_checkbox()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ch/bank_view.xml b/addons/l10n_ch/bank_view.xml
index 9111ad5e0c8..35593c2688c 100755
--- a/addons/l10n_ch/bank_view.xml
+++ b/addons/l10n_ch/bank_view.xml
@@ -24,5 +24,31 @@
 				</field>
 			</field>
 		</record>
+
+        <record model="ir.ui.view" id="l10nch_view_res_partner_bank">
+			<field name="name">res.partner_bank.form</field>
+			<field name="model">res.partner.bank</field>
+			<field name="type">form</field>
+			<field name="inherit_id" ref="base.view_partner_bank_form"/>
+			<field name="arch" type="xml">
+				<field name="country_id" position="after">
+					<field name="printBank" select="2"/>
+                    <field name="printAccount" select="2"/>
+				</field>
+			</field>
+		</record>
+         <record model="ir.ui.view" id="l10nch_view_res_partner_bank">
+			<field name="name">res.partner_partner_bank.form</field>
+			<field name="model">res.partner</field>
+			<field name="type">form</field>
+			<field name="inherit_id" ref="account.view_partner_property_form"/>
+			<field name="arch" type="xml">
+				<field name="bank" position="after">
+                    <newline />
+					<field name="printBank" select="2"/>
+                    <field name="printAccount" select="2"/>
+				</field>
+			</field>
+		</record>
 	</data>
 </openerp>
diff --git a/addons/l10n_ch/company.py b/addons/l10n_ch/company.py
index 924278cd1a5..312fb1f3264 100755
--- a/addons/l10n_ch/company.py
+++ b/addons/l10n_ch/company.py
@@ -34,17 +34,17 @@
 import netsvc
 from osv import fields, osv
 class res_company(osv.osv):
-	"""override company in order to add bvr vertical and 
-	Horizontal print delta"""
-	_inherit = "res.company"
-	_columns = {
-		### horiz. delta in mm 1.2 will print the bvz 1.2mm lefter
-		'bvr_delta_horz': fields.float('BVR Horz. Delta (mm)',
-			help='horiz. delta in mm 1.2 will print the bvz 1.2mm lefter'),
-		### vert. delta in mm 1.2 will print the bvz 1.2mm lefter
-		'bvr_delta_vert': fields.float('BVR Vert. Delta (mm)',
-			help='vert. delta in mm 1.2 will print the bvz 1.2mm lefter'),
-	}
+    """override company in order to add bvr vertical and 
+    Horizontal print delta"""
+    _inherit = "res.company"
+    _columns = {
+        ### horiz. delta in mm 1.2 will print the bvz 1.2mm lefter
+        'bvr_delta_horz': fields.float('BVR Horz. Delta (mm)',
+            help='horiz. delta in mm 1.2 will print the bvz 1.2mm lefter'),
+        ### vert. delta in mm 1.2 will print the bvz 1.2mm lefter
+        'bvr_delta_vert': fields.float('BVR Vert. Delta (mm)',
+            help='vert. delta in mm 1.2 will print the bvz 1.2mm lefter'),
+    }
 res_company()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ch/dta.py b/addons/l10n_ch/dta.py
index 435a0b2b18b..e128f12128c 100755
--- a/addons/l10n_ch/dta.py
+++ b/addons/l10n_ch/dta.py
@@ -34,62 +34,62 @@ import time
 from osv import osv,fields
 
 class account_dta(osv.osv):
-	"""class that implements bank DTA File format, 
-	used to transfert bulk batch payment instruction to a bank"""
-	_name = "account.dta"
-	_description = "DTA History"
-	_columns = {
-		### name of the file 
-		'name': fields.binary('DTA file', readonly=True),
-		### list of dta line linked to the dta order
-		'dta_line_ids': fields.one2many('account.dta.line','dta_id','DTA lines', readonly=True), 
-		## textual notes
-		'note': fields.text('Creation log', readonly=True, 
-			help="display the problem during dta generation"),
-		### bank how will execute DTA order
-		'bank': fields.many2one('res.partner.bank','Bank', readonly=True,select=True,
-			help="bank how will execute DTA order"),
-		### date of DTA order generation 
-		'date': fields.date('Creation Date', readonly=True,select=True,
-			help="date of DTA order generation"),
-		### user how generate the DTA order
-		'user_id': fields.many2one('res.users','User', readonly=True, select=True),
-	}
+    """class that implements bank DTA File format, 
+    used to transfert bulk batch payment instruction to a bank"""
+    _name = "account.dta"
+    _description = "DTA History"
+    _columns = {
+        ### name of the file 
+        'name': fields.binary('DTA file', readonly=True),
+        ### list of dta line linked to the dta order
+        'dta_line_ids': fields.one2many('account.dta.line','dta_id','DTA lines', readonly=True), 
+        ## textual notes
+        'note': fields.text('Creation log', readonly=True, 
+            help="display the problem during dta generation"),
+        ### bank how will execute DTA order
+        'bank': fields.many2one('res.partner.bank','Bank', readonly=True,select=True,
+            help="bank how will execute DTA order"),
+        ### date of DTA order generation 
+        'date': fields.date('Creation Date', readonly=True,select=True,
+            help="date of DTA order generation"),
+        ### user how generate the DTA order
+        'user_id': fields.many2one('res.users','User', readonly=True, select=True),
+    }
 account_dta()
 
 class account_dta_line(osv.osv):
-	"""Class that represent a DTA order line, 
-	each lin corressponds to a payment instruction"""
-	_name = "account.dta.line"
-	_description = "DTA line"
-	_columns = {
-		### name of the line 
-		'name' : fields.many2one('account.invoice','Invoice', required=True, size=256),
-		### partner how will receive payments
-		'partner_id' : fields.many2one('res.partner','Partner',
-			help="Partenr to pay"),
-		### due date of the payment
-		'due_date' : fields.date('Due date'),
-		### date of the supplier invoice to pay
-		'invoice_date' : fields.date('Invoice date'),
-		### cash discount date
-		'cashdisc_date' : fields.date('Cash Discount date'),
-		### amount effectively paied on this line 
-		'amount_to_pay' : fields.float('Amount to pay', 
-			help="amount effectively paid"),
-		### amount that was on the supplier invoice
-		'amount_invoice': fields.float('Invoiced Amount',
-			help="amount to pay base on the supplier invoice"),
-		### Cash discount amount 
-		'amount_cashdisc': fields.float('Cash Discount Amount'),
-		### Linke to the main dta order
-		'dta_id': fields.many2one('account.dta','Associated DTA', required=True, ondelete='cascade'),
-		### state of the invoice Drat, Cancel, Done
-		'state' : fields.selection([('draft','Draft'),('cancel','Error'),('done','Paid')],'State')
-	}
-	_defaults = {
-		'state' : lambda *a :'draft',
-	}
+    """Class that represent a DTA order line, 
+    each lin corressponds to a payment instruction"""
+    _name = "account.dta.line"
+    _description = "DTA line"
+    _columns = {
+        ### name of the line 
+        'name' : fields.many2one('account.invoice','Invoice', required=True, size=256),
+        ### partner how will receive payments
+        'partner_id' : fields.many2one('res.partner','Partner',
+            help="Partenr to pay"),
+        ### due date of the payment
+        'due_date' : fields.date('Due date'),
+        ### date of the supplier invoice to pay
+        'invoice_date' : fields.date('Invoice date'),
+        ### cash discount date
+        'cashdisc_date' : fields.date('Cash Discount date'),
+        ### amount effectively paied on this line 
+        'amount_to_pay' : fields.float('Amount to pay', 
+            help="amount effectively paid"),
+        ### amount that was on the supplier invoice
+        'amount_invoice': fields.float('Invoiced Amount',
+            help="amount to pay base on the supplier invoice"),
+        ### Cash discount amount 
+        'amount_cashdisc': fields.float('Cash Discount Amount'),
+        ### Linke to the main dta order
+        'dta_id': fields.many2one('account.dta','Associated DTA', required=True, ondelete='cascade'),
+        ### state of the invoice Drat, Cancel, Done
+        'state' : fields.selection([('draft','Draft'),('cancel','Error'),('done','Paid')],'State')
+    }
+    _defaults = {
+        'state' : lambda *a :'draft',
+    }
 account_dta_line()
 
 
diff --git a/addons/l10n_ch/invoice.py b/addons/l10n_ch/invoice.py
index 9d5780f003a..b19b74cebe9 100755
--- a/addons/l10n_ch/invoice.py
+++ b/addons/l10n_ch/invoice.py
@@ -37,176 +37,176 @@ from mx import DateTime
 
 
 class account_invoice(osv.osv):
-	"""Inherit account.invoice in order to add bvr
-	printing functionnalites. BVR is a Swiss payment vector"""
-	_inherit = "account.invoice"
-	
-	## @param self The object pointer.
-	## @param cursor a psycopg cursor
-	## @param user res.user.id that is currently loged
-	## @parma context a standard dict 
-	## @return a list of tuple (name,value)
-	def _get_reference_type(self, cursor, user, context=None):
-		"""Function use by the function field reference_type in order to initalise available 
-		BVR Reference Types"""
-		res = super(account_invoice, self)._get_reference_type(cursor, user,
-				context=context)
-		res.append(('bvr', 'BVR'))
-		return res
-	
-	## @param self The object pointer.
-	## @param cursor a psycopg cursor
-	## @param user res.user.id that is currently loged
-	## @parma context a standard dict
-	## @param name of the files 
-	## @param args a list of diverse argument 
-	## @parma context a standard dict 
-	## @return a  dict (invoice id,amount to pay)
-	def _amount_to_pay(self, cursor, user, ids, name, args, context=None):
-		'''Return the amount still to pay regarding all the payment orders'''
-		if not ids:
-			return {}
-		res = {}
-		for invoice in self.browse(cursor, user, ids, context=context):
-			res[invoice.id] = 0.0
-			if invoice.move_id:
-				for line in invoice.move_id.line_id:
-					if not line.date_maturity or \
-							DateTime.strptime(line.date_maturity, '%Y-%m-%d') \
-							< DateTime.now():
-						res[invoice.id] += line.amount_to_pay
-		return res
+    """Inherit account.invoice in order to add bvr
+    printing functionnalites. BVR is a Swiss payment vector"""
+    _inherit = "account.invoice"
+    
+    ## @param self The object pointer.
+    ## @param cursor a psycopg cursor
+    ## @param user res.user.id that is currently loged
+    ## @parma context a standard dict 
+    ## @return a list of tuple (name,value)
+    def _get_reference_type(self, cursor, user, context=None):
+        """Function use by the function field reference_type in order to initalise available 
+        BVR Reference Types"""
+        res = super(account_invoice, self)._get_reference_type(cursor, user,
+                context=context)
+        res.append(('bvr', 'BVR'))
+        return res
+    
+    ## @param self The object pointer.
+    ## @param cursor a psycopg cursor
+    ## @param user res.user.id that is currently loged
+    ## @parma context a standard dict
+    ## @param name of the files 
+    ## @param args a list of diverse argument 
+    ## @parma context a standard dict 
+    ## @return a  dict (invoice id,amount to pay)
+    def _amount_to_pay(self, cursor, user, ids, name, args, context=None):
+        '''Return the amount still to pay regarding all the payment orders'''
+        if not ids:
+            return {}
+        res = {}
+        for invoice in self.browse(cursor, user, ids, context=context):
+            res[invoice.id] = 0.0
+            if invoice.move_id:
+                for line in invoice.move_id.line_id:
+                    if not line.date_maturity or \
+                            DateTime.strptime(line.date_maturity, '%Y-%m-%d') \
+                            < DateTime.now():
+                        res[invoice.id] += line.amount_to_pay
+        return res
 
-	_columns = {
-		### BVR reference type BVR or FREE
-		'reference_type': fields.selection(_get_reference_type,
-			'Reference Type', required=True),
-		### Partner bank link between bank and partner id	
-		'partner_bank': fields.many2one('res.partner.bank', 'Bank Account',
-			help='The partner bank account to pay\nKeep empty to use the default'
-			),
-		### Amount to pay
-		'amount_to_pay': fields.function(_amount_to_pay, method=True,
-			type='float', string='Amount to be paid',
-			help='The amount which should be paid at the current date\n' \
-					'minus the amount which is already in payment order'),
-	}
-	
-	## @param self The object pointer.
-	## @param cursor a psycopg cursor
-	## @param user res.user.id that is currently loged
-	## @parma ids invoices id
-	## @return a boolean True if valid False if invalid 
-	def _check_bvr(self, cr, uid, ids):
-		"""
-		Function to validate a bvr reference like :
-		0100054150009>132000000000000000000000014+ 1300132412>
-		The validation is based on l10n_ch
-		"""
-		invoices = self.browse(cr,uid,ids)
-		for invoice in invoices:
-			if invoice.reference_type == 'bvr':
-				if not invoice.reference:
-					return False
-				## I need help for this bug because in this case
-				# <010001000060190> 052550152684006+ 43435>
-				# the reference 052550152684006 do not match modulo 10
-				#
-				if mod10r(invoice.reference[:-1]) != invoice.reference and \
-					len(invoice.reference) == 15:
-					return True
-				#
-				if mod10r(invoice.reference[:-1]) != invoice.reference:
-					return False
-		return True
-	## @param self The object pointer.
-	## @param cursor a psycopg cursor
-	## @param user res.user.id that is currently loged
-	## @parma ids invoices id
-	## @return a boolean True if valid False if invalid 
-	def _check_reference_type(self, cursor, user, ids):
-		"""Check the customer invoice reference type depending 
-		on the BVR reference type and the invoice partner bank type"""
-		for invoice in self.browse(cursor, user, ids):
-			if invoice.type in 'in_invoice':
-				if invoice.partner_bank and \
-						invoice.partner_bank.state in \
-						('bvrbank', 'bvrpost') and \
-						invoice.reference_type != 'bvr':
-							return False
-		return True
+    _columns = {
+        ### BVR reference type BVR or FREE
+        'reference_type': fields.selection(_get_reference_type,
+            'Reference Type', required=True),
+        ### Partner bank link between bank and partner id   
+        'partner_bank': fields.many2one('res.partner.bank', 'Bank Account',
+            help='The partner bank account to pay\nKeep empty to use the default'
+            ),
+        ### Amount to pay
+        'amount_to_pay': fields.function(_amount_to_pay, method=True,
+            type='float', string='Amount to be paid',
+            help='The amount which should be paid at the current date\n' \
+                    'minus the amount which is already in payment order'),
+    }
+    
+    ## @param self The object pointer.
+    ## @param cursor a psycopg cursor
+    ## @param user res.user.id that is currently loged
+    ## @parma ids invoices id
+    ## @return a boolean True if valid False if invalid 
+    def _check_bvr(self, cr, uid, ids):
+        """
+        Function to validate a bvr reference like :
+        0100054150009>132000000000000000000000014+ 1300132412>
+        The validation is based on l10n_ch
+        """
+        invoices = self.browse(cr,uid,ids)
+        for invoice in invoices:
+            if invoice.reference_type == 'bvr':
+                if not invoice.reference:
+                    return False
+                ## I need help for this bug because in this case
+                # <010001000060190> 052550152684006+ 43435>
+                # the reference 052550152684006 do not match modulo 10
+                #
+                if mod10r(invoice.reference[:-1]) != invoice.reference and \
+                    len(invoice.reference) == 15:
+                    return True
+                #
+                if mod10r(invoice.reference[:-1]) != invoice.reference:
+                    return False
+        return True
+    ## @param self The object pointer.
+    ## @param cursor a psycopg cursor
+    ## @param user res.user.id that is currently loged
+    ## @parma ids invoices id
+    ## @return a boolean True if valid False if invalid 
+    def _check_reference_type(self, cursor, user, ids):
+        """Check the customer invoice reference type depending 
+        on the BVR reference type and the invoice partner bank type"""
+        for invoice in self.browse(cursor, user, ids):
+            if invoice.type in 'in_invoice':
+                if invoice.partner_bank and \
+                        invoice.partner_bank.state in \
+                        ('bvrbank', 'bvrpost') and \
+                        invoice.reference_type != 'bvr':
+                            return False
+        return True
 
-	_constraints = [
-		(_check_bvr, 'Error: Invalid Bvr Number (wrong checksum).',
-			['reference']),
-		(_check_reference_type, 'Error: BVR reference is required.',
-			['reference_type']),
-	]
-	
-	## @param self The object pointer.
-	## @param cr a psycopg cursor
-	## @param uid res.user.id that is currently loged
-	## @parma ids invoices id
-	## @parma type the invoice type
-	## @param partner_id the partner linked to the invoice
-	## @parma date_invoice date of the invoice
-	## @parma payment_term inoice payment term
-	## @param partner_bank_id the partner linked invoice bank
-	## @return the dict of values with the partner_bank value updated 		
-	def onchange_partner_id(self, cr, uid, ids, type, partner_id,
-			date_invoice=False, payment_term=False, partner_bank_id=False):
-		""" Function that is call when the partner of the invoice is changed
-		it will retriev and set the good bank partner bank"""
-		res = super(account_invoice, self).onchange_partner_id(
-																cr,
-																 uid, 
-																 ids, 
-																 type,
-																 partner_id, 
-																 date_invoice, 
-																 payment_term
-															)
-		bank_id = False
-		if partner_id:
-			p = self.pool.get('res.partner').browse(cr, uid, partner_id)
-			if p.bank_ids:
-				bank_id = p.bank_ids[0].id
+    _constraints = [
+        (_check_bvr, 'Error: Invalid Bvr Number (wrong checksum).',
+            ['reference']),
+        (_check_reference_type, 'Error: BVR reference is required.',
+            ['reference_type']),
+    ]
+    
+    ## @param self The object pointer.
+    ## @param cr a psycopg cursor
+    ## @param uid res.user.id that is currently loged
+    ## @parma ids invoices id
+    ## @parma type the invoice type
+    ## @param partner_id the partner linked to the invoice
+    ## @parma date_invoice date of the invoice
+    ## @parma payment_term inoice payment term
+    ## @param partner_bank_id the partner linked invoice bank
+    ## @return the dict of values with the partner_bank value updated       
+    def onchange_partner_id(self, cr, uid, ids, type, partner_id,
+            date_invoice=False, payment_term=False, partner_bank_id=False):
+        """ Function that is call when the partner of the invoice is changed
+        it will retriev and set the good bank partner bank"""
+        res = super(account_invoice, self).onchange_partner_id(
+                                                                cr,
+                                                                 uid, 
+                                                                 ids, 
+                                                                 type,
+                                                                 partner_id, 
+                                                                 date_invoice, 
+                                                                 payment_term
+                                                            )
+        bank_id = False
+        if partner_id:
+            p = self.pool.get('res.partner').browse(cr, uid, partner_id)
+            if p.bank_ids:
+                bank_id = p.bank_ids[0].id
 
-		if type in ('in_invoice', 'in_refund'):
-			res['value']['partner_bank'] = bank_id
+        if type in ('in_invoice', 'in_refund'):
+            res['value']['partner_bank'] = bank_id
 
-		if partner_bank_id != bank_id:
-			to_update = self.onchange_partner_bank(cr, uid, ids, bank_id)
-			res['value'].update(to_update['value'])
-		return res
-		
-	## @param self The object pointer.
-	## @param cursor a psycopg cursor
-	## @param user res.user.id that is currently loged
-	## @parma ids invoices id
-	## @param partner_bank_id the partner linked invoice bank
-	## @return the dict of values with the reference type  value updated 
-	def onchange_partner_bank(self, cursor, user, ids, partner_bank_id):
-		"""update the reference type depending of the partner bank"""
-		res = {'value': {}}
-		partner_bank_obj = self.pool.get('res.partner.bank')
-		if partner_bank_id:
-			partner_bank = partner_bank_obj.browse(cursor, user, partner_bank_id)
-			if partner_bank.state in ('bvrbank', 'bvrpost'):
-				res['value']['reference_type'] = 'bvr'
-		return res
+        if partner_bank_id != bank_id:
+            to_update = self.onchange_partner_bank(cr, uid, ids, bank_id)
+            res['value'].update(to_update['value'])
+        return res
+        
+    ## @param self The object pointer.
+    ## @param cursor a psycopg cursor
+    ## @param user res.user.id that is currently loged
+    ## @parma ids invoices id
+    ## @param partner_bank_id the partner linked invoice bank
+    ## @return the dict of values with the reference type  value updated 
+    def onchange_partner_bank(self, cursor, user, ids, partner_bank_id):
+        """update the reference type depending of the partner bank"""
+        res = {'value': {}}
+        partner_bank_obj = self.pool.get('res.partner.bank')
+        if partner_bank_id:
+            partner_bank = partner_bank_obj.browse(cursor, user, partner_bank_id)
+            if partner_bank.state in ('bvrbank', 'bvrpost'):
+                res['value']['reference_type'] = 'bvr'
+        return res
 
 account_invoice()
 
 class account_tax_code(osv.osv):
-	"""Inherit account tax code in order
-	to add a Case code"""
-	_name = 'account.tax.code'
-	_inherit = "account.tax.code"
-	_columns = {
-		### The case code of the taxt code
-		'code': fields.char('Case Code', size=512),
-	}
+    """Inherit account tax code in order
+    to add a Case code"""
+    _name = 'account.tax.code'
+    _inherit = "account.tax.code"
+    _columns = {
+        ### The case code of the taxt code
+        'code': fields.char('Case Code', size=512),
+    }
 account_tax_code()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ch/partner.py b/addons/l10n_ch/partner.py
index 4dc9656826c..3ecfeaca670 100755
--- a/addons/l10n_ch/partner.py
+++ b/addons/l10n_ch/partner.py
@@ -34,13 +34,13 @@ import netsvc
 from osv import fields, osv
 
 class res_partner(osv.osv):
-	_inherit = 'res.partner'
+    _inherit = 'res.partner'
 
-	_columns = {
-		'ref_companies': fields.one2many('res.company', 'partner_id',
-		'Companies that refers to partner'),
-	}
-	
+    _columns = {
+        'ref_companies': fields.one2many('res.company', 'partner_id',
+        'Companies that refers to partner'),
+    }
+    
 
 
 res_partner()
@@ -48,52 +48,50 @@ res_partner()
 
 
 class res_partner_bank(osv.osv):
-	_inherit = "res.partner.bank"
-	_columns = {
-		'name': fields.char('Description', size=128, required=True),
-		'post_number': fields.char('Post number', size=64),
-		'bvr_number': fields.char('BVR account number', size=11),
-		'bvr_adherent_num': fields.char('BVR adherent number', size=11),
-		'dta_code': fields.char('DTA code', size=5),
-	}
-	
-	def _default_value(self, cursor, user, field, context=None):
-		if field in ('country_id', 'state_id'):
-			value = False
-		else:
-			value = ''
-		if not context.get('address', False):
-			return value
-		for ham, spam, address in context['address']:
-			if 'type' in address.keys() :
-				if address['type'] == 'default':
-					return address.get(field,False)
-				elif not address['type']:
-					value = address.get(field,False)
-			else :
-				value = False
-		return value
-		
-		
-	def name_get(self, cr, uid, ids, context=None):
-		if not len(ids):
-			return []
-		bank_type_obj = self.pool.get('res.partner.bank.type')
+    _inherit = "res.partner.bank"
+    _columns = {
+        'name': fields.char('Description', size=128, required=True),
+        'post_number': fields.char('Post number', size=64),
+        'bvr_number': fields.char('BVR account number', size=11),
+        'bvr_adherent_num': fields.char('BVR adherent number', size=11),
+        'dta_code': fields.char('DTA code', size=5),
+    }
+    
+#   def _default_value(self, cursor, user, field, context=None):
+#       if field in ('country_id', 'state_id'):
+#           value = False
+#       else:
+#           value = ''
+#       if not context.get('address', False):
+#           return value
+#       for ham, spam, address in context['address']:
+#           if 'type' in address.keys() :
+#               if address['type'] == 'default':
+#                   return address[field]
+#               elif not address['type']:
+#                   value = address[field]
+#           else :
+#               value = False
+#       return value
+        
+        
+    def name_get(self, cr, uid, ids, context=None):
+        if not len(ids):
+            return []
+        bank_type_obj = self.pool.get('res.partner.bank.type')
 
-		type_ids = bank_type_obj.search(cr, uid, [])
-		bank_type_names = {}
-		for bank_type in bank_type_obj.browse(cr, uid, type_ids,
-				context=context):
-			bank_type_names[bank_type.code] = bank_type.name
-		res = []
-		for r in self.read(cr, uid, ids, ['name','state'], context):
-			res.append((r['id'], r['name']+' : '+bank_type_names[r['state']]))
-		return res
-	
-	_sql_constraints = [
-		('bvr_adherent_uniq', 'unique (bvr_adherent_num)', 'The BVR adherent number must be unique !')
-	]
-
-	
+        type_ids = bank_type_obj.search(cr, uid, [])
+        bank_type_names = {}
+        for bank_type in bank_type_obj.browse(cr, uid, type_ids,
+                context=context):
+            bank_type_names[bank_type.code] = bank_type.name
+        res = []
+        for r in self.read(cr, uid, ids, ['name','state'], context):
+            res.append((r['id'], r['name']+' : '+bank_type_names[r['state']]))
+        return res
+    
+    _sql_constraints = [
+        ('bvr_adherent_uniq', 'unique (bvr_adherent_num)', 'The BVR adherent number must be unique !')
+    ]
 res_partner_bank()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ch/payment.py b/addons/l10n_ch/payment.py
index 56420e85046..6da5146f34b 100755
--- a/addons/l10n_ch/payment.py
+++ b/addons/l10n_ch/payment.py
@@ -34,11 +34,11 @@ from osv import fields
 from osv import osv
 
 class payment_order(osv.osv):
-	_inherit = 'payment.order'
+    _inherit = 'payment.order'
 
-	def get_wizard(self,mode):
-		if mode == 'dta':
-			return 'l10n_ch','wizard_account_dta_create'
-		return super(payment_order,self).get_wizard(mode)
+    def get_wizard(self,mode):
+        if mode == 'dta':
+            return 'l10n_ch','wizard_account_dta_create'
+        return super(payment_order,self).get_wizard(mode)
 payment_order()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ch/report/bvr.py b/addons/l10n_ch/report/bvr.py
index 8804f6c876a..a268f2ac411 100755
--- a/addons/l10n_ch/report/bvr.py
+++ b/addons/l10n_ch/report/bvr.py
@@ -34,70 +34,92 @@ import time
 from report import report_sxw
 from tools import mod10r
 import re
+import os 
+import sys
+import shutil
 from mx.DateTime import *
 
 class account_invoice_bvr(report_sxw.rml_parse):
-	"""Report class that Allows to print BVR payement vector"""
-	def __init__(self, cr, uid, name, context):
-		super(account_invoice_bvr, self).__init__(cr, uid, name, context=context)
-		self.localcontext.update({
-			'time': time,
-			'user':self.pool.get("res.users").browse(cr,uid,uid),
-			'mod10r': mod10r,
-			'_space': self._space,
-			'_get_ref': self._get_ref,
-			'comma_me': self.comma_me,
-			'format_date': self._get_and_change_date_format_for_swiss,
-			#'date_invoice':
-		})
-	def _get_and_change_date_format_for_swiss (self,date_to_format):
-		date_formatted=''
-		print date_to_format
-		if date_to_format:
-			date_formatted = strptime(date_to_format,'%Y-%m-%d').strftime('%d.%m.%Y')
-		return date_formatted
-		
-	def comma_me(self,amount):
-		if  type(amount) is float :
-			amount = str('%.2f'%amount)
-		else :
-			amount = str(amount)
-		orig = amount
-		new = re.sub("^(-?\d+)(\d{3})", "\g<1>'\g<2>", amount)
-		if orig == new:
-			return new
-		else:
-			return self.comma_me(new)
+    """Report class that Allows to print BVR payement vector"""
+    def __init__(self, cr, uid, name, context):
+        super(account_invoice_bvr, self).__init__(cr, uid, name, context)
+        self.copyocrbfile('addons/l10n_ch/report/ocrbb.ttf')
+        self.localcontext.update({
+            'time': time,
+            'user':self.pool.get("res.users").browse(cr,uid,uid),
+            'mod10r': mod10r,
+            '_space': self._space,
+            '_get_ref': self._get_ref,
+            'comma_me': self.comma_me,
+            'format_date': self._get_and_change_date_format_for_swiss,
+            'police_absolute_path' : self.police_absolute_path,
+            'copyocrbfile': self.copyocrbfile
+        })
+    def _get_and_change_date_format_for_swiss (self,date_to_format):
+        date_formatted=''
+        print date_to_format
+        if date_to_format:
+            date_formatted = strptime(date_to_format,'%Y-%m-%d').strftime('%d.%m.%Y')
+        return date_formatted
+        
+    def police_absolute_path(self, inner_path) :
+        path = os.path.join(os.path.dirname(sys.argv[0]), inner_path)
+        return  path
+        
+    def copyocrbfile(self,file):
+        src = self.police_absolute_path(file)
+        file = os.path.basename(src)
+        dest = os.path.join('/tmp/',file)
+        if not os.path.isfile(dest):
+            try:
+                shutil.copyfile(src,dest)
+            except:
+                """print ocrbfile was not copy in /tmp/ please 
+                copy it manually from l10_ch/report"""
+        
+            
 
-	def _space(self,nbr, nbrspc=5):
-		res = ''
-		for i in range(len(nbr)):
-			res = res + nbr[i]
-			if not (i-1) % nbrspc:
-				res = res + ' '
-		return res
+    def comma_me(self,amount):
+        if  type(amount) is float :
+            amount = str('%.2f'%amount)
+        else :
+            amount = str(amount)
+        orig = amount
+        new = re.sub("^(-?\d+)(\d{3})", "\g<1>'\g<2>", amount)
+        if orig == new:
+            return new
+        else:
+            return self.comma_me(new)
 
-	def _get_ref(self, o):
-		res = ''
-		if o.partner_bank.bvr_adherent_num:
-			res = o.partner_bank.bvr_adherent_num
-		invoice_number = ''
-		if o.number:
-			invoice_number = re.sub('[^0-9]', '0', o.number)
-		return mod10r(res + invoice_number.rjust(26-len(res), '0'))
+    def _space(self,nbr, nbrspc=5):
+        res = ''
+        for i in range(len(nbr)):
+            res = res + nbr[i]
+            if not (i-1) % nbrspc:
+                res = res + ' '
+        return res
+
+    def _get_ref(self, o):
+        res = ''
+        if o.partner_bank.bvr_adherent_num:
+            res = o.partner_bank.bvr_adherent_num
+        invoice_number = ''
+        if o.number:
+            invoice_number = re.sub('[^0-9]', '0', o.number)
+        return mod10r(res + invoice_number.rjust(26-len(res), '0'))
 
 report_sxw.report_sxw(
-	'report.l10n_ch.bvr',
-	'account.invoice',
-	'addons/l10n_ch/report/bvr.rml',
-	parser=account_invoice_bvr,
-	header=False)
+    'report.l10n_ch.bvr',
+    'account.invoice',
+    'addons/l10n_ch/report/bvr.rml',
+    parser=account_invoice_bvr,
+    header=False)
 
 report_sxw.report_sxw(
-	'report.l10n_ch.invoice.bvr',
-	'account.invoice',
-	'addons/l10n_ch/report/invoice.rml',
-	parser=account_invoice_bvr,
-	header=False)
+    'report.l10n_ch.invoice.bvr',
+    'account.invoice',
+    'addons/l10n_ch/report/invoice.rml',
+    parser=account_invoice_bvr,
+    header=False)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ch/report/bvr.rml b/addons/l10n_ch/report/bvr.rml
index 72244304e4b..caaa585d835 100755
--- a/addons/l10n_ch/report/bvr.rml
+++ b/addons/l10n_ch/report/bvr.rml
@@ -1,40 +1,36 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
   <docinit>
-    <registerFont fontName="ocrb" fontFile="addons/l10n_ch/report/ocrbb.ttf"/>
+    <registerFont fontFile="/tmp/ocrbb.ttf"  expr="{'fontFile':str(police_absolute_path('addons/l10n_ch/report/ocrbb.ttf'))}"  fontName="ocrb"   />
   </docinit>
   <template pageSize="(210.0mm,297.0mm)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
 	  <pageGraphics>
-	  	<setFont name="Helvetica" size="30"/>
-	  	<fill color="darkblue"/>
-	  	<stroke color="darkblue"/>
-	  	<drawString x="1cm" y="27.8cm">[[ company.partner_id.name ]]</drawString>
-	  	<lines>1cm 27.7cm 20cm 27.7cm</lines>
+            <!-- You Logo - Change X,Y,Width and Height -->
+      <image x="1.3cm" y="27.6cm" height="40.0" >[[company.logo or removeParentNode('image')]]</image>
+            <setFont name="Helvetica" size="8"/>
+            <fill color="black"/>
+            <stroke color="black"/>
+            <lines>1.3cm 27.7cm 20cm 27.7cm</lines>
 
-	  	<setFont name="Helvetica" size="10"/>
-	  	<drawRightString x="20cm" y="27.8cm">[[ company.rml_header1 ]]</drawRightString>
-
-	  	<drawString x="1cm" y="27.1cm">[[ company.partner_id.address[0].street ]]</drawString>
-	  	<drawString x="1cm" y="26.7cm">[[ company.partner_id.address[0].zip ]] [[ company.partner_id.address[0].city ]]</drawString>
-		<drawString x="17cm" y="27.1cm">TVA:</drawString>
-		<drawString x="18cm" y="27.1cm">[[ company.partner_id.vat ]]</drawString>
-		<drawString x="1cm" y="26.2cm">Phone:</drawString>
-	  	<drawRightString x="7cm" y="26.2cm">[[ company.partner_id.address[0].phone ]]</drawRightString>
-
-	  	<drawString x="1cm" y="25.8cm">Mail:</drawString>
-	  	<drawRightString x="7cm" y="25.8cm">[[ company.partner_id.address[0].email ]]</drawRightString>
-	  	<lines>1cm 25.7cm 7cm 25.7cm</lines>
-
-	  </pageGraphics>
+            <drawRightString x="20cm" y="27.8cm">[[ company.rml_header1 ]] </drawRightString>            
+            <drawString x="1.3cm" y="27.2cm">[[ company.partner_id.name ]]</drawString>
+            <drawString x="1.3cm" y="26.8cm">[[ company.partner_id.address and company.partner_id.address[0].street or  '' ]]</drawString>
+            <drawString x="1.3cm" y="26.4cm">[[ company.partner_id.address and company.partner_id.address[0].zip or '' ]] [[ company.partner_id.address and company.partner_id.address[0].city or '' ]] - [[ company.partner_id.address and company.partner_id.address[0].country_id and company.partner_id.address[0].country_id.name  or '']]</drawString>
+            <drawString x="1.3cm" y="26.0cm">Phone:</drawString>
+            <drawRightString x="7cm" y="26.0cm">[[ company.partner_id.address and company.partner_id.address[0].phone or '' ]]</drawRightString>
+            <drawString x="1.3cm" y="25.6cm">Mail:</drawString>
+            <drawRightString x="7cm" y="25.6cm">[[ company.partner_id.address and company.partner_id.address[0].email or '' ]]</drawRightString>
+            <lines>1.3cm 25.5cm 7cm 25.5cm</lines>
+        </pageGraphics>
 
       <frame id="first" x1="24.0" y1="111.5mm" width="190mm" height="142mm" last="1"/>
       <frame id="Frame1"
 		expr="{'height':str(111+(company.bvr_delta_vert or 0.0))+'mm', 'x1': str((company.bvr_delta_horz or 0.0))+'mm'}"
 		x1="0mm"
-		y1="0mm"
+		y1="-5"
 		width="210mm"
-		height="106mm"/>
+		height="111mm"/>
     </pageTemplate>
   </template>
 
@@ -116,6 +112,12 @@
 	-->
 	<illustration width="210mm" height="106mm">
 		<setFont name="Helvetica" size="11"/>
+        <drawString x="2mm" y="93mm">[[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.name or '' ]]</drawString>
+		<drawString x="2mm" y="88mm">[[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.zip or '']] [[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.city or '']]</drawString>
+
+		<drawString x="62mm" y="93mm">[[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.name or '' ]]</drawString>
+		<drawString x="62mm" y="88mm">[[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.zip or '']] [[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.city or '']]</drawString>
+
 		<drawString x="2mm" y="78mm">  [[ user.company_id.partner_id.name ]]</drawString>
 		<drawString x="2mm" y="73mm">  [[ user.company_id.partner_id.address[0].street ]]</drawString>
 		<drawString x="2mm" y="68mm">  [[ (user.company_id.partner_id.address[0].street2 or '')]]</drawString>
@@ -145,10 +147,11 @@
 		<drawString x="124mm" y="67mm">[[ _space(_get_ref(o)) ]]</drawString>
 
 		<setFont name="ocrb" size="12"/>
-
+        <drawRightString x="52 mm" y="59.3mm">[[ o.partner_bank and o.partner_bank.printAccount and o.partner_bank.bvr_number or '' ]]</drawRightString>
+        <drawRightString x="112mm" y="59.3mm">[[ o.partner_bank and o.partner_bank.printAccount and o.partner_bank.bvr_number or '' ]]</drawRightString>
 		<drawRightString x="42mm" y="50mm">[[ _space(('%.2f' % o.amount_total)[:-3], 1) + ' ' ]]</drawRightString>
 		<drawRightString x="104mm" y="50mm">[[ _space(('%.2f' % o.amount_total)[:-3], 1) + ' ' ]]</drawRightString>
-
+        <drawRightString x="114 mm" y="59.3mm">[[ o.partner_bank and o.partner_bank.printAccount and o.partner_bank.bvr_number or '' ]]</drawRightString>
 		<drawRightString x="58mm" y="50mm">[[ _space(('%.2f' % o.amount_total)[-2:], 1) + ' ' ]]</drawRightString>
 		<drawRightString x="119mm" y="50mm">[[ _space(('%.2f' % o.amount_total)[-2:], 1) + ' ' ]]</drawRightString>
 
diff --git a/addons/l10n_ch/report/invoice.rml b/addons/l10n_ch/report/invoice.rml
index 4aba63b6986..ce5ef808f2a 100755
--- a/addons/l10n_ch/report/invoice.rml
+++ b/addons/l10n_ch/report/invoice.rml
@@ -1,41 +1,40 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
   <docinit>
-    <registerFont fontName="ocrb" fontFile="addons/l10n_ch/report/ocrbb.ttf"/>
+     <registerFont fontFile="/tmp/ocrbb.ttf"  expr="{'fontFile':str(police_absolute_path('addons/l10n_ch/report/ocrbb.ttf'))}"  fontName="ocrb"   />
+
   </docinit>
 
   <template pageSize="(210.0mm,297.0mm)" title="Test" author="Martin Simon" allowSplitting="20">
   	<pageTemplate id="first">
 		<pageGraphics>
-			<!--logo-->
-			<setFont name="Helvetica" size="30"/>
-			<fill color="darkblue"/>
-			<stroke color="darkblue"/>
-			<drawString x="1cm" y="27.8cm">[[ company.partner_id.name ]]</drawString>
-			<lines>1cm 27.7cm 20cm 27.7cm</lines>
+            <!-- You Logo - Change X,Y,Width and Height -->
+        <image x="1.3cm" y="27.6cm" height="40.0" >[[company.logo or removeParentNode('image')]]</image>
+            <setFont name="Helvetica" size="8"/>
+            <fill color="black"/>
+            <stroke color="black"/>
+            <lines>1.3cm 27.7cm 20cm 27.7cm</lines>
 
-			<setFont name="Helvetica" size="10"/>
-			<drawRightString x="20cm" y="27.8cm">[[ company.rml_header1 ]]</drawRightString>
+            <drawRightString x="20cm" y="27.8cm">[[ company.rml_header1 ]]</drawRightString>
 
 
-			<drawString x="1cm" y="27.1cm">[[ company.partner_id.address and company.partner_id.address[0].street ]]</drawString>
-			<drawString x="1cm" y="26.7cm">[[ company.partner_id.address and company.partner_id.address[0].zip ]] [[ company.partner_id.address and company.partner_id.address[0].city ]] - [[ company.partner_id.address and company.partner_id.address[0].country_id and company.partner_id.address[0].country_id.name ]]</drawString>
-				<drawString x="17cm" y="27.1cm">TVA:</drawString>
-				<drawString x="18cm" y="27.1cm">[[ company.partner_id.vat ]]</drawString>
-			<drawString x="1cm" y="26.2cm">Phone:</drawString>
-			<drawRightString x="7cm" y="26.2cm">[[ company.partner_id.address and company.partner_id.address[0].phone ]]</drawRightString>
-			<drawString x="1cm" y="25.8cm">Mail:</drawString>
-			<drawRightString x="7cm" y="25.8cm">[[ company.partner_id.address and company.partner_id.address[0].email ]]</drawRightString>
-			<lines>1cm 25.7cm 7cm 25.7cm</lines>
-			</pageGraphics>
-		<!-- end of header -->
+            <drawString x="1.3cm" y="27.2cm">[[ company.partner_id.name ]]</drawString>
+            <drawString x="1.3cm" y="26.8cm">[[ company.partner_id.address and company.partner_id.address[0].street or  '' ]]</drawString>
+            <drawString x="1.3cm" y="26.4cm">[[ company.partner_id.address and company.partner_id.address[0].zip or '' ]] [[ company.partner_id.address and company.partner_id.address[0].city or '' ]] - [[ company.partner_id.address and company.partner_id.address[0].country_id and company.partner_id.address[0].country_id.name  or '']]</drawString>
+            <drawString x="1.3cm" y="26.0cm">Phone:</drawString>
+            <drawRightString x="7cm" y="26.0cm">[[ company.partner_id.address and company.partner_id.address[0].phone or '' ]]</drawRightString>
+            <drawString x="1.3cm" y="25.6cm">Mail:</drawString>
+            <drawRightString x="7cm" y="25.6cm">[[ company.partner_id.address and company.partner_id.address[0].email or '' ]]</drawRightString>
+            <lines>1.3cm 25.5cm 7cm 25.5cm</lines>
+            <drawCentredString x="10.5cm" y="0.8cm">Contact : [[ user.name ]] - Page: <pageNumber/></drawCentredString>
+        </pageGraphics>		<!-- end of header -->
 		<frame id="first" x1="24.0" y1="111.5mm" width="190mm" height="142mm" last="1"/>
       <frame id="Frame1"
 		expr="{'height':str(111+(company.bvr_delta_vert or 0.0))+'mm', 'x1': str((company.bvr_delta_horz or 0.0))+'mm'}"
 		x1="0mm"
-		y1="0mm"
+		y1="-5"
 		width="210mm"
-		height="106mm"/>
+		height="111mm"/>
 </pageTemplate>
  </template>
 <!-- begin of core -->
@@ -189,7 +188,7 @@
     </para>
     <para style="P21">
       <font face="Helvetica">Invoice Date: </font>
-      <font face="Helvetica">[[format_date(o.date_invoice)]]</font>
+      <font face="Helvetica">[[ o.date_invoice and format_date(o.date_invoice) or '']]</font>
     </para>
     <para style="P21">
       <font face="Helvetica">Remarque:</font>
@@ -248,19 +247,18 @@
           </td>
         </tr>
       </blockTable>
-      <blockTable colWidths="28.0,499.0" style="Table4">
+      <blockTable colWidths="28.0, 499.0" style="Table4">
         <tr>
           <td>
-            <para style="P16">[[ repeatIn((l.note and l.note.splitlines()) or [], 'note') ]]</para>
+           <para style="P9">[[ note or removeParentNode('blockTable') ]]</para>            
           </td>
           <td>
-            <para style="P9">[[ note or removeParentNode('table') ]]</para>
+            <xpre style="P16">[[ l.note  ]]</xpre>
           </td>
         </tr>
       </blockTable>
     </section>
     <para style="P18">
-      <font color="white"> </font>
     </para>
     <blockTable colWidths="215.0,313.0" style="Table5">
       <tr>
@@ -328,6 +326,11 @@
 	-->
 	<illustration width="210mm" height="106mm">
 		<setFont name="Helvetica" size="11"/>
+        <drawString x="2mm" y="93mm">[[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.name or '' ]]</drawString>
+		<drawString x="2mm" y="88mm">[[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.zip or '']] [[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.city or '']]</drawString>
+
+		<drawString x="62mm" y="93mm">[[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.name or '' ]]</drawString>
+		<drawString x="62mm" y="88mm">[[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.zip or '']] [[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.city or '']]</drawString>
 		<drawString x="2mm" y="78mm"> [[user.company_id.name]]</drawString>
 		<drawString x="2mm" y="73mm"> [[ user.company_id.partner_id.address[0].street ]]</drawString>
 		<drawString x="2mm" y="68mm"> [[ (user.company_id.partner_id.address[0].street2 or '')]]</drawString>
@@ -354,10 +357,12 @@
 
 
 		<setFont name="ocrb" size="11"/>
+        
 		<drawString x="124mm" y="67mm">[[ _space(_get_ref(o)) ]]</drawString>
 
 		<setFont name="ocrb" size="12"/>
-
+        <drawRightString x="52 mm" y="59.3mm">[[ o.partner_bank and o.partner_bank.printAccount and o.partner_bank.bvr_number or '' ]]</drawRightString>
+        <drawRightString x="112mm" y="59.3mm">[[ o.partner_bank and o.partner_bank.printAccount and o.partner_bank.bvr_number or '' ]]</drawRightString>
 		<drawRightString x="42mm" y="50mm">[[ _space(('%.2f' % o.amount_total)[:-3], 1) + ' ' ]]</drawRightString>
 		<drawRightString x="104mm" y="50mm">[[ _space(('%.2f' % o.amount_total)[:-3], 1) + ' ' ]]</drawRightString>
 
@@ -375,4 +380,4 @@
 	</illustration>
 
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/l10n_ch/report/tiny_sxw2rml.py b/addons/l10n_ch/report/tiny_sxw2rml.py
deleted file mode 100755
index e7a5422b6ec..00000000000
--- a/addons/l10n_ch/report/tiny_sxw2rml.py
+++ /dev/null
@@ -1,342 +0,0 @@
-
-
-#!/usr/bin/python
-#coding: latin-1
-
-##############################################################################
-#
-# Copyright (c):
-#
-#     2005 pyopenoffice.py Martin Simon (http://www.bezirksreiter.de)
-#     2005 Fabien Pinckaers, TINY SPRL. (http://tiny.be)
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contact a Free Software
-# Service Company
-#
-# 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 2
-# 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-"""
-Tiny SXW2RML - The Tiny ERP's report engine
-
-Tiny SXW2RMLis part of the Tiny report project.
-Tiny Report is a module that allows you to render high quality PDF document
-from an OpenOffice template (.sxw) and any relationnal database.
-
-The whole source code is distributed under the terms of the
-GNU Public Licence.
-
-(c) 2005 pyopenoffice.py Martin Simon (http://www.bezirksreiter.de)
-(c) 2005-TODAY, Fabien Pinckaers - Tiny sprl
-"""
-__version__ = '0.9'
-
-
-import re
-import string
-import os
-import time
-import zipfile
-import xml.dom.minidom
-from reportlab.lib.units import toLength
-import optparse
-
-parser = optparse.OptionParser(
-	version="Tiny Report v%s" % __version__,
-	usage = 'tiny_sxw2rml.py [options] file.sxw')
-parser.add_option("-v", "--verbose", default=False, dest="verbose", help="enable basic debugging")
-parser.add_option("-o", "--output", dest="output", default='.', help="directory of image output")
-(opt, args) = parser.parse_args()
-if len(args) != 1:
-	parser.error("incorrect number of arguments")
-
-class DomApiGeneral:
-	"""General DOM API utilities."""
-	def __init__(self,content_string="",file=""):
-		self.content_string = content_string
-		self.re_digits = re.compile(r"(.*?\d)(pt|cm|mm|inch|in)")
-
-	def _unitTuple(self,string):
-		"""Split values and units to a tuple."""
-		temp = self.re_digits.findall(string)
-		if not temp:
-			return (string,"")
-		else:
-			return (temp[0])
-
-	def stringPercentToFloat(self,string):
-		temp = string.replace("""%""","")
-		return float(temp)/100
-
-	def findChildrenByName(self,parent,name,attr_dict={}):
-		"""Helper functions. Does not work recursively.
-		Optional: also test for certain attribute/value pairs."""
-		children = []
-		for c in parent.childNodes:
-			if c.nodeType == c.ELEMENT_NODE and c.nodeName == name:
-				children.append(c)
-		if attr_dict == {}:
-			return children
-		else:
-			return self._selectForAttributes(nodelist=children,attr_dict=attr_dict)
-
-	def _selectForAttributes(self,nodelist,attr_dict):
-		"Helper function."""
-		selected_nodes = []
-		for n in nodelist:
-			check = 1
-			for a in attr_dict.keys():
-				if n.getAttribute(a) != attr_dict[a]:
-					# at least one incorrect attribute value?
-					check = 0
-			if check:
-				selected_nodes.append(n)
-		return selected_nodes
-
-	def _stringToTuple(self,s):
-		"""Helper function."""
-		try:
-			temp = string.split(s,",")
-			return int(temp[0]),int(temp[1])
-		except:
-			return None
-
-	def _tupleToString(self,t):
-		try:
-			return self.openOfficeStringUtf8("%s,%s" % (t[0],t[1]))
-		except:
-			return None
-
-	def _lengthToFloat(self,value):
-		v = value
-		if not self.re_digits.search(v):
-			return v
-		try:
-			if v[-4:] == "inch":
-				# OO files use "inch" instead of "in" in Reportlab units
-				v = v[:-2]
-		except:
-			pass
-		try:
-			c = round(toLength(v))
-			return c
-		except:
-			return v
-
-	def openOfficeStringUtf8(self,string):
-		if type(string) == unicode:
-			return string.encode("utf-8")
-		tempstring = unicode(string,"cp1252").encode("utf-8")
-		return tempstring 
-
-class DomApi(DomApiGeneral):
-	"""This class provides a DOM-API for XML-Files from an SXW-Archive."""
-	def __init__(self,xml_content,xml_styles):
-		DomApiGeneral.__init__(self)
-		self.content_dom = xml.dom.minidom.parseString(xml_content)
-		self.styles_dom = xml.dom.minidom.parseString(xml_styles)
-		body = self.content_dom.getElementsByTagName("office:body")
-		self.body = body and body[0]
-
-		# TODO: 
-		self.style_dict = {}
-		self.style_properties_dict = {}
-
-		# ******** always use the following order:
-		self.buildStyleDict()
-		self.buildStylePropertiesDict()
-
-		self.page_master = self.styles_dom.getElementsByTagName("style:page-master")[0]
-		self.document = self.content_dom.getElementsByTagName("office:document-content")[0]
-
-	def buildStylePropertiesDict(self):
-		for s in self.style_dict.keys():
-			self.style_properties_dict[s] = self.getStylePropertiesDict(s)
-
-	def updateWithPercents(self,dict,updatedict):
-		"""Sometimes you find values like "115%" in the style hierarchy."""
-		if not updatedict:
-			# no style hierarchies for this style? =>
-			return
-		new_updatedict = copy.copy(updatedict)
-		for u in new_updatedict.keys():
-			try:
-				if new_updatedict[u].find("""%""") != -1 and dict.has_key(u):
-					number = float(self.re_digits.search(dict[u]).group(1))
-					unit = self.re_digits.search(dict[u]).group(2)
-					new_number = self.stringPercentToFloat(new_updatedict[u]) * number
-					if unit == "pt":
-						new_number = int(new_number)
-						# no floats allowed for "pt"
-						# OOo just takes the int, does not round (try it out!)
-					new_updatedict[u] = "%s%s" % (new_number,unit)
-				else:
-					dict[u] = new_updatedict[u]
-			except:
-				dict[u] = new_updatedict[u]
-		dict.update(new_updatedict)
-
-	def normalizeStyleProperties(self):
-		"""Transfer all style:style-properties attributes from the
-		self.style_properties_hierarchical dict to the automatic-styles
-		from content.xml. Use this function to preprocess content.xml for
-		XSLT transformations etc.Do not try to implement this function
-		with XSlT - believe me, it's a terrible task..."""
-		styles_styles = self.styles_dom.getElementsByTagName("style:style")
-		automatic_styles = self.content_dom.getElementsByTagName("office:automatic-styles")[0]
-		for s in styles_styles:
-			automatic_styles.appendChild(s.cloneNode(deep=1))
-		content_styles = self.content_dom.getElementsByTagName("style:style")
-		# these are the content_styles with styles_styles added!!!
-		for s in content_styles:
-			c = self.findChildrenByName(s,"style:properties")
-			if c == []:
-				# some derived automatic styles do not have "style:properties":
-				temp = self.content_dom.createElement("style:properties")
-				s.appendChild(temp)
-				c = self.findChildrenByName(s,"style:properties")
-			c = c[0]
-			dict = self.style_properties_dict[(s.getAttribute("style:name")).encode("latin-1")] or {}
-			for attribute in dict.keys():
-				c.setAttribute(self.openOfficeStringUtf8(attribute),self.openOfficeStringUtf8(dict[attribute]))
-
-	def transferStylesXml(self):
-		"""Transfer certain sub-trees from styles.xml to the normalized content.xml
-		(see above). It is not necessary to do this - for example - with paragraph styles.
-		the "normalized" style properties contain all information needed for
-		further processing."""
-		# TODO: What about table styles etc.?
-		page_master = self.page_master
-		outline_styles = self.styles_dom.getElementsByTagName("text:outline-style")
-		t = self.content_dom.createElement("transferredfromstylesxml")
-		self.document.insertBefore(t,self.body)
-		t_new = self.body.previousSibling
-		try:
-			t_new.appendChild(page_master.cloneNode(deep=1))
-			t_new.appendChild(outline_styles[0].cloneNode(deep=1))
-		except:
-			pass
-
-	def normalizeLength(self):
-		"""Normalize all lengthes to floats (i.e: 1 inch = 72).
-		Always use this after "normalizeContent" and "transferStyles"!""" 
-		# TODO: The complex attributes of table cell styles are not transferred yet.
-		#all_styles = self.content_dom.getElementsByTagName("style:properties")
-		#all_styles += self.content_dom.getElementsByTagName("draw:image")
-		all_styles = self.content_dom.getElementsByTagName("*")
-		for s in all_styles:
-			for x in s._attrs.keys():
-				v = s.getAttribute(x)
-				s.setAttribute(x,"%s" % self._lengthToFloat(v))
-				# convert float to string first!
-
-	def normalizeTableColumns(self):
-		"""Handle this strange table:number-columns-repeated attribute."""
-		columns = self.content_dom.getElementsByTagName("table:table-column")
-		for c in columns:
-			if c.hasAttribute("table:number-columns-repeated"):
-				number = int(c.getAttribute("table:number-columns-repeated"))
-				c.removeAttribute("table:number-columns-repeated")
-				for i in range(number-1):
-					(c.parentNode).insertBefore(c.cloneNode(deep=1),c)
-
-	def buildStyleDict(self):
-		"""Store all style:style-nodes from content.xml and styles.xml in self.style_dict.
-		Caution: in this dict the nodes from two dom apis are merged!"""
-		for st in (self.styles_dom,self.content_dom):
-			for s in st.getElementsByTagName("style:style"):
-				name = s.getAttribute("style:name").encode("latin-1")
-				self.style_dict[name] = s
-		return True
-
-	def toxml(self):
-		return self.content_dom.toxml(encoding="utf-8")
-
-	def getStylePropertiesDict(self,style_name):
-		res = {}
-
-		if self.style_dict[style_name].hasAttribute("style:parent-style-name"):
-			parent = self.style_dict[style_name].getAttribute("style:parent-style-name").encode("latin-1")
-			res = self.getStylePropertiesDict(parent)
-
-		childs = self.style_dict[style_name].childNodes
-		for c in childs:
-			if c.nodeType == c.ELEMENT_NODE and c.nodeName == "style:properties":
-				for attr in c._attrs.keys():
-					res[attr] = c.getAttribute(attr).encode("latin-1")
-		return res
-
-class PyOpenOffice(object):
-	"""This is the main class which provides all functionality."""
-	def __init__(self, path='.'):
-		self.path = path
-
-	def oo_read(self,fname):
-		z = zipfile.ZipFile(fname,"r")
-		content = z.read('content.xml')
-		style = z.read('styles.xml')
-		all = z.namelist()
-		for a in all:
-			if a[:9]=='Pictures/' and len(a)>10:
-				pic_content = z.read(a)
-				f=open(os.path.join(self.path, os.path.basename(a)),"wb")
-				f.write(pic_content)
-				f.close()
-		z.close()
-		return content,style
-
-	def oo_replace(self,content):
-		regex = [
-			(r"<para[^>]*/>", ""),
-			#(r"<text:ordered-list.*?>(.*?)</text:ordered-list>", "$1"),
-			#(r"<text:unordered-list.*?>(.*?)</text:unordered-list>", "$1"),
-			(r"<para(.*)>(.*?)<text:line-break[^>]*/>", "<para$1>$2</para><para$1>"),
-		]
-		for key,val in regex:
-			content = re.sub(key, val, content)
-		return content
-
-	def unpackNormalize(self,sourcefile):
-		c,s = self.oo_read(sourcefile)
-		c = self.oo_replace(c)
-		dom = DomApi(c,s)
-		dom.normalizeStyleProperties()
-		dom.transferStylesXml()
-		dom.normalizeLength()
-		dom.normalizeTableColumns()
-		new_c = dom.toxml()
-		return new_c
-
-
-if __name__ == "__main__":
-	import sys
-	import libxslt
-	import libxml2
-
-	f = sys.argv[1]
-	tool = PyOpenOffice(opt.output)
-	res = tool.unpackNormalize(f)
-	styledoc = libxml2.parseFile('normalized_oo2rml.xsl')
-	style = libxslt.parseStylesheetDoc(styledoc)
-	doc = libxml2.parseMemory(res,len(res))
-	result = style.applyStylesheet(doc, None)
-	xml = style.saveResultToString(result)
-	print xml
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ch/wizard/bvr_import.py b/addons/l10n_ch/wizard/bvr_import.py
index 585e996bbed..d52e5941c69 100755
--- a/addons/l10n_ch/wizard/bvr_import.py
+++ b/addons/l10n_ch/wizard/bvr_import.py
@@ -39,215 +39,215 @@ from tools.translate import _
 
 ASK_FORM = """<?xml version="1.0"?>
 <form string="BVR Import">
-	<field name="file"/>
+    <field name="file"/>
 </form>"""
 
 ASK_FIELDS = {
-	'file': {
-		'string': 'BVR file',
-		'type': 'binary',
-		'required': True,
-	},
+    'file': {
+        'string': 'BVR file',
+        'type': 'binary',
+        'required': True,
+    },
 }
 
 def _reconstruct_invoice_ref(cursor, user, reference, context):
-	###
-	id_invoice = False
-	# On fait d'abord une recherche sur toutes les factures
-	# we now searhc for company
-	user_obj=pooler.get_pool(cursor.dbname).get('res.users')
-	user_current=user_obj.browse(cursor, user, user)
-	
-	##
-	
-	cursor.execute("SELECT inv.id,inv.number from account_invoice AS inv where inv.company_id = " + str(user_current.company_id.id))
-	result_invoice = cursor.fetchall()
-	
-	for inv_id,inv_name in result_invoice:
-		inv_name =  re.sub('[^0-9]', '0', str(inv_name))
-		if inv_name == reference:
-			id_invoice = inv_id
-			break
-	if  id_invoice:
-		cursor.execute('SELECT l.id ' \
-					'FROM account_move_line l, account_invoice i ' \
-					'WHERE l.move_id = i.move_id AND l.reconcile_id is NULL  ' \
-						'AND i.id in (' + ','.join([str(x) for x in [id_invoice]]) + ')')
-		inv_line = []
-		for id_line in cursor.fetchall():
-			inv_line.append(id_line[0])
-		return inv_line
-	else:
-		return []
-	return True
+    ###
+    id_invoice = False
+    # On fait d'abord une recherche sur toutes les factures
+    # we now searhc for company
+    user_obj=pooler.get_pool(cursor.dbname).get('res.users')
+    user_current=user_obj.browse(cursor, user, user)
+    
+    ##
+    
+    cursor.execute("SELECT inv.id,inv.number from account_invoice AS inv where inv.company_id = " + str(user_current.company_id.id))
+    result_invoice = cursor.fetchall()
+    
+    for inv_id,inv_name in result_invoice:
+        inv_name =  re.sub('[^0-9]', '0', str(inv_name))
+        if inv_name == reference:
+            id_invoice = inv_id
+            break
+    if  id_invoice:
+        cursor.execute('SELECT l.id ' \
+                    'FROM account_move_line l, account_invoice i ' \
+                    'WHERE l.move_id = i.move_id AND l.reconcile_id is NULL  ' \
+                        'AND i.id in (' + ','.join([str(x) for x in [id_invoice]]) + ')')
+        inv_line = []
+        for id_line in cursor.fetchall():
+            inv_line.append(id_line[0])
+        return inv_line
+    else:
+        return []
+    return True
 def _import(obj, cursor, user, data, context):
 
-	pool = pooler.get_pool(cursor.dbname)
-	statement_line_obj = pool.get('account.bank.statement.line')
-	statement_reconcile_obj = pool.get('account.bank.statement.reconcile')
-	move_line_obj = pool.get('account.move.line')
-	property_obj = pool.get('ir.property')
-	model_fields_obj = pool.get('ir.model.fields')
-	attachment_obj = pool.get('ir.attachment')
-	file = data['form']['file']
-	statement_id = data['id']
+    pool = pooler.get_pool(cursor.dbname)
+    statement_line_obj = pool.get('account.bank.statement.line')
+    statement_reconcile_obj = pool.get('account.bank.statement.reconcile')
+    move_line_obj = pool.get('account.move.line')
+    property_obj = pool.get('ir.property')
+    model_fields_obj = pool.get('ir.model.fields')
+    attachment_obj = pool.get('ir.attachment')
+    file = data['form']['file']
+    statement_id = data['id']
 
-	records = []
-	total_amount = 0
-	total_cost = 0
-	find_total = False
+    records = []
+    total_amount = 0
+    total_cost = 0
+    find_total = False
 
-	for lines in base64.decodestring(file).split("\n"):
-		# Manage files without carriage return
-		while lines:
-			(line, lines) = (lines[:128], lines[128:])
-			record = {}
+    for lines in base64.decodestring(file).split("\n"):
+        # Manage files without carriage return
+        while lines:
+            (line, lines) = (lines[:128], lines[128:])
+            record = {}
 
-			if line[0:3] in ('999', '995'):
-				if find_total:
-					raise wizard.except_wizard(_('Error'),
-							_('Too much total record found!'))
-				find_total = True
-				if lines:
-					raise wizard.except_wizard(_('Error'),
-							_('Record found after total record!'))
-				amount = float(line[39:49]) + (float(line[49:51]) / 100)
-				cost = float(line[69:76]) + (float(line[76:78]) / 100)
-				if line[2] == '5':
-					amount *= -1
-					cost *= -1
+            if line[0:3] in ('999', '995'):
+                if find_total:
+                    raise wizard.except_wizard(_('Error'),
+                            _('Too much total record found!'))
+                find_total = True
+                if lines:
+                    raise wizard.except_wizard(_('Error'),
+                            _('Record found after total record!'))
+                amount = float(line[39:49]) + (float(line[49:51]) / 100)
+                cost = float(line[69:76]) + (float(line[76:78]) / 100)
+                if line[2] == '5':
+                    amount *= -1
+                    cost *= -1
 
-				if round(amount - total_amount, 2) >= 0.01 \
-						or round(cost - total_cost, 2) >= 0.01:
-					raise wizard.except_wizard(_('Error'),
-							_('Total record different from the computed!'))
-				if int(line[51:63]) != len(records):
-					raise wizard.except_wizard(_('Error'),
-							_('Number record different from the computed!'))
-			else:
-				record = {
-					'reference': line[12:39],
-					'amount': float(line[39:47]) + (float(line[47:49]) / 100),
-					'date': time.strftime('%Y-%m-%d',
-						time.strptime(line[65:71], '%y%m%d')),
-					'cost': float(line[96:98]) + (float(line[98:100]) / 100),
-				}
+                if round(amount - total_amount, 2) >= 0.01 \
+                        or round(cost - total_cost, 2) >= 0.01:
+                    raise wizard.except_wizard(_('Error'),
+                            _('Total record different from the computed!'))
+                if int(line[51:63]) != len(records):
+                    raise wizard.except_wizard(_('Error'),
+                            _('Number record different from the computed!'))
+            else:
+                record = {
+                    'reference': line[12:39],
+                    'amount': float(line[39:47]) + (float(line[47:49]) / 100),
+                    'date': time.strftime('%Y-%m-%d',
+                        time.strptime(line[65:71], '%y%m%d')),
+                    'cost': float(line[96:98]) + (float(line[98:100]) / 100),
+                }
 
-				if record['reference'] != mod10r(record['reference'][:-1]):
-					raise wizard.except_wizard(_('Error'),
-							_('Recursive mod10 is invalid for reference: %s') % \
-									record['reference'])
+                if record['reference'] != mod10r(record['reference'][:-1]):
+                    raise wizard.except_wizard(_('Error'),
+                            _('Recursive mod10 is invalid for reference: %s') % \
+                                    record['reference'])
 
-				if line[2] == '5':
-					record['amount'] *= -1
-					record['cost'] *= -1
-				total_amount += record['amount']
-				total_cost += record['cost']
-				records.append(record)
+                if line[2] == '5':
+                    record['amount'] *= -1
+                    record['cost'] *= -1
+                total_amount += record['amount']
+                total_cost += record['cost']
+                records.append(record)
 
-	model_fields_ids = model_fields_obj.search(cursor, user, [
-		('name', 'in', ['property_account_receivable', 'property_account_payable']),
-		('model', '=', 'res.partner'),
-		], context=context)
-	property_ids = property_obj.search(cursor, user, [
-		('fields_id', 'in', model_fields_ids),
-		('res_id', '=', False),
-		], context=context)
+    model_fields_ids = model_fields_obj.search(cursor, user, [
+        ('name', 'in', ['property_account_receivable', 'property_account_payable']),
+        ('model', '=', 'res.partner'),
+        ], context=context)
+    property_ids = property_obj.search(cursor, user, [
+        ('fields_id', 'in', model_fields_ids),
+        ('res_id', '=', False),
+        ], context=context)
 
-	account_receivable = False
-	account_payable = False
-	for property in property_obj.browse(cursor, user, property_ids, context=context):
-		if property.fields_id.name == 'property_account_receivable':
-			account_receivable = int(property.value.split(',')[1])
-		elif property.fields_id.name == 'property_account_payable':
-			account_payable = int(property.value.split(',')[1])
+    account_receivable = False
+    account_payable = False
+    for property in property_obj.browse(cursor, user, property_ids, context=context):
+        if property.fields_id.name == 'property_account_receivable':
+            account_receivable = int(property.value.split(',')[1])
+        elif property.fields_id.name == 'property_account_payable':
+            account_payable = int(property.value.split(',')[1])
 
-	for record in records:
-		# Remove the 11 first char because it can be adherent number
-		# TODO check if 11 is the right number
-		reference = record['reference'][11:-1].lstrip('0')
-		values = {
-			'name': 'IN '+ reference,
-			'date': record['date'],
-			'amount': record['amount'],
-			'ref': reference,
-			'type': (record['amount'] >= 0 and 'customer') or 'supplier',
-			'statement_id': statement_id,
-		}
-		line_ids = move_line_obj.search(cursor, user, [
-			('ref', 'like', reference),
-			('reconcile_id', '=', False),
-			('account_id.type', 'in', ['receivable', 'payable']),
-			], order='date desc', context=context)
-		if not line_ids:
-			line_ids = _reconstruct_invoice_ref(cursor,user,reference,None)
-			
-		line2reconcile = False
-		partner_id = False
-		account_id = False
-		for line in move_line_obj.browse(cursor, user, line_ids, context=context):
-			if line.partner_id.id:
-				partner_id = line.partner_id.id
-			if record['amount'] >= 0:
-				if round(record['amount'] - line.debit, 2) < 0.01:
-					line2reconcile = line.id
-					account_id = line.account_id.id
-					break
-			else:
-				if round(line.credit + record['amount'], 2) < 0.01:
-					line2reconcile = line.id
-					account_id = line.account_id.id
-					break
-		if not account_id:
-			if record['amount'] >= 0:
-				account_id = account_receivable
-			else:
-				account_id = account_payable
-		if not account_id :
-			raise wizard.except_wizard(_('Error'),
-				_('The properties account payable account receivable'))
-		values['account_id'] = account_id
-		values['partner_id'] = partner_id
+    for record in records:
+        # Remove the 11 first char because it can be adherent number
+        # TODO check if 11 is the right number
+        reference = record['reference'][11:-1].lstrip('0')
+        values = {
+            'name': 'IN '+ reference,
+            'date': record['date'],
+            'amount': record['amount'],
+            'ref': reference,
+            'type': (record['amount'] >= 0 and 'customer') or 'supplier',
+            'statement_id': statement_id,
+        }
+        line_ids = move_line_obj.search(cursor, user, [
+            ('ref', 'like', reference),
+            ('reconcile_id', '=', False),
+            ('account_id.type', 'in', ['receivable', 'payable']),
+            ], order='date desc', context=context)
+        if not line_ids:
+            line_ids = _reconstruct_invoice_ref(cursor,user,reference,None)
+            
+        line2reconcile = False
+        partner_id = False
+        account_id = False
+        for line in move_line_obj.browse(cursor, user, line_ids, context=context):
+            if line.partner_id.id:
+                partner_id = line.partner_id.id
+            if record['amount'] >= 0:
+                if round(record['amount'] - line.debit, 2) < 0.01:
+                    line2reconcile = line.id
+                    account_id = line.account_id.id
+                    break
+            else:
+                if round(line.credit + record['amount'], 2) < 0.01:
+                    line2reconcile = line.id
+                    account_id = line.account_id.id
+                    break
+        if not account_id:
+            if record['amount'] >= 0:
+                account_id = account_receivable
+            else:
+                account_id = account_payable
+        if not account_id :
+            raise wizard.except_wizard(_('Error'),
+                _('The properties account payable account receivable'))
+        values['account_id'] = account_id
+        values['partner_id'] = partner_id
 
-		if line2reconcile:
-			values['reconcile_id'] = statement_reconcile_obj.create(cursor, user, {
-				'line_ids': [(6, 0, [line2reconcile])],
-				}, context=context)
+        if line2reconcile:
+            values['reconcile_id'] = statement_reconcile_obj.create(cursor, user, {
+                'line_ids': [(6, 0, [line2reconcile])],
+                }, context=context)
 
-		statement_line_obj.create(cursor, user, values, context=context)
-	attachment_obj.create(cursor, user, {
-		'name': 'BVR',
-		'datas': file,
-		'datas_fname': 'BVR.txt',
-		'res_model': 'account.bank.statement',
-		'res_id': statement_id,
-		}, context=context)
-	return {}
+        statement_line_obj.create(cursor, user, values, context=context)
+    attachment_obj.create(cursor, user, {
+        'name': 'BVR',
+        'datas': file,
+        'datas_fname': 'BVR.txt',
+        'res_model': 'account.bank.statement',
+        'res_id': statement_id,
+        }, context=context)
+    return {}
 
 
 class BVRImport(wizard.interface):
-	states = {
-		'init': {
-			'actions': [],
-			'result': {
-				'type': 'form',
-				'arch': ASK_FORM,
-				'fields': ASK_FIELDS,
-				'state': [
-					('end', 'Cancel', 'gtk-cancel'),
-					('import', 'Import', 'gtk-ok', True),
-				],
-			},
-		},
-		'import': {
-			'actions': [],
-			'result': {
-				'type': 'action',
-				'action': _import,
-				'state': 'end',
-			},
-		},
-	}
+    states = {
+        'init': {
+            'actions': [],
+            'result': {
+                'type': 'form',
+                'arch': ASK_FORM,
+                'fields': ASK_FIELDS,
+                'state': [
+                    ('end', 'Cancel', 'gtk-cancel'),
+                    ('import', 'Import', 'gtk-ok', True),
+                ],
+            },
+        },
+        'import': {
+            'actions': [],
+            'result': {
+                'type': 'action',
+                'action': _import,
+                'state': 'end',
+            },
+        },
+    }
 
 BVRImport('l10n_ch.bvr_import')
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ch/wizard/dta_wizard.py b/addons/l10n_ch/wizard/dta_wizard.py
index fe148c0810a..53bd0d94405 100755
--- a/addons/l10n_ch/wizard/dta_wizard.py
+++ b/addons/l10n_ch/wizard/dta_wizard.py
@@ -41,558 +41,568 @@ from tools.translate import _
 FORM = """<?xml version="1.0"?>
 <form string="DTA file creation - Results">
 <separator colspan="4" string="Clic on 'Save as' to save the DTA file :" />
-	<field name="dta"/>
+    <field name="dta"/>
 </form>"""
 
 FIELDS = {
-	'dta': {
-		'string': 'DTA File',
-		'type': 'binary',
-		'readonly': True,
-	},
+    'dta': {
+        'string': 'DTA File',
+        'type': 'binary',
+        'readonly': True,
+    },
 }
 
 TRANS=[
-	(u'é','e'),
-	(u'è','e'),
-	(u'à','a'),
-	(u'ê','e'),
-	(u'î','i'),
-	(u'ï','i'),
-	(u'â','a'),
-	(u'ä','a'),
+    (u'é','e'),
+    (u'è','e'),
+    (u'à','a'),
+    (u'ê','e'),
+    (u'î','i'),
+    (u'ï','i'),
+    (u'â','a'),
+    (u'ä','a'),
 ]
 
-def tr(s):
-	s= s.decode('utf-8')
-	for k in TRANS:
-		s = s.replace(k[0],k[1])
-	try:
-		res= s.encode('ascii','replace')
-	except:
-		res = s
-	return res
+def tr(string_in):
+    try:
+        string_in= string_in.decode('utf-8')
+    except:
+        # If exception => then just take the string as is
+        pass
+    for k in TRANS:
+        string_in = string_in.replace(k[0],k[1])
+    try:
+        res= string_in.encode('ascii','replace')
+    except:
+        res = string_in
+    return res
 
 
 class record:
 
-	def __init__(self, global_context_dict):
-		for i in global_context_dict:
-			global_context_dict[i] = global_context_dict[i] \
-					and tr(global_context_dict[i])
-		self.fields = []
-		self.global_values = global_context_dict
-		self.pre = {
-			'padding': '',
-			'seg_num1': '01',
-			'seg_num2': '02',
-			'seg_num3': '03',
-			'seg_num4': '04',
-			'seg_num5': '05',
-			'flag': '0',
-			'zero5': '00000'
-		}
-		self.post={'date_value_hdr': '000000', 'type_paiement': '0'}
-		self.init_local_context()
+    def __init__(self, global_context_dict):
+        for i in global_context_dict:
+            global_context_dict[i] = global_context_dict[i] \
+                    and tr(global_context_dict[i])
+        self.fields = []
+        self.global_values = global_context_dict
+        self.pre = {
+            'padding': '',
+            'seg_num1': '01',
+            'seg_num2': '02',
+            'seg_num3': '03',
+            'seg_num4': '04',
+            'seg_num5': '05',
+            'flag': '0',
+            'zero5': '00000'
+        }
+        self.post={'date_value_hdr': '000000', 'type_paiement': '0'}
+        self.init_local_context()
 
-	def init_local_context(self):
-		"""
-		Must instanciate a fields list, field = (name,size)
-		and update a local_values dict.
-		"""
-		raise _('not implemented')
+    def init_local_context(self):
+        """
+        Must instanciate a fields list, field = (name,size)
+        and update a local_values dict.
+        """
+        raise _('not implemented')
 
-	def generate(self):
-		res=''
-		for field in self.fields :
-			if self.pre.has_key(field[0]):
-				value = self.pre[field[0]]
-			elif self.global_values.has_key(field[0]):
-				value = self.global_values[field[0]]
-			elif self.post.has_key(field[0]):
-				value = self.post[field[0]]
-			else :
-				pass
-				#raise Exception(field[0]+' not found !')
-			try:
-				res = res + c_ljust(value, field[1])
-			except :
-				pass
-		return res
+    def generate(self):
+        res=''
+        for field in self.fields :
+            if self.pre.has_key(field[0]):
+                value = self.pre[field[0]]
+            elif self.global_values.has_key(field[0]):
+                value = self.global_values[field[0]]
+            elif self.post.has_key(field[0]):
+                value = self.post[field[0]]
+            else :
+                pass
+                #raise Exception(field[0]+' not found !')
+            try:
+                res = res + c_ljust(value, field[1])
+            except :
+                pass
+        return res
 
 
 class record_gt826(record):
-	"""
-	bvr
-	"""
-	def init_local_context(self):
-		self.fields=[
-			('seg_num1', 2),
-			#header
-			('date_value_hdr', 6),
-			('partner_bank_clearing', 12),
-			('zero5', 5),
-			('creation_date', 6),
-			('comp_bank_clearing', 7),
-			('uid', 5),
-			('sequence', 5),
-			('genre_trans', 3),
-			('type_paiement', 1),
-			('flag', 1),
-			#seg1
-			('comp_dta', 5),
-			('number', 11),
-			('comp_bank_iban', 24),
-			('date_value', 6),
-			('currency', 3),
-			('amount_to_pay', 12),
-			('padding', 14),
-			#seg2
-			('seg_num2', 2),
-			('comp_name', 20),
-			('comp_street', 20),
-			('comp_zip', 10),
-			('comp_city', 10),
-			('comp_country', 20),
-			('padding', 46),
-			#seg3
-			('seg_num3', 2),
-			('partner_bvr', 12),#numero d'adherent bvr
-			('partner_name', 20),
-			('partner_street', 20),
-			('partner_zip', 10),
-			('partner_city', 10),
-			('partner_country', 20),
-			('reference', 27),#communication structuree
-			('padding', 2),#cle de controle
-			('padding', 5)
-		]
-		self.pre.update({
-			'date_value_hdr': self.global_values['date_value'],
-			'date_value': '',
-			'partner_bank_clearing': '',
-			'partner_cpt_benef': '',
-			'genre_trans': '826',
-			'conv_cours': '',
-			'option_id_bank': 'D',
-			'partner_bvr': '/C/'+ self.global_values['partner_bvr'],
-			'ref2': '',
-			'ref3': '',
-			'format': '0',
-		})
+    """
+    bvr
+    """
+    def init_local_context(self):
+        self.fields=[
+            ('seg_num1', 2),
+            #header
+            ('date_value_hdr', 6),
+            ('partner_bank_clearing', 12),
+            ('zero5', 5),
+            ('creation_date', 6),
+            ('comp_bank_clearing', 7),
+            ('uid', 5),
+            ('sequence', 5),
+            ('genre_trans', 3),
+            ('type_paiement', 1),
+            ('flag', 1),
+            #seg1
+            ('comp_dta', 5),
+            ('number', 11),
+            ('comp_bank_iban', 24),
+            ('date_value', 6),
+            ('currency', 3),
+            ('amount_to_pay', 12),
+            ('padding', 14),
+            #seg2
+            ('seg_num2', 2),
+            ('comp_name', 20),
+            ('comp_street', 20),
+            ('comp_zip', 10),
+            ('comp_city', 10),
+            ('comp_country', 20),
+            ('padding', 46),
+            #seg3
+            ('seg_num3', 2),
+            ('partner_bvr', 12),#numero d'adherent bvr
+            ('partner_name', 20),
+            ('partner_street', 20),
+            ('partner_zip', 10),
+            ('partner_city', 10),
+            ('partner_country', 20),
+            ('reference', 27),#communication structuree
+            ('padding', 2),#cle de controle
+            ('padding', 5)
+        ]
+        self.pre.update({
+            'date_value_hdr': self.global_values['date_value'],
+            'date_value': '',
+            'partner_bank_clearing': '',
+            'partner_cpt_benef': '',
+            'genre_trans': '826',
+            'conv_cours': '',
+            'option_id_bank': 'D',
+            'partner_bvr': '/C/'+ self.global_values['partner_bvr'],
+            'ref2': '',
+            'ref3': '',
+            'format': '0',
+        })
 
 class record_gt827(record):
-	"""
-	interne suisse (bvpost et bvbank)
-	"""
-	def init_local_context(self):
-		self.fields = [
-			('seg_num1', 2),
-			#header
-			('date_value_hdr', 6),
-			('partner_bank_clearing', 12),
-			('zero5', 5),
-			('creation_date', 6),
-			('comp_bank_clearing', 7),
-			('uid', 5),
-			('sequence', 5),
-			('genre_trans', 3),
-			('type_paiement', 1),
-			('flag', 1),
-			#seg1
-			('comp_dta', 5),
-			('number', 11),
-			('comp_bank_iban', 24),
-			('date_value', 6),
-			('currency', 3),
-			('amount_to_pay', 12),
-			('padding', 14),
-			#seg2
-			('seg_num2', 2),
-			('comp_name', 20),
-			('comp_street', 20),
-			('comp_zip', 10),
-			('comp_city', 10),
-			('comp_country', 20),
-			('padding', 46),
-			#seg3
-			('seg_num3', 2),
-			('partner_bank_number', 30),
-			('partner_name', 24),
-			('partner_street', 24),
-			('partner_zip', 12),
-			('partner_city', 12),
-			('partner_country', 24),
-			#seg4
-			('seg_num4', 2),
-			('reference', 112),
-			('padding', 14),
-			#seg5
-			#('padding',128)
-			]
+    """
+    interne suisse (bvpost et bvbank)
+    """
+    def init_local_context(self):
+        self.fields = [
+            ('seg_num1', 2),
+            #header
+            ('date_value_hdr', 6),
+            ('partner_bank_clearing', 12),
+            ('zero5', 5),
+            ('creation_date', 6),
+            ('comp_bank_clearing', 7),
+            ('uid', 5),
+            ('sequence', 5),
+            ('genre_trans', 3),
+            ('type_paiement', 1),
+            ('flag', 1),
+            #seg1
+            ('comp_dta', 5),
+            ('number', 11),
+            ('comp_bank_iban', 24),
+            ('date_value', 6),
+            ('currency', 3),
+            ('amount_to_pay', 12),
+            ('padding', 14),
+            #seg2
+            ('seg_num2', 2),
+            ('comp_name', 20),
+            ('comp_street', 20),
+            ('comp_zip', 10),
+            ('comp_city', 10),
+            ('comp_country', 20),
+            ('padding', 46),
+            #seg3
+            ('seg_num3', 2),
+            ('partner_bank_number', 30),
+            ('partner_name', 24),
+            ('partner_street', 24),
+            ('partner_zip', 12),
+            ('partner_city', 12),
+            ('partner_country', 24),
+            #seg4
+            ('seg_num4', 2),
+            ('reference', 112),
+            ('padding', 14),
+            #seg5
+            #('padding',128)
+            ]
 
-		self.pre.update({
-			'date_value_hdr': self.global_values['date_value'],
-			'date_value': '',
-			'partner_cpt_benef': '',
-			'type_paiement': '0',
-			'genre_trans': '827',
-			'conv_cours': '',
-			'option_id_bank': 'D',
-			'ref2': '',
-			'ref3': '',
-			'format': '0'
-		})
+        self.pre.update({
+            'date_value_hdr': self.global_values['date_value'],
+            'date_value': '',
+            'partner_cpt_benef': '',
+            'type_paiement': '0',
+            'genre_trans': '827',
+            'conv_cours': '',
+            'option_id_bank': 'D',
+            'ref2': '',
+            'ref3': '',
+            'format': '0'
+        })
 
 
 class record_gt836(record):
-	"""
-	iban
-	"""
-	def init_local_context(self):
-		self.fields = [
-			('seg_num1', 2),
-			#header
-			('date_value_hdr', 6),
-			('partner_bank_clearing', 12),
-			('zero5', 5),
-			('creation_date', 6),
-			('comp_bank_clearing', 7),
-			('uid', 5),
-			('sequence', 5),
-			('genre_trans', 3),
-			('type_paiement', 1),
-			('flag', 1),
-			#seg1
-			('comp_dta', 5),
-			('number', 11),
-			('comp_bank_iban', 24),
-			('date_value', 6),
-			('currency', 3),
-			('amount_to_pay', 15),
-			('padding', 11),
-			#seg2
-			('seg_num2', 2),
-			('conv_cours', 12),
-			('comp_name', 35),
-			('comp_street', 35),
-			('comp_country', 3),
-			('comp_zip', 10),
-			('comp_city', 22),
-			('padding', 9),
-			#seg3
-			('seg_num3', 2),
-			('option_id_bank', 1),
-			('partner_bank_ident', 70),
-			('partner_bank_iban', 34),
-			('padding', 21),
-			#seg4
-			('seg_num4', 2),
-			('partner_name', 35),
-			('partner_street', 35),
-			('partner_country', 3),
-			('partner_zip', 10),
-			('partner_city', 22),
-			('padding', 21),
-			#seg5
-			('seg_num5', 2),
-			('option_motif', 1),
-			('reference', 105),
-			('format', 1),
-			('padding', 19)
-		]
-		self.pre.update( {
-			'partner_bank_clearing': '',
-			'partner_cpt_benef': '',
-			'type_paiement': '0',
-			'genre_trans': '836',
-			'conv_cours': '',
-			'reference': self.global_values['reference'],
-			'ref2': '',
-			'ref3': '',
-			'format': '2'
-		})
-		self.post.update({'option_motif': 'U'})
+    """
+    iban
+    """
+    def init_local_context(self):
+        self.fields = [
+            ('seg_num1', 2),
+            #header
+            ('date_value_hdr', 6),
+            ('partner_bank_clearing', 12),
+            ('zero5', 5),
+            ('creation_date', 6),
+            ('comp_bank_clearing', 7),
+            ('uid', 5),
+            ('sequence', 5),
+            ('genre_trans', 3),
+            ('type_paiement', 1),
+            ('flag', 1),
+            #seg1
+            ('comp_dta', 5),
+            ('number', 11),
+            ('comp_bank_iban', 24),
+            ('date_value', 6),
+            ('currency', 3),
+            ('amount_to_pay', 15),
+            ('padding', 11),
+            #seg2
+            ('seg_num2', 2),
+            ('conv_cours', 12),
+            ('comp_name', 35),
+            ('comp_street', 35),
+            ('comp_country', 3),
+            ('comp_zip', 10),
+            ('comp_city', 22),
+            ('padding', 9),
+            #seg3
+            ('seg_num3', 2),
+            ('option_id_bank', 1),
+            ('partner_bank_ident', 70),
+            ('partner_bank_iban', 34),
+            ('padding', 21),
+            #seg4
+            ('seg_num4', 2),
+            ('partner_name', 35),
+            ('partner_street', 35),
+            ('partner_country', 3),
+            ('partner_zip', 10),
+            ('partner_city', 22),
+            ('padding', 21),
+            #seg5
+            ('seg_num5', 2),
+            ('option_motif', 1),
+            ('reference', 105),
+            ('format', 1),
+            ('padding', 19)
+        ]
+        self.pre.update( {
+            'partner_bank_clearing': '',
+            'partner_cpt_benef': '',
+            'type_paiement': '0',
+            'genre_trans': '836',
+            'conv_cours': '',
+            'reference': self.global_values['reference'],
+            'ref2': '',
+            'ref3': '',
+            'format': '2'
+        })
+        self.post.update({'option_motif': 'U'})
 
 
 class record_gt890(record):
-	"""
-	Total
-	"""
-	def init_local_context(self):
-		self.fields = [
-			('seg_num1', 2),
-			#header
-			('date_value_hdr', 6),
-			('partner_bank_clearing', 12),
-			('zero5', 5),
-			('creation_date', 6),
-			('comp_bank_clearing', 7),
-			('uid', 5),
-			('sequence', 5),
-			('genre_trans', 3),
-			('type_paiement', 1),
-			('flag', 1),
-			#total
-			('amount_total', 16),
-			('padding', 59)
-		]
-		self.pre.update({'partner_bank_clearing': '', 'partner_cpt_benef': '',
-			'company_bank_clearing': '', 'genre_trans': '890'})
+    """
+    Total
+    """
+    def init_local_context(self):
+        self.fields = [
+            ('seg_num1', 2),
+            #header
+            ('date_value_hdr', 6),
+            ('partner_bank_clearing', 12),
+            ('zero5', 5),
+            ('creation_date', 6),
+            ('comp_bank_clearing', 7),
+            ('uid', 5),
+            ('sequence', 5),
+            ('genre_trans', 3),
+            ('type_paiement', 1),
+            ('flag', 1),
+            #total
+            ('amount_total', 16),
+            ('padding', 59)
+        ]
+        self.pre.update({'partner_bank_clearing': '', 'partner_cpt_benef': '',
+            'company_bank_clearing': '', 'genre_trans': '890'})
 
 def c_ljust(s, size):
-	"""
-	check before calling ljust
-	"""
-	s= s or ''
-	if len(s) > size:
-		s= s[:size]
-	s = s.decode('utf-8').encode('latin1','replace').ljust(size)
-	return s
+    """
+    check before calling ljust
+    """
+    s= s or ''
+    if len(s) > size:
+        s= s[:size]
+    s = s.decode('utf-8').encode('latin1','replace').ljust(size)
+    return s
 
 def _create_dta(obj, cr, uid, data, context):
-	v={}
-	v['uid'] = str(uid)
-	v['creation_date']= time.strftime('%y%m%d')
-	dta=''
+    v={}
+    v['uid'] = str(uid)
+    v['creation_date']= time.strftime('%y%m%d')
+    dta=''
 
-	pool = pooler.get_pool(cr.dbname)
-	payment_obj = pool.get('payment.order')
-	attachment_obj = pool.get('ir.attachment')
+    pool = pooler.get_pool(cr.dbname)
+    payment_obj = pool.get('payment.order')
+    attachment_obj = pool.get('ir.attachment')
 
-	payment = payment_obj.browse(cr, uid, data['id'], context=context)
+    payment = payment_obj.browse(cr, uid, data['id'], context=context)
 
-	if not payment.mode or payment.mode.type.code != 'dta':
-		raise wizard.except_wizard(_('Error'),
-				_('No payment mode or payment type code invalid.'))
-	bank = payment.mode.bank_id
-	if not bank:
-		raise wizard.except_wizard(_('Error'), _('No bank account for the company.'))
+    if not payment.mode or payment.mode.type.code != 'dta':
+        raise wizard.except_wizard(_('Error'),
+                _('No payment mode or payment type code invalid.'))
+    bank = payment.mode.bank_id
+    if not bank:
+        raise wizard.except_wizard(_('Error'), _('No bank account for the company.'))
 
-	v['comp_bank_name']= bank.bank and bank.bank.name or False
-	v['comp_bank_clearing'] = bank.bank.clearing
+    v['comp_bank_name']= bank.bank and bank.bank.name or False
+    v['comp_bank_clearing'] = bank.bank.clearing
 
-	if not v['comp_bank_clearing']:
-		raise wizard.except_wizard(_('Error'),
-				_('You must provide a Clearing Number for your bank account.'))
+    if not v['comp_bank_clearing']:
+        raise wizard.except_wizard(_('Error'),
+                _('You must provide a Clearing Number for your bank account.'))
 
-	user = pool.get('res.users').browse(cr,uid,[uid])[0]
-	company= user.company_id
-	#XXX dirty code use get_addr
-	co_addr= company.partner_id.address[0]
-	v['comp_country'] = co_addr.country_id and co_addr.country_id.name or ''
-	v['comp_street'] = co_addr.street or ''
-	v['comp_zip'] = co_addr.zip
-	v['comp_city'] = co_addr.city
-	v['comp_name'] = co_addr.name
-	v['comp_dta'] = bank.dta_code or '' #XXX not mandatory in pratice
+    user = pool.get('res.users').browse(cr,uid,[uid])[0]
+    company= user.company_id
+    #XXX dirty code use get_addr
+    co_addr= company.partner_id.address[0]
+    v['comp_country'] = co_addr.country_id and co_addr.country_id.name or ''
+    v['comp_street'] = co_addr.street or ''
+    v['comp_zip'] = co_addr.zip
+    v['comp_city'] = co_addr.city
+    v['comp_name'] = co_addr.name
+    v['comp_dta'] = bank.dta_code or '' #XXX not mandatory in pratice
 
 
-	v['comp_bank_number'] = bank.acc_number or ''
-	if bank.iban:
-		v['comp_bank_iban'] = bank.iban.replace(' ','') or ''
-	else:
-		v['comp_bank_iban'] = ''
-	if not v['comp_bank_iban']:
-		raise wizard.except_wizard(_('Error'),
-				_('No IBAN for the company bank account.'))
+    v['comp_bank_number'] = bank.acc_number or ''
+    if bank.iban:
+        v['comp_bank_iban'] = bank.iban.replace(' ','') or ''
+    else:
+        v['comp_bank_iban'] = ''
+    if not v['comp_bank_iban']:
+        raise wizard.except_wizard(_('Error'),
+                _('No IBAN for the company bank account.'))
 
-	dta_line_obj = pool.get('account.dta.line')
-	res_partner_bank_obj = pool.get('res.partner.bank')
+    dta_line_obj = pool.get('account.dta.line')
+    res_partner_bank_obj = pool.get('res.partner.bank')
 
-	seq= 1
-	amount_tot = 0
-	amount_currency_tot = 0
+    seq= 1
+    amount_tot = 0
+    amount_currency_tot = 0
 
-	for pline in payment.line_ids:
-		if not pline.bank_id:
-			raise wizard.except_wizard(_('Error'), _('No bank account defined\n' \
-					'on line: %s') % pline.name)
-		if not pline.bank_id.bank:
-			raise wizard.except_wizard(_('Error'), _('No bank defined\n' \
-					'for the bank account: %s\n' \
-					'on the partner: %s\n' \
-					'on line: %s') + (pline.bank_id.state, pline.partner_id.name, pline.name))
+    for pline in payment.line_ids:
+        if not pline.bank_id:
+            raise wizard.except_wizard(_('Error'), _('No bank account defined\n' \
+                    'on line: %s') % pline.name)
+        if not pline.bank_id.bank:
+            raise wizard.except_wizard(_('Error'), _('No bank defined\n' \
+                    'for the bank account: %s\n' \
+                    'on the partner: %s\n' \
+                    'on line: %s') + (pline.bank_id.state, pline.partner_id.name, pline.name))
 
-		v['sequence'] = str(seq).rjust(5).replace(' ', '0')
-		v['amount_to_pay']= str(pline.amount_currency).replace('.', ',')
-		v['number'] = pline.name
-		v['currency'] = pline.currency.code
+        v['sequence'] = str(seq).rjust(5).replace(' ', '0')
+        v['amount_to_pay']= str(pline.amount_currency).replace('.', ',')
+        v['number'] = pline.name
+        v['currency'] = pline.currency.code
 
-		v['partner_bank_name'] =  pline.bank_id.bank.name or False
-		v['partner_bank_clearing'] =  pline.bank_id.bank.clearing or False
-		if not v['partner_bank_name'] :
-			raise wizard.except_wizard(_('Error'), _('No bank name defined\n' \
-					'for the bank account: %s\n' \
-					'on the partner: %s\n' \
-					'on line: %s') % (pline.bank_id.state, pline.partner_id.name, pline.name))
+        v['partner_bank_name'] =  pline.bank_id.bank.name or False
+        v['partner_bank_clearing'] =  pline.bank_id.bank.clearing or False
+        if not v['partner_bank_name'] :
+            raise wizard.except_wizard(_('Error'), _('No bank name defined\n' \
+                    'for the bank account: %s\n' \
+                    'on the partner: %s\n' \
+                    'on line: %s') % (pline.bank_id.state, pline.partner_id.name, pline.name))
 
-		v['partner_bank_iban']=  pline.bank_id.iban or False
-		v['partner_bank_number']=  pline.bank_id.acc_number  \
-				and pline.bank_id.acc_number.replace('.','').replace('-','') \
-				or  False
-		v['partner_post_number']=  pline.bank_id.post_number \
-				and pline.bank_id.post_number.replace('.', '').replace('-', '') \
-				or  False
-		v['partner_bvr'] = pline.bank_id.bvr_number or ''
-		if v['partner_bvr']:
-			v['partner_bvr'] = v['partner_bvr'].replace('-','')
-			if len(v['partner_bvr']) < 9:
-				v['partner_bvr'] = v['partner_bvr'][:2] + '0' * \
-						(9 - len(v['partner_bvr'])) + v['partner_bvr'][2:]
+        v['partner_bank_iban']=  pline.bank_id.iban or False
+        v['partner_bank_number']=  pline.bank_id.acc_number  \
+                and pline.bank_id.acc_number.replace('.','').replace('-','') \
+                or  False
+        v['partner_post_number']=  pline.bank_id.post_number \
+                and pline.bank_id.post_number.replace('.', '').replace('-', '') \
+                or  False
+        v['partner_bvr'] = pline.bank_id.bvr_number or ''
+        if v['partner_bvr']:
+            v['partner_bvr'] = v['partner_bvr'].replace('-','')
+            if len(v['partner_bvr']) < 9:
+                v['partner_bvr'] = v['partner_bvr'][:2] + '0' * \
+                        (9 - len(v['partner_bvr'])) + v['partner_bvr'][2:]
 
-		if pline.bank_id.bank:
-			v['partner_bank_city'] = pline.bank_id.bank.city or False
-			v['partner_bank_street'] = pline.bank_id.bank.street or ''
-			v['partner_bank_zip'] = pline.bank_id.bank.zip or ''
-			v['partner_bank_country'] = pline.bank_id.bank.country and \
-					pline.bank_id.bank.country.name or ''
+        if pline.bank_id.bank:
+            v['partner_bank_city'] = pline.bank_id.bank.city or False
+            v['partner_bank_street'] = pline.bank_id.bank.street or ''
+            v['partner_bank_zip'] = pline.bank_id.bank.zip or ''
+            v['partner_bank_country'] = pline.bank_id.bank.country and \
+                    pline.bank_id.bank.country.name or ''
 
-		v['partner_bank_code'] = pline.bank_id.bank.bic
-		v['reference'] = pline.move_line_id.ref
-		v['partner_name'] = pline.partner_id and pline.partner_id.name or ''
-		if pline.partner_id and pline.partner_id.address \
-				and pline.partner_id.address[0]:
-			v['partner_street'] = pline.partner_id.address[0].street
-			v['partner_city']= pline.partner_id.address[0].city
-			v['partner_zip']= pline.partner_id.address[0].zip
-			# If iban => country=country code for space reason
-			elec_pay = pline.bank_id.state #Bank type
-			if elec_pay == 'iban':
-				v['partner_country']= pline.partner_id.address[0].country_id \
-						and pline.partner_id.address[0].country_id.code+'-' \
-						or ''
-			else:
-				v['partner_country']= pline.partner_id.address[0].country_id \
-						and pline.partner_id.address[0].country_id.name \
-						or ''
-		else:
-			v['partner_street'] =''
-			v['partner_city']= ''
-			v['partner_zip']= ''
-			v['partner_country']= ''
-			raise wizard.except_wizard(_('Error'), _('No address defined \n' \
-					'for the partner: %s\n' \
-					'on line: %s') % (pline.partner_id.name, pline.name))
+        v['partner_bank_code'] = pline.bank_id.bank.bic
+        v['reference'] = pline.move_line_id.ref
+        # Add support for owner of the account if exists..
+        if pline.bank_id.owner_name:
+            v['partner_name'] = pline.bank_id.owner_name
+        else:
+            v['partner_name'] = pline.partner_id and pline.partner_id.name or ''
+        
+        if pline.partner_id and pline.partner_id.address \
+                and pline.partner_id.address[0]:
+            v['partner_street'] = pline.partner_id.address[0].street
+            v['partner_city']= pline.partner_id.address[0].city
+            v['partner_zip']= pline.partner_id.address[0].zip
+            # If iban => country=country code for space reason
+            elec_pay = pline.bank_id.state #Bank type
+            if elec_pay == 'iban':
+                v['partner_country']= pline.partner_id.address[0].country_id \
+                        and pline.partner_id.address[0].country_id.code+'-' \
+                        or ''
+            else:
+                v['partner_country']= pline.partner_id.address[0].country_id \
+                        and pline.partner_id.address[0].country_id.name \
+                        or ''
+        else:
+            v['partner_street'] =''
+            v['partner_city']= ''
+            v['partner_zip']= ''
+            v['partner_country']= ''
+            raise wizard.except_wizard('Error', 'No address defined \n' \
+                    'for the partner: ' + pline.partner_id.name + '\n' \
+                    'on line: ' + pline.name)
 
-		if pline.order_id.date_planned :
-			date_value = mx.DateTime.strptime(pline.order_id.date_planned, '%Y-%m-%d')
-		elif pline.date :
-			date_value = mx.DateTime.strptime(pline.date, '%Y-%m-%d')
-		else :
-			date_value = mx.DateTime.now()
-		v['date_value'] = date_value.strftime("%y%m%d")
+        if pline.order_id.date_planned :
+            date_value = mx.DateTime.strptime(pline.order_id.date_planned, '%Y-%m-%d')
+        elif pline.date :
+            date_value = mx.DateTime.strptime(pline.date, '%Y-%m-%d')
+        else :
+            date_value = mx.DateTime.now()
+        v['date_value'] = date_value.strftime("%y%m%d")
 
-		# si compte iban -> iban (836)
-		# si payment structure  -> bvr (826)
-		# si non -> (827) 
+        # si compte iban -> iban (836)
+        # si payment structure  -> bvr (826)
+        # si non -> (827) 
 
-		if elec_pay == 'dta_iban':
-			# If iban => country=country code for space reason
-			v['comp_country'] = co_addr.country_id and co_addr.country_id.code+'-' or ''
-			record_type = record_gt836
-			if not v['partner_bank_iban']:
-				raise wizard.except_wizard(_('Error'), _('No IBAN defined \n' \
-						'for the bank account: %s\n' + \
-						'on line: %s') % (res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], context)[0][1] , pline.name))
+        if elec_pay == 'dta_iban':
+            # If iban => country=country code for space reason
+            v['comp_country'] = co_addr.country_id and co_addr.country_id.code+'-' or ''
+            record_type = record_gt836
+            if not v['partner_bank_iban']:
+                raise wizard.except_wizard(_('Error'), _('No IBAN defined \n' \
+                        'for the bank account: %s\n' + \
+                        'on line: %s') % (res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], context)[0][1] , pline.name))
 
-			if v['partner_bank_code'] : # bank code is swift (BIC address)
-				v['option_id_bank']= 'A'
-				v['partner_bank_ident']= v['partner_bank_code']
-			elif v['partner_bank_city']:
+            if v['partner_bank_code'] : # bank code is swift (BIC address)
+                v['option_id_bank']= 'A'
+                v['partner_bank_ident']= v['partner_bank_code']
+            elif v['partner_bank_city']:
 
-				v['option_id_bank']= 'D'
-				v['partner_bank_ident']= v['partner_bank_name'] \
-						+ ' ' + v['partner_bank_street'] \
-						+ ' ' + v['partner_bank_zip'] \
-						+ ' ' + v['partner_bank_city'] \
-						+ ' ' + v['partner_bank_country']
-			else:
-				raise wizard.except_wizard(_('Error'), _('You must provide the bank city '
-						'or the bic code for the partner bank: \n %d\n' + \
-						'on line: %s') %(res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], context)[0][1], pline.name))
+                v['option_id_bank']= 'D'
+                v['partner_bank_ident']= v['partner_bank_name'] \
+                        + ' ' + v['partner_bank_street'] \
+                        + ' ' + v['partner_bank_zip'] \
+                        + ' ' + v['partner_bank_city'] \
+                        + ' ' + v['partner_bank_country']
+            else:
+                raise wizard.except_wizard(_('Error'), _('You must provide the bank city '
+                        'or the bic code for the partner bank: \n %d\n' + \
+                        'on line: %s') %(res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], context)[0][1], pline.name))
 
-		elif elec_pay == 'bvrbank' or elec_pay == 'bvrpost':
-			from tools import mod10r
-			if v['reference']:
-				v['reference'] = v['reference'].replace(' ',
-						'').rjust(27).replace(' ', '0')
-			if not v['reference'] \
-					or mod10r(v['reference'][:-1]) != v['reference']:
-				raise wizard.except_wizard(_('Error'), _('You must provide ' \
-						'a valid BVR reference number \n' \
-						'for the line: %s') % pline.name)
-			if not v['partner_bvr']:
-				raise wizard.except_wizard(_('Error'), _('You must provide a BVR number\n'
-					'for the bank account: %s' \
-					'on line: %s') % (res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id],context)[0][1] ,pline.name))
-			record_type = record_gt826
+        elif elec_pay == 'bvrbank' or elec_pay == 'bvrpost':
+            from tools import mod10r
+            if v['reference']:
+                v['reference'] = v['reference'].replace(' ',
+                        '').rjust(27).replace(' ', '0')
+                if not v['reference'] \
+                    or (mod10r(v['reference'][:-1]) != v['reference'] and \
+                    not len(v['reference']) == 15):
+                raise wizard.except_wizard(_('Error'), _('You must provide ' \
+                        'a valid BVR reference number \n' \
+                        'for the line: %s') % pline.name)
+            if not v['partner_bvr']:
+                raise wizard.except_wizard(_('Error'), _('You must provide a BVR number\n'
+                    'for the bank account: %s' \
+                    'on line: %s') % (res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id],context)[0][1] ,pline.name))
+            record_type = record_gt826
 
-		elif elec_pay == 'bvbank':
-			if not v['partner_bank_number'] :
-				if v['partner_bank_iban'] :
-					v['partner_bank_number']= v['partner_bank_iban'] 
-				else:
-					raise wizard.except_wizard(_('Error'), _('You must provide ' \
-							'a bank number \n' \
-							'for the partner bank: %s\n' \
-							'on line: %s') % (res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], context)[0][1] , pline.name))
-			if not  v['partner_bank_clearing']:
-				raise wizard.except_wizard(_('Error'), _('You must provide ' \
-						'a Clearing Number\n' \
-						'for the partner bank: %s\n' \
-						'on line %s') % (res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], context)[0][1] , pline.name))
-			v['partner_bank_number'] = '/C/'+v['partner_bank_number']
-			record_type = record_gt827
-		elif elec_pay == 'bvpost':
-			if not v['partner_post_number']:
-				raise wizard.except_wizard(_('Error'), _('You must provide ' \
-						'a post number \n' \
-						'for the partner bank: %s\n' \
-						'on line: %s') % (res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], context)[0][1] ,pline.name))
-			v['partner_bank_clearing']= ''
-			v['partner_bank_number'] = '/C/'+v['partner_post_number']
-			record_type = record_gt827
-		else:
-			raise wizard.except_wizard(_('Error'), _('The Bank type %s of the bank account: %s is not supported') \
+        elif elec_pay == 'bvbank':
+            if not v['partner_bank_number'] :
+                if v['partner_bank_iban'] :
+                    v['partner_bank_number']= v['partner_bank_iban'] 
+                else:
+                    raise wizard.except_wizard(_('Error'), _('You must provide ' \
+                            'a bank number \n' \
+                            'for the partner bank: %s\n' \
+                            'on line: %s') % (res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], context)[0][1] , pline.name))
+            if not  v['partner_bank_clearing']:
+                raise wizard.except_wizard(_('Error'), _('You must provide ' \
+                        'a Clearing Number\n' \
+                        'for the partner bank: %s\n' \
+                        'on line %s') % (res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], context)[0][1] , pline.name))
+            v['partner_bank_number'] = '/C/'+v['partner_bank_number']
+            record_type = record_gt827
+        elif elec_pay == 'bvpost':
+            if not v['partner_post_number']:
+                raise wizard.except_wizard(_('Error'), _('You must provide ' \
+                        'a post number \n' \
+                        'for the partner bank: %s\n' \
+                        'on line: %s') % (res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], context)[0][1] ,pline.name))
+            v['partner_bank_clearing']= ''
+            v['partner_bank_number'] = '/C/'+v['partner_post_number']
+            record_type = record_gt827
+        else:
+            raise wizard.except_wizard(_('Error'), _('The Bank type %s of the bank account: %s is not supported') \
                     % (elec_pay, res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], context)[0][1],))
 
-		dta_line = record_type(v).generate()
+        dta_line = record_type(v).generate()
 
-		dta = dta + dta_line
-		amount_tot += pline.amount
-		amount_currency_tot += pline.amount_currency
-		seq += 1
+        dta = dta + dta_line
+        amount_tot += pline.amount
+        amount_currency_tot += pline.amount_currency
+        seq += 1
 
-	# segment total
-	v['amount_total'] = str(amount_currency_tot).replace('.',',')
-	v['sequence'] = str(seq).rjust(5).replace(' ','0')	
-	if dta :
-		dta = dta + record_gt890(v).generate()
+    # segment total
+    v['amount_total'] = str(amount_currency_tot).replace('.',',')
+    v['sequence'] = str(seq).rjust(5).replace(' ','0')  
+    if dta :
+        dta = dta + record_gt890(v).generate()
 
-	dta_data= base64.encodestring(dta)
-	payment_obj.set_done(cr, uid, data['id'], context)
-	attachment_obj.create(cr, uid, {
-		'name': 'DTA',
-		'datas': dta_data,
-		'datas_fname': 'DTA.txt',
-		'res_model': 'payment.order',
-		'res_id': data['id'],
-		}, context=context)
-	return {'dta': dta_data}
+    dta_data= base64.encodestring(dta)
+    payment_obj.set_done(cr, uid, data['id'], context)
+    attachment_obj.create(cr, uid, {
+        'name': 'DTA',
+        'datas': dta_data,
+        'datas_fname': 'DTA.txt',
+        'res_model': 'payment.order',
+        'res_id': data['id'],
+        }, context=context)
+    return {'dta': dta_data}
 
 
 class wizard_dta_create(wizard.interface):
-	states = {
-		'init' : {
-			'actions' : [_create_dta],
-			'result' : {'type' : 'form',
-				'arch' : FORM,
-				'fields' : FIELDS,
-				'state' : [('end', 'OK', 'gtk-ok', True)]
-			}
-		},
-	}
+    states = {
+        'init' : {
+            'actions' : [_create_dta],
+            'result' : {'type' : 'form',
+                'arch' : FORM,
+                'fields' : FIELDS,
+                'state' : [('end', 'OK', 'gtk-ok', True)]
+            }
+        },
+    }
 
 wizard_dta_create('account.dta_create')
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 122230e73c8e863a3b405741d2495198abb24d22 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@tinyerp.com>
Date: Fri, 16 Oct 2009 17:16:43 +0200
Subject: [PATCH 043/200] [FIX] allow to call write without ids on osv_memory
 objects

bzr revid: chs@tinyerp.com-20091016151643-uh7a9m0lfeqajfqf
---
 bin/osv/orm.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 73015dffbde..652bcafab0a 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1472,6 +1472,8 @@ class orm_memory(orm_template):
         return result
 
     def write(self, cr, user, ids, vals, context=None):
+        if not ids:
+            return True
         vals2 = {}
         upd_todo = []
         for field in vals:

From 3a3ea98257856975756a73efa7e9d4ea1edb8a8f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 19 Oct 2009 20:16:33 +0200
Subject: [PATCH 044/200] [FIX] recursive child_of on one2many and many2many

bzr revid: fp@tinyerp.com-20091019181633-8szl9k4nlp9mmr1p
---
 bin/osv/expression.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/osv/expression.py b/bin/osv/expression.py
index 3c330aaaa1a..72fde0be88b 100644
--- a/bin/osv/expression.py
+++ b/bin/osv/expression.py
@@ -52,8 +52,8 @@ class expression(object):
                        '  FROM "%s"'    \
                        ' WHERE "%s" in (%s)' % (s, f, w, ','.join(['%s']*len(subids))),
                        subids)
-            res.extend([r[0] for r in cr.fetchall()])
-        return res
+            res += [r[0] for r in cr.fetchall() if r[0]]
+        return res + (res and self.__execute_recursive_in(cr, s, f, w, res) or [])
 
 
     def __init__(self, exp):

From a34163911b5675e01d5387a38e0aa2653bb0d764 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Tue, 20 Oct 2009 18:22:54 +0200
Subject: [PATCH 045/200] [FIX] purchase: Use the price_accuracy

bzr revid: stephane@openerp.com-20091020162254-4tqmgq8d8toau15b
---
 addons/purchase/purchase.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 5661deedeee..521549cf472 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -442,7 +442,7 @@ class purchase_order_line(osv.osv):
         'move_ids': fields.one2many('stock.move', 'purchase_line_id', 'Reservation', readonly=True, ondelete='set null'),
         'move_dest_id': fields.many2one('stock.move', 'Reservation Destination', ondelete='set null'),
         'price_unit': fields.float('Unit Price', required=True, digits=(16, int(config['price_accuracy']))),
-        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal'),
+        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits=(16, int(config['price_accuracy']))),
         'notes': fields.text('Notes'),
         'order_id': fields.many2one('purchase.order', 'Order Ref', select=True, required=True, ondelete='cascade'),
         'account_analytic_id':fields.many2one('account.analytic.account', 'Analytic Account',),

From 636d392c646767e43dfe9e51b5cbc4da0e1ace84 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Tue, 20 Oct 2009 18:23:07 +0200
Subject: [PATCH 046/200] [FIX] Import OSV in the wizard

bzr revid: stephane@openerp.com-20091020162307-zgrmea9e9gadmu30
---
 addons/purchase_manual/wizard/wizard_purchase_line_invoice.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/purchase_manual/wizard/wizard_purchase_line_invoice.py b/addons/purchase_manual/wizard/wizard_purchase_line_invoice.py
index 89d7d188287..c65cefd97d0 100644
--- a/addons/purchase_manual/wizard/wizard_purchase_line_invoice.py
+++ b/addons/purchase_manual/wizard/wizard_purchase_line_invoice.py
@@ -24,6 +24,7 @@ import wizard
 import netsvc
 import ir
 import pooler
+import osv
 
 invoice_form = """<?xml version="1.0"?>
 <form string="Control invoices">

From f4f07382f5853849af46eeb3d6a8925bc0c2228b Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Wed, 21 Oct 2009 11:52:40 +0530
Subject: [PATCH 047/200] [FIX] Account : Restricting Payment term lines
 percentage insertion from 0 to 1

lp bug: https://launchpad.net/bugs/421636 fixed

bzr revid: jvo@tinyerp.com-20091021062240-55hy0og5o7t87bkr
---
 addons/account/account.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 85dc85fd2d8..ff344b0256b 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -77,7 +77,10 @@ class account_payment_term_line(osv.osv):
     _columns = {
         'name': fields.char('Line Name', size=32, required=True),
         'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the payment term lines from the lowest sequences to the higher ones"),
-        'value': fields.selection([('procent', 'Percent'), ('balance', 'Balance'), ('fixed', 'Fixed Amount')], 'Value',required=True),
+        'value': fields.selection([('procent', 'Percent'), ('balance', 'Balance'), ('fixed', 'Fixed Amount')], 'Value', required=True, help="""Example: 14 days 2%, 30 days net
+1. Line 1: percent 0.02 14 days
+2. Line 2: balance 30 days"""),
+
         'value_amount': fields.float('Value Amount', help="For Value percent enter % ratio between 0-1."),
         'days': fields.integer('Number of Days', required=True, help="Number of days to add before computation of the day of month." \
             "If Date=15/01, Number of Days=22, Day of Month=-1, then the due date is 28/02."),
@@ -90,6 +93,17 @@ class account_payment_term_line(osv.osv):
         'days2': lambda *a: 0,
     }
     _order = "sequence"
+
+    def _check_percent(self, cr, uid, ids, context={}):
+        obj = self.browse(cr, uid, ids[0])
+        if obj.value == 'procent' and ( obj.value_amount < 0.0 or obj.value_amount > 1.0):
+            return False
+        return True
+
+    _constraints = [
+        (_check_percent, _('Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for 2% '), ['value_amount']),
+    ]
+    
 account_payment_term_line()
 
 

From 8fd383c54afd7f653a6b7073c946ccc6563c6050 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?VRA=28OpenERP=29=2C=20Claude=20Brul=C3=A9=28Syleam=29?= <>
Date: Wed, 21 Oct 2009 15:43:24 +0530
Subject: [PATCH 048/200] [FIX] Project_timesheet : Analytic line
 creation/edition takes user based information

lp bug: https://launchpad.net/bugs/395160 fixed

bzr revid: jvo@tinyerp.com-20091021101324-37sddttk0hqlyt8k
---
 addons/project_timesheet/project_timesheet.py | 36 +++++++++++++------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index f914faec86f..255f83e7021 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -30,18 +30,15 @@ from tools.translate import _
 class project_work(osv.osv):
     _inherit = "project.task.work"
     _description = "Task Work"
-    def create(self, cr, uid, vals, *args, **kwargs):
-
-        obj = self.pool.get('hr.analytic.timesheet')
-        vals_line = {}
-        obj_task = self.pool.get('project.task').browse(cr, uid, vals['task_id'])
 
+    def get_user_related_details(self, cr, uid, user_id):
+        res = {}
         emp_obj = self.pool.get('hr.employee')
-        emp_id = emp_obj.search(cr, uid, [('user_id', '=', vals.get('user_id', uid))])
-
+        emp_id = emp_obj.search(cr, uid, [('user_id', '=', user_id)])
         if not emp_id:
+            user_name = self.pool.get('res.users').read(cr, uid, [user_id], ['name'])[0]['name']
             raise osv.except_osv(_('Bad Configuration !'),
-                 _('No employee defined for this user. You must create one.'))
+                 _('No employee defined for user "%s". You must create one.')% (user_name,))
         emp = self.pool.get('hr.employee').browse(cr, uid, emp_id[0])
         if not emp.product_id:
             raise osv.except_osv(_('Bad Configuration !'),
@@ -54,9 +51,22 @@ class project_work(osv.osv):
         a =  emp.product_id.product_tmpl_id.property_account_expense.id
         if not a:
             a = emp.product_id.categ_id.property_account_expense_categ.id
-
+            if not a:
+                raise osv.except_osv(_('Bad Configuration !'),
+                        _('No product and product category property account defined on the related employee.\nFill in the timesheet tab of the employee form.'))
+        res['product_id'] = emp.product_id.id
+        res['journal_id'] = emp.journal_id.id
+        res['general_account_id'] = a
+        return res
+        
+    def create(self, cr, uid, vals, *args, **kwargs):
+        obj = self.pool.get('hr.analytic.timesheet')
+        vals_line = {}
+        obj_task = self.pool.get('project.task').browse(cr, uid, vals['task_id'])
+        result = self.get_user_related_details(cr, uid, vals.get('user_id', uid))
         vals_line['name'] = '%s: %s' % (tools.ustr(obj_task.name), tools.ustr(vals['name']) or '/')
         vals_line['user_id'] = vals['user_id']
+        vals_line['product_id'] = result['product_id']
         vals_line['date'] = vals['date'][:10]
         vals_line['unit_amount'] = vals['hours']
         acc_id = obj_task.project_id.category_id.id
@@ -64,8 +74,8 @@ class project_work(osv.osv):
         res = obj.on_change_account_id(cr, uid, False, acc_id)
         if res.get('value'):
             vals_line.update(res['value'])
-        vals_line['general_account_id'] = a
-        vals_line['journal_id'] = emp.journal_id.id
+        vals_line['general_account_id'] = result['general_account_id']
+        vals_line['journal_id'] = result['journal_id']
         vals_line['amount'] = 00.0
         timeline_id = obj.create(cr, uid, vals_line, {})
 
@@ -87,6 +97,10 @@ class project_work(osv.osv):
                 vals_line['name'] = '%s: %s' % (tools.ustr(task.task_id.name), tools.ustr(vals['name']) or '/')
             if 'user_id' in vals:
                 vals_line['user_id'] = vals['user_id']
+                result = self.get_user_related_details(cr, uid, vals['user_id'])
+                vals_line['product_id'] = result['product_id']
+                vals_line['general_account_id'] = result['general_account_id']
+                vals_line['journal_id'] = result['journal_id']
             if 'date' in vals:
                 vals_line['date'] = vals['date'][:10]
             if 'hours' in vals:

From 391807ea8fa0d7d794eb43f89f9fe6eb407f2143 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Wed, 21 Oct 2009 18:13:26 +0530
Subject: [PATCH 049/200] [FIX]: #TODO: fix me sale module can not be used
 here,                     #as may be mrp can be installed without sale modul

bzr revid: mga@tinyerp.com-20091021124326-0bcr4q9st2wy9yf0
---
 addons/mrp/mrp.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index caef74d4540..5e7658b69eb 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -362,6 +362,8 @@ class mrp_production(osv.osv):
                 parent_move_line=get_parent_move(production['move_prod_id'][0])
                 if parent_move_line:
                     move = move_obj.browse(cr,uid,parent_move_line)
+                    #TODO: fix me sale module can not be used here, 
+                    #as may be mrp can be installed without sale module
                     if field_name=='name':
                         res[production['id']]=move.sale_line_id and move.sale_line_id.order_id.name or False
                     if field_name=='client_order_ref':

From 4c63801b0da73cb9a3d6976b07a86c9163a0a201 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Wed, 21 Oct 2009 19:36:19 +0530
Subject: [PATCH 050/200] [FIX] AuditTrail : View Logs should only show logs of
 current object and resources

bzr revid: jvo@tinyerp.com-20091021140619-st7tv6jaytp410kh
---
 addons/audittrail/audittrail.py | 40 ++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index ee23e790e7b..8467355addb 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -63,18 +63,18 @@ class audittrail_rule(osv.osv):
                         _('WARNING:audittrail is not part of the pool'),
                         _('Change audittrail depends -- Setting rule as DRAFT'))
                 self.write(cr, uid, [thisrule.id], {"state": "draft"})
-        val={
-             "name":'View Log',
-             "res_model":'audittrail.log',
-             "src_model":thisrule.object_id.model,
-             "domain":"[('res_id', '=', active_id)]"
-
-        }
-        id=self.pool.get('ir.actions.act_window').create(cr, uid, val)
-        self.write(cr, uid, ids, {"state": "subscribed","action_id":id})
-        keyword = 'client_action_relate'
-        value = 'ir.actions.act_window,'+str(id)
-        res=self.pool.get('ir.model.data').ir_set(cr, uid, 'action', keyword,'View_log_'+thisrule.object_id.model, [thisrule.object_id.model], value, replace=True, isobject=True, xml_id=False)
+            val={
+                 "name":'View Log',
+                 "res_model":'audittrail.log',
+                 "src_model":thisrule.object_id.model,
+                 "domain":"[('object_id','=',"+str(thisrule.object_id.id)+"),('res_id', '=', active_id)]"
+    
+            }
+            id=self.pool.get('ir.actions.act_window').create(cr, uid, val)
+            self.write(cr, uid, [thisrule.id], {"state": "subscribed","action_id":id})
+            keyword = 'client_action_relate'
+            value = 'ir.actions.act_window,'+str(id)
+            res=self.pool.get('ir.model.data').ir_set(cr, uid, 'action', keyword,'View_log_'+thisrule.object_id.model, [thisrule.object_id.model], value, replace=True, isobject=True, xml_id=False)
         return True
 
 
@@ -84,14 +84,14 @@ class audittrail_rule(osv.osv):
             if thisrule.id in self.__functions :
                 for function in self.__functions[thisrule.id]:
                     setattr(function[0], function[1], function[2])
-        w_id=self.pool.get('ir.actions.act_window').search(cr, uid, [('name','=','View Log'),('res_model','=','audittrail.log'),('src_model','=',thisrule.object_id.model)])
-        self.pool.get('ir.actions.act_window').unlink(cr, uid,w_id )
-        val_obj=self.pool.get('ir.values')
-        value="ir.actions.act_window"+','+str(w_id[0])
-        val_id=val_obj.search(cr, uid, [('model','=',thisrule.object_id.model),('value','=',value)])
-        if val_id:
-            res = ir.ir_del(cr, uid, val_id[0])
-        self.write(cr, uid, ids, {"state": "draft"})
+            w_id=self.pool.get('ir.actions.act_window').search(cr, uid, [('name','=','View Log'),('res_model','=','audittrail.log'),('src_model','=',thisrule.object_id.model)])
+            self.pool.get('ir.actions.act_window').unlink(cr, uid,w_id )
+            val_obj=self.pool.get('ir.values')
+            value="ir.actions.act_window"+','+str(w_id[0])
+            val_id=val_obj.search(cr, uid, [('model','=',thisrule.object_id.model),('value','=',value)])
+            if val_id:
+                res = ir.ir_del(cr, uid, val_id[0])
+            self.write(cr, uid, [thisrule.id], {"state": "draft"})
         return True
 
 audittrail_rule()

From 28bd548716b00c8d2b5debde76f665f26a0d7c55 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Thu, 22 Oct 2009 13:14:36 +0530
Subject: [PATCH 051/200] [FIX] Stock : Partial Picking wizard was making the
 back order reference jump to 2 numbers,notification given on packing done.

lp bug: https://launchpad.net/bugs/379118 fixed

bzr revid: jvo@tinyerp.com-20091022074436-20u01i4vye2jk7l8
---
 addons/stock/stock.py                         |  3 ++-
 addons/stock/wizard/wizard_partial_picking.py | 19 +++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 1d7b69c6b3a..6410bb16d09 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -467,7 +467,8 @@ class stock_picking(osv.osv):
         if default is None:
             default = {}
         default = default.copy()
-        default['name'] = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking')
+        if not default.get('name',False):
+            default['name'] = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking')
         return super(stock_picking, self).copy(cr, uid, id, default, context)
 
     def onchange_partner_in(self, cr, uid, context, partner_id=None):
diff --git a/addons/stock/wizard/wizard_partial_picking.py b/addons/stock/wizard/wizard_partial_picking.py
index 2fe375c1b4f..89d34605dcd 100644
--- a/addons/stock/wizard/wizard_partial_picking.py
+++ b/addons/stock/wizard/wizard_partial_picking.py
@@ -27,6 +27,7 @@ import pooler
 
 import wizard
 from osv import osv
+import tools
 
 _moves_arch = UpdateableStr()
 _moves_fields = UpdateableDict()
@@ -34,8 +35,11 @@ _moves_fields = UpdateableDict()
 _moves_arch_end = '''<?xml version="1.0"?>
 <form string="Packing result">
     <label string="The packing has been successfully made !" colspan="4"/>
+    <field name="back_order_notification" colspan="4" nolabel="1"/>
 </form>'''
-_moves_fields_end = {}
+_moves_fields_end = {
+    'back_order_notification': {'string':'Back Order' ,'type':'text', 'readonly':True}
+                     }
 
 def make_default(val):
     def fct(uid, data, state):
@@ -198,8 +202,15 @@ def _do_split(self, cr, uid, data, context):
     else:
         pick_obj.action_move(cr, uid, [pick.id])
         wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_done', cr)
-    return {'new_picking':new_picking or False}
+    bo_name = ''
+    if new_picking:
+        bo_name = pick_obj.read(cr, uid, [new_picking], ['name'])[0]['name']
+    return {'new_picking':new_picking or False, 'back_order':bo_name}
 
+def _get_default(self, cr, uid, data, context):
+    if data['form']['back_order']:
+        data['form']['back_order_notification'] = 'Back Order ' + tools.ustr(data['form']['back_order']) + ' Assigned to this Packing.'
+    return data['form']
 
 class partial_picking(wizard.interface):
 
@@ -215,10 +226,10 @@ class partial_picking(wizard.interface):
         },
         'split': {
             'actions': [ _do_split ],
-            'result': {'type': 'state', 'state': 'end'},
+            'result': {'type': 'state', 'state': 'end2'},
         },
         'end2': {
-            'actions': [ ],
+            'actions': [ _get_default ],
             'result': {'type': 'form', 'arch': _moves_arch_end,
                 'fields': _moves_fields_end,
                 'state': (

From 87fe5ef53ff0fb050a3b609c2a38c51e62b7a2fe Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Thu, 22 Oct 2009 12:06:47 +0200
Subject: [PATCH 052/200] [FIX] python2.6 compatibility

bzr revid: olt@tinyerp.com-20091022100647-1hqb0w9gm0awokh2
---
 addons/document/ftpserver/ftpserver.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/document/ftpserver/ftpserver.py b/addons/document/ftpserver/ftpserver.py
index ae0fc38e1e1..13c44287303 100644
--- a/addons/document/ftpserver/ftpserver.py
+++ b/addons/document/ftpserver/ftpserver.py
@@ -1412,7 +1412,10 @@ class FTPHandler(asynchat.async_chat):
             established connection.
          - (instance) server: the ftp server class instance.
         """
-        asynchat.async_chat.__init__(self, conn=conn)
+        try:
+            asynchat.async_chat.__init__(self, conn=conn) # python2.5
+        except TypeError, e:
+            asynchat.async_chat.__init__(self, sock=conn) # python2.6
         self.server = server
         self.remote_ip, self.remote_port = self.socket.getpeername()[:2]
         self.in_buffer = []

From 1bbc4322935111f5f44aec681591d1140aec9b19 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Thu, 22 Oct 2009 19:12:26 +0530
Subject: [PATCH 053/200] [FIX] Account : Analytic account functional field
 methods corrected.

lp bug: https://launchpad.net/bugs/396637 fixed

bzr revid: jvo@tinyerp.com-20091022134226-p1nn7pvky62ewnbg
---
 addons/account/project/project.py | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/addons/account/project/project.py b/addons/account/project/project.py
index bcec9209d22..a7055862cf7 100644
--- a/addons/account/project/project.py
+++ b/addons/account/project/project.py
@@ -66,9 +66,16 @@ class account_analytic_account(osv.osv):
         return r
 
     def _balance_calc(self, cr, uid, ids, name, arg, context={}):
+        res = {}
         ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
         acc_set = ",".join(map(str, ids2))
         
+        for i in ids:
+            res.setdefault(i,0.0)
+            
+        if not acc_set:
+            return res
+        
         where_date = ''
         if context.get('from_date',False):
             where_date += " AND l.date >= '" + context['from_date'] + "'"
@@ -76,7 +83,7 @@ class account_analytic_account(osv.osv):
             where_date += " AND l.date <= '" + context['to_date'] + "'"
             
         cr.execute("SELECT a.id, COALESCE(SUM(l.amount),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id %s) WHERE a.id IN (%s) GROUP BY a.id" % (where_date,acc_set))
-        res = {}
+        
         for account_id, sum in cr.fetchall():
             res[account_id] = sum
 
@@ -86,10 +93,12 @@ class account_analytic_account(osv.osv):
 
         res_currency= self.pool.get('res.currency')
         for id in ids:
+            if id not in ids2:
+                continue
             for child in self.search(cr, uid, [('parent_id', 'child_of', [id])]):
                 if child <> id:
                     res.setdefault(id, 0.0)
-                    if  currency[child]<>currency[id] :
+                    if  currency[child]<>currency[id]:
                         res[id] += res_currency.compute(cr, uid, currency[child], currency[id], res.get(child, 0.0), context=context)
                     else:
                         res[id] += res.get(child, 0.0)
@@ -97,15 +106,23 @@ class account_analytic_account(osv.osv):
         cur_obj = res_currency.browse(cr,uid,currency.values(),context)
         cur_obj = dict([(o.id, o) for o in cur_obj])
         for id in ids:
-            res[id] = res_currency.round(cr,uid,cur_obj[currency[id]],res.get(id,0.0))
+            if id in ids2:
+                res[id] = res_currency.round(cr,uid,cur_obj[currency[id]],res.get(id,0.0))
 
         return dict([(i, res[i]) for i in ids ])
 
     def _quantity_calc(self, cr, uid, ids, name, arg, context={}):
         #XXX must convert into one uom
+        res = {}
         ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
         acc_set = ",".join(map(str, ids2))
         
+        for i in ids:
+            res.setdefault(i,0.0)
+            
+        if not acc_set:
+            return res
+        
         where_date = ''
         if context.get('from_date',False):
             where_date += " AND l.date >= '" + context['from_date'] + "'"
@@ -116,11 +133,13 @@ class account_analytic_account(osv.osv):
                 FROM account_analytic_account a \
                     LEFT JOIN account_analytic_line l ON (a.id = l.account_id ' + where_date + ') \
                 WHERE a.id IN ('+acc_set+') GROUP BY a.id')
-        res = {}
+
         for account_id, sum in cr.fetchall():
             res[account_id] = sum
 
         for id in ids:
+            if id not in ids2:
+                continue
             for child in self.search(cr, uid, [('parent_id', 'child_of', [id])]):
                 if child <> id:
                     res.setdefault(id, 0.0)

From 0c935cec345ce4c1093ca94bf22458870cd8e7b4 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Thu, 22 Oct 2009 19:13:16 +0530
Subject: [PATCH 054/200] [FIX] account_analytic_analysis : Analytic account
 functional field methods corrected.

lp bug: https://launchpad.net/bugs/396637 fixed

bzr revid: jvo@tinyerp.com-20091022134316-sa5mrf2u0qei3wpg
---
 .../account_analytic_analysis.py              | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 30c6f98d6a2..e93bea7fa58 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -371,10 +371,13 @@ class account_analytic_account(osv.osv):
         res = {}
         for id in ids:
             ids2 = self.search(cr, uid, [('parent_id', 'child_of', [id])])
-            cr.execute('SELECT DISTINCT(month_id) FROM account_analytic_analysis_summary_month ' \
-                    'WHERE account_id in (' + ','.join([str(x) for x in ids2]) + ') ' \
-                        'AND unit_amount <> 0.0')
-            res[id] = [int(id * 1000000 + int(x[0])) for x in cr.fetchall()]
+            if ids2:
+                cr.execute('SELECT DISTINCT(month_id) FROM account_analytic_analysis_summary_month ' \
+                        'WHERE account_id in (' + ','.join([str(x) for x in ids2]) + ') ' \
+                            'AND unit_amount <> 0.0')
+                res[id] = [int(id * 1000000 + int(x[0])) for x in cr.fetchall()]
+            else:
+                res[id] = []
         return res
 
     def _user(self, cr, uid, ids, name, arg, context=None):
@@ -383,10 +386,13 @@ class account_analytic_account(osv.osv):
         max_user = cr.fetchone()[0]
         for id in ids:
             ids2 = self.search(cr, uid, [('parent_id', 'child_of', [id])])
-            cr.execute('SELECT DISTINCT("user") FROM account_analytic_analysis_summary_user ' \
-                    'WHERE account_id in (' + ','.join([str(x) for x in ids2]) + ') ' \
-                        'AND unit_amount <> 0.0')
-            res[id] = [int((id * max_user) + x[0]) for x in cr.fetchall()]
+            if ids2:
+                cr.execute('SELECT DISTINCT("user") FROM account_analytic_analysis_summary_user ' \
+                        'WHERE account_id in (' + ','.join([str(x) for x in ids2]) + ') ' \
+                            'AND unit_amount <> 0.0')
+                res[id] = [int((id * max_user) + x[0]) for x in cr.fetchall()]
+            else:
+                res[id] = []   
         return res
 
     _columns ={

From 7b06ec81af6893ca030520c0605915c0c641f312 Mon Sep 17 00:00:00 2001
From: "YSA,JVO" <>
Date: Thu, 22 Oct 2009 19:32:51 +0530
Subject: [PATCH 055/200] [FIX] Export : Selection field gets imported by its
 external name  if export is not import compatible

lp bug: https://launchpad.net/bugs/434341 fixed

bzr revid: jvo@tinyerp.com-20091022140251-epxtjovnp2xe4g27
---
 bin/osv/orm.py | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 50b16ddf7f8..4859bd7d85a 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -450,6 +450,15 @@ class orm_template(object):
                 return False                                
             return ''
         
+        def selection_field(in_field):
+            col_obj = self.pool.get(in_field.keys()[0])
+            if f[i] in col_obj._columns.keys():
+                return  col_obj._columns[f[i]]
+            elif f[i] in col_obj._inherits.keys():
+                selection_field(col_obj._inherits)
+            else:
+                return False    
+           
         lines = []
         data = map(lambda x: '', range(len(fields)))
         done = []
@@ -473,7 +482,19 @@ class orm_template(object):
                         else:
                             break
                     else:
-                        r = r[f[i]]                   
+                        r = r[f[i]]
+                        # To display external name of selection field when its exported
+                        if not context.get('import_comp',False):# Allow external name only if its not import compatible 
+                            cols = False
+                            if f[i] in self._columns.keys():
+                                cols = self._columns[f[i]]
+                            elif f[i] in self._inherit_fields.keys():
+                                cols = selection_field(self._inherits)
+                            if cols and cols._type == 'selection':
+                                sel_list = cols.selection
+                                if type(sel_list) == type([]):
+                                    r = [x[1] for x in sel_list if r==x[0]][0]
+
                     if not r:
                         if f[i] in self._columns: 
                             r = check_type(self._columns[f[i]]._type)
@@ -2119,10 +2140,12 @@ class orm(orm_template):
         if isinstance(ids, (int, long)):
             select = [ids]
         result = self._read_flat(cr, user, select, fields, context, load)
+        
         for r in result:
             for key, v in r.items():
                 if v == None:
                     r[key] = False
+        
         if isinstance(ids, (int, long)):
             return result and result[0] or False
         return result

From da2e99051a57989c592418668ab4614baf142c4e Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Thu, 22 Oct 2009 20:06:41 +0530
Subject: [PATCH 056/200] [FIX] Expression : domain calculation failes, max.
 recursion error protected

bzr revid: jvo@tinyerp.com-20091022143641-l5b4jbk0spce8b1t
---
 bin/osv/expression.py | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/bin/osv/expression.py b/bin/osv/expression.py
index 3b4516e6657..d695fc62230 100644
--- a/bin/osv/expression.py
+++ b/bin/osv/expression.py
@@ -46,18 +46,25 @@ class expression(object):
 
     def __execute_recursive_in(self, cr, s, f, w, ids, op, type):
         res = []
-        if not ids:
-            return []
-        if op not in ('<','>','=','>=','<=','not in'):
-            op = 'in'
-        for i in range(0, len(ids), cr.IN_MAX):
-            subids = ids[i:i+cr.IN_MAX]
-            cr.execute('SELECT "%s"'    \
-                       ' FROM "%s"'    \
-                       ' WHERE "%s" %s (%s)' % (s, f, w, op, ','.join(['%s']*len(subids))),
-                       subids)
-            res += [r[0] for r in cr.fetchall() if r[0]]
-        return res + (res and self.__execute_recursive_in(cr, s, f, w, res, op, type) or [])
+        if ids:
+            if op in ['<','>','>=','<=']:
+                cr.execute('SELECT "%s"'    \
+                               '  FROM "%s"'    \
+                               ' WHERE "%s" %s %s' % (s, f, w, op, ids[0]))
+                res.extend([r[0] for r in cr.fetchall()])
+            else:
+                for i in range(0, len(ids), cr.IN_MAX):
+                    subids = ids[i:i+cr.IN_MAX]
+                    cr.execute('SELECT "%s"'    \
+                               '  FROM "%s"'    \
+                               ' WHERE "%s" in (%s)' % (s, f, w, ','.join(['%s']*len(subids))),
+                               subids)
+                    res.extend([r[0] for r in cr.fetchall()])
+        else:
+            cr.execute('SELECT distinct("%s")'    \
+                           '  FROM "%s" where "%s" is not null'  % (s, f, s)),
+            res.extend([r[0] for r in cr.fetchall()])
+        return res
 
     def __init__(self, exp):
         # check if the expression is valid

From 0a424fe358d62cf4d56454b85acc52d58570b97e Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Thu, 22 Oct 2009 19:23:47 +0200
Subject: [PATCH 057/200] [FIX] purchase_manual: Import OSV

bzr revid: stephane@openerp.com-20091022172347-3xdvi6tmwgzmq7dk
---
 addons/purchase_manual/wizard/wizard_purchase_line_invoice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase_manual/wizard/wizard_purchase_line_invoice.py b/addons/purchase_manual/wizard/wizard_purchase_line_invoice.py
index c65cefd97d0..b1814455e98 100644
--- a/addons/purchase_manual/wizard/wizard_purchase_line_invoice.py
+++ b/addons/purchase_manual/wizard/wizard_purchase_line_invoice.py
@@ -24,7 +24,7 @@ import wizard
 import netsvc
 import ir
 import pooler
-import osv
+from osv import osv
 
 invoice_form = """<?xml version="1.0"?>
 <form string="Control invoices">

From e0d09ed6bfb553b715dc0e3218f5509a4fae5215 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Fri, 23 Oct 2009 11:09:40 +0530
Subject: [PATCH 058/200] [FIX]document_ics : solved accent problem

lp bug: https://launchpad.net/bugs/458415 fixed

bzr revid: hmo@tinyerp.com-20091023053940-px64bjhm0fvypu52
---
 addons/document_ics/document.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/document_ics/document.py b/addons/document_ics/document.py
index 048a82c7680..2d70f3f5770 100644
--- a/addons/document_ics/document.py
+++ b/addons/document_ics/document.py
@@ -128,6 +128,7 @@ class document_directory_content(osv.osv):
                 event.add('last-modified').value = ics_datetime(perm[0]['write_date'][:19])
             for field in node.content.ics_field_ids:
                 value = getattr(obj, field.field_id.name)
+                value = value and tools.ustr(value)
                 if (not value) and field.name=='uid':
                     value = 'OpenERP-%s_%s@%s' % (node.content.ics_object_id.model, str(obj.id), cr.dbname,)
                     obj_class.write(cr, uid, [obj.id], {field.field_id.name: value})
@@ -146,7 +147,7 @@ class document_directory_content(osv.osv):
                     else:
                         value = ics_datetime(value)
                     event.add(field.name).value = value
-        s= StringIO.StringIO(cal.serialize().encode('utf8'))
+        s= StringIO.StringIO(cal.serialize())
         s.name = node
         cr.commit()
         return s

From 85bdfc4a286b5ce682c5d1bf7116ac01f3306564 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Sat, 24 Oct 2009 16:24:02 +0530
Subject: [PATCH 059/200] [FIX] Account : Onchange of amount/base amount of
 Invocie tax corrected

lp bug: https://launchpad.net/bugs/458553 fixed

bzr revid: jvo@tinyerp.com-20091024105402-kpclegj6labz54mi
---
 addons/account/invoice.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 10a49230480..54e258d791d 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -1121,24 +1121,27 @@ class account_invoice_tax(osv.osv):
         'tax_code_id': fields.many2one('account.tax.code', 'Tax Code', help="The tax basis of the tax declaration."),
         'tax_amount': fields.float('Tax Code Amount', digits=(16,int(config['price_accuracy']))),
     }
+    
     def base_change(self, cr, uid, ids, base,currency_id=False,company_id=False,date_invoice=False):
         cur_obj = self.pool.get('res.currency')
         company_obj = self.pool.get('res.company')
         company_currency=False
         if company_id:            
-            company_currency=company_obj.browse(cr,uid,company_id).id
+            company_currency = company_obj.read(cr,uid,[company_id],['currency_id'])[0]['currency_id'][0]
         if currency_id and company_currency:
-            base=cur_obj.compute(cr, uid, currency_id, company_currency, base, context={'date': date_invoice or time.strftime('%Y-%m-%d')}, round=False)
+            base = cur_obj.compute(cr, uid, currency_id, company_currency, base, context={'date': date_invoice or time.strftime('%Y-%m-%d')}, round=False)
         return {'value': {'base_amount':base}}
+
     def amount_change(self, cr, uid, ids, amount,currency_id=False,company_id=False,date_invoice=False):
         cur_obj = self.pool.get('res.currency')
         company_obj = self.pool.get('res.company')
         company_currency=False
         if company_id:
-            company_currency=company_obj.browse(cr,uid,company_id).id
+            company_currency = company_obj.read(cr,uid,[company_id],['currency_id'])[0]['currency_id'][0]
         if currency_id and company_currency:
-            amount=cur_obj.compute(cr, uid, currency_id, company_currency, amount, context={'date': date_invoice or time.strftime('%Y-%m-%d')}, round=False)
+            amount = cur_obj.compute(cr, uid, currency_id, company_currency, amount, context={'date': date_invoice or time.strftime('%Y-%m-%d')}, round=False)
         return {'value': {'tax_amount':amount}}
+    
     _order = 'sequence'
     _defaults = {
         'manual': lambda *a: 1,

From 0f3f287ddef2b47a4fee20dabc47934de3fb5e9c Mon Sep 17 00:00:00 2001
From: "GPA(OpenERP)" <>
Date: Sat, 24 Oct 2009 18:29:29 +0530
Subject: [PATCH 060/200] [FIX] Account_analytic_analysis : Summary of Months
 calculation Corrected

lp bug: https://launchpad.net/bugs/457188 fixed

bzr revid: jvo@tinyerp.com-20091024125929-uj393p5fwae93hbb
---
 addons/account_analytic_analysis/account_analytic_analysis.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index e93bea7fa58..a272aed9ca2 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -614,7 +614,7 @@ class account_analytic_account_summary_month(osv.osv):
             for child_id in account_obj.search(cr, uid,
                     [('parent_id', 'child_of', [int(str(int(obj_id))[:-6])])]):
                 if child_id != int(str(int(obj_id))[:-6]):
-                    res[obj_id] += res.get(int(child_id * 1000000 + int(obj_id)), 0.0)
+                    res[obj_id] += res.get(int(child_id * 1000000 + int(str(int(obj_id))[-6:])), 0.0)
         for id in ids:
             res[id] = round(res.get(id, 0.0), 2)
         return res

From 8518378db12baa899e8fc5e416896a38d6473e25 Mon Sep 17 00:00:00 2001
From: "ACH(OpenERP)" <>
Date: Mon, 26 Oct 2009 15:08:39 +0530
Subject: [PATCH 061/200] [FIX] Account : Corrected the malformed report of
 Partner Ledger

bzr revid: jvo@tinyerp.com-20091026093839-5n74m0y6k655hl2l
---
 addons/account/report/third_party_ledger.rml       | 2 +-
 addons/account/report/third_party_ledger_other.rml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/report/third_party_ledger.rml b/addons/account/report/third_party_ledger.rml
index 82d14a6ef94..71488665f57 100644
--- a/addons/account/report/third_party_ledger.rml
+++ b/addons/account/report/third_party_ledger.rml
@@ -125,7 +125,7 @@
   </stylesheet>
   <story>
 	<para style="P2"><font color="white"></font></para>
-    <para>[[ repeatIn(objects, 'p') ]] [[ setLang(p.partner_id.lang) ]]</para>
+    <para>[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]</para>
     <blockTable colWidths="50.0,30.0,42.0,220.0,69.0,72.0,63.0" repeatRows="1" style="tbl_heading">
   	 <tr>
         <td><para style="date">Date</para></td>
diff --git a/addons/account/report/third_party_ledger_other.rml b/addons/account/report/third_party_ledger_other.rml
index 36a208d1206..e22da1d66d5 100644
--- a/addons/account/report/third_party_ledger_other.rml
+++ b/addons/account/report/third_party_ledger_other.rml
@@ -149,7 +149,7 @@
      </tr>
      <tr>
      	<td>
-		 	<para style="P1">[[ repeatIn(objects, 'p') ]]</para>
+		 	<para style="P1">[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]] </para>
 		   	<blockTable colWidths="300.0,37.0,69.0,72.0,63.0" style="Table5">
 		     <tr>
 		     	<td><para style="total">[[ p.ref ]] - [[ p.name ]]</para></td>

From a6641dffcec583ecfeb05ff4b2bb76713f590ac4 Mon Sep 17 00:00:00 2001
From: "HDA (OpenERP)" <hda@tinyerp.com>
Date: Mon, 26 Oct 2009 15:57:05 +0530
Subject: [PATCH 062/200] Fixed Indent problem

bzr revid: hda@tinyerp.com-20091026102705-lv3baidhq9taalyz
---
 addons/l10n_ch/wizard/dta_wizard.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_ch/wizard/dta_wizard.py b/addons/l10n_ch/wizard/dta_wizard.py
index 53bd0d94405..4a0a8582a0a 100755
--- a/addons/l10n_ch/wizard/dta_wizard.py
+++ b/addons/l10n_ch/wizard/dta_wizard.py
@@ -529,7 +529,7 @@ def _create_dta(obj, cr, uid, data, context):
                 if not v['reference'] \
                     or (mod10r(v['reference'][:-1]) != v['reference'] and \
                     not len(v['reference']) == 15):
-                raise wizard.except_wizard(_('Error'), _('You must provide ' \
+                    raise wizard.except_wizard(_('Error'), _('You must provide ' \
                         'a valid BVR reference number \n' \
                         'for the line: %s') % pline.name)
             if not v['partner_bvr']:

From bbad963f1b9c3cae478a75bb99abe13f9aeda9c6 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Mon, 26 Oct 2009 18:20:05 +0530
Subject: [PATCH 063/200] [FIX] Config : wrong calculation if cached_timeout
 comes from config file

bzr revid: jvo@tinyerp.com-20091026125005-r8jbk8iqhpessa2c
---
 bin/tools/misc.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index d8bd58bfcbd..ca93a3936e2 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -662,9 +662,9 @@ class cache(object):
             self.fun_default_values = dict(zip(self.fun_arg_names[-len(argspec[3]):], argspec[3]))
         
         def cached_result(self2, cr, *args, **kwargs):
-            if time.time()-self.timeout > self.lasttime:
+            if time.time()-int(self.timeout) > self.lasttime:
                 self.lasttime = time.time()
-                t = time.time()-self.timeout 
+                t = time.time()-int(self.timeout) 
                 old_keys = [key for key in self.cache if self.cache[key][1] < t]
                 for key in old_keys:
                     del self.cache[key]

From be63c95cb212dacdef0f1a0279ccd25ce087ac59 Mon Sep 17 00:00:00 2001
From: "ACH,VRA" <>
Date: Mon, 26 Oct 2009 19:20:06 +0530
Subject: [PATCH 064/200] [FIX] Account_voucher : Typo corrected for Voucher
 type.

bzr revid: jvo@tinyerp.com-20091026135006-81oxfwxcw6e3sugm
---
 addons/account_voucher/voucher.py             | 7 +++----
 addons/account_voucher/voucher_view.xml       | 4 ++--
 addons/account_voucher/wizard/open_voucher.py | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index d1dc30c6b67..6fd5204d318 100755
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -214,7 +214,7 @@ class account_voucher(osv.osv):
         
         for il in iml:
             if il['account_analytic_id']:
-                if inv.type in ('pay_voucher', 'rec_voucher','cont_voucher','bank_pay_voucher','bank_rec_voucher','journal_sale_voucher','journal_pur_voucher'):
+                if inv.type in ('pay_voucher', 'rec_voucher','cont_voucher','bank_pay_voucher','bank_rec_voucher','journal_sale_vou','journal_pur_voucher'):
                     ref = inv.reference
                 else:
                     ref = self._convert_ref(cr, uid, inv.number)
@@ -244,7 +244,7 @@ class account_voucher(osv.osv):
             diff_currency_p = inv.currency_id.id <> company_currency
 
             total = 0
-            if inv.type in ('pay_voucher', 'journal_voucher', 'rec_voucher','cont_voucher','bank_pay_voucher','bank_rec_voucher','journal_sale_voucher','journal_pur_voucher'):
+            if inv.type in ('pay_voucher', 'journal_voucher', 'rec_voucher','cont_voucher','bank_pay_voucher','bank_rec_voucher','journal_sale_vou','journal_pur_voucher'):
                 ref = inv.reference
             else:
                 ref = self._convert_ref(cr, uid, inv.number)
@@ -508,12 +508,11 @@ class VoucherLine(osv.osv):
             res.append(self.move_line_get_item(cr, uid, line, context))
         return res
     
-    def onchange_partner(self, cr, uid, ids, partner_id, ttype,type1):
+    def onchange_partner(self, cr, uid, ids, partner_id, ttype ,type1):
         if not partner_id:
             return {'value' : {'account_id' : False, 'type' : False ,'amount':False}}
         obj = self.pool.get('res.partner')
         account_id = False
-        
         if type1 in ('rec_voucher','bank_rec_voucher', 'journal_voucher'):
             account_id = obj.browse(cr, uid, partner_id).property_account_receivable
             balance = obj.browse(cr,uid,partner_id).credit
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 089ec8d1614..28233ad6f8c 100755
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -231,8 +231,8 @@
 			<field name="view_type">form</field>
 			<field name="view_mode">form,tree</field>
 			<field name="view_id" eval="view_voucher_form"/>
-			<field name="domain">[('type','=','journal_sale_voucher')]</field>
-			<field name="context">{'type':'journal_sale_voucher'}</field>
+			<field name="domain">[('type','=','journal_sale_vou')]</field>
+			<field name="context">{'type':'journal_sale_vou'}</field>
 		</record>
 		<menuitem name="Financial Management/Voucher Entries/Other Vouchers/Journal Sale Voucher" id="menu_action_view_jour_sale_voucher_form" action="action_view_jour_sale_voucher_form"/>
 		<record model="ir.actions.act_window" id="action_view_jour_pur_voucher_form">
diff --git a/addons/account_voucher/wizard/open_voucher.py b/addons/account_voucher/wizard/open_voucher.py
index 253d220dbb9..c88819df315 100644
--- a/addons/account_voucher/wizard/open_voucher.py
+++ b/addons/account_voucher/wizard/open_voucher.py
@@ -45,7 +45,7 @@ _types = {
     'rec_voucher':'Cash Receipt Voucher',
     'bank_rec_voucher':'Bank Receipt Voucher',
     'cont_voucher':'Contra Voucher',
-    'journal_sale_voucher':'Journal Sale Voucher',
+    'journal_sale_vou':'Journal Sale Voucher',
     'journal_pur_voucher':'Journal Purchase Voucher'
 }
 _states = {
@@ -62,7 +62,7 @@ _voucher_fields = {
             ('rec_voucher','Cash Receipt Voucher'),
             ('bank_rec_voucher','Bank Receipt Voucher'),
             ('cont_voucher','Contra Voucher'),
-            ('journal_sale_voucher','Journal Sale Voucher'),
+            ('journal_sale_vou','Journal Sale Voucher'),
             ('journal_pur_voucher','Journal Purchase Voucher')], 'required':True},
     'state': {'string':'State', 'type':'selection', 'selection':[
                     ('draft','Draft'),

From ba53d85a07a36040a4110a01db6c9c1d7ed6043e Mon Sep 17 00:00:00 2001
From: Albert Cervera i Areny <>
Date: Mon, 26 Oct 2009 21:08:17 +0530
Subject: [PATCH 065/200] [FIX] Document : Attachment with document can now be
 deleted

lp bug: https://launchpad.net/bugs/460701 fixed

bzr revid: jvo@tinyerp.com-20091026153817-cn3mmj43ng90ymyp
---
 addons/document/document.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/addons/document/document.py b/addons/document/document.py
index 460c52a9698..338c6e69255 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -531,17 +531,21 @@ class document_file(osv.osv):
                 result[id] = base64.encodestring(value)
             except:
                 result[id]=''
-
-            if context.get('bin_size', False):
-                result[id] = tools.human_size(len(result[id]))
-
+#            if context.get('bin_size', False):
+#                result[id] = tools.human_size(result[id])
         return result
 
     #
     # This code can be improved
     #
-    def _data_set(self, cr, obj, id, name, value, uid=None, context={}):
+    def _data_set(self, cr, uid, id, name, value, args=None, context={}):
         if not value:
+            filename = self.browse(cr, uid, id, context).store_fname
+            try:
+                os.unlink(os.path.join(self._get_filestore(cr), filename))
+            except:
+                pass
+            cr.execute('update ir_attachment set store_fname=NULL WHERE id=%s', (id,) )
             return True
         #if (not context) or context.get('store_method','fs')=='fs':
         try:

From ab09c43edd6866b768943ddfd0b7e7f29fa41128 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Tue, 27 Oct 2009 11:24:19 +0530
Subject: [PATCH 066/200] [FIX] Ir_attachment : Context updation corrected on
 preview

lp bug: https://launchpad.net/bugs/460560 fixed

bzr revid: jvo@tinyerp.com-20091027055419-du965jjvgup05amh
---
 bin/addons/base/ir/ir_attachment.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/ir/ir_attachment.py b/bin/addons/base/ir/ir_attachment.py
index 1339ea284a3..9c4ab915674 100644
--- a/bin/addons/base/ir/ir_attachment.py
+++ b/bin/addons/base/ir/ir_attachment.py
@@ -91,8 +91,9 @@ class ir_attachment(osv.osv):
         result = {}
         if context is None:
             context = {}
-        context['bin_size'] = False
-        for i in self.browse(cr, uid, ids, context=context):
+        ctx = context.copy()    
+        ctx['bin_size'] = False
+        for i in self.browse(cr, uid, ids, context=ctx):
             result[i.id] = False
             for format in ('png','jpg','jpeg','gif','bmp'):
                 if (i.datas_fname and i.datas_fname.lower() or '').endswith(format):

From 7c26523b0acb2073b0c34d35adeac6758e062a45 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Tue, 27 Oct 2009 12:37:15 +0530
Subject: [PATCH 067/200] [FIX] Account_date_check : correction on a method

bzr revid: jvo@tinyerp.com-20091027070715-mut1j0f0jvxaweqy
---
 addons/account_date_check/account_date_check.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/account_date_check/account_date_check.py b/addons/account_date_check/account_date_check.py
index 4ee33dbef85..0471fa34ff7 100644
--- a/addons/account_date_check/account_date_check.py
+++ b/addons/account_date_check/account_date_check.py
@@ -47,6 +47,8 @@ class account_move_line(osv.osv):
     _name='account.move.line'
 
     def check_date(self, cr, uid, vals, context=None, check=True):
+        if not context:
+            context = {}
         if 'date' in vals.keys():
             if 'journal_id' in vals and 'journal_id' not in context:
                 journal_id = vals['journal_id']

From 58fe9c62e673a3695afb3c0a983f6ec53c2a8a88 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Tue, 27 Oct 2009 09:32:21 +0100
Subject: [PATCH 068/200] [IMP] better python2.5/2.6 compatibility handling

bzr revid: olt@tinyerp.com-20091027083221-37mv4k6lei43xfla
---
 addons/document/ftpserver/ftpserver.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/addons/document/ftpserver/ftpserver.py b/addons/document/ftpserver/ftpserver.py
index 13c44287303..94bc5b3d90c 100644
--- a/addons/document/ftpserver/ftpserver.py
+++ b/addons/document/ftpserver/ftpserver.py
@@ -1412,10 +1412,7 @@ class FTPHandler(asynchat.async_chat):
             established connection.
          - (instance) server: the ftp server class instance.
         """
-        try:
-            asynchat.async_chat.__init__(self, conn=conn) # python2.5
-        except TypeError, e:
-            asynchat.async_chat.__init__(self, sock=conn) # python2.6
+        asynchat.async_chat.__init__(self, conn)
         self.server = server
         self.remote_ip, self.remote_port = self.socket.getpeername()[:2]
         self.in_buffer = []

From db8f833229f950c7bc7056cc650704f2b37d605e Mon Sep 17 00:00:00 2001
From: "UCO,JVO" <>
Date: Tue, 27 Oct 2009 18:42:56 +0530
Subject: [PATCH 069/200] [FIX] Record rule : domain evaluation problem
 corrected

lp bug: https://launchpad.net/bugs/410191 fixed

bzr revid: jvo@tinyerp.com-20091027131256-7q2gl9vzf21jsuir
---
 bin/addons/base/ir/ir_rule.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bin/addons/base/ir/ir_rule.py b/bin/addons/base/ir/ir_rule.py
index a2d53b4de27..d8235403ce3 100644
--- a/bin/addons/base/ir/ir_rule.py
+++ b/bin/addons/base/ir/ir_rule.py
@@ -107,6 +107,11 @@ class ir_rule(osv.osv):
         for rule in self.browse(cr, uid, ids, context):
             eval_user_data = {'user': self.pool.get('res.users').browse(cr, 1, uid),
                             'time':time}
+            if rule.operand.startswith('user.') and rule.operand.count('.') > 1:
+                #Need to check user.field.field1.field2(if field  is False,it will break the chain)
+                op = rule.operand[5:]
+                rule.operand = rule.operand[:5+len(op[:op.find('.')])] +' and '+ rule.operand + ' or False'
+            
             if rule.domain_force:
                 res[rule.id] = eval(rule.domain_force, eval_user_data)
             else:

From 0ad84d2cad4fc681bcf079a6415646f9e4828eab Mon Sep 17 00:00:00 2001
From: "VRA(OpenERP)" <>
Date: Wed, 28 Oct 2009 15:16:04 +0530
Subject: [PATCH 070/200] [FIX] Account : Partner Ledger Report formatting
 problem solved

lp bug: https://launchpad.net/bugs/459196 fixed

bzr revid: jvo@tinyerp.com-20091028094604-z7h98zwdxwquyqrh
---
 addons/account/report/third_party_ledger.rml  | 325 +++++++++--------
 .../report/third_party_ledger_other.rml       | 329 ++++++++++--------
 2 files changed, 358 insertions(+), 296 deletions(-)

diff --git a/addons/account/report/third_party_ledger.rml b/addons/account/report/third_party_ledger.rml
index 71488665f57..df6d1c239b0 100644
--- a/addons/account/report/third_party_ledger.rml
+++ b/addons/account/report/third_party_ledger.rml
@@ -2,176 +2,203 @@
 <document filename="test.pdf">
   <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
-
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
-      	<header>
-			<pageGraphics>
-				<!--logo-->
-				<!--<fill color="darkblue"/>-->
-				<!--<stroke color="darkblue"/>-->
-
-				<!--TITLE COMPANY-->
-				<!-- <drawString x="4.6cm" y="28.7cm">[[ company.partner_id.name ]]</drawString> -->
-
-				<setFont name="Helvetica-Bold" size="9"/>
-
-
-				<!--COL 1-->
-				<drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
-				<drawRightString x="20cm" y="28.1cm">Third Party Ledger [[ data['form']['result_selection'] == 'customer' and '/ Débiteur' ]] [[ data['form']['result_selection'] == 'supplier' and '/ Créancier' ]] [[ data['form']['result_selection'] == 'all' and '/ Créancier et Débiteur' ]]</drawRightString>
-
-				<!-- Header -->
-
-
-				<setFont name="Helvetica" size="9"/>
-				<drawString x="1.0cm" y="1cm"> [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]</drawString>
-				<drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
-				<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
-
-
-			    <lineMode width="0.7"/>
-				<lines>1cm 27.7cm 20cm 27.7cm</lines>
-				<setFont name="Helvetica" size="8"/>
-
-			</pageGraphics>
-			</header>
+      <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
-
   </template>
   <stylesheet>
     <blockTableStyle id="Standard_Outline">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
+    <blockTableStyle id="Table_header">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_header_1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+    </blockTableStyle>
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/>
-      <blockBackground colorName="#e6e6e6" start="0,1" stop="0,1"/>
-      <blockBackground colorName="#e6e6e6" start="1,1" stop="1,1"/>
-      <blockBackground colorName="#e6e6e6" start="2,1" stop="2,1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
-
-    <blockTableStyle id="tbl_heading">
-
-      <blockValign value="TOP"/>
-
-       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-    </blockTableStyle>
-
-	<blockTableStyle id="Table2">
+    <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
-      <blockValign value="LEFT"/>
-
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-
-
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="1,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table3">
-      <blockLeftPadding length="0" start="1,0" stop="1,0"/>
       <blockAlignment value="LEFT"/>
-      <blockValign value="LEFT"/>
-
-     <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,-1"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table5">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="LEFT"/>
-	  <lineStyle kind="LINEBELOW" colorName="#777777" start="0,0" stop="0,-1"/>
-
-
-    </blockTableStyle>
-    <blockTableStyle id="Table4">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="LEFT"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-    </blockTableStyle>
-
-
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="2.0" leading="1" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="14.5" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P3" fontName="Helvetica" fontSize="7.5" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P4" fontName="Helvetica" fontSize="7.5" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P5" fontName="Helvetica" fontSize="7.5" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P6" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="8.5" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Balance" fontName="Helvetica-Bold" fontSize="8.5" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P9" fontName="Helvetica-Bold" alignment="CENTER" fontSize="14.5" leftIndent="-5.0"/>
-    <paraStyle name="P9a" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P9c" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P9b" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="total" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P10" fontName="Helvetica" alignment="CENTER"/>
-    <paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="14"/>
-    <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="date" fontName="Helvetica" fontSize="8.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P14" fontName="Helvetica-Bold" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P15" rightIndent="17.0" leftIndent="-0.0" fontName="Helvetica" fontSize="7.5" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P16" fontName="Helvetica" fontSize="8.0" leading="12" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Standard" fontName="Helvetica"/>
-    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P4" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_Bold_Right_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
   </stylesheet>
+  <images/>
   <story>
-	<para style="P2"><font color="white"></font></para>
-    <para>[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]</para>
-    <blockTable colWidths="50.0,30.0,42.0,220.0,69.0,72.0,63.0" repeatRows="1" style="tbl_heading">
-  	 <tr>
-        <td><para style="date">Date</para></td>
-       	<td><para style="P12">JNRL</para></td>
-       	<td><para style="P12">Ref.</para></td>
-       	<td><para style="P12">Entry label</para></td>
-       	<td><para style="P16">Debit</para></td>
-       	<td><para style="P16">Credit</para></td>
-       	<td><para style="P16">Balance</para></td>
-     </tr>
-     <tr>
-     	<td>
-    	 <blockTable colWidths="337.0,69.0,72.0,63.0" style="Table3">
-    	 <tr>
-     		<td><para style="Balance">Balance brought forward</para></td>
-	        <td><para style="P8"><u>[[ formatLang((sum_debit(data))) ]]</u></para></td>
-	        <td><para style="P8"><u>[[ formatLang((sum_credit(data))) ]]</u></para></td>
-	        <td><para style="P8"><u>[[ formatLang((sum_debit(data) - sum_credit(data))) ]]</u></para></td>
-	     </tr>
-	    </blockTable>
-	    </td>
-     </tr>
-     <tr>
-     	<td>
-		   	<blockTable colWidths="300.0,37.0,69.0,72.0,63.0" style="Table5">
-		     <tr>
-		     	<td><para style="total">[[ p.ref ]] - [[ p.name ]]</para></td>
-		        <td><para style="total"></para></td>
-		        <td><para style="P9b"><u>[[ formatLang((sum_debit_partner(p,data))) ]]</u></para></td>
-		        <td><para style="P9b"><u>[[ formatLang((sum_credit_partner(p,data))) ]]</u></para></td>
-		        <td><para style="P9b"><u>[[ formatLang((sum_debit_partner(p,data) - sum_credit_partner(p,data))) ]]</u></para></td>
-		     </tr>
-		    </blockTable>
-		    <blockTable colWidths="45.0,30.0,262.0,0.0,69.0,72.0,63.0" style="Table2">
-		     <tr>
-			     <td><para style="P15"><font face="Helvetica">[[ repeatIn(lines(p,data), 'line') ]]</font>[[ formatLang(line['date'],date=True) ]]</para></td>
-		         <td><para style="P3">[[ line['code'] ]]</para></td>
-		         <td><para style="P3">[[ line['ref'] ]] / [[ line['name'] ]]</para></td>
-		         <td><para style="P4"></para></td>
-		         <td><para style="P5">[[ formatLang((line['debit'])) ]]</para></td>
-		         <td><para style="P5">[[ formatLang((line['credit'])) ]]</para></td>
-		         <td><para style="P5">[[ formatLang((line['progress'])) ]]</para></td>
-		     </tr>
-		    </blockTable>
-     	</td>
-     </tr>
+    <blockTable colWidths="539.0" style="Table_header">
+      <tr>
+        <td>
+          <para style="terp_header_Centre">Third Party Ledger</para>
+        </td>
+      </tr>
     </blockTable>
+    <para style="P3">[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]</para>
+    <blockTable colWidths="65.0,28.0,45.0,175.0,77.0,75.0,74.0" style="Table_header_1">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">JNRL</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Ref.</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Entry Label</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Debit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Credit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Balance</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P4">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="314.0,77.0,75.0,74.0" style="Table1">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Balance Brought Forward</para>
+        </td>
+        <td>
+          <para style="P5"><u>[[ formatLang((sum_debit(data))) ]]</u></para>
+        </td>
+        <td>
+          <para style="P5"><u>[[ formatLang((sum_credit(data))) ]]</u></para>
+        </td>
+        <td>
+          <para style="P5"><u>[[ formatLang((sum_debit(data) - sum_credit(data))) ]]</u></para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="314.0,77.0,75.0,74.0" style="Table2">
+      <tr>
+        <td>
+          <para style="P2">[[ p.ref ]] - [[ p.name ]]</para>
+        </td>
+        <td>
+          <para style="P5">[[ formatLang((sum_debit_partner(p,data))) ]]</para>
+        </td>
+        <td>
+          <para style="P5">[[ formatLang((sum_credit_partner(p,data))) ]]</para>
+        </td>
+        <td>
+          <para style="P5">[[ formatLang((sum_debit_partner(p,data) - sum_credit_partner(p,data))) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="P1">[[ repeatIn(lines(p,data), 'line') ]]</para>
+      <blockTable colWidths="65.0,28.0,45.0,175.0,77.0,75.0,74.0" style="Table3">
+        <tr>
+          <td>
+            <para style="P3">[[ formatLang(line['date'],date=True) ]]</para>
+          </td>
+          <td>
+            <para style="P3">[[ line['code'] ]]</para>
+          </td>
+          <td>
+            <para style="P3">[[ line['ref'] ]]</para>
+          </td>
+          <td>
+            <para style="P3">[[ line['name'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_2">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
   </story>
 </document>
\ No newline at end of file
diff --git a/addons/account/report/third_party_ledger_other.rml b/addons/account/report/third_party_ledger_other.rml
index e22da1d66d5..296d310fcd9 100644
--- a/addons/account/report/third_party_ledger_other.rml
+++ b/addons/account/report/third_party_ledger_other.rml
@@ -2,176 +2,211 @@
 <document filename="test.pdf">
   <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
-
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
-      	<header>
-			<pageGraphics>
-				<!--logo-->
-				<!--<fill color="darkblue"/>-->
-				<!--<stroke color="darkblue"/>-->
-
-				<!--TITLE COMPANY-->
-				<!-- <drawString x="4.6cm" y="28.7cm">[[ company.partner_id.name ]]</drawString> -->
-
-				<setFont name="Helvetica-Bold" size="9"/>
-
-
-				<!--COL 1-->
-				<drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
-				<drawRightString x="20cm" y="28.1cm">Third Party Ledger [[ data['form']['result_selection'] == 'customer' and '/ Débiteur' ]] [[ data['form']['result_selection'] == 'supplier' and '/ Créancier' ]] [[ data['form']['result_selection'] == 'all' and '/ Créancier et Débiteur' ]]</drawRightString>
-
-				<!-- Header -->
-
-
-				<setFont name="Helvetica" size="9"/>
-				<drawString x="1.0cm" y="1cm"> [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]</drawString>
-				<drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
-				<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
-
-
-			    <lineMode width="0.7"/>
-				<lines>1cm 27.7cm 20cm 27.7cm</lines>
-				<setFont name="Helvetica" size="8"/>
-
-			</pageGraphics>
-			</header>
     </pageTemplate>
-
   </template>
   <stylesheet>
     <blockTableStyle id="Standard_Outline">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
+    <blockTableStyle id="Table_title">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_header_1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+    </blockTableStyle>
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/>
-      <blockBackground colorName="#e6e6e6" start="0,1" stop="0,1"/>
-      <blockBackground colorName="#e6e6e6" start="1,1" stop="1,1"/>
-      <blockBackground colorName="#e6e6e6" start="2,1" stop="2,1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
-
-    <blockTableStyle id="tbl_heading">
-
-      <blockValign value="TOP"/>
-
-       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-    </blockTableStyle>
-
-	<blockTableStyle id="Table2">
+    <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
-      <blockValign value="LEFT"/>
-
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-
-
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="1,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table3">
-      <blockLeftPadding length="0" start="1,0" stop="1,0"/>
       <blockAlignment value="LEFT"/>
-      <blockValign value="LEFT"/>
-
-     <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,-1"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table5">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="LEFT"/>
-	  <lineStyle kind="LINEBELOW" colorName="#777777" start="0,0" stop="0,-1"/>
-
-
-    </blockTableStyle>
-    <blockTableStyle id="Table4">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="LEFT"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-    </blockTableStyle>
-
-
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="2.0" leading="1" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="14.5" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P3" fontName="Helvetica" fontSize="7.5" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P4" fontName="Helvetica" fontSize="7.5" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P5" fontName="Helvetica" fontSize="7.5" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P6" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="8.5" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Balance" fontName="Helvetica-Bold" fontSize="8.5" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P9" fontName="Helvetica-Bold" alignment="CENTER" fontSize="14.5" leftIndent="-5.0"/>
-    <paraStyle name="P9a" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P9c" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P9b" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="total" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P10" fontName="Helvetica" alignment="CENTER"/>
-    <paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="14"/>
-    <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="date" fontName="Helvetica" fontSize="8.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P14" fontName="Helvetica-Bold" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P15" rightIndent="17.0" leftIndent="-0.0" fontName="Helvetica" fontSize="7.5" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P16" fontName="Helvetica" fontSize="8.0" leading="12" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Standard" fontName="Helvetica"/>
-    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P3" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica" fontSize="9.0" leading="11"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9_italic" fontName="Helvetica-Oblique" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
   </stylesheet>
+  <images/>
   <story>
-	<para style="P2"><font color="white"></font></para>
-    <blockTable colWidths="50.0,30.0,42.0,220.0,69.0,72.0,63.0" repeatRows="1" style="tbl_heading">
-  	 <tr>
-        <td><para style="date">Date</para></td>
-       	<td><para style="P12">JNRL</para></td>
-       	<td><para style="P12">Ref.</para></td>
-       	<td><para style="P12">Entry label</para></td>
-       	<td><para style="P16">Debit</para></td>
-       	<td><para style="P16">Credit</para></td>
-       	<td><para style="P16">Balance</para></td>
-     </tr>
-     <tr>
-     	<td>
-    	 <blockTable colWidths="337.0,69.0,72.0,63.0" style="Table3">
-    	 <tr>
-     		<td><para style="Balance">Balance brought forward</para></td>
-	        <td><para style="P8"><u>[[ formatLang((sum_debit(data))) ]]</u></para></td>
-	        <td><para style="P8"><u>[[ formatLang((sum_credit(data))) ]]</u></para></td>
-	        <td><para style="P8"><u>[[ formatLang((sum_debit(data) - sum_credit(data))) ]]</u></para></td>
-	     </tr>
-	    </blockTable>
-	    </td>
-     </tr>
-     <tr>
-     	<td>
-		 	<para style="P1">[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]] </para>
-		   	<blockTable colWidths="300.0,37.0,69.0,72.0,63.0" style="Table5">
-		     <tr>
-		     	<td><para style="total">[[ p.ref ]] - [[ p.name ]]</para></td>
-		        <td><para style="total"></para></td>
-		        <td><para style="P9b"><u>[[ formatLang((sum_debit_partner(p,data))) ]]</u></para></td>
-		        <td><para style="P9b"><u>[[ formatLang((sum_credit_partner(p,data))) ]]</u></para></td>
-		        <td><para style="P9b"><u>[[ formatLang((sum_debit_partner(p,data) - sum_credit_partner(p,data))) ]]</u></para></td>
-		     </tr>
-		    </blockTable>
-		    <blockTable colWidths="45.0,30.0,262.0,0.0,69.0,72.0,63.0" style="Table2">
-		     <tr>
-			     <td><para style="P15"><font face="Helvetica">[[ repeatIn(lines(p,data), 'line') ]]</font>[[ formatLang(line['date'],date=True) ]]</para></td>
-		         <td><para style="P3">[[ line['code'] ]]</para></td>
-		         <td><para style="P3">[[ line['ref'] ]] / [[ line['name'] ]]</para></td>
-		         <td><para style="P4"></para></td>
-		         <td><para style="P5">[[ formatLang((line['debit'])) ]]</para></td>
-		         <td><para style="P5">[[ formatLang((line['credit'])) ]]</para></td>
-		         <td><para style="P5">[[ formatLang((line['progress'])) ]]</para></td>
-		     </tr>
-		    </blockTable>
-     	</td>
-     </tr>
+    <blockTable colWidths="482.0" style="Table_title">
+      <tr>
+        <td>
+          <para style="terp_header_Centre">Third Party Ledger</para>
+        </td>
+      </tr>
     </blockTable>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="58.0,26.0,40.0,156.0,68.0,67.0,66.0" style="Table_header_1">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">JNRL</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Ref.</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Entry Label</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Debit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Credit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Balance</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="280.0,68.0,67.0,66.0" style="Table1">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Balance Brought Forward</para>
+        </td>
+        <td>
+          <para style="P5">[[ formatLang((sum_debit(data))) ]]</para>
+        </td>
+        <td>
+          <para style="P5">[[ formatLang((sum_credit(data))) ]]</para>
+        </td>
+        <td>
+          <para style="P5">[[ formatLang((sum_debit(data) - sum_credit(data))) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="P4">[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]</para>
+      <blockTable colWidths="280.0,68.0,67.0,66.0" style="Table2">
+        <tr>
+          <td>
+            <para style="P2">[[ p.ref ]] - [[ p.name ]]</para>
+          </td>
+          <td>
+            <para style="P5"><u>[[ formatLang((sum_debit_partner(p,data))) ]]</u></para>
+          </td>
+          <td>
+            <para style="P5"><u>[[ formatLang((sum_credit_partner(p,data))) ]]</u></para>
+          </td>
+          <td>
+            <para style="P5"><u>[[ formatLang((sum_debit_partner(p,data) - sum_credit_partner(p,data))) ]]</u></para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_2">
+        <font color="white"> </font>
+      </para>
+      <section>
+        <para style="P1">[[ repeatIn(lines(p,data), 'line') ]]</para>
+        <blockTable colWidths="58.0,26.0,40.0,156.0,68.0,67.0,66.0" style="Table3">
+          <tr>
+            <td>
+              <para style="P4">[[ formatLang(line['date'],date=True) ]]</para>
+            </td>
+            <td>
+              <para style="P4">[[ line['code'] ]]</para>
+            </td>
+            <td>
+              <para style="P4">[[ line['ref'] ]]</para>
+            </td>
+            <td>
+              <para style="P4">[[ line['name'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]]</para>
+            </td>
+          </tr>
+        </blockTable>
+        <para style="terp_default_2">
+          <font color="white"> </font>
+        </para>
+      </section>
+      <para style="terp_default_2">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
   </story>
 </document>
\ No newline at end of file

From e1e9aae8ac20f36a8ded160db11c0d01ef6b1452 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Wed, 28 Oct 2009 20:39:40 +0530
Subject: [PATCH 071/200] [FIX] Warning : Onchange Methods were
 malfunctioned.Corrected and made messages available for translations

lp bug: https://launchpad.net/bugs/454536 fixed

bzr revid: jvo@tinyerp.com-20091028150940-04nvtjkwk6htithx
---
 addons/warning/warning.py | 89 +++++++++++++++++++++++++--------------
 1 file changed, 58 insertions(+), 31 deletions(-)

diff --git a/addons/warning/warning.py b/addons/warning/warning.py
index c5ee7106851..3a8d9f53fb9 100644
--- a/addons/warning/warning.py
+++ b/addons/warning/warning.py
@@ -29,7 +29,7 @@ WARNING_MESSAGE = [
                    ('block','Blocking Message')
                    ]
 
-WARNING_HELP = 'Selecting the "Warning" option will notify user with the message, Selecting "Blocking Message" will throw an exception with the message and block the flow. The Message has to be written in the next field.'
+WARNING_HELP = _('Selecting the "Warning" option will notify user with the message, Selecting "Blocking Message" will throw an exception with the message and block the flow. The Message has to be written in the next field.')
 
 class res_partner(osv.osv):
     _inherit = 'res.partner'
@@ -64,20 +64,21 @@ class sale_order(osv.osv):
         partner = self.pool.get('res.partner').browse(cr, uid, part)
         if partner.sale_warn != 'no-message':
             if partner.sale_warn == 'block':
-                raise osv.except_osv(_('Alert for ' + partner.name +' !'), partner.sale_warn_msg)
-            
+                raise osv.except_osv(_('Alert for %s !') % (partner.name), partner.sale_warn_msg)
+            title =  _("Warning for %s") % partner.name
+            message = partner.sale_warn_msg
             warning = {
-                    'title': "Warning for " + partner.name,
-                    'message': partner.sale_warn_msg
+                    'title': title,
+                    'message': message,
             }
 
-        result =  super(sale_order, self).onchange_partner_id(cr, uid, ids, part)['value']
+        result =  super(sale_order, self).onchange_partner_id(cr, uid, ids, part)
         
         if result.get('warning',False):
             warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
             warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']
             
-        return {'value': result, 'warning':warning}
+        return {'value': result['value'], 'warning':warning}
 sale_order()
 
 
@@ -87,17 +88,25 @@ class purchase_order(osv.osv):
         if not part:
             return {'value':{'partner_address_id': False}}
         warning = {}
+        title = False
+        message = False
         partner = self.pool.get('res.partner').browse(cr, uid, part)
         if partner.purchase_warn != 'no-message':
             if partner.purchase_warn == 'block':
-                raise osv.except_osv(_('Alert for ' + partner.name +' !'), partner.purchase_warn_msg)
-            
+                raise osv.except_osv(_('Alert for %s !') % (partner.name), partner.purchase_warn_msg)
+            title = _("Warning for %s") % partner.name
+            message = partner.purchase_warn_msg
             warning = {
-                'title': "Warning for " + partner.name,
-                'message': partner.purchase_warn_msg
+                'title': title,
+                'message': message
                 }
-        result =  super(purchase_order, self).onchange_partner_id(cr, uid, ids, part)['value']
-        return {'value': result, 'warning':warning}
+        result =  super(purchase_order, self).onchange_partner_id(cr, uid, ids, part)
+        
+        if result.get('warning',False):
+            warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
+            warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']
+            
+        return {'value': result['value'], 'warning':warning}
     
 purchase_order()
 
@@ -116,17 +125,27 @@ class account_invoice(osv.osv):
             }
         }
         warning = {}
+        title = False
+        message = False
         partner = self.pool.get('res.partner').browse(cr, uid, partner_id)
         if partner.invoice_warn != 'no-message':
             if partner.invoice_warn == 'block':
-                raise osv.except_osv(_('Alert for ' + partner.name +' !'), partner.invoice_warn_msg)
+                raise osv.except_osv(_('Alert for %s !') % (partner.name), partner.invoice_warn_msg)
+            
+            title = _("Warning for %s") % partner.name
+            message = partner.invoice_warn_msg
             warning = {
-                'title': "Warning for " + partner.name,
-                'message': partner.invoice_warn_msg
+                'title': title,
+                'message': message
                 }
         result =  super(account_invoice, self).onchange_partner_id(cr, uid, ids, type, partner_id,
-            date_invoice=False, payment_term=False, partner_bank_id=False)['value']
-        return {'value': result, 'warning':warning}
+            date_invoice=False, payment_term=False, partner_bank_id=False)
+        
+        if result.get('warning',False):
+            warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
+            warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']
+        
+        return {'value': result['value'], 'warning':warning}
     
 account_invoice()
 
@@ -138,15 +157,23 @@ class stock_picking(osv.osv):
             return {}
         partner = self.pool.get('res.partner.address').browse(cr, uid, [partner_id])[0].partner_id
         warning = {}
+        title = False
+        message = False
         if partner.picking_warn != 'no-message':
             if partner.picking_warn == 'block':
-                raise osv.except_osv(_('Alert for ' + partner.name +' !'), partner.picking_warn_msg)
+                raise osv.except_osv(_('Alert for %s !') % (partner.name), partner.picking_warn_msg)
+            title = _("Warning for %s") % partner.name
+            message = partner.picking_warn_msg
             warning = {
-                'title': "Warning for " + partner.name,
-                'message': partner.picking_warn_msg
+                'title': title,
+                'message': message
             }
         result =  super(stock_picking, self).onchange_partner_in(cr, uid, context, partner_id)
-        return {'value': result, 'warning':warning}
+        if result.get('warning',False):
+            warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
+            warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']
+        
+        return {'value': result['value'], 'warning':warning}
     
 stock_picking()
 
@@ -184,8 +211,8 @@ class sale_order_line(osv.osv):
         
         if product_info.sale_line_warn != 'no-message':
             if product_info.sale_line_warn == 'block':
-                raise osv.except_osv(_('Alert for ' + product_info.name +' !'), product_info.sale_line_warn_msg)
-            title = "Warning for " + product_info.name
+                raise osv.except_osv(_('Alert for %s !') % (product_info.name), product_info.sale_line_warn_msg)
+            title = _("Warning for %s") % product_info.name
             message = product_info.sale_line_warn_msg
             warning['title'] = title
             warning['message'] = message
@@ -193,12 +220,12 @@ class sale_order_line(osv.osv):
         result =  super(sale_order_line, self).product_id_change( cr, uid, ids, pricelist, product, qty,
             uom, qty_uos, uos, name, partner_id,
             lang, update_tax, date_order, packaging, fiscal_position, flag)
-        if title and message:
-             warning['title']=title[0]
-             warning['message']=message
+#        if title and message:
+#             warning['title'] = title
+#             warning['message']= message
 
         if result.get('warning',False):
-            warning['title'] = title and title[0]+' & '+result['warning']['title'] or result['warning']['title']
+            warning['title'] = title and title +' & '+result['warning']['title'] or result['warning']['title']
             warning['message'] = message and message +'\n\n'+result['warning']['message'] or result['warning']['message']
         
         return {'value': result['value'], 'warning':warning}
@@ -219,8 +246,8 @@ class purchase_order_line(osv.osv):
         
         if product_info.purchase_line_warn != 'no-message':
             if product_info.purchase_line_warn == 'block':
-                raise osv.except_osv(_('Alert for ' + product_info.name +' !'), product_info.purchase_line_warn_msg)
-            title = "Warning for " + product_info.name
+                raise osv.except_osv(_('Alert for %s !') % (product_info.name), product_info.purchase_line_warn_msg)
+            title = _("Warning for %s") % product_info.name
             message = product_info.purchase_line_warn_msg
             warning['title'] = title
             warning['message'] = message
@@ -229,7 +256,7 @@ class purchase_order_line(osv.osv):
             partner_id, date_order, fiscal_position)
 
         if result.get('warning',False):
-            warning['title'] = title and title[0]+' & '+result['warning']['title'] or result['warning']['title']
+            warning['title'] = title and title +' & '+result['warning']['title'] or result['warning']['title']
             warning['message'] = message and message +'\n\n'+result['warning']['message'] or result['warning']['message']
         
         return {'value': result['value'], 'warning':warning}

From c9d35c7012162e69b6edf4fbe72ba44636b6cd25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= <rvalyi@gmail.com>
Date: Wed, 28 Oct 2009 18:04:43 -0200
Subject: [PATCH 072/200] [MERGE] lxml+etree instead of deprecated XML libs
 which prevent install on Ubuntu. Merged from old_trunk branch because on ne
 trunk, commits were not atomics anymore (after pig merge + bzr unability to
 track partial merge origins). merge directive used was: bzr merge -r
 1825..1826 lp:~openerp/openobject-server/old_trunk tested main flows on
 manufacturing database + French -> no bug found; still will commit a few more
 commits related to trunk + etree

lp bug: https://launchpad.net/bugs/429519 fixed

bzr revid: rvalyi@gmail.com-20091028200443-2ciyhqaz7rczdusy
---
 bin/osv/orm.py         | 183 +++++++++++------------
 bin/tools/convert.py   | 330 ++++++++++++++++++++---------------------
 bin/tools/translate.py |  34 ++---
 bin/wizard/__init__.py |  17 +--
 4 files changed, 268 insertions(+), 296 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 4859bd7d85a..ec74d01dd79 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -50,16 +50,15 @@ import pickle
 
 import fields
 import tools
+from tools.translate import _
 
 import sys
 
 try:
-    from xml import dom, xpath
+    from lxml import etree
 except ImportError:
-    sys.stderr.write("ERROR: Import xpath module\n")
-    sys.stderr.write("ERROR: Try to install the old python-xml package\n")
-    sys.stderr.write('On Ubuntu Jaunty, try this: sudo cp /usr/lib/python2.6/dist-packages/oldxml/_xmlplus/utils/boolean.so /usr/lib/python2.5/site-packages/oldxml/_xmlplus/utils\n')
-    raise
+    sys.stderr.write("ERROR: Import lxml module\n")
+    sys.stderr.write("ERROR: Try to install the python-lxml package\n")
 
 from tools.config import config
 
@@ -997,14 +996,14 @@ class orm_template(object):
         fields = {}
         childs = True
 
-        if node.nodeType == node.ELEMENT_NODE and node.localName == 'field':
-            if node.hasAttribute('name'):
+        if node.tag == 'field':
+            if node.get('name'):
                 attrs = {}
                 try:
-                    if node.getAttribute('name') in self._columns:
-                        column = self._columns[node.getAttribute('name')]
+                    if node.get('name') in self._columns:
+                        column = self._columns[node.get('name')]
                     else:
-                        column = self._inherit_fields[node.getAttribute('name')][2]
+                        column = self._inherit_fields[node.get('name')][2]
                 except:
                     column = False
 
@@ -1012,65 +1011,63 @@ class orm_template(object):
                     relation = column._obj
                     childs = False
                     views = {}
-                    for f in node.childNodes:
-                        if f.nodeType == f.ELEMENT_NODE and f.localName in ('form', 'tree', 'graph'):
-                            node.removeChild(f)
+                    for f in node:
+                        if f.tag in ('form', 'tree', 'graph'):
+                            node.remove(f)
                             ctx = context.copy()
                             ctx['base_model_name'] = self._name
                             xarch, xfields = self.pool.get(relation).__view_look_dom_arch(cr, user, f, view_id, ctx)
-                            views[str(f.localName)] = {
+                            views[str(f.tag)] = {
                                 'arch': xarch,
                                 'fields': xfields
                             }
                     attrs = {'views': views}
-                    if node.hasAttribute('widget') and node.getAttribute('widget')=='selection':
+                    if node.get('widget') and node.get('widget') == 'selection':
                         # We can not use the 'string' domain has it is defined according to the record !
-                        dom = []
+                        dom = None
                         if column._domain and not isinstance(column._domain, (str, unicode)):
                             dom = column._domain
-                        
                         attrs['selection'] = self.pool.get(relation).name_search(cr, user, '', dom, context=context)
-                        if (node.hasAttribute('required') and not int(node.getAttribute('required'))) or not column.required:
+                        if (node.get('required') and not int(node.get('required'))) or not column.required:
                             attrs['selection'].append((False,''))
-                fields[node.getAttribute('name')] = attrs
+                fields[node.get('name')] = attrs
 
-        elif node.nodeType==node.ELEMENT_NODE and node.localName in ('form', 'tree'):
-            result = self.view_header_get(cr, user, False, node.localName, context)
+        elif node.tag in ('form', 'tree'):
+            result = self.view_header_get(cr, user, False, node.tag, context)
             if result:
-                node.setAttribute('string', result)
+                node.set('string', result)
 
-        elif node.nodeType==node.ELEMENT_NODE and node.localName == 'calendar':
+        elif node.tag == 'calendar':
             for additional_field in ('date_start', 'date_delay', 'date_stop', 'color'):
-                if node.hasAttribute(additional_field) and node.getAttribute(additional_field):
-                    fields[node.getAttribute(additional_field)] = {}
+                if node.get(additional_field):
+                    fields[node.get(additional_field)] = {}
 
-        if node.nodeType == node.ELEMENT_NODE and node.hasAttribute('groups'):
-            if node.getAttribute('groups'):
-                groups = node.getAttribute('groups').split(',')
+        if 'groups' in node.attrib:
+            if node.get('groups'):
+                groups = node.get('groups').split(',')
                 readonly = False
                 access_pool = self.pool.get('ir.model.access')
                 for group in groups:
                     readonly = readonly or access_pool.check_groups(cr, user, group)
                 if not readonly:
-                    node.setAttribute('invisible', '1')
-            node.removeAttribute('groups')
+                    node.set('invisible', '1')
+            del(node.attrib['groups'])
 
-        if node.nodeType == node.ELEMENT_NODE:
-            # translate view
-            if ('lang' in context) and not result:
-                if node.hasAttribute('string') and node.getAttribute('string'):
-                    trans = self.pool.get('ir.translation')._get_source(cr, user, self._name, 'view', context['lang'], node.getAttribute('string').encode('utf8'))
-                    if not trans and ('base_model_name' in context):
-                        trans = self.pool.get('ir.translation')._get_source(cr, user, context['base_model_name'], 'view', context['lang'], node.getAttribute('string').encode('utf8'))
-                    if trans:
-                        node.setAttribute('string', trans)
-                if node.hasAttribute('sum') and node.getAttribute('sum'):
-                    trans = self.pool.get('ir.translation')._get_source(cr, user, self._name, 'view', context['lang'], node.getAttribute('sum').encode('utf8'))
-                    if trans:
-                        node.setAttribute('sum', trans)
+        # translate view
+        if ('lang' in context) and not result:
+            if node.get('string'):
+                trans = self.pool.get('ir.translation')._get_source(cr, user, self._name, 'view', context['lang'], node.get('string').encode('utf8'))
+                if not trans and ('base_model_name' in context):
+                    trans = self.pool.get('ir.translation')._get_source(cr, user, context['base_model_name'], 'view', context['lang'], node.get('string').encode('utf8'))
+                if trans:
+                    node.set('string', trans)
+            if node.get('sum'):
+                trans = self.pool.get('ir.translation')._get_source(cr, user, self._name, 'view', context['lang'], node.get('sum').encode('utf8'))
+                if trans:
+                    node.set('sum', trans)
 
         if childs:
-            for f in node.childNodes:
+            for f in node:
                 fields.update(self.__view_look_dom(cr, user, f, view_id, context))
 
         return fields
@@ -1081,7 +1078,7 @@ class orm_template(object):
         rolesobj = self.pool.get('res.roles')
         usersobj = self.pool.get('res.users')
 
-        buttons = (n for n in node.getElementsByTagName('button') if n.getAttribute('type') != 'object')
+        buttons = (n for n in node.getiterator('button') if n.get('type') != 'object')
         for button in buttons:
             can_click = True
             if user != 1:   # admin user has all roles
@@ -1104,8 +1101,6 @@ class orm_template(object):
                 #
                 # running -> done = signal_next (role Z)
                 # running -> cancel = signal_cancel (role Z)
-                
-
                 # As we don't know the object state, in this scenario, 
                 #   the button "signal_cancel" will be always shown as there is no restriction to cancel in draft
                 #   the button "signal_next" will be show if the user has any of the roles (X Y or Z)
@@ -1113,9 +1108,9 @@ class orm_template(object):
                 if roles:
                     can_click = any((not role) or rolesobj.check(cr, user, user_roles, role) for (role,) in roles)
             
-            button.setAttribute('readonly', str(int(not can_click)))
+            button.set('readonly', str(int(not can_click)))
 
-        arch = node.toxml(encoding="utf-8").replace('\t', '')
+        arch = etree.tostring(node, encoding="utf-8").replace('\t', '')
         fields = self.fields_get(cr, user, fields_def.keys(), context)
         for field in fields_def:
             if field == 'id':
@@ -1180,70 +1175,64 @@ class orm_template(object):
 
         def _inherit_apply(src, inherit):
             def _find(node, node2):
-                if node2.nodeType == node2.ELEMENT_NODE and node2.localName == 'xpath':
-                    res = xpath.Evaluate(node2.getAttribute('expr'), node)
+                if node2.tag == 'xpath':
+                    res = node.xpath(node2.get('expr'))
                     return res and res[0]
                 else:
-                    if node.nodeType == node.ELEMENT_NODE and node.localName == node2.localName:
+                    for n in node.getiterator(node2.tag):
                         res = True
-                        for attr in node2.attributes.keys():
+                        for attr in node2.attrib:
                             if attr == 'position':
                                 continue
-                            if node.hasAttribute(attr):
-                                if node.getAttribute(attr)==node2.getAttribute(attr):
+                            if n.get(attr):
+                                if n.get(attr) == node2.get(attr):
                                     continue
                             res = False
                         if res:
-                            return node
-                    for child in node.childNodes:
-                        res = _find(child, node2)
-                        if res:
-                            return res
+                            return n
                 return None
+            # End: _find(node, node2)
 
-
-            doc_src = dom.minidom.parseString(encode(src))
-            doc_dest = dom.minidom.parseString(encode(inherit))
-            toparse = doc_dest.childNodes
+            doc_dest = etree.fromstring(encode(inherit))
+            toparse = [ doc_dest ]
             while len(toparse):
                 node2 = toparse.pop(0)
-                if not node2.nodeType == node2.ELEMENT_NODE:
+                if node2.tag == 'data':
+                    toparse += [ c for c in doc_dest ]
                     continue
-                if node2.localName == 'data':
-                    toparse += node2.childNodes
-                    continue
-                node = _find(doc_src, node2)
-                if node:
+                node = _find(src, node2)
+                if node is not None:
                     pos = 'inside'
-                    if node2.hasAttribute('position'):
-                        pos = node2.getAttribute('position')
+                    if node2.get('position'):
+                        pos = node2.get('position')
                     if pos == 'replace':
-                        parent = node.parentNode
-                        for child in node2.childNodes:
-                            if child.nodeType == child.ELEMENT_NODE:
-                                parent.insertBefore(child, node)
-                        parent.removeChild(node)
+                        for child in node2:
+                            node.addprevious(child)
+                        node.getparent().remove(node)
                     else:
-                        sib = node.nextSibling
-                        for child in node2.childNodes:
-                            if child.nodeType == child.ELEMENT_NODE:
-                                if pos == 'inside':
-                                    node.appendChild(child)
-                                elif pos == 'after':
-                                    node.parentNode.insertBefore(child, sib)
-                                elif pos=='before':
-                                    node.parentNode.insertBefore(child, node)
+                        sib = node.getnext()
+                        for child in node2:
+                            if pos == 'inside':
+                                node.append(child)
+                            elif pos == 'after':
+                                if sib is None:
+                                    node.addnext(child)
                                 else:
-                                    raise AttributeError(_('Unknown position in inherited view %s !') % pos)
+                                    sib.addprevious(child)
+                            elif pos == 'before':
+                                node.addprevious(child)
+                            else:
+                                raise AttributeError(_('Unknown position in inherited view %s !') % pos)
                 else:
                     attrs = ''.join([
-                        ' %s="%s"' % (attr, node2.getAttribute(attr))
-                        for attr in node2.attributes.keys()
+                        ' %s="%s"' % (attr, node2.get(attr))
+                        for attr in node2.attrib
                         if attr != 'position'
                     ])
-                    tag = "<%s%s>" % (node2.localName, attrs)
+                    tag = "<%s%s>" % (node2.tag, attrs)
                     raise AttributeError(_("Couldn't find tag '%s' in parent view !") % tag)
-            return doc_src.toxml(encoding="utf-8").replace('\t', '')
+            return src
+        # End: _inherit_apply(src, inherit)
 
         result = {'type': view_type, 'model': self._name}
 
@@ -1295,7 +1284,8 @@ class orm_template(object):
                     result = _inherit_apply_rec(result, id)
                 return result
 
-            result['arch'] = _inherit_apply_rec(result['arch'], sql_res[3])
+            inherit_result = etree.fromstring(encode(result['arch']))
+            result['arch'] = _inherit_apply_rec(inherit_result, sql_res[3])
 
             result['name'] = sql_res[1]
             result['field_parent'] = sql_res[2] or False
@@ -1322,13 +1312,12 @@ class orm_template(object):
                 xml = self.__get_default_calendar_view()
             else:
                 xml = ''
-            result['arch'] = xml
+            result['arch'] = etree.fromstring(xml)
             result['name'] = 'default'
             result['field_parent'] = False
             result['view_id'] = 0
 
-        doc = dom.minidom.parseString(encode(result['arch']))
-        xarch, xfields = self.__view_look_dom_arch(cr, user, doc, view_id, context=context)
+        xarch, xfields = self.__view_look_dom_arch(cr, user, result['arch'], view_id, context=context)
         result['arch'] = xarch
         result['fields'] = xfields
         if toolbar:
@@ -3044,7 +3033,3 @@ class orm(orm_template):
                 if i in ids:
                     return False
         return True
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/bin/tools/convert.py b/bin/tools/convert.py
index 71e44655154..485583b5d9e 100644
--- a/bin/tools/convert.py
+++ b/bin/tools/convert.py
@@ -21,7 +21,7 @@
 ##############################################################################
 import re
 import cStringIO
-import xml.dom.minidom
+from lxml import etree
 import osv
 import ir
 import pooler
@@ -62,16 +62,13 @@ def _obj(pool, cr, uid, model_str, context=None):
 def _eval_xml(self,node, pool, cr, uid, idref, context=None):
     if context is None:
         context = {}
-    if node.nodeType == node.TEXT_NODE:
-        return node.data.encode("utf8")
-    elif node.nodeType == node.ELEMENT_NODE:
-        if node.nodeName in ('field','value'):
-            t = node.getAttribute('type') or 'char'
-            f_model = node.getAttribute("model").encode('ascii')
-            if len(node.getAttribute('search')):
-                f_search = node.getAttribute("search").encode('utf-8')
-                f_use = node.getAttribute("use").encode('ascii')
-                f_name = node.getAttribute("name").encode('utf-8')
+    if node.tag in ('field','value'):
+            t = node.get('type','') or 'char'
+            f_model = node.get("model", '').encode('ascii')
+            if len(node.get('search','')):
+                f_search = node.get("search",'').encode('utf-8')
+                f_use = node.get("use",'').encode('ascii')
+                f_name = node.get("name",'').encode('utf-8')
                 if len(f_use)==0:
                     f_use = "id"
                 q = eval(f_search, idref)
@@ -87,7 +84,7 @@ def _eval_xml(self,node, pool, cr, uid, idref, context=None):
                     if isinstance(f_val, tuple):
                         f_val = f_val[0]
                 return f_val
-            a_eval = node.getAttribute('eval')
+            a_eval = node.get('eval','')
             if len(a_eval):
                 import time
                 from mx import DateTime
@@ -116,14 +113,11 @@ def _eval_xml(self,node, pool, cr, uid, idref, context=None):
                         if not id in idref:
                             idref[id]=self.id_get(cr, False, id)
                     return s % idref
-                txt = '<?xml version="1.0"?>\n'+_process("".join([i.toxml().encode("utf8") for i in node.childNodes]), idref)
-#               txt = '<?xml version="1.0"?>\n'+"".join([i.toxml().encode("utf8") for i in node.childNodes]) % idref
-
+                txt = '<?xml version="1.0"?>\n'+_process("".join([etree.tostring(i).encode("utf8") for i in node.getchildren()]), idref)
                 return txt
             if t in ('char', 'int', 'float'):
                 d = ""
-                for n in [i for i in node.childNodes]:
-                    d+=str(_eval_xml(self,n,pool,cr,uid,idref))
+                d = node.text
                 if t == 'int':
                     d = d.strip()
                     if d=='None':
@@ -135,37 +129,37 @@ def _eval_xml(self,node, pool, cr, uid, idref, context=None):
                 return d
             elif t in ('list','tuple'):
                 res=[]
-                for n in [i for i in node.childNodes if (i.nodeType == i.ELEMENT_NODE and i.nodeName=='value')]:
+                for n in [i for i in node.getchildren() if (i.tag=='value')]:
                     res.append(_eval_xml(self,n,pool,cr,uid,idref))
                 if t=='tuple':
                     return tuple(res)
                 return res
-        elif node.nodeName=="getitem":
-            for n in [i for i in node.childNodes if (i.nodeType == i.ELEMENT_NODE)]:
-                res=_eval_xml(self,n,pool,cr,uid,idref)
-            if not res:
-                raise LookupError
-            elif node.getAttribute('type') in ("int", "list"):
-                return res[int(node.getAttribute('index'))]
-            else:
-                return res[node.getAttribute('index').encode("utf8")]
-        elif node.nodeName=="function":
-            args = []
-            a_eval = node.getAttribute('eval')
-            if len(a_eval):
-                idref['ref'] = lambda x: self.id_get(cr, False, x)
-                args = eval(a_eval, idref)
-            for n in [i for i in node.childNodes if (i.nodeType == i.ELEMENT_NODE)]:
-                args.append(_eval_xml(self,n, pool, cr, uid, idref, context))
-            model = pool.get(node.getAttribute('model'))
-            method = node.getAttribute('name')
-            res = getattr(model, method)(cr, uid, *args)
-            return res
-        elif node.nodeName=="test":
-            d = ""
-            for n in [i for i in node.childNodes]:
-                d+=str(_eval_xml(self,n,pool,cr,uid,idref, context=context))
-            return d
+    elif node.tag == "getitem":
+        for n in [i for i in node.getchildren()]:
+            res=_eval_xml(self,n,pool,cr,uid,idref)
+        if not res:
+            raise LookupError
+        elif node.get('type','') in ("int", "list"):
+            return res[int(node.get('index',''))]
+        else:
+            return res[node.get('index','').encode("utf8")]
+    elif node.tag == "function":
+        args = []
+        a_eval = node.get('eval','')
+        if len(a_eval):
+            idref['ref'] = lambda x: self.id_get(cr, False, x)
+            args = eval(a_eval, idref)
+        for n in [i for i in node.getchildren()]:
+            return_val = _eval_xml(self,n, pool, cr, uid, idref, context)
+            if return_val != None:
+                args.append(return_val)
+        model = pool.get(node.get('model',''))
+        method = node.get('name','')
+        res = getattr(model, method)(cr, uid, *args)
+        return res
+    elif node.tag == "test":
+        d = node.text
+        return d
 
 
 escape_re = re.compile(r'(?<!\\)/')
@@ -205,9 +199,9 @@ class xml_import(object):
 
     @staticmethod
     def nodeattr2bool(node, attr, default=False):
-        if not node.hasAttribute(attr):
+        if not node.get(attr):
             return default
-        val = node.getAttribute(attr).strip()
+        val = node.get(attr).strip()
         if not val:
             return default
         return val.lower() not in ('0', 'false', 'off')
@@ -216,20 +210,20 @@ class xml_import(object):
         return self.noupdate or (data_node and self.nodeattr2bool(data_node, 'noupdate', False)) 
 
     def get_context(self, data_node, node, eval_dict):
-        data_node_context = (data_node and data_node.getAttribute('context').encode('utf8'))
+        data_node_context = (data_node and data_node.get('context','').encode('utf8'))
         if data_node_context:
             context = eval(data_node_context, eval_dict)
         else:
             context = {}
 
-        node_context = node.getAttribute("context").encode('utf8')
+        node_context = node.get("context",'').encode('utf8')
         if len(node_context):
             context.update(eval(node_context, eval_dict))
 
         return context
 
     def get_uid(self, cr, uid, data_node, node):
-        node_uid = node.getAttribute('uid') or (data_node and data_node.getAttribute('uid'))
+        node_uid = node.get('uid','') or (data_node and data_node.get('uid',''))
         if len(node_uid):
             return self.id_get(cr, None, node_uid)
         return uid
@@ -249,9 +243,9 @@ form: module.record_id""" % (xml_id,)
             self.logger.notifyChannel('init', netsvc.LOG_ERROR, 'id: %s is to long (max: 64)'% (id,))
 
     def _tag_delete(self, cr, rec, data_node=None):
-        d_model = rec.getAttribute("model")
-        d_search = rec.getAttribute("search")
-        d_id = rec.getAttribute("id")
+        d_model = rec.get("model",'')
+        d_search = rec.get("search",'')
+        d_id = rec.get("id",'')
         ids = []
         if len(d_search):
             ids = self.pool.get(d_model).search(cr,self.uid,eval(d_search))
@@ -269,24 +263,24 @@ form: module.record_id""" % (xml_id,)
     def _tag_report(self, cr, rec, data_node=None):
         res = {}
         for dest,f in (('name','string'),('model','model'),('report_name','name')):
-            res[dest] = rec.getAttribute(f).encode('utf8')
+            res[dest] = rec.get(f,'').encode('utf8')
             assert res[dest], "Attribute %s of report is empty !" % (f,)
         for field,dest in (('rml','report_rml'),('xml','report_xml'),('xsl','report_xsl'),('attachment','attachment'),('attachment_use','attachment_use')):
-            if rec.hasAttribute(field):
-                res[dest] = rec.getAttribute(field).encode('utf8')
-        if rec.hasAttribute('auto'):
-            res['auto'] = eval(rec.getAttribute('auto'))
-        if rec.hasAttribute('sxw'):
-            sxw_content = misc.file_open(rec.getAttribute('sxw')).read()
+            if rec.get(field):
+                res[dest] = rec.get(field,'').encode('utf8')
+        if rec.get('auto'):
+            res['auto'] = eval(rec.get('auto',''))
+        if rec.get('sxw'):
+            sxw_content = misc.file_open(rec.get('sxw','')).read()
             res['report_sxw_content'] = sxw_content
-        if rec.hasAttribute('header'):
-            res['header'] = eval(rec.getAttribute('header'))
-        res['multi'] = rec.hasAttribute('multi') and  eval(rec.getAttribute('multi'))
-        xml_id = rec.getAttribute('id').encode('utf8')
+        if rec.get('header'):
+            res['header'] = eval(rec.get('header',''))
+        res['multi'] = rec.get('multi','') and eval(rec.get('multi',''))
+        xml_id = rec.get('id','').encode('utf8')
         self._test_xml_id(xml_id)
 
-        if rec.hasAttribute('groups'):
-            g_names = rec.getAttribute('groups').split(',')
+        if rec.get('groups'):
+            g_names = rec.get('groups','').split(',')
             groups_value = []
             groups_obj = self.pool.get('res.groups')
             for group in g_names:
@@ -302,11 +296,11 @@ form: module.record_id""" % (xml_id,)
         self.idref[xml_id] = int(id)
         
         
-        if not rec.hasAttribute('menu') or eval(rec.getAttribute('menu')):
-            keyword = str(rec.getAttribute('keyword') or 'client_print_multi')
+        if not rec.get('menu') or eval(rec.get('menu','')):
+            keyword = str(rec.get('keyword','') or 'client_print_multi')
             keys = [('action',keyword),('res_model',res['model'])]
             value = 'ir.actions.report.xml,'+str(id)
-            replace = rec.hasAttribute('replace') and rec.getAttribute("replace") or True
+            replace = rec.get("replace",'') or True
             self.pool.get('ir.model.data').ir_set(cr, self.uid, 'action', keyword, res['name'], [res['model']], value, replace=replace, isobject=True, xml_id=xml_id)
         return False
 
@@ -319,16 +313,16 @@ form: module.record_id""" % (xml_id,)
         return False
 
     def _tag_wizard(self, cr, rec, data_node=None):
-        string = rec.getAttribute("string").encode('utf8')
-        model = rec.getAttribute("model").encode('utf8')
-        name = rec.getAttribute("name").encode('utf8')
-        xml_id = rec.getAttribute('id').encode('utf8')
+        string = rec.get("string",'').encode('utf8')
+        model = rec.get("model",'').encode('utf8')
+        name = rec.get("name",'').encode('utf8')
+        xml_id = rec.get('id','').encode('utf8')
         self._test_xml_id(xml_id)
-        multi = rec.hasAttribute('multi') and  eval(rec.getAttribute('multi'))
+        multi = rec.get('multi','') and eval(rec.get('multi',''))
         res = {'name': string, 'wiz_name': name, 'multi': multi, 'model': model}
 
-        if rec.hasAttribute('groups'):
-            g_names = rec.getAttribute('groups').split(',')
+        if rec.get('groups'):
+            g_names = rec.get('groups','').split(',')
             groups_value = []
             groups_obj = self.pool.get('res.groups')
             for group in g_names:
@@ -343,20 +337,19 @@ form: module.record_id""" % (xml_id,)
         id = self.pool.get('ir.model.data')._update(cr, self.uid, "ir.actions.wizard", self.module, res, xml_id, noupdate=self.isnoupdate(data_node), mode=self.mode)
         self.idref[xml_id] = int(id)
         # ir_set
-        if (not rec.hasAttribute('menu') or eval(rec.getAttribute('menu'))) and id:
-            keyword = str(rec.getAttribute('keyword') or 'client_action_multi')
+        if (not rec.get('menu') or eval(rec.get('menu',''))) and id:
+            keyword = str(rec.get('keyword','') or 'client_action_multi')
             keys = [('action',keyword),('res_model',model)]
             value = 'ir.actions.wizard,'+str(id)
-            replace = rec.hasAttribute('replace') and \
-                    rec.getAttribute("replace") or True
+            replace = rec.get("replace",'') or True
             self.pool.get('ir.model.data').ir_set(cr, self.uid, 'action', keyword, string, [model], value, replace=replace, isobject=True, xml_id=xml_id)
         return False
 
     def _tag_url(self, cr, rec, data_node=None):
-        url = rec.getAttribute("string").encode('utf8')
-        target = rec.getAttribute("target").encode('utf8')
-        name = rec.getAttribute("name").encode('utf8')
-        xml_id = rec.getAttribute('id').encode('utf8')
+        url = rec.get("string",'').encode('utf8')
+        target = rec.get("target",'').encode('utf8')
+        name = rec.get("name",'').encode('utf8')
+        xml_id = rec.get('id','').encode('utf8')
         self._test_xml_id(xml_id)
 
         res = {'name': name, 'url': url, 'target':target}
@@ -364,34 +357,31 @@ form: module.record_id""" % (xml_id,)
         id = self.pool.get('ir.model.data')._update(cr, self.uid, "ir.actions.url", self.module, res, xml_id, noupdate=self.isnoupdate(data_node), mode=self.mode)
         self.idref[xml_id] = int(id)
         # ir_set
-        if (not rec.hasAttribute('menu') or eval(rec.getAttribute('menu'))) and id:
-            keyword = str(rec.getAttribute('keyword') or 'client_action_multi')
+        if (not rec.get('menu') or eval(rec.get('menu',''))) and id:
+            keyword = str(rec.get('keyword','') or 'client_action_multi')
             keys = [('action',keyword)]
             value = 'ir.actions.url,'+str(id)
-            replace = rec.hasAttribute('replace') and \
-                    rec.getAttribute("replace") or True
+            replace = rec.get("replace",'') or True
             self.pool.get('ir.model.data').ir_set(cr, self.uid, 'action', keyword, url, ["ir.actions.url"], value, replace=replace, isobject=True, xml_id=xml_id)
         return False
 
     def _tag_act_window(self, cr, rec, data_node=None):
-        name = rec.hasAttribute('name') and rec.getAttribute('name').encode('utf-8')
-        xml_id = rec.getAttribute('id').encode('utf8')
+        name = rec.get('name','').encode('utf-8')
+        xml_id = rec.get('id','').encode('utf8')
         self._test_xml_id(xml_id)
-        type = rec.hasAttribute('type') and rec.getAttribute('type').encode('utf-8') or 'ir.actions.act_window'
+        type = rec.get('type','').encode('utf-8') or 'ir.actions.act_window'
         view_id = False
-        if rec.hasAttribute('view'):
-            view_id = self.id_get(cr, 'ir.actions.act_window', rec.getAttribute('view').encode('utf-8'))
-        domain = rec.hasAttribute('domain') and rec.getAttribute('domain').encode('utf-8')
-        context = rec.hasAttribute('context') and rec.getAttribute('context').encode('utf-8') or '{}'
-        res_model = rec.getAttribute('res_model').encode('utf-8')
-        src_model = rec.hasAttribute('src_model') and rec.getAttribute('src_model').encode('utf-8')
-        view_type = rec.hasAttribute('view_type') and rec.getAttribute('view_type').encode('utf-8') or 'form'
-        view_mode = rec.hasAttribute('view_mode') and rec.getAttribute('view_mode').encode('utf-8') or 'tree,form'
-        usage = rec.hasAttribute('usage') and rec.getAttribute('usage').encode('utf-8')
-        limit = rec.hasAttribute('limit') and rec.getAttribute('limit').encode('utf-8')
-        auto_refresh = rec.hasAttribute('auto_refresh') \
-                and rec.getAttribute('auto_refresh').encode('utf-8')
-#        groups_id = rec.hasAttribute('groups') and rec.getAttribute('groups').encode('utf-8')
+        if rec.get('view'):
+            view_id = self.id_get(cr, 'ir.actions.act_window', rec.get('view','').encode('utf-8'))
+        domain = rec.get('domain','').encode('utf-8')
+        context = rec.get('context','').encode('utf-8') or '{}'
+        res_model = rec.get('res_model','').encode('utf-8')
+        src_model = rec.get('src_model','').encode('utf-8')
+        view_type = rec.get('view_type','').encode('utf-8') or 'form'
+        view_mode = rec.get('view_mode','').encode('utf-8') or 'tree,form'
+        usage = rec.get('usage','').encode('utf-8')
+        limit = rec.get('limit','').encode('utf-8')
+        auto_refresh = rec.get('auto_refresh','').encode('utf-8')
 
         # def ref() added because , if context has ref('id') eval wil use this ref
 
@@ -417,8 +407,8 @@ form: module.record_id""" % (xml_id,)
 #            'groups_id':groups_id,
         }
 
-        if rec.hasAttribute('groups'):
-            g_names = rec.getAttribute('groups').split(',')
+        if rec.get('groups'):
+            g_names = rec.get('groups','').split(',')
             groups_value = []
             groups_obj = self.pool.get('res.groups')
             for group in g_names:
@@ -430,8 +420,8 @@ form: module.record_id""" % (xml_id,)
                     groups_value.append((4, group_id))
             res['groups_id'] = groups_value
 
-        if rec.hasAttribute('target'):
-            res['target'] = rec.getAttribute('target')
+        if rec.get('target'):
+            res['target'] = rec.get('target','')
         id = self.pool.get('ir.model.data')._update(cr, self.uid, 'ir.actions.act_window', self.module, res, xml_id, noupdate=self.isnoupdate(data_node), mode=self.mode)
         self.idref[xml_id] = int(id)
 
@@ -439,7 +429,7 @@ form: module.record_id""" % (xml_id,)
             keyword = 'client_action_relate'
             keys = [('action', keyword), ('res_model', res_model)]
             value = 'ir.actions.act_window,'+str(id)
-            replace = rec.hasAttribute('replace') and rec.getAttribute('replace') or True
+            replace = rec.get('replace','') or True
             self.pool.get('ir.model.data').ir_set(cr, self.uid, 'action', keyword, xml_id, [src_model], value, replace=replace, isobject=True, xml_id=xml_id)
         # TODO add remove ir.model.data
         return False
@@ -448,8 +438,8 @@ form: module.record_id""" % (xml_id,)
         if not self.mode=='init':
             return False
         res = {}
-        for field in [i for i in rec.childNodes if (i.nodeType == i.ELEMENT_NODE and i.nodeName=="field")]:
-            f_name = field.getAttribute("name").encode('utf-8')
+        for field in [i for i in rec.getchildren() if (i.tag=="field")]:
+            f_name = field.get("name",'').encode('utf-8')
             f_val = _eval_xml(self,field,self.pool, cr, self.uid, self.idref)
             res[f_name] = f_val
         self.pool.get('ir.model.data').ir_set(cr, self.uid, res['key'], res['key2'], res['name'], res['models'], res['value'], replace=res.get('replace',True), isobject=res.get('isobject', False), meta=res.get('meta',None))
@@ -458,21 +448,21 @@ form: module.record_id""" % (xml_id,)
     def _tag_workflow(self, cr, rec, data_node=None):
         if self.isnoupdate(data_node) and self.mode != 'init':
             return
-        model = str(rec.getAttribute('model'))
-        w_ref = rec.getAttribute('ref')
+        model = str(rec.get('model',''))
+        w_ref = rec.get('ref','')
         if len(w_ref):
             id = self.id_get(cr, model, w_ref)
         else:
-            assert rec.childNodes, 'You must define a child node if you dont give a ref'
-            element_childs = [i for i in rec.childNodes if i.nodeType == i.ELEMENT_NODE]
-            assert len(element_childs) == 1, 'Only one child node is accepted (%d given)' % len(rec.childNodes)
+            assert rec.getchildren(), 'You must define a child node if you dont give a ref'
+            element_childs = [i for i in rec.getchildren()]
+            assert len(element_childs) == 1, 'Only one child node is accepted (%d given)' % len(rec.getchildren())
             id = _eval_xml(self, element_childs[0], self.pool, cr, self.uid, self.idref)
 
         uid = self.get_uid(cr, self.uid, data_node, rec)
         wf_service = netsvc.LocalService("workflow")
         wf_service.trg_validate(uid, model,
             id,
-            str(rec.getAttribute('action')), cr)
+            str(rec.get('action','')), cr)
         return False
 
     #
@@ -483,12 +473,12 @@ form: module.record_id""" % (xml_id,)
     #   parent="parent_id"
     #
     def _tag_menuitem(self, cr, rec, data_node=None):
-        rec_id = rec.getAttribute("id").encode('ascii')
+        rec_id = rec.get("id",'').encode('ascii')
         self._test_xml_id(rec_id)
-        m_l = map(escape, escape_re.split(rec.getAttribute("name").encode('utf8')))
+        m_l = map(escape, escape_re.split(rec.get("name",'').encode('utf8')))
 
         values = {'parent_id': False}
-        if not rec.hasAttribute('parent'):
+        if not rec.get('parent'):
             pid = False
             for idx, menu_elem in enumerate(m_l):
                 if pid:
@@ -500,7 +490,7 @@ form: module.record_id""" % (xml_id,)
                     values = {'parent_id': pid,'name':menu_elem}
                 elif res:
                     pid = res[0]
-                    xml_id = idx==len(m_l)-1 and rec.getAttribute('id').encode('utf8')
+                    xml_id = idx==len(m_l)-1 and rec.get('id','').encode('utf8')
                     try:
                         npid = self.pool.get('ir.model.data')._update_dummy(cr, self.uid, 'ir.ui.menu', self.module, xml_id, idx==len(m_l)-1)
                     except:
@@ -510,18 +500,18 @@ form: module.record_id""" % (xml_id,)
                     self.logger.notifyChannel("init", netsvc.LOG_WARNING, 'Warning no ID for submenu %s of menu %s !' % (menu_elem, str(m_l)))
                     pid = self.pool.get('ir.ui.menu').create(cr, self.uid, {'parent_id' : pid, 'name' : menu_elem})
         else:
-            menu_parent_id = self.id_get(cr, 'ir.ui.menu', rec.getAttribute('parent'))
+            menu_parent_id = self.id_get(cr, 'ir.ui.menu', rec.get('parent',''))
             values = {'parent_id': menu_parent_id}
-            if rec.hasAttribute('name'):
-                values['name'] = rec.getAttribute('name')
+            if rec.get('name'):
+                values['name'] = rec.get('name','')
             try:
-                res = [ self.id_get(cr, 'ir.ui.menu', rec.getAttribute('id')) ]
+                res = [ self.id_get(cr, 'ir.ui.menu', rec.get('id','')) ]
             except:
                 res = None
 
-        if rec.hasAttribute('action'):
-            a_action = rec.getAttribute('action').encode('utf8')
-            a_type = rec.getAttribute('type').encode('utf8') or 'act_window'
+        if rec.get('action'):
+            a_action = rec.get('action','').encode('utf8')
+            a_type = rec.get('type','').encode('utf8') or 'act_window'
             icons = {
                 "act_window": 'STOCK_NEW',
                 "report.xml": 'STOCK_PASTE',
@@ -560,13 +550,13 @@ form: module.record_id""" % (xml_id,)
                 resw = cr.fetchone()
                 if (not values.get('name', False)) and resw:
                     values['name'] = resw[0]
-        if rec.hasAttribute('sequence'):
-            values['sequence'] = int(rec.getAttribute('sequence'))
-        if rec.hasAttribute('icon'):
-            values['icon'] = str(rec.getAttribute('icon'))
+        if rec.get('sequence'):
+            values['sequence'] = int(rec.get('sequence',''))
+        if rec.get('icon'):
+            values['icon'] = str(rec.get('icon',''))
 
-        if rec.hasAttribute('groups'):
-            g_names = rec.getAttribute('groups').split(',')
+        if rec.get('groups'):
+            g_names = rec.get('groups','').split(',')
             groups_value = []
             groups_obj = self.pool.get('res.groups')
             for group in g_names:
@@ -578,16 +568,16 @@ form: module.record_id""" % (xml_id,)
                     groups_value.append((4, group_id))
             values['groups_id'] = groups_value
 
-        xml_id = rec.getAttribute('id').encode('utf8')
+        xml_id = rec.get('id','').encode('utf8')
         self._test_xml_id(xml_id)
         pid = self.pool.get('ir.model.data')._update(cr, self.uid, 'ir.ui.menu', self.module, values, xml_id, noupdate=self.isnoupdate(data_node), mode=self.mode, res_id=res and res[0] or False)
 
         if rec_id and pid:
             self.idref[rec_id] = int(pid)
 
-        if rec.hasAttribute('action') and pid:
-            a_action = rec.getAttribute('action').encode('utf8')
-            a_type = rec.getAttribute('type').encode('utf8') or 'act_window'
+        if rec.get('action') and pid:
+            a_action = rec.get('action','').encode('utf8')
+            a_type = rec.get('type','').encode('utf8') or 'act_window'
             a_id = self.id_get(cr, 'ir.actions.%s' % a_type, a_action)
             action = "ir.actions.%s,%d" % (a_type, a_id)
             self.pool.get('ir.model.data').ir_set(cr, self.uid, 'action', 'tree_but_open', 'Menuitem', [('ir.ui.menu', int(pid))], action, True, True, xml_id=rec_id)
@@ -600,17 +590,17 @@ form: module.record_id""" % (xml_id,)
         if self.isnoupdate(data_node) and self.mode != 'init':
             return
 
-        rec_model = rec.getAttribute("model").encode('ascii')
+        rec_model = rec.get("model",'').encode('ascii')
         model = self.pool.get(rec_model)
         assert model, "The model %s does not exist !" % (rec_model,)
-        rec_id = rec.getAttribute("id").encode('ascii')
+        rec_id = rec.get("id",'').encode('ascii')
         self._test_xml_id(rec_id)
-        rec_src = rec.getAttribute("search").encode('utf8')
-        rec_src_count = rec.getAttribute("count")
+        rec_src = rec.get("search",'').encode('utf8')
+        rec_src_count = rec.get("count",'')
 
-        severity = rec.getAttribute("severity").encode('ascii') or netsvc.LOG_ERROR
+        severity = rec.get("severity",'').encode('ascii') or netsvc.LOG_ERROR
 
-        rec_string = rec.getAttribute("string").encode('utf8') or 'unknown'
+        rec_string = rec.get("string",'').encode('utf8') or 'unknown'
 
         ids = None
         eval_dict = {'ref': _ref(self, cr)}
@@ -651,8 +641,8 @@ form: module.record_id""" % (xml_id,)
             globals['floatEqual'] = self._assert_equals
             globals['ref'] = ref
             globals['_ref'] = ref
-            for test in [i for i in rec.childNodes if (i.nodeType == i.ELEMENT_NODE and i.nodeName=="test")]:
-                f_expr = test.getAttribute("expr").encode('utf-8')
+            for test in [i for i in rec.getchildren() if (i.tag=="test")]:
+                f_expr = test.get("expr",'').encode('utf-8')
                 expected_value = _eval_xml(self, test, self.pool, cr, uid, self.idref, context=context) or True
                 expression_value = eval(f_expr, globals)
                 if expression_value != expected_value: # assertion failed
@@ -661,7 +651,7 @@ form: module.record_id""" % (xml_id,)
                           ' xmltag: %s\n'               \
                           ' expected value: %r\n'       \
                           ' obtained value: %r\n'       \
-                          % (rec_string, test.toxml(), expected_value, expression_value)
+                          % (rec_string, etree.tostring(test), expected_value, expression_value)
                     self.logger.notifyChannel('init', severity, msg)
                     sevval = getattr(logging, severity.upper())
                     if sevval >= config['assert_exit_level']:
@@ -672,12 +662,11 @@ form: module.record_id""" % (xml_id,)
             self.assert_report.record_assertion(True, severity)
 
     def _tag_record(self, cr, rec, data_node=None):
-        rec_model = rec.getAttribute("model").encode('ascii')
+        rec_model = rec.get("model").encode('ascii')
         model = self.pool.get(rec_model)
         assert model, "The model %s does not exist !" % (rec_model,)
-        rec_id = rec.getAttribute("id").encode('ascii')
+        rec_id = rec.get("id",'').encode('ascii')
         self._test_xml_id(rec_id)
-
         if self.isnoupdate(data_node) and self.mode != 'init':
             # check if the xml record has an id string
             if rec_id:
@@ -703,17 +692,16 @@ form: module.record_id""" % (xml_id,)
             else:
                 # otherwise it is skipped
                 return None
-
         res = {}
-        for field in [i for i in rec.childNodes if (i.nodeType == i.ELEMENT_NODE and i.nodeName=="field")]:
+        for field in [i for i in rec.getchildren() if (i.tag == "field")]:
 #TODO: most of this code is duplicated above (in _eval_xml)...
-            f_name = field.getAttribute("name").encode('utf-8')
-            f_ref = field.getAttribute("ref").encode('ascii')
-            f_search = field.getAttribute("search").encode('utf-8')
-            f_model = field.getAttribute("model").encode('ascii')
+            f_name = field.get("name",'').encode('utf-8')
+            f_ref = field.get("ref",'').encode('ascii')
+            f_search = field.get("search",'').encode('utf-8')
+            f_model = field.get("model",'').encode('ascii')
             if not f_model and model._columns.get(f_name,False):
                 f_model = model._columns[f_name]._obj
-            f_use = field.getAttribute("use").encode('ascii') or 'id'
+            f_use = field.get("use",'').encode('ascii') or 'id'
             f_val = False
 
             if len(f_search):
@@ -761,24 +749,22 @@ form: module.record_id""" % (xml_id,)
         return int(self.pool.get('ir.model.data').read(cr, self.uid, [result], ['res_id'])[0]['res_id'])
 
     def parse(self, xmlstr):
-        d = xml.dom.minidom.parseString(xmlstr)
-        de = d.documentElement
+        de = etree.XML(xmlstr)
 
-        if not de.nodeName in ['terp', 'openerp']:
+        if not de.tag in ['terp', 'openerp']:
             self.logger.notifyChannel("init", netsvc.LOG_ERROR, "Mismatch xml format" )
             raise Exception( "Mismatch xml format: only terp or openerp as root tag" )
 
-        if de.nodeName == 'terp':
+        if de.tag == 'terp':
             self.logger.notifyChannel("init", netsvc.LOG_WARNING, "The tag <terp/> is deprecated, use <openerp/>")
 
-        for n in [i for i in de.childNodes if (i.nodeType == i.ELEMENT_NODE and i.nodeName=="data")]:
-            for rec in n.childNodes:
-                if rec.nodeType == rec.ELEMENT_NODE:
-                    if rec.nodeName in self._tags:
+        for n in [i for i in de.getchildren() if (i.tag=="data")]:
+            for rec in n.getchildren():
+                    if rec.tag in self._tags:
                         try:
-                            self._tags[rec.nodeName](self.cr, rec, n)
+                            self._tags[rec.tag](self.cr, rec, n)
                         except:
-                            self.logger.notifyChannel("init", netsvc.LOG_ERROR, '\n'+rec.toxml())
+                            self.logger.notifyChannel("init", netsvc.LOG_ERROR, '\n'+etree.tostring(rec))
                             self.cr.rollback()
                             raise
         return True
@@ -891,11 +877,13 @@ def convert_xml_export(res):
     pool=pooler.get_pool(cr.dbname)
     cr=pooler.db.cursor()
     idref = {}
-    d = xml.dom.minidom.getDOMImplementation().createDocument(None, "terp", None)
-    de = d.documentElement
-    data=d.createElement("data")
-    de.appendChild(data)
-    de.appendChild(d.createTextNode('Some textual content.'))
+
+    page = etree.Element ( 'terp' )
+    doc = etree.ElementTree ( page )
+    data = etree.SubElement ( page, 'data' )
+    text_node = etree.SubElement ( page, 'text' )
+    text_node.text = 'Some textual content.'
+    
     cr.commit()
     cr.close()
 
diff --git a/bin/tools/translate.py b/bin/tools/translate.py
index 62f48aaa3c6..b4fa6cc0138 100644
--- a/bin/tools/translate.py
+++ b/bin/tools/translate.py
@@ -23,9 +23,9 @@
 import os
 from os.path import join
 import fnmatch
-import csv, xml.dom, re
+import csv, re
+from lxml import etree
 import tools, pooler
-from osv.orm import BrowseRecordError
 import ir
 import netsvc
 from tools.misc import UpdateableStr
@@ -335,9 +335,9 @@ def trans_export(lang, modules, buffer, format, dbname=None):
 
 def trans_parse_xsl(de):
     res = []
-    for n in [i for i in de.childNodes if (i.nodeType == i.ELEMENT_NODE)]:
-        if n.hasAttribute("t"):
-            for m in [j for j in n.childNodes if (j.nodeType == j.TEXT_NODE)]:
+    for n in [i for i in de.getchildren()]:
+        if n.get("t"):
+            for m in [j for j in n.getchildren()]:
                 l = m.data.strip().replace('\n',' ')
                 if len(l):
                     res.append(l.encode("utf8"))
@@ -346,8 +346,8 @@ def trans_parse_xsl(de):
 
 def trans_parse_rml(de):
     res = []
-    for n in [i for i in de.childNodes if (i.nodeType == i.ELEMENT_NODE)]:
-        for m in [j for j in n.childNodes if (j.nodeType == j.TEXT_NODE)]:
+    for n in [i for i in de.getchildren()]:
+        for m in [j for j in n.getchildren()]:
             string_list = [s.replace('\n', ' ').strip() for s in re.split('\[\[.+?\]\]', m.data)]
             for s in string_list:
                 if s:
@@ -357,15 +357,15 @@ def trans_parse_rml(de):
 
 def trans_parse_view(de):
     res = []
-    if de.hasAttribute("string"):
-        s = de.getAttribute('string')
+    if de.get("string"):
+        s = de.get('string')
         if s:
             res.append(s.encode("utf8"))
-    if de.hasAttribute("sum"):
-        s = de.getAttribute('sum')
+    if de.get("sum"):
+        s = de.get('sum')
         if s:
             res.append(s.encode("utf8"))
-    for n in [i for i in de.childNodes if (i.nodeType == i.ELEMENT_NODE)]:
+    for n in [i for i in de.getchildren()]:
         res.extend(trans_parse_view(n))
     return res
 
@@ -434,8 +434,8 @@ def trans_generate(lang, modules, dbname=None):
         obj = pool.get(model).browse(cr, uid, res_id)
 
         if model=='ir.ui.view':
-            d = xml.dom.minidom.parseString(encode(obj.arch))
-            for t in trans_parse_view(d.documentElement):
+            d = etree.XML(encode(obj.arch))
+            for t in trans_parse_view(d):
                 push_translation(module, 'view', encode(obj.model), 0, t)
         elif model=='ir.actions.wizard':
             service_name = 'wizard.'+encode(obj.wiz_name)
@@ -522,10 +522,10 @@ def trans_generate(lang, modules, dbname=None):
                 report_type = "xsl"
             try:
                 xmlstr = tools.file_open(fname).read()
-                d = xml.dom.minidom.parseString(xmlstr)
-                for t in parse_func(d.documentElement):
+                d = etree.XML()(xmlstr)
+                for t in parse_func(d.getroot()):
                     push_translation(module, report_type, name, 0, t)
-            except IOError, xml.dom.expatbuilder.expat.ExpatError:
+            except IOError, etree.expatbuilder.expat.ExpatError:
                 if fname:
                     logger.notifyChannel("i18n", netsvc.LOG_ERROR, "couldn't export translation for report %s %s %s" % (name, report_type, fname))
 
diff --git a/bin/wizard/__init__.py b/bin/wizard/__init__.py
index 1621559c628..378f9ac4563 100644
--- a/bin/wizard/__init__.py
+++ b/bin/wizard/__init__.py
@@ -24,7 +24,7 @@ import netsvc
 from tools import copy
 from tools.misc import UpdateableStr, UpdateableDict
 from tools.translate import translate
-from xml import dom
+from lxml import etree
 
 import ir
 import pooler
@@ -50,13 +50,12 @@ class interface(netsvc.Service):
         self.wiz_name = name
         
     def translate_view(self, cr, node, state, lang):
-        if node.nodeType == node.ELEMENT_NODE:
-            if node.hasAttribute('string') and node.getAttribute('string'):
-                trans = translate(cr, self.wiz_name+','+state, 'wizard_view', lang, node.getAttribute('string').encode('utf8'))
+            if node.get('string'):
+                trans = translate(cr, self.wiz_name+','+state, 'wizard_view', lang, node.get('string').encode('utf8'))
                 if trans:
-                    node.setAttribute('string', trans)
-        for n in node.childNodes:
-            self.translate_view(cr, n, state, lang)
+                    node.set('string', trans)
+            for n in node.getchildren():
+                self.translate_view(cr, n, state, lang)
 
     def execute_cr(self, cr, uid, data, state='init', context=None):
         if not context:
@@ -132,9 +131,9 @@ class interface(netsvc.Service):
 
                     # translate arch
                     if not isinstance(arch, UpdateableStr):
-                        doc = dom.minidom.parseString(arch.encode('utf8'))
+                        doc = etree.XML(arch)
                         self.translate_view(cr, doc, state, lang)
-                        arch = doc.toxml()
+                        arch = etree.tostring(doc)
 
                     # translate buttons
                     button_list = list(button_list)

From ece8b2918a786b93e7fdb38ae64dcca1a5333428 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= <rvalyi@gmail.com>
Date: Wed, 28 Oct 2009 18:07:03 -0200
Subject: [PATCH 073/200] [MERGE] bzr merge -r 1847..1848 lp:openobject-server
 ([FIX] Prevent etree deprication warnings)

lp bug: https://launchpad.net/bugs/429519 fixed

bzr revid: rvalyi@gmail.com-20091028200703-u7298esyxktryqyk
---
 bin/tools/convert.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/bin/tools/convert.py b/bin/tools/convert.py
index 485583b5d9e..23930fa8b75 100644
--- a/bin/tools/convert.py
+++ b/bin/tools/convert.py
@@ -205,12 +205,12 @@ class xml_import(object):
         if not val:
             return default
         return val.lower() not in ('0', 'false', 'off')
-    
+
     def isnoupdate(self, data_node=None):
-        return self.noupdate or (data_node and self.nodeattr2bool(data_node, 'noupdate', False)) 
+        return self.noupdate or (len(data_node) and self.nodeattr2bool(data_node, 'noupdate', False))
 
     def get_context(self, data_node, node, eval_dict):
-        data_node_context = (data_node and data_node.get('context','').encode('utf8'))
+        data_node_context = (len(data_node) and data_node.get('context','').encode('utf8'))
         if data_node_context:
             context = eval(data_node_context, eval_dict)
         else:
@@ -223,7 +223,7 @@ class xml_import(object):
         return context
 
     def get_uid(self, cr, uid, data_node, node):
-        node_uid = node.get('uid','') or (data_node and data_node.get('uid',''))
+        node_uid = node.get('uid','') or (len(data_node) and data_node.get('uid',''))
         if len(node_uid):
             return self.id_get(cr, None, node_uid)
         return uid
@@ -294,8 +294,8 @@ form: module.record_id""" % (xml_id,)
 
         id = self.pool.get('ir.model.data')._update(cr, self.uid, "ir.actions.report.xml", self.module, res, xml_id, noupdate=self.isnoupdate(data_node), mode=self.mode)
         self.idref[xml_id] = int(id)
-        
-        
+
+
         if not rec.get('menu') or eval(rec.get('menu','')):
             keyword = str(rec.get('keyword','') or 'client_print_multi')
             keys = [('action',keyword),('res_model',res['model'])]
@@ -688,7 +688,7 @@ form: module.record_id""" % (xml_id,)
                         # we don't want to create it, so we skip it
                         return None
                     # else, we let the record to be created
-                
+
             else:
                 # otherwise it is skipped
                 return None

From 2686991976e4862ad42cdc3c504fd56f9177448f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= <rvalyi@gmail.com>
Date: Wed, 28 Oct 2009 18:12:54 -0200
Subject: [PATCH 074/200] [MERGE] bzr merge -r 1856..1857 lp:openobject-server
 . rev #1857 we merge here consists in a fix by Tiny because they didn't
 applied the etree conversion properly weeks back (the 2 previous merges
 here); part was already better merged on our side (2 commits back) because we
 resolved the conflicts more carefully.

lp bug: https://launchpad.net/bugs/429519 fixed

bzr revid: rvalyi@gmail.com-20091028201254-oxcmetgpxbp2oelp
---
 bin/osv/orm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index ec74d01dd79..da7cfc7558f 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1090,7 +1090,7 @@ class orm_template(object):
                           INNER JOIN wkf_transition t ON (t.act_to = a.id)
                                WHERE wkf.osv = %s
                                  AND t.signal = %s
-                           """, (self._name, button.getAttribute('name'),))
+                           """, (self._name, button.get('name'),))
                 roles = cr.fetchall()
                 
                 # draft -> valid = signal_next (role X)

From d421389da9671293f66b36196aa33d5c2516741d Mon Sep 17 00:00:00 2001
From: "GPA,JVO" <>
Date: Thu, 29 Oct 2009 19:13:48 +0530
Subject: [PATCH 075/200] [FIX] Sale : Workflow behaviour fixed when order is
 set to draft

lp bug: https://launchpad.net/bugs/461801 fixed

bzr revid: jvo@tinyerp.com-20091029134348-f44814d758scekrz
---
 addons/sale/sale.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 6a9572b547c..d43c7533e86 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -505,12 +505,13 @@ class sale_order(osv.osv):
         write_done_ids = []
         write_cancel_ids = []
         stock_move_obj = self.pool.get('stock.move')
-
         for order in self.browse(cr, uid, ids, context={}):
             
             #check for pending deliveries 
             pending_deliveries = False
-            
+            # check => if order_lines do not exist,don't proceed for any mode.
+            if not order.order_line:
+                return False
             for line in order.order_line:    
                 move_ids = stock_move_obj.search(cr, uid, [('sale_line_id','=', line.id)])
                 for move in stock_move_obj.browse( cr, uid, move_ids ):
@@ -518,8 +519,9 @@ class sale_order(osv.osv):
                     #this order line is not yet delivered
                     if move.state in ('draft', 'auto', 'confirmed'):
                         pending_deliveries = True
-                
-                if ((not line.procurement_id) or (line.procurement_id.state=='done')) and not pending_deliveries:
+                # Reason => if there are no move lines,the following condition will always set to be true,and will set SO to 'DONE'.
+                # Added move_ids check to SOLVE.
+                if move_ids and ((not line.procurement_id) or (line.procurement_id.state=='done')) and not pending_deliveries:
 #                    finished = True
                     if line.state != 'done':
                         write_done_ids.append(line.id)
@@ -532,7 +534,6 @@ class sale_order(osv.osv):
                             write_cancel_ids.append(line.id)
                     else:
                         notcanceled = True
-
         if write_done_ids:
             self.pool.get('sale.order.line').write(cr, uid, write_done_ids, {'state': 'done'})
         if write_cancel_ids:

From 549bc3b290698a2c4d83b365d339f06cfb150992 Mon Sep 17 00:00:00 2001
From: "GPA,JVO" <>
Date: Fri, 30 Oct 2009 11:55:26 +0530
Subject: [PATCH 076/200] [FIX] Scrum : Wrong view,widgetless fields on scrum
 view made correct

lp bug: https://launchpad.net/bugs/461720 fixed

bzr revid: jvo@tinyerp.com-20091030062526-50m1mhofe5dz9y8s
---
 addons/scrum/scrum_view.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index 9133f40d242..f4ca15a902a 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -398,8 +398,24 @@
             <field name="name">All Tasks</field>
             <field name="res_model">scrum.task</field>
             <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
             <field name="domain">[('scrum','=',1)]</field>
         </record>
+        
+        <record id="action_view_scrum_task_tree_view" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="project.view_task_tree2"/>
+            <field name="act_window_id" ref="action_view_task"/>
+        </record>
+        
+        <record id="action_view_scrum_task_form_view" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_task_form2"/>
+            <field name="act_window_id" ref="action_view_task"/>
+        </record>
+        
         <menuitem action="action_view_task" id="menu_action_view_task" parent="scrum.next_id_67"/>
         
         <record id="action_view_task4" model="ir.actions.act_window">

From 97129738266d38ea98a0f9ed4e2bc785ea3b721b Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Fri, 30 Oct 2009 17:41:06 +0530
Subject: [PATCH 077/200] [REF] Partner : copy() improved

lp bug: https://launchpad.net/bugs/463415 fixed

bzr revid: jvo@tinyerp.com-20091030121106-tyl0c5azlu1dll8k
---
 bin/addons/base/res/partner/partner.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py
index 2e5c23c7b6c..5adcbb7ea16 100644
--- a/bin/addons/base/res/partner/partner.py
+++ b/bin/addons/base/res/partner/partner.py
@@ -166,9 +166,9 @@ class res_partner(osv.osv):
         'customer': lambda *a: 1,
         'category_id': _default_category,
     }
-    def copy(self, cr, uid, id, default=None, context={}):
+    def copy(self, cr, uid, id, default={}, context={}):
         name = self.read(cr, uid, [id], ['name'])[0]['name']
-        default.update({'name': name+' (copy)', 'events':[]})
+        default.update({'name': name+ _(' (copy)'), 'events':[]})
         return super(res_partner, self).copy(cr, uid, id, default, context)
 
     def _check_ean_key(self, cr, uid, ids):

From 206a019f2d462f9e03976d5ad91750d8163e11fd Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 1 Nov 2009 08:28:28 +0100
Subject: [PATCH 078/200] merge

bzr revid: fp@tinyerp.com-20091101072828-7t81kwm0mgvx9c1a
---
 bin/addons/base/res/res_currency.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bin/addons/base/res/res_currency.py b/bin/addons/base/res/res_currency.py
index 0ce4cbb3254..7033abe7ec6 100644
--- a/bin/addons/base/res/res_currency.py
+++ b/bin/addons/base/res/res_currency.py
@@ -26,7 +26,6 @@ import ir
 
 from tools.misc import currency
 from tools.translate import _
-from tools import config
 
 import mx.DateTime
 from mx.DateTime import RelativeDateTime, now, DateTime, localtime
@@ -68,7 +67,7 @@ class res_currency(osv.osv):
         if currency.rounding == 0:
             return 0.0
         else:
-            return round(amount / currency.rounding, int(config['price_accuracy'])) * currency.rounding
+            return round(amount / currency.rounding) * currency.rounding
 
     def is_zero(self, cr, uid, currency, amount):
         return abs(self.round(cr, uid, currency, amount)) < currency.rounding

From 858222d4964d9469748d8a7bae517017abf1df1b Mon Sep 17 00:00:00 2001
From: "VRA(OpenERP)" <>
Date: Mon, 2 Nov 2009 10:42:51 +0530
Subject: [PATCH 079/200] [FIX] Account : Refund wizard wasnt calculating taxes
 for new invoices

lp bug: https://launchpad.net/bugs/448591 fixed

bzr revid: jvo@tinyerp.com-20091102051251-rpt29iur2ccpb0ni
---
 addons/account/wizard/wizard_refund.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/account/wizard/wizard_refund.py b/addons/account/wizard/wizard_refund.py
index 2f93b0e3459..9635821d9a1 100644
--- a/addons/account/wizard/wizard_refund.py
+++ b/addons/account/wizard/wizard_refund.py
@@ -110,7 +110,9 @@ class wiz_refund(wizard.interface):
             # we compute due date
             #!!!due date = date inv date on formdate
             pool.get('account.invoice').write(cr, uid, [refund.id],{'date_due':date,'check_total':inv.check_total})
-
+            # to make the taxes calculated
+            pool.get('account.invoice').button_compute(cr, uid, refund_id)
+            
             created_inv.append(refund_id[0])
             #if inv is paid we unreconcile
             if mode in ('cancel','modify'):

From 2e7381178a188fba927d086a19cc5f97bdc3cc15 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Mon, 2 Nov 2009 10:47:28 +0530
Subject: [PATCH 080/200] [FIX] Account : Action window of anlytic entries was
 missing name

lp bug: https://launchpad.net/bugs/466658 fixed

bzr revid: jvo@tinyerp.com-20091102051728-uf5nfq67tbz153f2
---
 addons/account/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 02842c47333..0273b1b3837 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -163,7 +163,7 @@
 
 
         <record id="action_account_tree1" model="ir.actions.act_window">
-            <field name="name"></field>
+            <field name="name">Analytic Entries</field>
             <field name="res_model">account.analytic.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>

From e364cf15b3c52cf04c9178f1cf53bb7591e61293 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Mon, 2 Nov 2009 10:58:20 +0530
Subject: [PATCH 081/200] [FIX] Stock : Notification Message made translatable

lp bug: https://launchpad.net/bugs/465010 fixed

bzr revid: jvo@tinyerp.com-20091102052820-2mrfh9vuoyr60uj0
---
 addons/stock/wizard/wizard_partial_picking.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/wizard/wizard_partial_picking.py b/addons/stock/wizard/wizard_partial_picking.py
index 89d34605dcd..a93a8981a18 100644
--- a/addons/stock/wizard/wizard_partial_picking.py
+++ b/addons/stock/wizard/wizard_partial_picking.py
@@ -209,7 +209,7 @@ def _do_split(self, cr, uid, data, context):
 
 def _get_default(self, cr, uid, data, context):
     if data['form']['back_order']:
-        data['form']['back_order_notification'] = 'Back Order ' + tools.ustr(data['form']['back_order']) + ' Assigned to this Packing.'
+        data['form']['back_order_notification'] = _('Back Order %s Assigned to this Packing.') % (tools.ustr(data['form']['back_order']),)
     return data['form']
 
 class partial_picking(wizard.interface):

From c64e10c4fa39f39c84014551e023fddf090b24d2 Mon Sep 17 00:00:00 2001
From: Joel Grand-Guillaume <joel.grandguillaume@camptocamp.com>
Date: Mon, 2 Nov 2009 09:29:18 +0100
Subject: [PATCH 082/200] [FIX] account_payment when importing payment lines
 (currency not set correctly)

lp bug: https://launchpad.net/bugs/428926 fixed

bzr revid: joel.grandguillaume@camptocamp.com-20091102082918-udyj4yyr408myiqq
---
 addons/account_payment/wizard/wizard_payment_order.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account_payment/wizard/wizard_payment_order.py b/addons/account_payment/wizard/wizard_payment_order.py
index 2e84efa5fa8..60dd10010b2 100644
--- a/addons/account_payment/wizard/wizard_payment_order.py
+++ b/addons/account_payment/wizard/wizard_payment_order.py
@@ -95,6 +95,7 @@ def create_payment(self, cr, uid, data, context):
             'partner_id': line.partner_id and line.partner_id.id or False,
             'communication': line.ref or '/',
             'date': date_to_pay,
+            'currency': line.invoice and line.invoice.currency_id.id or False,
             }, context=context)
     return {}
 

From 7a2cbc32de5d311dc839d8622ec56ff6cf2c48ff Mon Sep 17 00:00:00 2001
From: rvalyi <>
Date: Mon, 2 Nov 2009 09:40:00 +0100
Subject: [PATCH 083/200] [FIX][IMP] Correct write-off date, add analytic
 account, better interface between all way to reconcile

lp bug: https://launchpad.net/bugs/435160 fixed

bzr revid: joel.grandguillaume@camptocamp.com-20091102084000-h21k703spch2hqxl
---
 addons/account/account_move_line.py         |  5 ++--
 addons/account/wizard/wizard_pay_invoice.py | 14 ++++++----
 addons/account/wizard/wizard_reconcile.py   | 30 ++++++++++++++-------
 3 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index d7c098de206..f31fca91a44 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -616,6 +616,7 @@ class account_move_line(osv.osv):
                     'debit':debit,
                     'credit':credit,
                     'account_id':writeoff_acc_id,
+                    'analytic_account_id': context.get('analytic_id', False),
                     'date':date,
                     'partner_id':partner_id
                 })
@@ -624,7 +625,7 @@ class account_move_line(osv.osv):
             writeoff_move_id = self.pool.get('account.move').create(cr, uid, {
                 'period_id': writeoff_period_id,
                 'journal_id': writeoff_journal_id,
-
+                'date':date,
                 'state': 'draft',
                 'line_id': writeoff_lines
             })
@@ -869,7 +870,7 @@ class account_move_line(osv.osv):
                         'amount': vals['debit'] or vals['credit'],
                         'general_account_id': vals['account_id'],
                         'journal_id': journal.analytic_journal_id.id,
-                        'ref': vals['ref'],
+                        'ref': vals.get('ref', False),
                     })]
             #else:
             #    raise osv.except_osv(_('No analytic journal !'), _('Please set an analytic journal on this financial journal !'))
diff --git a/addons/account/wizard/wizard_pay_invoice.py b/addons/account/wizard/wizard_pay_invoice.py
index 2baba87e51d..c7781d1b19d 100644
--- a/addons/account/wizard/wizard_pay_invoice.py
+++ b/addons/account/wizard/wizard_pay_invoice.py
@@ -53,6 +53,7 @@ def _pay_and_reconcile(self, cr, uid, data, context):
     pool = pooler.get_pool(cr.dbname)
     cur_obj = pool.get('res.currency')
     amount = form['amount']
+    context['analytic_id'] = form.get('analytic_id', False)
 
     invoice = pool.get('account.invoice').browse(cr, uid, data['id'], context)
     journal = pool.get('account.journal').browse(cr, uid, data['form']['journal_id'], context)
@@ -62,9 +63,9 @@ def _pay_and_reconcile(self, cr, uid, data, context):
 
     # Take the choosen date
     if form.has_key('comment'):
-        context={'date_p':form['date'],'comment':form['comment']}
+        context.update({'date_p':form['date'],'comment':form['comment']})
     else:
-        context={'date_p':form['date'],'comment':False}
+        context.update({'date_p':form['date'],'comment':False})      
 
     acc_id = journal.default_credit_account_id and journal.default_credit_account_id.id
     if not acc_id:
@@ -90,19 +91,22 @@ def _wo_check(self, cr, uid, data, context):
 _transaction_add_form = '''<?xml version="1.0"?>
 <form string="Information addendum">
     <separator string="Write-Off Move" colspan="4"/>
-    <field name="writeoff_acc_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
     <field name="writeoff_journal_id"/>
+    <field name="writeoff_acc_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
     <field name="comment"/>
+    <separator string="Analytic" colspan="4"/>
+    <field name="analytic_id"/>
 </form>'''
 
 _transaction_add_fields = {
     'writeoff_acc_id': {'string':'Write-Off account', 'type':'many2one', 'relation':'account.account', 'required':True},
     'writeoff_journal_id': {'string': 'Write-Off journal', 'type': 'many2one', 'relation':'account.journal', 'required':True},
-    'comment': {'string': 'Entry Name', 'type':'char', 'size': 64, 'required':True},
+    'comment': {'string': 'Comment', 'type':'char', 'size': 64 , 'required':True},
+    'analytic_id': {'string':'Analytic Account', 'type': 'many2one', 'relation':'account.analytic.account'},
 }
 
 def _get_value_addendum(self, cr, uid, data, context={}):
-    return {}
+    return {'comment': _('Write-Off')}
 
 def _get_period(self, cr, uid, data, context={}):
     pool = pooler.get_pool(cr.dbname)
diff --git a/addons/account/wizard/wizard_reconcile.py b/addons/account/wizard/wizard_reconcile.py
index d1f98ec191e..de4dbe3c202 100644
--- a/addons/account/wizard/wizard_reconcile.py
+++ b/addons/account/wizard/wizard_reconcile.py
@@ -25,6 +25,7 @@ import netsvc
 import time
 import osv
 import pooler
+from mx import DateTime
 
 _transaction_form = '''<?xml version="1.0"?>
 <form string="Reconciliation">
@@ -70,8 +71,18 @@ def _trans_rec_reconcile(self, cr, uid, data, context=None):
 
     form = data['form']
     account_id = form.get('writeoff_acc_id', False)
-    period_id = form.get('period_id', False)
+    context['date_p'] = form.get('date_p', False)
+    date = False
+    if context['date_p']:
+        date = DateTime.strptime(context['date_p'], '%Y-%m-%d')
+    ids = pool.get('account.period').find(cr, uid, dt=date, context=context)
+    period_id = False
+    if len(ids):
+        period_id = ids[0]
+
     journal_id = form.get('journal_id', False)
+    context['comment'] = form.get('comment', False)
+    context['analytic_id'] = form.get('analytic_id', False)
     account_move_line_obj.reconcile(cr, uid, data['ids'], 'manual', account_id,
             period_id, journal_id, context=context)
     return {}
@@ -85,23 +96,24 @@ _transaction_add_form = '''<?xml version="1.0"?>
 <form string="Information addendum">
     <separator string="Write-Off Move" colspan="4"/>
     <field name="journal_id"/>
-    <field name="period_id"/>
     <field name="writeoff_acc_id" domain="[('type', '&lt;&gt;', 'view')]"/>
+    <field name="date_p"/>
+    <field name="comment"/>
+    <separator string="Analytic" colspan="4"/>
+    <field name="analytic_id"/>
 </form>'''
 
 _transaction_add_fields = {
     'journal_id': {'string': 'Write-Off Journal', 'type': 'many2one', 'relation':'account.journal', 'required':True},
-    'period_id': {'string': 'Write-Off Period', 'type': 'many2one', 'relation':'account.period', 'required':True},
     'writeoff_acc_id': {'string':'Write-Off account', 'type':'many2one', 'relation':'account.account', 'required':True},
+    'date_p': {'string':'Date','type':'date'},
+    'comment': {'string':'Comment','type':'char', 'size': 64},
+    'analytic_id': {'string':'Analytic Account', 'type': 'many2one', 'relation':'account.analytic.account'},
 }
 
 def _trans_rec_addendum(self, cr, uid, data, context={}):
-    pool = pooler.get_pool(cr.dbname)
-    ids = pool.get('account.period').find(cr, uid, context=context)
-    period_id = False
-    if len(ids):
-        period_id = ids[0]
-    return {'period_id':period_id}
+    date_p = time.strftime('%Y-%m-%d')
+    return {'date_p':date_p, 'comment': _('Write-Off')}
 
 
 class wiz_reconcile(wizard.interface):

From 2d09f1d6391e72b9723729eefe480f7e944f0f6d Mon Sep 17 00:00:00 2001
From: Joel Grand-Guillaume <joel.grandguillaume@camptocamp.com>
Date: Mon, 2 Nov 2009 09:42:45 +0100
Subject: [PATCH 084/200] [FIX] Residual amount in invoice when currency rating
 change

lp bug: https://launchpad.net/bugs/427869 fixed

bzr revid: joel.grandguillaume@camptocamp.com-20091102084245-qatsx72ulgn7ib20
---
 addons/account/invoice.py | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 54e258d791d..3d098bfea2b 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -106,23 +106,29 @@ class account_invoice(osv.osv):
         cur_obj = self.pool.get('res.currency')
         for inv in data_inv:
             debit = credit = 0.0
+            context.update({'date':inv.date_invoice})
             for lines in inv.move_lines:
-                if lines.account_id.company_currency_id.id <> inv.currency_id.id:
-                    if lines.debit:
-                        debit += cur_obj.compute(cr, uid, lines.account_id.company_currency_id.id, inv.currency_id.id, lines.debit)
-                    if lines.credit:
-                        credit += cur_obj.compute(cr, uid, lines.account_id.company_currency_id.id, inv.currency_id.id, lines.credit)
+                # If currency conversion needed
+                if inv.company_id.currency_id.id <> inv.currency_id.id:
+                    # If invoice paid, compute currency amount according to invoice date
+                    # otherwise, take the line date
+                    if not inv.reconciled:
+                        context.update({'date':lines.date})
+                    # Compute amount in currency
+                    debit += cur_obj.compute(cr, uid, inv.company_id.currency_id.id, inv.currency_id.id, lines.debit, round=False,context=context)
+                    credit += cur_obj.compute(cr, uid, inv.company_id.currency_id.id, inv.currency_id.id, lines.credit, round=False,context=context)
                 else:
                     debit += lines.debit
                     credit += lines.credit
-
             if not inv.amount_total:
                 result = 0.0
             elif inv.type in ('out_invoice','in_refund'):
-                result = inv.amount_total * (1.0 - credit / (debit + inv.amount_total))
+                amount = credit-debit
+                result = inv.amount_total - amount
             else:
-                result = inv.amount_total * (1.0 - debit / (credit + inv.amount_total))
-            res[inv.id] = round(result,int(config['price_accuracy']))
+                amount = debit-credit
+                result = inv.amount_total - amount
+            res[inv.id] = result
         return res
 
     def _get_lines(self, cr, uid, ids, name, arg, context=None):

From 4ee6427c0b13c8f8ded9e0b7188af3ee0dd25884 Mon Sep 17 00:00:00 2001
From: Joel Grand-Guillaume <joel.grandguillaume@camptocamp.com>
Date: Mon, 2 Nov 2009 09:52:13 +0100
Subject: [PATCH 085/200] [FIX] Avoid display write-off in pay invoice wizard.
 Put the right date and currency for conversion

lp bug: https://launchpad.net/bugs/453030 fixed

bzr revid: joel.grandguillaume@camptocamp.com-20091102085213-d3w0kwk10sj6gyb8
---
 addons/account/invoice.py                   | 14 +++++++++
 addons/account/wizard/wizard_pay_invoice.py | 33 ++++++++++++++++-----
 2 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 3d098bfea2b..606b42ee926 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -878,6 +878,16 @@ class account_invoice(osv.osv):
             date=context['date_p']
         else:
             date=time.strftime('%Y-%m-%d')
+            
+        # Take the amount in currency and the currency of the payment
+        if 'amount_currency' in context and context['amount_currency'] and 'currency_id' in context and context['currency_id']:
+            amount_currency = context['amount_currency']
+            currency_id = context['currency_id']
+        else:
+            amount_currency = False
+            currency_id = False
+            
+        # Pay attention to the sign for both debit/credit AND amount_currency
         l1 = {
             'debit': direction * pay_amount>0 and direction * pay_amount,
             'credit': direction * pay_amount<0 and - direction * pay_amount,
@@ -885,6 +895,8 @@ class account_invoice(osv.osv):
             'partner_id': invoice.partner_id.id,
             'ref':invoice.number,
             'date': date,
+            'currency_id':currency_id,
+            'amount_currency':amount_currency and direction * amount_currency or 0.0,
         }
         l2 = {
             'debit': direction * pay_amount<0 and - direction * pay_amount,
@@ -893,6 +905,8 @@ class account_invoice(osv.osv):
             'partner_id': invoice.partner_id.id,
             'ref':invoice.number,
             'date': date,
+            'currency_id':currency_id,
+            'amount_currency':amount_currency and - direction * amount_currency or 0.0,
         }
 
         if not name:
diff --git a/addons/account/wizard/wizard_pay_invoice.py b/addons/account/wizard/wizard_pay_invoice.py
index c7781d1b19d..c51fe6be54b 100644
--- a/addons/account/wizard/wizard_pay_invoice.py
+++ b/addons/account/wizard/wizard_pay_invoice.py
@@ -25,6 +25,7 @@ import netsvc
 import pooler
 import time
 from tools.translate import _
+import tools
 
 pay_form = '''<?xml version="1.0"?>
 <form string="Pay invoice">
@@ -37,7 +38,7 @@ pay_form = '''<?xml version="1.0"?>
 </form>'''
 
 pay_fields = {
-    'amount': {'string': 'Amount paid', 'type':'float', 'required':True},
+    'amount': {'string': 'Amount paid', 'type':'float', 'required':True, 'digits': (16,int(tools.config['price_accuracy']))},
     'name': {'string': 'Entry Name', 'type':'char', 'size': 64, 'required':True},
     'date': {'string': 'Payment date', 'type':'date', 'required':True, 'default':lambda *args: time.strftime('%Y-%m-%d')},
     'journal_id': {'string': 'Journal/Payment Mode', 'type': 'many2one', 'relation':'account.journal', 'required':True, 'domain':[('type','=','cash')]},
@@ -57,10 +58,15 @@ def _pay_and_reconcile(self, cr, uid, data, context):
 
     invoice = pool.get('account.invoice').browse(cr, uid, data['id'], context)
     journal = pool.get('account.journal').browse(cr, uid, data['form']['journal_id'], context)
+    # Compute the amount in company's currency, with the journal currency (which is equal to payment currency) 
+    # when it is needed :  If payment currency (according to selected journal.currency) is <> from company currency
     if journal.currency and invoice.company_id.currency_id.id<>journal.currency.id:
         ctx = {'date':data['form']['date']}
         amount = cur_obj.compute(cr, uid, journal.currency.id, invoice.company_id.currency_id.id, amount, context=ctx)
-
+        currency_id = journal.currency.id
+        # Put the paid amount in currency, and the currency, in the context if currency is different from company's currency
+        context.update({'amount_currency':form['amount'],'currency_id':currency_id})
+        
     # Take the choosen date
     if form.has_key('comment'):
         context.update({'date_p':form['date'],'comment':form['comment']})
@@ -79,12 +85,23 @@ def _wo_check(self, cr, uid, data, context):
     pool = pooler.get_pool(cr.dbname)
     invoice = pool.get('account.invoice').browse(cr, uid, data['id'], context)
     journal = pool.get('account.journal').browse(cr, uid, data['form']['journal_id'], context)
-    if invoice.company_id.currency_id.id <> invoice.currency_id.id:
-        return 'addendum'
-    if journal.currency and (journal.currency.id <> invoice.currency_id.id):
-        return 'addendum'
-    if pool.get('res.currency').is_zero(cr, uid, invoice.currency_id,
-            (data['form']['amount'] - invoice.amount_total)):
+    cur_obj = pool.get('res.currency')
+    # Here we need that:
+    #    The invoice total amount in company's currency <> paid amount in company currency
+    #    (according to the correct day rate, invoicing rate and payment rate are may be different)
+    #    => Ask to a write-off of the difference. This could happen even if both amount are equal,
+    #    because if the currency rate
+    # Get the amount in company currency for the invoice (according to move lines)
+    inv_amount_company_currency=invoice.move_id.amount
+    # Get the amount paid in company currency
+    if journal.currency and invoice.company_id.currency_id.id<>journal.currency.id:
+        ctx = {'date':data['form']['date']}
+        amount_paid = cur_obj.compute(cr, uid, journal.currency.id, invoice.company_id.currency_id.id, data['form']['amount'], round=True, context=ctx)
+    else:
+        amount_paid = data['form']['amount']
+    # Test if there is a difference according to currency rouding setting
+    if pool.get('res.currency').is_zero(cr, uid, invoice.company_id.currency_id,
+            (amount_paid - inv_amount_company_currency)):
         return 'reconcile'
     return 'addendum'
 

From 482d6374b929ffd3610679e0c2c6a45534a41acd Mon Sep 17 00:00:00 2001
From: Joel Grand-Guillaume <joel.grandguillaume@camptocamp.com>
Date: Mon, 2 Nov 2009 10:15:42 +0100
Subject: [PATCH 086/200] [IMP] Add account field into bank statement line

lp bug: https://launchpad.net/bugs/351167 fixed

bzr revid: joel.grandguillaume@camptocamp.com-20091102091542-qaufnbe3bac03bty
---
 addons/account/account_view.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 97c50abdea8..91ebe4ba662 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -335,6 +335,7 @@
                                     <field name="date"/>
                                     <field name="ref"/>
                                     <field name="name"/>
+                                    <field name="account_id"/>
                                     <field name="type"/>
                                     <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
                                     <field domain="[('journal_id','=',parent.journal_id)]" name="account_id"/>
@@ -345,6 +346,7 @@
                                 <form string="Statement lines">
                                     <field name="date"/>
                                     <field name="name"/>
+                                     <field name="account_id"/>
                                     <field name="type"/>
                                     <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
                                     <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>

From e7a50c6a8f5c11adac5a2c05c6db86c5dc62bef9 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Mon, 2 Nov 2009 15:44:15 +0530
Subject: [PATCH 087/200] [FIX]: fix the problem of the reports account voucher

bzr revid: mga@tinyerp.com-20091102101415-vfasqbyb0ytomjjh
---
 addons/account_voucher/report/report_voucher.py        | 2 +-
 addons/account_voucher/report/report_voucher.rml       | 5 +++--
 addons/account_voucher/report/report_voucher_amount.py | 4 ++--
 addons/account_voucher/report/rml_parse.py             | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 addons/account_voucher/report/rml_parse.py

diff --git a/addons/account_voucher/report/report_voucher.py b/addons/account_voucher/report/report_voucher.py
index 9f40c6ad920..27ba2efd488 100755
--- a/addons/account_voucher/report/report_voucher.py
+++ b/addons/account_voucher/report/report_voucher.py
@@ -32,7 +32,7 @@ from tools import amount_to_text_en
 
 class report_voucher(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(report_voucher, self).__init__(cr, uid, name, context=context)
+        super(report_voucher, self).__init__(cr, uid, name, context)
         self.localcontext.update({
             'time': time,
             'convert':self.convert,
diff --git a/addons/account_voucher/report/report_voucher.rml b/addons/account_voucher/report/report_voucher.rml
index abd22ecc428..9be52c064d7 100755
--- a/addons/account_voucher/report/report_voucher.rml
+++ b/addons/account_voucher/report/report_voucher.rml
@@ -104,7 +104,7 @@
     <para style="P2">Cash Payment Voucher [[ (voucher.type == 'pay_voucher' or removeParentNode('para')) and '' ]]</para>
     <para style="P24">Bank Receipt Voucher [[ (voucher.type == 'bank_rec_voucher' or removeParentNode('para')) and '' ]]</para>
     <para style="P2">Bank Payment Voucher [[ (voucher.type == 'bank_pay_voucher' or removeParentNode('para')) and '' ]]</para>
-
+    
     <blockTable colWidths="49.0,143.0,116.0,69.0,106.0" style="Table1">
       <tr>
         <td>
@@ -171,13 +171,14 @@
     <blockTable colWidths="482.0" style="voucher_lines">
       <tr>
         <td>
-          <para style="P20">[[ repeatIn(voucher.move_ids,'move_ids') ]] <font>[[ (not move_ids) and removeParentNode('blockTable') ]]</font></para>
+          <para style="P20">[[ repeatIn(voucher.move_ids,'move_ids') ]] </para>
           <blockTable colWidths="251.0,110.0,115.0" style="Table2">
             <tr>
               <td>
                 <para style="P11">[[ (move_ids.partner_id and move_ids.partner_id.name) or 'Account']] :</para>
                 <para style="P28">[[ move_ids.account_id.name ]] </para>
                 <para style="P28"><i>[[ move_ids.name ]] - [[ get_ref(voucher.id,move_ids) ]]</i></para>
+                <!--para style="P31">[[ get_ref(voucher.id,move_ids) ]]</para-->
               </td>
               <td>
                 <para style="P21">[[ move_ids.debit ]]</para>
diff --git a/addons/account_voucher/report/report_voucher_amount.py b/addons/account_voucher/report/report_voucher_amount.py
index 246782e433e..3b67ff7a9ac 100755
--- a/addons/account_voucher/report/report_voucher_amount.py
+++ b/addons/account_voucher/report/report_voucher_amount.py
@@ -32,7 +32,7 @@ from tools import amount_to_text_en
 
 class report_voucher_amount(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(report_voucher_amount, self).__init__(cr, uid, name, context=context)
+        super(report_voucher_amount, self).__init__(cr, uid, name, context)
         self.localcontext.update({
             'time': time,
             'convert':self.convert
@@ -48,4 +48,4 @@ report_sxw.report_sxw(
     'account.voucher',
     'addons/account_voucher/report/report_voucher_amount.rml',
     parser=report_voucher_amount,header=False
-)
+)
\ No newline at end of file
diff --git a/addons/account_voucher/report/rml_parse.py b/addons/account_voucher/report/rml_parse.py
old mode 100644
new mode 100755
index 9f4b8e6bfb9..31bd26617cd
--- a/addons/account_voucher/report/rml_parse.py
+++ b/addons/account_voucher/report/rml_parse.py
@@ -32,7 +32,7 @@ import sys
 
 class rml_parse(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(rml_parse, self).__init__(cr, uid, name, context=context)
+        super(rml_parse, self).__init__(cr, uid, name, context=None)
         self.localcontext.update({
             'comma_me': self.comma_me,
             'format_date': self._get_and_change_date_format_for_swiss,

From 61e37654f4990a2bba16f03f4a0e9e10a3f8703f Mon Sep 17 00:00:00 2001
From: Joel Grand-Guillaume <joel.grandguillaume@camptocamp.com>
Date: Mon, 2 Nov 2009 12:24:47 +0100
Subject: [PATCH 088/200] [FIX] Avoid display write-off in pay invoice wizard :
 take care of partial payment

lp bug: https://launchpad.net/bugs/453030 fixed

bzr revid: joel.grandguillaume@camptocamp.com-20091102112447-dvhsfwf8lkma5c6v
---
 addons/account/wizard/wizard_pay_invoice.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/addons/account/wizard/wizard_pay_invoice.py b/addons/account/wizard/wizard_pay_invoice.py
index c51fe6be54b..5dd98286339 100644
--- a/addons/account/wizard/wizard_pay_invoice.py
+++ b/addons/account/wizard/wizard_pay_invoice.py
@@ -93,12 +93,20 @@ def _wo_check(self, cr, uid, data, context):
     #    because if the currency rate
     # Get the amount in company currency for the invoice (according to move lines)
     inv_amount_company_currency=invoice.move_id.amount
-    # Get the amount paid in company currency
+    # Get the current amount paid in company currency
     if journal.currency and invoice.company_id.currency_id.id<>journal.currency.id:
         ctx = {'date':data['form']['date']}
         amount_paid = cur_obj.compute(cr, uid, journal.currency.id, invoice.company_id.currency_id.id, data['form']['amount'], round=True, context=ctx)
     else:
         amount_paid = data['form']['amount']
+    # Get the old payment if there are some
+    if invoice.payment_ids:
+        debit=credit=0.0
+        for payment in invoice.payment_ids:
+            debit+=payment.debit
+            credit+=payment.credit
+        amount_paid+=abs(debit-credit)
+        
     # Test if there is a difference according to currency rouding setting
     if pool.get('res.currency').is_zero(cr, uid, invoice.company_id.currency_id,
             (amount_paid - inv_amount_company_currency)):

From 3a3ded3e6733f98be7615352895f8fcef4f4463d Mon Sep 17 00:00:00 2001
From: Joel Grand-Guillaume <joel.grandguillaume@camptocamp.com>
Date: Mon, 2 Nov 2009 12:53:09 +0100
Subject: [PATCH 089/200] [IMP] Add support of analytic account into bank
 statement to be convenient with other method

lp bug: https://launchpad.net/bugs/470359 fixed

bzr revid: joel.grandguillaume@camptocamp.com-20091102115309-qh4zkiio3chsepcs
---
 addons/account/account_bank_statement.py | 14 +++++++++++---
 addons/account/account_view.xml          |  1 +
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 56c4ddba96e..1e4022395af 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -170,7 +170,9 @@ class account_bank_statement(osv.osv):
                 if line.state <> 'valid':
                     raise osv.except_osv(_('Error !'),
                             _('The account entries lines are not in valid state.'))
-
+            # for bank.statement.lines
+            # In line we get reconcile_id on bank.ste.rec.
+            # in bank stat.rec we get line_new_ids on bank.stat.rec.line
             for move in st.line_ids:
                 move_id = account_move_obj.create(cr, uid, {
                     'journal_id': st.journal_id.id,
@@ -209,7 +211,7 @@ class account_bank_statement(osv.osv):
                     'period_id': st.period_id.id,
                     'currency_id': st.currency.id,
                 }
-
+                
                 amount = res_currency_obj.compute(cr, uid, st.currency.id,
                         company_currency_id, move.amount, context=context,
                         account=acc_cur)
@@ -245,6 +247,8 @@ class account_bank_statement(osv.osv):
                             'statement_id': st.id,
                             'journal_id': st.journal_id.id,
                             'period_id': st.period_id.id,
+                            # Add analytical account if provided..
+                            'analytic_account_id':newline.analytic_id and newline.analytic_id.id or False,
                         }, context=context)
 
                 # Fill the secondary amount/currency
@@ -491,10 +495,14 @@ class account_bank_statement_reconcile_line(osv.osv):
     _name = "account.bank.statement.reconcile.line"
     _description = "Statement reconcile line"
     _columns = {
-        'name': fields.char('Description', size=64),
+        'name': fields.char('Description', size=64, required=True),
         'account_id': fields.many2one('account.account', 'Account', required=True),
         'line_id': fields.many2one('account.bank.statement.reconcile', 'Reconcile'),
         'amount': fields.float('Amount', required=True),
+        'analytic_id': fields.many2one('account.analytic.account',"Analytic Account")
+    }
+    _defaults = {
+        'name': lambda *a: 'Write-Off',
     }
 account_bank_statement_reconcile_line()
 
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 91ebe4ba662..ff4fca8186c 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -417,6 +417,7 @@
                         <tree editable="bottom" string="Write-Off">
                             <field name="account_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                             <field name="amount"/>
+                            <field name="analytic_id" domain="[('type','&lt;&gt;','view')]"/>
                             <field name="name"/>
                         </tree>
                     </field>

From aff362e191631adea7624f6289a1acb18c86834c Mon Sep 17 00:00:00 2001
From: Joel Grand-Guillaume <joel.grandguillaume@camptocamp.com>
Date: Mon, 2 Nov 2009 16:53:05 +0100
Subject: [PATCH 090/200] [FIX] Residual amount into invoice is now correct in
 every case and avoid rounding trouble even if rating has changed

bzr revid: joel.grandguillaume@camptocamp.com-20091102155305-swj8zxhsey8wjhue
---
 addons/account/invoice.py | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 606b42ee926..a4cede582f9 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -104,22 +104,34 @@ class account_invoice(osv.osv):
         res = {}
         data_inv = self.browse(cr, uid, ids)
         cur_obj = self.pool.get('res.currency')
+        import pdb
+        pdb.set_trace()
         for inv in data_inv:
             debit = credit = 0.0
             context.update({'date':inv.date_invoice})
+            context_unreconciled=context.copy()
             for lines in inv.move_lines:
+                debit_tmp = lines.debit
+                credit_tmp = lines.credit
                 # If currency conversion needed
                 if inv.company_id.currency_id.id <> inv.currency_id.id:
                     # If invoice paid, compute currency amount according to invoice date
                     # otherwise, take the line date
                     if not inv.reconciled:
                         context.update({'date':lines.date})
-                    # Compute amount in currency
-                    debit += cur_obj.compute(cr, uid, inv.company_id.currency_id.id, inv.currency_id.id, lines.debit, round=False,context=context)
-                    credit += cur_obj.compute(cr, uid, inv.company_id.currency_id.id, inv.currency_id.id, lines.credit, round=False,context=context)
+                    context_unreconciled.update({'date':lines.date})
+                    # If amount currency setted, compute for debit and credit in company currency
+                    if lines.amount_currency < 0:
+                        credit_tmp=abs(cur_obj.compute(cr, uid, lines.currency_id.id, inv.company_id.currency_id.id, lines.amount_currency, round=False,context=context_unreconciled))
+                    elif lines.amount_currency > 0:
+                        debit_tmp=abs(cur_obj.compute(cr, uid, lines.currency_id.id, inv.company_id.currency_id.id, lines.amount_currency, round=False,context=context_unreconciled))
+                    # Then, recomput into invoice currency to avoid rounding trouble !
+                    debit += cur_obj.compute(cr, uid, inv.company_id.currency_id.id, inv.currency_id.id, debit_tmp, round=False,context=context)
+                    credit += cur_obj.compute(cr, uid, inv.company_id.currency_id.id, inv.currency_id.id, credit_tmp, round=False,context=context)
                 else:
-                    debit += lines.debit
-                    credit += lines.credit
+                    debit+=debit_tmp
+                    credit+=credit_tmp
+                    
             if not inv.amount_total:
                 result = 0.0
             elif inv.type in ('out_invoice','in_refund'):
@@ -128,7 +140,9 @@ class account_invoice(osv.osv):
             else:
                 amount = debit-credit
                 result = inv.amount_total - amount
-            res[inv.id] = result
+            # Use is_zero function to avoid rounding trouble => should be fixed into ORM
+            res[inv.id] = not self.pool.get('res.currency').is_zero(cr, uid, inv.company_id.currency_id,result) and result or 0.0
+            
         return res
 
     def _get_lines(self, cr, uid, ids, name, arg, context=None):

From 7022a6016f826c2c5d475aec6fc079e3e82ba8bc Mon Sep 17 00:00:00 2001
From: "GPA(OpenERP)" <>
Date: Tue, 3 Nov 2009 10:16:55 +0530
Subject: [PATCH 091/200] [FIX] MRP : Procurement can only be confirmed when
 qty>0.0

lp bug: https://launchpad.net/bugs/467880 fixed

bzr revid: jvo@tinyerp.com-20091103044655-4y4qust3n1u2xdm0
---
 addons/mrp/mrp.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 5e7658b69eb..0288081148d 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -978,6 +978,8 @@ class mrp_procurement(osv.osv):
 
     def action_confirm(self, cr, uid, ids, context={}):
         for procurement in self.browse(cr, uid, ids):
+            if procurement.product_qty <= 0.00:
+                raise osv.except_osv(_('Data Insufficient !'), _('Please check the Quantity of Procurement Order(s), it should not be less than 1!'))
             if procurement.product_id.type in ('product', 'consu'):
                 if not procurement.move_id:
                     source = procurement.location_id.id

From 50071d7df3516510e6f273f904a68c38ea1f4487 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= <rvalyi@gmail.com>
Date: Tue, 3 Nov 2009 03:16:13 -0200
Subject: [PATCH 092/200] [FIX] account: removed pdb now that things are
 claimed fixed (after the commits messages)

bzr revid: rvalyi@gmail.com-20091103051613-f2m2n7t20uce8df6
---
 addons/account/invoice.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index a4cede582f9..ca8b36fbdfe 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -104,8 +104,6 @@ class account_invoice(osv.osv):
         res = {}
         data_inv = self.browse(cr, uid, ids)
         cur_obj = self.pool.get('res.currency')
-        import pdb
-        pdb.set_trace()
         for inv in data_inv:
             debit = credit = 0.0
             context.update({'date':inv.date_invoice})

From 2dabd5f34f4076171797703e2e14e84ca917e735 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= <rvalyi@gmail.com>
Date: Tue, 3 Nov 2009 03:17:10 -0200
Subject: [PATCH 093/200] [FIX] account: avoid translate tool missing import on
 strictier Python 2.6 versions; bare in mind that mx.Datetime should be
 eraticated from the surface of the earth

bzr revid: rvalyi@gmail.com-20091103051710-koeenh3su23yvls2
---
 addons/account/wizard/wizard_reconcile.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/account/wizard/wizard_reconcile.py b/addons/account/wizard/wizard_reconcile.py
index de4dbe3c202..59c0e062070 100644
--- a/addons/account/wizard/wizard_reconcile.py
+++ b/addons/account/wizard/wizard_reconcile.py
@@ -25,7 +25,8 @@ import netsvc
 import time
 import osv
 import pooler
-from mx import DateTime
+from datetime import datetime
+from tools.translate import _
 
 _transaction_form = '''<?xml version="1.0"?>
 <form string="Reconciliation">
@@ -74,7 +75,7 @@ def _trans_rec_reconcile(self, cr, uid, data, context=None):
     context['date_p'] = form.get('date_p', False)
     date = False
     if context['date_p']:
-        date = DateTime.strptime(context['date_p'], '%Y-%m-%d')
+        date = datetime.strptime(context['date_p'], '%Y-%m-%d')
     ids = pool.get('account.period').find(cr, uid, dt=date, context=context)
     period_id = False
     if len(ids):

From 2b326eb066002d70092e1a8c9fd96d6b70ecd63a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= <rvalyi@gmail.com>
Date: Tue, 3 Nov 2009 03:19:12 -0200
Subject: [PATCH 094/200] [IMP] account: make comment mandatory. Since it has a
 default value anyway, it doesn't reall y change anything, but makes the
 reconciliation UI looks consistent accross the whole OpenERP (eg invoice
 payment)

bzr revid: rvalyi@gmail.com-20091103051912-ead9jx19l3g0d8dm
---
 addons/account/wizard/wizard_reconcile.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/wizard/wizard_reconcile.py b/addons/account/wizard/wizard_reconcile.py
index 59c0e062070..2b5385043d6 100644
--- a/addons/account/wizard/wizard_reconcile.py
+++ b/addons/account/wizard/wizard_reconcile.py
@@ -108,7 +108,7 @@ _transaction_add_fields = {
     'journal_id': {'string': 'Write-Off Journal', 'type': 'many2one', 'relation':'account.journal', 'required':True},
     'writeoff_acc_id': {'string':'Write-Off account', 'type':'many2one', 'relation':'account.account', 'required':True},
     'date_p': {'string':'Date','type':'date'},
-    'comment': {'string':'Comment','type':'char', 'size': 64},
+    'comment': {'string':'Comment','type':'char', 'size': 64, 'required':True},
     'analytic_id': {'string':'Analytic Account', 'type': 'many2one', 'relation':'account.analytic.account'},
 }
 

From 91efa25bb78859121a7a0887e95c63aa7f7a6bc0 Mon Sep 17 00:00:00 2001
From: Joel Grand-Guillaume <joel.grandguillaume@camptocamp.com>
Date: Tue, 3 Nov 2009 08:08:58 +0100
Subject: [PATCH 095/200] [FIX] Residual amount into invoice is now correct in
 every case and avoid rounding trouble even if rating has changed

bzr revid: joel.grandguillaume@camptocamp.com-20091103070858-86gtu8tzvztjuyt4
---
 addons/account/invoice.py | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 606b42ee926..ca8b36fbdfe 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -107,19 +107,29 @@ class account_invoice(osv.osv):
         for inv in data_inv:
             debit = credit = 0.0
             context.update({'date':inv.date_invoice})
+            context_unreconciled=context.copy()
             for lines in inv.move_lines:
+                debit_tmp = lines.debit
+                credit_tmp = lines.credit
                 # If currency conversion needed
                 if inv.company_id.currency_id.id <> inv.currency_id.id:
                     # If invoice paid, compute currency amount according to invoice date
                     # otherwise, take the line date
                     if not inv.reconciled:
                         context.update({'date':lines.date})
-                    # Compute amount in currency
-                    debit += cur_obj.compute(cr, uid, inv.company_id.currency_id.id, inv.currency_id.id, lines.debit, round=False,context=context)
-                    credit += cur_obj.compute(cr, uid, inv.company_id.currency_id.id, inv.currency_id.id, lines.credit, round=False,context=context)
+                    context_unreconciled.update({'date':lines.date})
+                    # If amount currency setted, compute for debit and credit in company currency
+                    if lines.amount_currency < 0:
+                        credit_tmp=abs(cur_obj.compute(cr, uid, lines.currency_id.id, inv.company_id.currency_id.id, lines.amount_currency, round=False,context=context_unreconciled))
+                    elif lines.amount_currency > 0:
+                        debit_tmp=abs(cur_obj.compute(cr, uid, lines.currency_id.id, inv.company_id.currency_id.id, lines.amount_currency, round=False,context=context_unreconciled))
+                    # Then, recomput into invoice currency to avoid rounding trouble !
+                    debit += cur_obj.compute(cr, uid, inv.company_id.currency_id.id, inv.currency_id.id, debit_tmp, round=False,context=context)
+                    credit += cur_obj.compute(cr, uid, inv.company_id.currency_id.id, inv.currency_id.id, credit_tmp, round=False,context=context)
                 else:
-                    debit += lines.debit
-                    credit += lines.credit
+                    debit+=debit_tmp
+                    credit+=credit_tmp
+                    
             if not inv.amount_total:
                 result = 0.0
             elif inv.type in ('out_invoice','in_refund'):
@@ -128,7 +138,9 @@ class account_invoice(osv.osv):
             else:
                 amount = debit-credit
                 result = inv.amount_total - amount
-            res[inv.id] = result
+            # Use is_zero function to avoid rounding trouble => should be fixed into ORM
+            res[inv.id] = not self.pool.get('res.currency').is_zero(cr, uid, inv.company_id.currency_id,result) and result or 0.0
+            
         return res
 
     def _get_lines(self, cr, uid, ids, name, arg, context=None):

From 675d14e54fb5fe674d0e678e5444abe37ba9f2d9 Mon Sep 17 00:00:00 2001
From: Joel Grand-Guillaume <joel.grandguillaume@camptocamp.com>
Date: Tue, 3 Nov 2009 08:30:04 +0100
Subject: [PATCH 096/200] [FIX] Use price_accuracy to verify balanced entry
 insteed of fixed '0,0001'. Add price_accuracy on debit and credit move lines

lp bug: https://launchpad.net/bugs/452854 fixed

bzr revid: joel.grandguillaume@camptocamp.com-20091103073004-7vjpq2t4uqwpgi0j
---
 addons/account/account.py           |  2 +-
 addons/account/account_move_line.py | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index ff344b0256b..3ed4ebc600c 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -988,7 +988,7 @@ class account_move(osv.osv):
                     if line.account_id.currency_id.id != line.currency_id.id and (line.account_id.currency_id.id != line.account_id.company_id.currency_id.id or line.currency_id):
                         raise osv.except_osv(_('Error'), _("""Couldn't create move with currency different from the secondary currency of the account "%s - %s". Clear the secondary currency field of the account definition if you want to accept all currencies.""" % (line.account_id.code, line.account_id.name)))
 
-            if abs(amount) < 0.0001:
+            if abs(amount) < config['price_accuracy']:
                 if not len(line_draft_ids):
                     continue
                 self.pool.get('account.move.line').write(cr, uid, line_draft_ids, {
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index f31fca91a44..26d45ab7395 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -341,8 +341,8 @@ class account_move_line(osv.osv):
         'quantity': fields.float('Quantity', digits=(16,2), help="The optional quantity expressed by this line, eg: number of product sold. The quantity is not a legal requirement but is very usefull for some reports."),
         'product_uom_id': fields.many2one('product.uom', 'UoM'),
         'product_id': fields.many2one('product.product', 'Product'),
-        'debit': fields.float('Debit', digits=(16,2)),
-        'credit': fields.float('Credit', digits=(16,2)),
+        'debit': fields.float('Debit', digits=(16,int(tools.config['price_accuracy']))),
+        'credit': fields.float('Credit', digits=(16,int(tools.config['price_accuracy']))),
         'account_id': fields.many2one('account.account', 'Account', required=True, ondelete="cascade", domain=[('type','<>','view'), ('type', '<>', 'closed')], select=2),
         'move_id': fields.many2one('account.move', 'Move', ondelete="cascade", states={'valid':[('readonly',True)]}, help="The move of this entry line.", select=2),
 
@@ -350,7 +350,7 @@ class account_move_line(osv.osv):
         'statement_id': fields.many2one('account.bank.statement', 'Statement', help="The bank statement used for bank reconciliation", select=1),
         'reconcile_id': fields.many2one('account.move.reconcile', 'Reconcile', readonly=True, ondelete='set null', select=2),
         'reconcile_partial_id': fields.many2one('account.move.reconcile', 'Partial Reconcile', readonly=True, ondelete='set null', select=2),
-        'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optional other currency if it is a multi-currency entry."),
+        'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optional other currency if it is a multi-currency entry.", digits=(16,int(tools.config['price_accuracy']))),
         'currency_id': fields.many2one('res.currency', 'Currency', help="The optional other currency if it is a multi-currency entry."),
 
         'period_id': fields.many2one('account.period', 'Period', required=True, select=2),
@@ -369,14 +369,14 @@ class account_move_line(osv.osv):
         'balance': fields.function(_balance, method=True, string='Balance'),
         'state': fields.selection([('draft','Draft'), ('valid','Valid')], 'Status', readonly=True),
         'tax_code_id': fields.many2one('account.tax.code', 'Tax Account', help="The Account can either be a base tax code or tax code account."),
-        'tax_amount': fields.float('Tax/Base Amount', digits=(16,2), select=True, help="If the Tax account is tax code account, this field will contain the taxed amount.If the tax account is base tax code,\
+        'tax_amount': fields.float('Tax/Base Amount', digits=(16,int(tools.config['price_accuracy'])), select=True, help="If the Tax account is tax code account, this field will contain the taxed amount.If the tax account is base tax code,\
                     this field will contain the basic amount(without tax)."),
         'invoice': fields.function(_invoice, method=True, string='Invoice',
             type='many2one', relation='account.invoice', fnct_search=_invoice_search),
         'account_tax_id':fields.many2one('account.tax', 'Tax'),
         'analytic_account_id' : fields.many2one('account.analytic.account', 'Analytic Account'),
 #TODO: remove this
-        'amount_taxed':fields.float("Taxed Amount",digits=(16,2)),
+        'amount_taxed':fields.float("Taxed Amount",digits=(16,int(tools.config['price_accuracy']))),
 
     }
 

From ba392d143b96b14da5fcda352b61e03133d5d089 Mon Sep 17 00:00:00 2001
From: Joel Grand-Guillaume <joel.grandguillaume@camptocamp.com>
Date: Wed, 4 Nov 2009 07:52:26 +0100
Subject: [PATCH 097/200] [FIX] Correct the validate function for balanced move
 into account.py (after Fabien Warning)

lp bug: https://launchpad.net/bugs/452854 fixed

bzr revid: joel.grandguillaume@camptocamp.com-20091104065226-sax4u9d6ss4oif62
---
 addons/account/account.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 3ed4ebc600c..eb7771d8197 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -988,7 +988,7 @@ class account_move(osv.osv):
                     if line.account_id.currency_id.id != line.currency_id.id and (line.account_id.currency_id.id != line.account_id.company_id.currency_id.id or line.currency_id):
                         raise osv.except_osv(_('Error'), _("""Couldn't create move with currency different from the secondary currency of the account "%s - %s". Clear the secondary currency field of the account definition if you want to accept all currencies.""" % (line.account_id.code, line.account_id.name)))
 
-            if abs(amount) < config['price_accuracy']:
+            if abs(amount) < 10**-config['price_accuracy']:
                 if not len(line_draft_ids):
                     continue
                 self.pool.get('account.move.line').write(cr, uid, line_draft_ids, {

From 80f729db80cd4f73278eef2fb26b980949be7695 Mon Sep 17 00:00:00 2001
From: "GPA,JVO" <>
Date: Wed, 4 Nov 2009 15:26:30 +0530
Subject: [PATCH 098/200] [FIX] Product : Pricelist Item cannot use Main
 pricelist as the other pricelist

lp bug: https://launchpad.net/bugs/471052 fixed

bzr revid: jvo@tinyerp.com-20091104095630-cg9y5hrnh95p16z0
---
 addons/product/pricelist.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 3170a7662a1..4c8006d80f3 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -332,6 +332,16 @@ class product_pricelist_item(osv.osv):
         'sequence': lambda *a: 5,
         'price_discount': lambda *a: 0,
     }
+    
+    def _check_recursion(self, cr, uid, ids):
+        for obj_list in self.browse(cr, uid, ids):
+            if obj_list.base == -1:
+                main_pricelist = obj_list.price_version_id.pricelist_id.id
+                other_pricelist = obj_list.base_pricelist_id.id
+                if main_pricelist == other_pricelist:
+                    return False 
+        return True
+    
     _columns = {
         'name': fields.char('Rule Name', size=64, help="Explicit rule name for this pricelist line."),
         'price_version_id': fields.many2one('product.pricelist.version', 'Price List Version', required=True, select=True),
@@ -358,6 +368,11 @@ class product_pricelist_item(osv.osv):
         'price_max_margin': fields.float('Max. Price Margin',
             digits=(16, int(config['price_accuracy']))),
     }
+    
+    _constraints = [
+        (_check_recursion, _('Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList Item!'), ['base_pricelist_id'])
+    ]
+     
     def product_id_change(self, cr, uid, ids, product_id, context={}):
         if not product_id:
             return {}

From b3870e3aec2c7f72cc1e3ce723c159946bce88ac Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Wed, 4 Nov 2009 11:16:28 +0100
Subject: [PATCH 099/200] [FIX] account_analytic_plans: Use etree instead of
 xml.dom

bzr revid: stephane@openerp.com-20091104101628-c2qb2u0b1xpmp7lc
---
 addons/account_analytic_plans/account_analytic_plans.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index 790e2c25cc0..4cb14997bce 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -19,7 +19,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from xml import dom
+from lxml import etree
 
 from mx import DateTime
 from mx.DateTime import now
@@ -163,7 +163,7 @@ class account_analytic_plan_instance(osv.osv):
                 <newline/>"""%(i,tools.to_xml(line.name),tools.to_xml(line.name),line.root_analytic_id and line.root_analytic_id.id or 0)
                     i+=1
                 res['arch'] += "</form>"
-                doc = dom.minidom.parseString(res['arch'].encode('utf8'))
+                doc = etree.fromstring(res['arch'].encode('utf8'))
                 xarch, xfields = self._view_look_dom_arch(cr, uid, doc, view_id, context=context)
                 res['arch'] = xarch
                 res['fields'] = xfields

From a5e1d56dd28051f224e8c24b694333c4a2478451 Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Wed, 4 Nov 2009 11:51:34 +0100
Subject: [PATCH 100/200] [FIX] Avoid crash when no args

bzr revid: nel@tinyerp.com-20091104105134-jl0c4gj5cecm388z
---
 bin/addons/base/ir/ir_cron.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/ir/ir_cron.py b/bin/addons/base/ir/ir_cron.py
index 0ef23a6c423..86d4bd57c0e 100644
--- a/bin/addons/base/ir/ir_cron.py
+++ b/bin/addons/base/ir/ir_cron.py
@@ -28,7 +28,7 @@ import pooler
 from osv import fields,osv
 
 def str2tuple(s):
-    return eval('tuple(%s)' % s)
+    return eval('tuple(%s)' % (s or ''))
 
 _intervalTypes = {
     'work_days': lambda interval: DateTime.RelativeDateTime(days=interval),

From 62ce2fd8f540b5171501367a27f26d5bfd8ebaa5 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Thu, 5 Nov 2009 11:25:07 +0530
Subject: [PATCH 101/200] [FIX][CRITICAL] warning : missing import statement
 for "_"

lp bug: https://launchpad.net/bugs/474337 fixed

bzr revid: hmo@tinyerp.com-20091105055507-g7c82iwomrgi5fnt
---
 addons/warning/warning.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/warning/warning.py b/addons/warning/warning.py
index 3a8d9f53fb9..16d29d91758 100644
--- a/addons/warning/warning.py
+++ b/addons/warning/warning.py
@@ -22,6 +22,7 @@
 
 import time
 from osv import fields,osv
+from tools.translate import _
 
 WARNING_MESSAGE = [
                    ('no-message','No Message'),

From 52066fa67905ea6c98a326b1d68992bc41b2bf97 Mon Sep 17 00:00:00 2001
From: Marcelo Hamra <>
Date: Thu, 5 Nov 2009 12:11:39 +0530
Subject: [PATCH 102/200] Improved trigger selection query

bzr revid: hda@tinyerp.com-20091105064139-ydbaycbiogouwqgc
---
 bin/addons/base/ir/ir_actions.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 1403923c040..3047ceb7c8c 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -363,8 +363,8 @@ class actions_server(osv.osv):
     def _select_signals(self, cr, uid, context={}):
         cr.execute("select distinct t.signal as key, t.signal || ' - [ ' || w.osv || ' ] ' as val from wkf w, wkf_activity a, wkf_transition t "\
                         " where w.id = a.wkf_id " \
-                        " and t.act_from = a.wkf_id " \
-                        " or t.act_to = a.wkf_id and t.signal not in (null, NULL)")
+                        " and t.act_from = a.id " \
+                        " or t.act_to = a.id and t.signal not in (null, NULL)")
         result = cr.fetchall() or []
         res = []
         for rs in result:

From 0390b4904c1f5e2d941afcef932846434d590ec6 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Thu, 5 Nov 2009 13:14:28 +0530
Subject: [PATCH 103/200] [FIX] Account : Warning message was missing _ import

lp bug: https://launchpad.net/bugs/475135 fixed

bzr revid: jvo@tinyerp.com-20091105074428-ipa7tqos7e0ix4j6
---
 addons/account/wizard/wizard_state_open.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account/wizard/wizard_state_open.py b/addons/account/wizard/wizard_state_open.py
index 4ba200f9b08..b0fdff88d4c 100644
--- a/addons/account/wizard/wizard_state_open.py
+++ b/addons/account/wizard/wizard_state_open.py
@@ -23,6 +23,7 @@
 import wizard
 import pooler
 import netsvc
+from tools.translate import _
 
 form = '''<?xml version="1.0"?>
 <form string="Open Invoice">

From 4f3dc20b2fce19a20818964dd37118f36765631f Mon Sep 17 00:00:00 2001
From: "PSO(OpenERP)" <>
Date: Fri, 6 Nov 2009 16:51:45 +0530
Subject: [PATCH 104/200] [IMP] Stock : Improved names of Stock move tree view

lp bug: https://launchpad.net/bugs/476343 fixed

bzr revid: jvo@tinyerp.com-20091106112145-aqwh8xoddhy61unm
---
 addons/stock/stock_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 6281d2dd1cc..ca2aeeb4f3e 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -229,7 +229,7 @@
         # Lot composition (history)
         #
         <record id="stock_move_tree" model="ir.ui.view">
-            <field name="name">stock.move.tree2</field>
+            <field name="name">Stock Moves</field>
             <field name="model">stock.move</field>
             <field name="type">tree</field>
             <field name="field_parent">move_history_ids</field>
@@ -251,7 +251,7 @@
         </record>
 
         <record id="stock_move_tree2" model="ir.ui.view">
-            <field name="name">stock.move.tree2</field>
+            <field name="name">Stock Moves</field>
             <field name="model">stock.move</field>
             <field name="type">tree</field>
             <field name="field_parent">move_history_ids2</field>

From 5494568aa69a60fdf03a8c7a91069ae579980fff Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Fri, 6 Nov 2009 16:56:29 +0530
Subject: [PATCH 105/200] [IMP] Account : Entry Line action Name Improved

bzr revid: jvo@tinyerp.com-20091106112629-uu7ojl5sy432uwii
---
 addons/account/account_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 91ebe4ba662..56019d04cc4 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1354,7 +1354,7 @@
         </record>
 
         <record id="action_tax_code_line_open" model="ir.actions.act_window">
-            <field name="name">account.move.line</field>
+            <field name="name">Account Entry Lines</field>
             <field name="res_model">account.move.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>

From 328aceb4eda6b6815299e18b6c7beba7082178b6 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Fri, 6 Nov 2009 17:15:34 +0530
Subject: [PATCH 106/200] [FIX] Account: Wizards were missing translation
 import statement

bzr revid: jvo@tinyerp.com-20091106114534-46rddtl0mk9qh6g4
---
 addons/account/wizard/wizard_central_journal.py | 1 +
 addons/account/wizard/wizard_general_journal.py | 1 +
 addons/account/wizard/wizard_print_journal.py   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/addons/account/wizard/wizard_central_journal.py b/addons/account/wizard/wizard_central_journal.py
index 1b8c4ba525a..09e6bd52e0d 100644
--- a/addons/account/wizard/wizard_central_journal.py
+++ b/addons/account/wizard/wizard_central_journal.py
@@ -22,6 +22,7 @@
 
 import wizard
 import pooler
+from tools.translate import _
 
 form = '''<?xml version="1.0"?>
 <form string="Print Central Journal">
diff --git a/addons/account/wizard/wizard_general_journal.py b/addons/account/wizard/wizard_general_journal.py
index fe9c1d1141f..c13352db213 100644
--- a/addons/account/wizard/wizard_general_journal.py
+++ b/addons/account/wizard/wizard_general_journal.py
@@ -22,6 +22,7 @@
 
 import wizard
 import pooler
+from tools.translate import _
 
 form = '''<?xml version="1.0"?>
 <form string="Print General Journal">
diff --git a/addons/account/wizard/wizard_print_journal.py b/addons/account/wizard/wizard_print_journal.py
index 6b2ea42d66c..a1fad884392 100644
--- a/addons/account/wizard/wizard_print_journal.py
+++ b/addons/account/wizard/wizard_print_journal.py
@@ -22,6 +22,7 @@
 
 import wizard
 import pooler
+from tools.translate import _
 
 form = '''<?xml version="1.0"?>
 <form string="Print Journal">

From c8909f06abdb7fedc8c6c4db9dc622a219c1d94d Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Fri, 6 Nov 2009 18:28:53 +0530
Subject: [PATCH 107/200] [FIX] Stock : Partial Picking wizard was missing
 translation import statement

lp bug: https://launchpad.net/bugs/476428 fixed

bzr revid: jvo@tinyerp.com-20091106125853-zn8vpglxm3lugp86
---
 addons/stock/wizard/wizard_partial_picking.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/stock/wizard/wizard_partial_picking.py b/addons/stock/wizard/wizard_partial_picking.py
index a93a8981a18..6efde5782cf 100644
--- a/addons/stock/wizard/wizard_partial_picking.py
+++ b/addons/stock/wizard/wizard_partial_picking.py
@@ -28,6 +28,7 @@ import pooler
 import wizard
 from osv import osv
 import tools
+from tools.translate import _
 
 _moves_arch = UpdateableStr()
 _moves_fields = UpdateableDict()

From 89dc28dfe7d8752ab00ee51e1a398a2bfaee9362 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Mon, 9 Nov 2009 12:55:32 +0530
Subject: [PATCH 108/200] [FIX] Export : M2M field name was missing last
 character

lp bug: https://launchpad.net/bugs/478724 fixed

bzr revid: jvo@tinyerp.com-20091109072532-rmub2t6519nz1hyu
---
 bin/osv/orm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 119405e57bf..c7999671b3a 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -523,7 +523,7 @@ class orm_template(object):
                                             rr = rr.name
                                         rr_name = self.pool.get(rr._table_name).name_get(cr, uid, [rr.id])
                                         rr_name = rr_name and rr_name[0] and rr_name[0][1] or ''
-                                        dt += rr_name or '' + ','
+                                        dt += tools.ustr(rr_name or '') + ','
                                     data[fpos] = dt[:-1]
                                     break
                                 lines += lines2[1:]

From c36ff651f2ee97e7975e94e0361525cff9bc8e10 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Wed, 11 Nov 2009 11:20:28 +0530
Subject: [PATCH 109/200] [FIX] M2M : values filtering on set()

lp bug: https://launchpad.net/bugs/480301 fixed

bzr revid: jvo@tinyerp.com-20091111055028-lza87cnyffvwxy4i
---
 bin/osv/fields.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index cde2a0e8ff4..dc5e2a9fd4a 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -528,6 +528,8 @@ class many2many(_column):
             return
         obj = obj.pool.get(self._obj)
         for act in values:
+            if not (isinstance(act, list) or isinstance(act, tuple)) or not act:
+                continue
             if act[0] == 0:
                 idnew = obj.create(cr, user, act[2])
                 cr.execute('insert into '+self._rel+' ('+self._id1+','+self._id2+') values (%s,%s)', (id, idnew))

From fbcd9132f2bc6fd19de6ead481dbdd3d9fc5bb89 Mon Sep 17 00:00:00 2001
From: "GPA(OpenERP)" <>
Date: Wed, 11 Nov 2009 12:27:46 +0530
Subject: [PATCH 110/200] [FIX] CRM : action name improved

lp bug: https://launchpad.net/bugs/480035 fixed

bzr revid: jvo@tinyerp.com-20091111065746-8zh3u6r6q2sch50u
---
 addons/crm/crm_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 3b425ba0f3c..d39ad143358 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -404,7 +404,7 @@
 
 
         <record id="crm_case_section_open_act" model="ir.actions.act_window">
-            <field name="name">crm.case.section.open</field>
+            <field name="name">Cases</field>
             <field name="res_model">crm.case</field>
             <field name="domain">[('section_id','child_of',[active_id])]</field>
             <field name="view_type">form</field>

From 4dc6cc8698b8f238a5d8c039433b29028e3d54ff Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Wed, 11 Nov 2009 12:24:00 +0530
Subject: [PATCH 111/200] [FIX] membership: solve problem of deleting
 membership invoice created with old membership product

bzr revid: mra@tinyerp.com-20091111065400-3dodf4zrsyw45wc3
---
 addons/membership/membership.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index a0d45169278..4b10f03ccab 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -267,7 +267,7 @@ class Partner(osv.osv):
                                 s = 3
                 if s==4:
                     for mline in partner_data.member_lines:
-                        if mline.date_from < today and mline.date_to < today and mline.date_from<=mline.date_to and mline.account_invoice_line.invoice_id.state == 'paid':
+                        if mline.date_from < today and mline.date_to < today and mline.date_from<=mline.date_to and (mline.account_invoice_line and mline.account_invoice_line.invoice_id.state) == 'paid':
                             s = 5
                         else:
                             s = 6

From 275e96de8859770b8804a7905ca0f4917ee9f0e4 Mon Sep 17 00:00:00 2001
From: Xavier Morel <>
Date: Wed, 11 Nov 2009 12:32:57 +0530
Subject: [PATCH 112/200] [FIX] Added lxml as required module on setup

lp bug: https://launchpad.net/bugs/479915 fixed

bzr revid: jvo@tinyerp.com-20091111070257-b628xbpfl0v3fshd
---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 47ea152b5d0..f34a69bfb8b 100755
--- a/setup.py
+++ b/setup.py
@@ -60,6 +60,7 @@ required_modules = [
     ('reportlab', 'reportlab module'),
     ('pychart', 'pychart module'),
     ('pydot', 'pydot module'),
+    ('lxml', 'lxml module: pythonic libxml2 and libxslt bindings'),
 ]
 
 def check_modules():

From 2af45b4557709987fe6e61daba7940fc39532648 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Wed, 11 Nov 2009 12:53:44 +0530
Subject: [PATCH 113/200] [IMP] MRP : mrp.routing.workcenter made deletable on
 cascade effect

lp bug: https://launchpad.net/bugs/479747 fixed

bzr revid: jvo@tinyerp.com-20091111072344-r5o7k252rqrbhc9w
---
 addons/mrp/mrp.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 0288081148d..33e3eb0d242 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -129,7 +129,7 @@ class mrp_routing_workcenter(osv.osv):
         'cycle_nbr': fields.float('Number of Cycle', required=True,
             help="A cycle is defined in the workcenter definition."),
         'hour_nbr': fields.float('Number of Hours', required=True),
-        'routing_id': fields.many2one('mrp.routing', 'Parent Routing', select=True),
+        'routing_id': fields.many2one('mrp.routing', 'Parent Routing', select=True, ondelete='cascade'),
         'note': fields.text('Description')
     }
     _defaults = {

From a5206878193c79eefdd89582381c0c8b6aca2663 Mon Sep 17 00:00:00 2001
From: "NCH(OpenERP)" <>
Date: Wed, 11 Nov 2009 18:07:41 +0530
Subject: [PATCH 114/200] Module: mrp_operations Fixed date format problem

bzr revid: hda@tinyerp.com-20091111123741-1pagu1r98e8rll0y
---
 addons/mrp_operations/mrp_operations.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index 059f6a5a0e1..0f194b4f4da 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -330,8 +330,8 @@ class mrp_operations_operation(osv.osv):
                 if not i: continue
                 if code_lst[i-1] not in ('resume','start'):
                    continue
-                a = datetime.datetime.strptime(time_lst[i-1],'%Y:%m:%d %H:%M:%S')
-                b = datetime.datetime.strptime(time_lst[i],'%Y:%m:%d %H:%M:%S')
+                a = datetime.datetime.strptime(time_lst[i-1],'%Y-%m-%d %H:%M:%S')
+                b = datetime.datetime.strptime(time_lst[i],'%Y-%m-%d %H:%M:%S')
                 diff += (b-a).days * 24
                 diff += (b-a).seconds / (60*60)
         return diff

From 436cfd6954d5ed8e538ae3c4c141e9cf56f75bae Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Thu, 12 Nov 2009 11:12:24 +0530
Subject: [PATCH 115/200] [FIX] Warning : the super of onchange may return
 {},covered the same

lp bug: https://launchpad.net/bugs/480856 fixed

bzr revid: jvo@tinyerp.com-20091112054224-sb6q3k0p3g1yfs7v
---
 addons/warning/warning.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/warning/warning.py b/addons/warning/warning.py
index 16d29d91758..6dd8d78f5c7 100644
--- a/addons/warning/warning.py
+++ b/addons/warning/warning.py
@@ -79,7 +79,7 @@ class sale_order(osv.osv):
             warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
             warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']
             
-        return {'value': result['value'], 'warning':warning}
+        return {'value': result.get('value',{}), 'warning':warning}
 sale_order()
 
 
@@ -107,7 +107,7 @@ class purchase_order(osv.osv):
             warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
             warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']
             
-        return {'value': result['value'], 'warning':warning}
+        return {'value': result.get('value',{}), 'warning':warning}
     
 purchase_order()
 
@@ -146,7 +146,7 @@ class account_invoice(osv.osv):
             warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
             warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']
         
-        return {'value': result['value'], 'warning':warning}
+        return {'value': result.get('value',{}), 'warning':warning}
     
 account_invoice()
 
@@ -174,7 +174,7 @@ class stock_picking(osv.osv):
             warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
             warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']
         
-        return {'value': result['value'], 'warning':warning}
+        return {'value': result.get('value',{}), 'warning':warning}
     
 stock_picking()
 
@@ -229,7 +229,7 @@ class sale_order_line(osv.osv):
             warning['title'] = title and title +' & '+result['warning']['title'] or result['warning']['title']
             warning['message'] = message and message +'\n\n'+result['warning']['message'] or result['warning']['message']
         
-        return {'value': result['value'], 'warning':warning}
+        return {'value': result.get('value',{}), 'warning':warning}
     
 sale_order_line()
 
@@ -260,7 +260,7 @@ class purchase_order_line(osv.osv):
             warning['title'] = title and title +' & '+result['warning']['title'] or result['warning']['title']
             warning['message'] = message and message +'\n\n'+result['warning']['message'] or result['warning']['message']
         
-        return {'value': result['value'], 'warning':warning}
+        return {'value': result.get('value',{}), 'warning':warning}
     
 purchase_order_line()
 

From 1d18ac45cc0354af60ed019ac0f611f6cc0afa31 Mon Sep 17 00:00:00 2001
From: "Ferdinand@Chricar" <>
Date: Thu, 12 Nov 2009 11:51:18 +0530
Subject: [PATCH 116/200] [IMP] ir_cron : added active feild on list view

lp bug: https://launchpad.net/bugs/480782 fixed

bzr revid: jvo@tinyerp.com-20091112062118-wrtw5fa64ta1j3lr
---
 bin/addons/base/ir/ir.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 9c94c8179f9..a18e4b49b04 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -1011,6 +1011,7 @@
                 <tree string="Scheduled Actions">
                     <field name="nextcall"/>
                     <field name="name"/>
+                    <field name="active"/>
                     <field name="interval_number"/>
                     <field name="interval_type"/>
                     <field name="numbercall"/>

From c141ef0840abd01cba567f69fa86abab75134cc7 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 12 Nov 2009 13:33:40 +0530
Subject: [PATCH 117/200] [FIX]: fix the problem that appers in to the account
 move due to accout voucher

bzr revid: mga@tinyerp.com-20091112080340-oeg9zkjwberb3pbf
---
 addons/account_voucher/__terp__.py      |  2 +-
 addons/account_voucher/account.py       | 12 +-----------
 addons/account_voucher/account_view.xml | 20 ++++----------------
 3 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/addons/account_voucher/__terp__.py b/addons/account_voucher/__terp__.py
index 92f6199f3cb..b23c289a8f1 100755
--- a/addons/account_voucher/__terp__.py
+++ b/addons/account_voucher/__terp__.py
@@ -41,10 +41,10 @@
     
     "update_xml" : [
         "voucher_sequence.xml",
-        "account_view.xml",
         "account_report.xml",
         "voucher_wizard.xml",
         "voucher_view.xml",
+        "account_view.xml",
     ],
     'certificate': '0037580727101',
     "active": False,
diff --git a/addons/account_voucher/account.py b/addons/account_voucher/account.py
index 4006cde9863..71765ef0fb6 100644
--- a/addons/account_voucher/account.py
+++ b/addons/account_voucher/account.py
@@ -220,17 +220,7 @@ class AccountMove(osv.osv):
     _inherit = "account.move"
     _columns = {
         'name':fields.char('Name', size=256, required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'voucher_type': fields.selection([
-            ('pay_voucher','Cash Payment Voucher'),
-            ('bank_pay_voucher','Bank Payment Voucher'),
-            ('rec_voucher','Cash Receipt Voucher'),
-            ('bank_rec_voucher','Bank Receipt Voucher'),
-            ('cont_voucher','Contra Voucher'),
-            ('journal_sale_vou','Journal Sale Voucher'),
-            ('journal_pur_voucher','Journal Purchase Voucher'),
-            ('journal_voucher','Journal Voucher'),
-            ],'Voucher Type', readonly=True, select=True, states={'draft':[('readonly',False)]}),
-        'narration':fields.text('Narration'),
+        'narration':fields.text('Narration', readonly=True, select=True, states={'draft':[('readonly',False)]}),
     }
 
 AccountMove()
diff --git a/addons/account_voucher/account_view.xml b/addons/account_voucher/account_view.xml
index 5201e41e468..b415f1af0b9 100755
--- a/addons/account_voucher/account_view.xml
+++ b/addons/account_voucher/account_view.xml
@@ -1,26 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 	<data>
-		<record model="ir.ui.view" id="account_move_inherit">
-			<field name="name">account.move.type.form.inherit1</field>
+		<record model="ir.ui.view" id="account_move_inherit_new">
+			<field name="name">account.move.type.form.inherit2</field>
 			<field name="inherit_id" ref="account.view_move_form"/>
 			<field name="model">account.move</field>
 			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<field name="journal_id" position="after">
-                    <field name="voucher_type" groups="base.group_extended" select="2"/>
-				</field>
-			</field>
-		</record>
-		
-		<record model="ir.ui.view" id="account_move_inherit_new">
-			<field name="name">account.move.type.form.inherit2</field>
-			<field name="inherit_id" ref="account_move_inherit"/>
-			<field name="model">account.move</field>
-			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<field name="line_id" position="replace">
-				    <field colspan="4" default_get="{'lines':line_id ,'journal':journal_id }" name="line_id" nolabel="1" widget="one2many_list" height="275">
+				    <field colspan="4" default_get="{'lines':line_id ,'journal':journal_id }" name="line_id" nolabel="1" widget="one2many_list" height="250">
                         <form string="Account Entry Line">
                             <separator colspan="4" string="General Information"/>
                             <field name="name" select="1"/>
@@ -120,7 +108,7 @@
 			</field>
 		</record>
 	
-<!--	sub_currency	-->
+        <!--	sub_currency	-->
 		<record model="ir.ui.view" id="sub_currency_form">
 			<field name="name">sub.currency.form</field>
 			<field name="inherit_id" ref="base.view_currency_form" />

From 820e9b38935e6ba6aa1942cd362abf8ca8c48ee2 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Thu, 12 Nov 2009 14:44:53 +0530
Subject: [PATCH 118/200] [FIX] Subscription : Disallowed to change the Object
 linked to the document type.

lp bug: https://launchpad.net/bugs/435298 fixed

bzr revid: jvo@tinyerp.com-20091112091453-wus13ocpep0rmgmp
---
 addons/subscription/subscription.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/subscription/subscription.py b/addons/subscription/subscription.py
index 7c4c80f03be..f2426fdd16c 100644
--- a/addons/subscription/subscription.py
+++ b/addons/subscription/subscription.py
@@ -40,6 +40,12 @@ class subscription_document(osv.osv):
     _defaults = {
         'active' : lambda *a: True,
     }
+    
+    def write(self, cr, uid, ids, vals, context=None):
+        if 'model' in vals:
+            raise osv.except_osv(_('Error !'),_('You cannot modify the Object linked to the Document Type!\nCreate another Document instead !'))
+        return super(subscription_document, self).write(cr, uid, ids, vals, context=context)
+    
 subscription_document()
 
 class subscription_document_fields(osv.osv):

From 0b976c8d12ac00271d5fc3be9504768a869289ff Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Thu, 12 Nov 2009 14:49:13 +0530
Subject: [PATCH 119/200] [FIX] membership: change membership product date from
 and date to value with current year on demo data

bzr revid: mra@tinyerp.com-20091112091913-ee8wqyhiicu3awpp
---
 addons/membership/membership_demo.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/membership/membership_demo.xml b/addons/membership/membership_demo.xml
index 35b04539ce3..495050398d1 100644
--- a/addons/membership/membership_demo.xml
+++ b/addons/membership/membership_demo.xml
@@ -5,8 +5,8 @@
 <!-- Demo Data for Membership Product -->
 	<record id="member_product_0" model="product.product">
 		<field name="membership">True</field>
-		<field name="membership_date_from">2008-01-01</field>
-		<field name="membership_date_to">2009-06-01</field>
+		<field name="membership_date_from">2009-01-01</field>
+		<field name="membership_date_to">2010-06-01</field>
 		<field name="name">Membership Product - 1</field>
 		<field name="list_price">80</field>
 		<field name="categ_id" ref="product.cat1"/>
@@ -14,8 +14,8 @@
 	</record>
 	<record id="member_product_1" model="product.product">
 		<field name="membership">True</field>
-		<field name="membership_date_from">2008-01-01</field>
-		<field name="membership_date_to">2009-08-01</field>
+		<field name="membership_date_from">2009-01-01</field>
+		<field name="membership_date_to">2010-08-01</field>
 		<field name="name">Membership Product - 2</field>
 		<field name="categ_id" ref="product.cat1"/>
 		<field name="list_price">80</field>

From 1cbcbffec0111046f09ca8bf6bbe41858d1a02b1 Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Fri, 13 Nov 2009 12:03:46 +0530
Subject: [PATCH 120/200] [FIX] membership: invoice membership wizard now
 calculate tax corectly and on product membership fields make readonly to
 false

bzr revid: mra@tinyerp.com-20091113063346-job7hqhxpvrhy239
---
 addons/membership/membership_view.xml          | 6 +++---
 addons/membership/wizard/invoice_membership.py | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index d30276dae95..b126dbd537e 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -51,10 +51,10 @@
             <field name="arch" type="xml">
                 <page string="Information" position="after">
                     <page string="Membership">
-                        <field name="membership" readonly="1"/>
+                        <field name="membership" readonly="0"/>
                         <newline/>
-                        <field name="membership_date_from" readonly="1"/>
-                        <field name="membership_date_to" readonly="1"/>
+                        <field name="membership_date_from" readonly="0"/>
+                        <field name="membership_date_to" readonly="0"/>
                     </page>
                 </page>
             </field>
diff --git a/addons/membership/wizard/invoice_membership.py b/addons/membership/wizard/invoice_membership.py
index 8eac255c610..5b5e3c44934 100644
--- a/addons/membership/wizard/invoice_membership.py
+++ b/addons/membership/wizard/invoice_membership.py
@@ -80,9 +80,9 @@ def _invoice_membership(self, cr, uid, data, context):
         invoice_obj.write(cr, uid, invoice_id, {'invoice_line':[(6,0,[invoice_line_id])]})
         invoice_list.append(invoice_id)
         if line_value['invoice_line_tax_id']:
-            invoice_obj.write(cr, uid, [invoice_id], {'tax_line':tax_tab})
-            tax_value = invoice_tax_obj.compute(cr, uid, invoice_id).values()[0]
-            invoice_tax_obj.create(cr, uid, tax_value)
+            tax_value = invoice_tax_obj.compute(cr, uid, invoice_id).values()
+            for tax in tax_value:
+                invoice_tax_obj.create(cr, uid, tax, context=context)
 
     value = {
             'domain': [

From 4abe8d620ec82cfe7d8740d9e99504d96751ead4 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Fri, 13 Nov 2009 12:44:18 +0530
Subject: [PATCH 121/200] [FIX] quality_integration_server : fixed problem in
 integration server on translation checking if translation file is changed on
 base module

bzr revid: hmo@tinyerp.com-20091113071418-6p79ugqwpqkv55ev
---
 .../quality_integration_server/base_quality_interrogation.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/addons/quality_integration_server/base_quality_interrogation.py b/bin/addons/quality_integration_server/base_quality_interrogation.py
index ca9bbddc593..0c82a9d4263 100755
--- a/bin/addons/quality_integration_server/base_quality_interrogation.py
+++ b/bin/addons/quality_integration_server/base_quality_interrogation.py
@@ -337,7 +337,10 @@ if opt.translate_in:
     translate = opt.translate_in
     for module_name,po_files in map(lambda x:tuple(x.split(':')),translate.split('+')):
         for po_file in po_files.split(','):
-            po_link = '%s/%s/i18n/%s'%(options['addons-path'], module_name, po_file)
+            if module_name == 'base':
+                po_link = '%saddons/%s/i18n/%s'%(options['root-path'],module_name,po_file)
+            else:
+                po_link = '%s/%s/i18n/%s'%(options['addons-path'], module_name, po_file)
             options['translate-in'].append(po_link)
 
 uri = 'http://localhost:' + str(options['port'])

From 4dc22b73e5629a109cb6b0227806db11d3b60e79 Mon Sep 17 00:00:00 2001
From: "UCO,JVO" <>
Date: Fri, 13 Nov 2009 12:56:56 +0530
Subject: [PATCH 122/200] [FIX] On Update, if only the size of column is
 changed,it should reflect into DB

bzr revid: jvo@tinyerp.com-20091113072656-ytd8372l270lho75
---
 bin/osv/orm.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index c7999671b3a..16c92574936 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1854,8 +1854,18 @@ class orm(orm_template):
                                 cr.commit()
                             for c in casts:
                                 if (f_pg_type==c[0]) and (f._type==c[1]):
-                                    if f_pg_type != f_obj_type:
-                                        logger.notifyChannel('orm', netsvc.LOG_INFO, "column '%s' in table '%s' changed type to %s." % (k, self._table, c[1]))
+                                    # Adding upcoming 6 lines to check whether only the size of the fields got changed or not.E.g. :(16,3) to (16,4)
+                                    field_size_change = False
+                                    if f.digits:
+                                        field_size = (65535 * f.digits[0]) + f.digits[0] + f.digits[1]
+                                        if field_size != f_pg_size:
+                                            field_size_change = True
+                                                
+                                    if f_pg_type != f_obj_type or field_size_change:
+                                        if f_pg_type != f_obj_type:
+                                            logger.notifyChannel('orm', netsvc.LOG_INFO, "column '%s' in table '%s' changed type to %s." % (k, self._table, c[1]))
+                                        if field_size_change:
+                                            logger.notifyChannel('orm', netsvc.LOG_INFO, "column '%s' in table '%s' changed in the size." % (k, self._table))
                                         ok = True
                                         cr.execute('ALTER TABLE "%s" RENAME COLUMN "%s" TO temp_change_size' % (self._table, k))
                                         cr.execute('ALTER TABLE "%s" ADD COLUMN "%s" %s' % (self._table, k, c[2]))

From 0d7e1a5fcfd4934eaba9572dab390b4edfa30d81 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Fri, 13 Nov 2009 19:27:13 +0530
Subject: [PATCH 123/200] [FIX] On update, fields with only numeric/int/float
 could have digits

bzr revid: jvo@tinyerp.com-20091113135713-eiv4kfs9mkn4su3p
---
 bin/osv/orm.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 16c92574936..1af15c8024c 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1856,10 +1856,11 @@ class orm(orm_template):
                                 if (f_pg_type==c[0]) and (f._type==c[1]):
                                     # Adding upcoming 6 lines to check whether only the size of the fields got changed or not.E.g. :(16,3) to (16,4)
                                     field_size_change = False
-                                    if f.digits:
-                                        field_size = (65535 * f.digits[0]) + f.digits[0] + f.digits[1]
-                                        if field_size != f_pg_size:
-                                            field_size_change = True
+                                    if f_pg_type in ['int4','numeric','float8']:
+                                        if f.digits:
+                                            field_size = (65535 * f.digits[0]) + f.digits[0] + f.digits[1]
+                                            if field_size != f_pg_size:
+                                                field_size_change = True
                                                 
                                     if f_pg_type != f_obj_type or field_size_change:
                                         if f_pg_type != f_obj_type:

From a29db43ce203a2585c95010733fea7256a43fd14 Mon Sep 17 00:00:00 2001
From: Sebastien LANGE <>
Date: Mon, 16 Nov 2009 17:07:10 +0530
Subject: [PATCH 124/200] Fixed Spelling mistake

lp bug: https://launchpad.net/bugs/483527 fixed

bzr revid: hda@tinyerp.com-20091116113710-ixwxro0bweezjbre
---
 bin/osv/orm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 1af15c8024c..4fd99b7d433 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1589,7 +1589,7 @@ class orm_memory(orm_template):
 
         # get the default values from the context
         for key in context or {}:
-            if key.startswith('default_') and (key[8:] in fieds_list):
+            if key.startswith('default_') and (key[8:] in fields_list):
                 value[key[8:]] = context[key]
         return value
 

From 32c483bb6ec83f7efe7b474090f9bb8536249226 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Tue, 17 Nov 2009 12:40:35 +0530
Subject: [PATCH 125/200] [FIX] Project : If company has no Project time
 unit,it would have crashed.

lp bug: https://launchpad.net/bugs/481372 fixed

bzr revid: jvo@tinyerp.com-20091117071035-9dah99zt6wuavyju
---
 addons/project/project.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index aaf16082792..029931ea6a9 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -306,12 +306,14 @@ class task(osv.osv):
     # Override view according to the company definition
     #
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False):
-        tm = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.project_time_mode
+        tm = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.project_time_mode or False
         f = self.pool.get('res.company').fields_get(cr, uid, ['project_time_mode'], context)
-        word = dict(f['project_time_mode']['selection'])[tm]
+        word = 'Hours'
+        if tm:
+            word = dict(f['project_time_mode']['selection'])[tm]
 
         res = super(task, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar)
-        if tm=='hours':
+        if (not tm) or (tm=='hours'):
             return res
         eview = etree.fromstring(res['arch'])
         def _check_rec(eview, tm):

From cd74873235d0c12aec517db3bd8c006c181ecd15 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Tue, 17 Nov 2009 12:52:34 +0530
Subject: [PATCH 126/200] [FIX] Priority on fields.function with store
 dictionary made working.

lp bug: https://launchpad.net/bugs/462506 fixed

bzr revid: jvo@tinyerp.com-20091117072234-fjb7gcupgnw4q22b
---
 bin/osv/orm.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 4fd99b7d433..a14286b675f 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1997,7 +1997,8 @@ class orm(orm_template):
                 ok = True
                 for x,y,z,e,f in self.pool._store_function[object]:
                     if (x==self._name) and (y==store_field) and (e==fields2):
-                        ok = False
+                        if f==order:
+                            ok = False
                 if ok:
                     self.pool._store_function[object].append( (self._name, store_field, fnct, fields2, order))
                     self.pool._store_function[object].sort(lambda x,y: cmp(x[4],y[4]))

From 2cb4136c9f6da3d1a01b7ec05a633102c5287567 Mon Sep 17 00:00:00 2001
From: "DSH (Open ERP)" <dsh@tinyerp.com>
Date: Tue, 17 Nov 2009 14:42:18 +0530
Subject: [PATCH 127/200] [FIX] act_window False domain problem - produce after
 dom to lxml conversion

bzr revid: dsh@tinyerp.com-20091117091218-4mvoqnf76o7mc0an
---
 bin/tools/convert.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/tools/convert.py b/bin/tools/convert.py
index 4d42e0729b7..9f8f2bc55c1 100644
--- a/bin/tools/convert.py
+++ b/bin/tools/convert.py
@@ -372,7 +372,7 @@ form: module.record_id""" % (xml_id,)
         view_id = False
         if rec.get('view'):
             view_id = self.id_get(cr, 'ir.actions.act_window', rec.get('view','').encode('utf-8'))
-        domain = rec.get('domain','').encode('utf-8')
+        domain = rec.get('domain','').encode('utf-8') or '{}'
         context = rec.get('context','').encode('utf-8') or '{}'
         res_model = rec.get('res_model','').encode('utf-8')
         src_model = rec.get('src_model','').encode('utf-8')

From 862230a6acb507de1d3f2132d158c8368e67430a Mon Sep 17 00:00:00 2001
From: "Alex Joni,PSI(OpenERP)" <>
Date: Tue, 17 Nov 2009 15:05:01 +0530
Subject: [PATCH 128/200] [FIX] Base_vat : Romania VAT validation corrected

lp bug: https://launchpad.net/bugs/479195 fixed

bzr revid: jvo@tinyerp.com-20091117093501-oy4zt46go56bbkr5
---
 addons/base_vat/partner.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/base_vat/partner.py b/addons/base_vat/partner.py
index e470244e5e4..ca6460620e9 100644
--- a/addons/base_vat/partner.py
+++ b/addons/base_vat/partner.py
@@ -915,7 +915,8 @@ class res_partner(osv.osv):
         except:
             return False
 
-        if len(vat) == 10:
+        if len(vat) >= 2 and len(vat) <= 10:
+            vat = (10 - len(vat)) * '0' + vat
             sum = 7 * int(vat[0]) + 5 * int(vat[1]) + 3 * int(vat[2]) + \
                     2 * int(vat[3]) + 1 * int(vat[4]) + 7 * int(vat[5]) + \
                     5 * int(vat[6]) + 3 * int(vat[7]) + 2 * int(vat[8])

From 8deb66a4f15a2da7e8acc96a0b590f83964d3609 Mon Sep 17 00:00:00 2001
From: "HDA (OpenERP)" <hda@tinyerp.com>
Date: Tue, 17 Nov 2009 18:15:11 +0530
Subject: [PATCH 129/200] Fixed xml dom problem in export translation.

bzr revid: hda@tinyerp.com-20091117124511-lz0ovl4j1rbo3qxj
---
 bin/tools/translate.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/bin/tools/translate.py b/bin/tools/translate.py
index 046e4b6136d..ca833dfee6e 100644
--- a/bin/tools/translate.py
+++ b/bin/tools/translate.py
@@ -345,8 +345,8 @@ def trans_parse_xsl(de):
     res = []
     for n in [i for i in de.getchildren()]:
         if n.get("t"):
-            for m in [j for j in n.getchildren()]:
-                l = m.data.strip().replace('\n',' ')
+            for m in [j for j in n.getchildren() if j.text]:
+                l = m.text.strip().replace('\n',' ')
                 if len(l):
                     res.append(l.encode("utf8"))
         res.extend(trans_parse_xsl(n))
@@ -355,8 +355,8 @@ def trans_parse_xsl(de):
 def trans_parse_rml(de):
     res = []
     for n in [i for i in de.getchildren()]:
-        for m in [j for j in n.getchildren()]:
-            string_list = [s.replace('\n', ' ').strip() for s in re.split('\[\[.+?\]\]', m.data)]
+        for m in [j for j in n.getchildren() if j.text]:
+            string_list = [s.replace('\n', ' ').strip() for s in re.split('\[\[.+?\]\]', m.text)]
             for s in string_list:
                 if s:
                     res.append(s.encode("utf8"))
@@ -475,8 +475,8 @@ def trans_generate(lang, modules, dbname=None):
                         # export arch
                         arch = result['arch']
                         if arch and not isinstance(arch, UpdateableStr):
-                            d = xml.dom.minidom.parseString(arch)
-                            for t in trans_parse_view(d.documentElement):
+                            d = etree.XML(arch)
+                            for t in trans_parse_view(d):
                                 push_translation(module, 'wizard_view', name, 0, t)
 
                         # export button labels
@@ -530,10 +530,10 @@ def trans_generate(lang, modules, dbname=None):
                 report_type = "xsl"
             try:
                 xmlstr = tools.file_open(fname).read()
-                d = etree.XML()(xmlstr)
-                for t in parse_func(d.getroot()):
+                d = etree.XML(xmlstr)
+                for t in parse_func(d):
                     push_translation(module, report_type, name, 0, t)
-            except IOError, etree.expatbuilder.expat.ExpatError:
+            except IOError, etree.XMLSyntaxError:
                 if fname:
                     logger.notifyChannel("i18n", netsvc.LOG_ERROR, "couldn't export translation for report %s %s %s" % (name, report_type, fname))
 

From efab356429018bd5bb1697833a0f866c1692722c Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Wed, 18 Nov 2009 11:07:48 +0530
Subject: [PATCH 130/200] [FIX] solve problem of importing data from csv with
 constraints available on object

bzr revid: mra@tinyerp.com-20091118053748-pmv0wxa5qp5n1qrx
---
 bin/osv/orm.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index a14286b675f..5318c242ad2 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -832,24 +832,27 @@ class orm_template(object):
             #try:
             (res, other, warning, translate, data_id, res_id) = \
                     process_liness(self, datas, [], current_module, self._name, fields_def)
-            if len(warning):                        
+            if len(warning):
                 cr.rollback()
                 return (-1, res, 'Line ' + str(counter) +' : ' + '!\n'.join(warning), '')
-            
+
             try:
                 id = ir_model_data_obj._update(cr, uid, self._name,
                      current_module, res, xml_id=data_id, mode=mode,
                      noupdate=noupdate, res_id=res_id, context=context)
             except Exception, e:
                 import psycopg2
+                import osv
                 if isinstance(e,psycopg2.IntegrityError):
-                    msg= _('Insertion Failed!')
+                    msg= _('Insertion Failed! ')
                     for key in self.pool._sql_error.keys():
                         if key in e[0]:
                             msg = self.pool._sql_error[key]
                             break
-                    return (-1, res,'Line ' + str(counter) +' : ' + msg,'' )
-                
+                    return (-1, res, 'Line ' + str(counter) +' : ' + msg, '' )
+                if isinstance(e, osv.orm.except_orm ):
+                    msg = _('Insertion Failed! ' + e[1])
+                    return (-1, res, 'Line ' + str(counter) +' : ' + msg, '' )
             for lang in translate:
                 context2 = context.copy()
                 context2['lang'] = lang

From 9c806c8d58c33356c2a2009569871b585a2ae0e8 Mon Sep 17 00:00:00 2001
From: "VRA(OpenERP)" <>
Date: Wed, 18 Nov 2009 12:49:26 +0530
Subject: [PATCH 131/200] [FIX] Account_invoice_layout : Reports improved and
 SXWs made compatible to RML

bzr revid: jvo@tinyerp.com-20091118071926-mbvsj1mniomge7ho
---
 .../report/report_account_invoice_layout.rml  | 784 +++++++++++------
 .../report/special_message_invoice.py         |  14 +-
 .../report/special_message_invoice.rml        | 806 ++++++++++++------
 3 files changed, 1067 insertions(+), 537 deletions(-)

diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.rml b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
index 74d33a8e5ec..e8f1cee42f3 100644
--- a/addons/account_invoice_layout/report/report_account_invoice_layout.rml
+++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
@@ -1,263 +1,525 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-<template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
-<pageTemplate id="first">
-<frame id="first" x1="34.0" y1="28.0" width="527" height="786"/>
-</pageTemplate>
-</template>
-<stylesheet>
-<blockTableStyle id="Standard_Outline">
-<blockAlignment value="LEFT"/>
-<blockValign value="TOP"/>
-</blockTableStyle>
-<blockTableStyle id="Tableau2">
-<blockAlignment value="LEFT"/>
-<blockValign value="TOP"/>
-</blockTableStyle>
-<blockTableStyle id="Tableau6">
-<blockAlignment value="LEFT"/>
-<blockValign value="TOP"/>
-  <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,0"/>
-  <lineStyle kind="LINEBELOW" colorName="#000000" start="1,0" stop="1,0"/>
-  <lineStyle kind="LINEBELOW" colorName="#000000" start="2,0" stop="2,0"/>
-  <lineStyle kind="LINEBELOW" colorName="#000000" start="3,0" stop="3,0"/>
-  <lineStyle kind="LINEBELOW" colorName="#000000" start="4,0" stop="4,0"/>
-  <lineStyle kind="LINEBELOW" colorName="#000000" start="5,0" stop="5,0"/>
-</blockTableStyle>
-<blockTableStyle id="Tableau7">
-<blockAlignment value="LEFT"/>
-<blockValign value="TOP"/>
-  <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,0"/>
-  
-  <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,1" stop="-1,-1"/>
-  <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
-</blockTableStyle>
-<blockTableStyle id="Tableau8">
-<blockAlignment value="LEFT"/>
-<blockValign value="TOP"/>
-</blockTableStyle>
-<blockTableStyle id="Tableau3">
-<blockAlignment value="LEFT"/>
-<blockValign value="TOP"/>
-</blockTableStyle>
-<blockTableStyle id="Tableau4">
-<blockAlignment value="LEFT"/>
-<blockValign value="TOP"/>
-<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,0"/>
-<lineStyle kind="LINEBELOW" colorName="#000000" start="1,0" stop="1,0"/>
-<lineStyle kind="LINEBELOW" colorName="#000000" start="2,0" stop="2,0"/>
-
-<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="0,-1"/>
-<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,1" stop="1,-1"/>
-<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,1" stop="2,-1"/>
-</blockTableStyle>
-<blockTableStyle id="Tableau5">
-<blockAlignment value="LEFT"/>
-<blockValign value="TOP"/>
-<lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="2,0"/>
-<lineStyle kind="LINEABOVE" colorName="#000000" start="0,2" stop="2,2"/>
-</blockTableStyle>
-<initialize>
-<paraStyle name="all" alignment="justify"/>
-</initialize>
-<paraStyle name="P1" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P2" fontName="Helvetica" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P4" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P4a" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P5" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P6" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P7" fontName="Helvetica" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P7a" fontName="Helvetica" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-<paraStyle name="P8" fontName="Helvetica-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0" />
-<paraStyle name="P8b" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="0.0"/>
-<paraStyle name="P8a" fontName="Helvetica" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" />
-<paraStyle name="P9" fontName="Times-Italic" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="3.0"/>
-<paraStyle name="P10" fontName="Helvetica-Bold" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P11" fontName="Helvetica-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P11a" fontName="Helvetica" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P12" fontName="Helvetica-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P13" fontName="Helvetica-Bold" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P14" fontName="Helvetica" fontSize="12.0" leading="13" alignment="LEFT"/>
-<paraStyle name="P15" fontName="Helvetica" fontSize="12.0" leading="13" alignment="CENTER"/>
-<paraStyle name="P16" fontName="Helvetica" fontSize="14.0" leading="15" alignment="LEFT"/>
-<paraStyle name="P17" fontName="Helvetica" fontSize="9.0" leading="11"/>
-<paraStyle name="P18" fontName="Helvetica" fontSize="9.0" leading="11"/>
-<paraStyle name="P19" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
-<paraStyle name="P20" fontName="Helvetica" fontSize="6.0" leading="4" spaceBefore="0.0" spaceAfter="0.0"/>
-<paraStyle name="P21" fontName="Helvetica-Bold" fontSize="8.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P22" fontName="Helvetica-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P23" fontName="Helvetica" fontSize="14.0" leading="15" alignment="LEFT"/>
-<paraStyle name="Standard" fontName="Helvetica"/>
-<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="Table Contents" fontName="Helvetica" alignment="CENTER" spaceBefore="2.0" spaceAfter="3.0" leading="10"/>
-<paraStyle name="Table Contents1" fontName="Helvetica" alignment="RIGHT" spaceBefore="2.0" spaceAfter="3.0" leading="10"/>
-<paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="Caption" fontName="Helvetica" fontSize="9.0" leading="11" spaceBefore="6.0" spaceAfter="6.0"/>
-<paraStyle name="Index" fontName="Helvetica"/>
-<paraStyle name="terp_default_Note" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-</stylesheet>
-<images/>
-<story>
-<para style="P1">[[ repeatIn(objects,'o') ]]</para>
-<para style="P1">[[ setLang(o.partner_id.lang) ]]</para>
-<blockTable colWidths="295.0,232.0" style="Tableau2">
-	<tr>
-		<td><para style="P8b"><font color="white"> </font></para></td>
-		<td>
-		<para style="Standard">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
-		<para style="Standard">[[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]]</para>
-		<para style="Standard">[[ o.address_invoice_id.street ]]</para>
-		<para style="Standard">[[ o.address_invoice_id.street2 or '' ]]</para>
-		<para style="Standard">[[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]]</para>
-		<para style="Standard">[[ o.address_invoice_id.state_id and o.address_invoice_id.state_id.name or '' ]]</para>
-		<para style="Standard">[[ o.address_invoice_id.country_id and o.address_invoice_id.country_id.name or '' ]]</para>
-		<para style="P8b"><font color="white"> </font></para>
-		<para style="Standard">Tel.&#xA0;: [[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
-		<para style="Standard">Fax&#xA0;: [[ o.address_invoice_id.fax or removeParentNode('para') ]]</para>
-		<para style="Standard">VAT&#xA0;: [[ o.partner_id.vat or removeParentNode('para') ]]</para>
-		</td>
-	</tr>
-</blockTable>
-<para style="P8b">
-<font color="white"></font>
-</para>
-<para style="P23">Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
-<para style="P23">PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma') or removeParentNode('para')) and '' ]]</para>
-<para style="P23">Draft Invoice [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</para>
-<para style="P23">Cancelled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
-<para style="P23">Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
-<para style="P23">Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
-<para style="P16"><font>Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]]</font><font>[[ o.number ]]</font></para>
-<para style="P8b">
-<font color="white"></font>
-</para>
-<para style="P17"><font>Document:</font><font>[[ o.name ]]</font></para>
-<para style="P8b"><font color="white"></font></para>
-<para style="P17"><font>Invoice Date: </font><font>[[ formatLang(o.date_invoice,date=True) ]]</font></para>
-<para style="P18"><font>Customer Ref:</font>[[ o.address_invoice_id.partner_id.ref or '/' ]]</para>
-<para style="P8b">
-<font color="white"></font>
-</para>
-<blockTable colWidths="274.0,62.0,70.0,67.0,68.0" style="Tableau6">
-<tr>
-<td><para style="P3">Description / Taxes</para></td>
-<td><para style="P3">Quantity</para></td>
-<td><para style="P4">Unit Price</para></td>
-<td><para style="P4">Disc. (%)</para></td>
-<td><para style="P3">Price</para></td>
-</tr>
-</blockTable>
-<section>
-	<para style="P20">[[ repeatIn(invoice_lines(o), 'a') ]]</para>
-	<blockTable colWidths="0.0,240.0,77.5,41.0,39.0,50.0,79.0" style="Tableau7">
-		<tr>
-			<td><para style="P8">[[ a['type']=='text' and removeParentNode('blockTable')]]</para></td>
-			<td><para style="P8a">[[ (a['type']=='title' or a['type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['name'] ]] / ( [[ a['tax_types'] ]] )</para></td>
-			<td><para style="P7a">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['quantity'] ]]</para></td>
-			<td><para style="P5">[[ a['uos'] ]]</para></td>
-			<td><para style="P7">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['price_unit'] ]]</para></td>
-			<td><para style="P7">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['discount'] ]]</para></td>
-			<td><para style="P7">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]]<font>[[ a['price_subtotal'] ]]</font><font> [[ a['currency'] ]]</font></para></td>
-		</tr>
-		<tr>
-			<td><para style="P8"><font color="white"></font></para></td>
-			<td><para style="terp_default_Note">Note : [[ format(a['note']) or removeParentNode('tr') ]]</para></td>
-			<td><para style="Table Contents"><font color="white"></font></para></td>
-			<td><para><font color="white"></font></para></td>
-			<td><para style="P7"><font color="white"></font></para></td>
-			<td><para style="Table Contents1"><font color="white"></font></para></td>
-			<td><para style="Table Contents"><font color="white"></font></para></td>
-		</tr>
-	</blockTable>
-	<blockTable colWidths="453.0,74.0" style="Tableau8">
-		<tr>
-			<td><para style="Table Contents">[[ a['type']=='text' and format(a['name']) or removeParentNode('blockTable') ]]</para></td>
-			<td><para style="P8">[[ a['type']=='text' and '' ]]</para></td>
-		</tr>
-	</blockTable>
-	<pageBreak>[[ a['type']!='break' and removeParentNode('pageBreak')]]</pageBreak>
-	<blockTable colWidths="274.0,62.0,70.0,67.0,68.0" style="Tableau6">
-		<tr>
-			<td><para style="P3">Description/Taxes [[ a['type']!='break' and removeParentNode('blockTable')]]</para></td>
-			<td><para style="P4">Quantity</para></td>
-			<td><para style="P4">Unit Price</para></td>
-			<td><para style="P4">Disc. (%)</para></td>
-			<td><para style="P3">Price</para></td>
-		</tr>
-	</blockTable>
-</section>
-<blockTable colWidths="321.0,210.0" style="Tableau3">
-<tr>
-<td>
-	<blockTable colWidths="100.0,73.0,100.0" style="Tableau8">
-		<tr>
-		<td><para style="P10"><font color="white"></font></para></td>
-		<td><para style="P8"><font color="white"></font></para></td>
-		<td><para style="P8"><font color="white"></font></para></td>
-		</tr>
-		<tr>
-		<td><para style="P11a"><font color="white"></font></para></td>
-		<td><para style="P11"><font color="white"></font></para></td>
-		<td><para style="P11"><font color="white"></font></para></td>
-		</tr>
-	</blockTable>
-</td>
-<td>
-	<blockTable colWidths="110.0,90.0" style="Tableau5">
-		<tr>
-		<td><para style="P13">Total (Excl. taxes):</para></td>
-		<td><para style="P12"><u>[[ '%.2f' % o.amount_untaxed ]] [[o.currency_id.code ]]</u></para></td>
-		</tr>
-		<tr>
-		<td><para style="P13">Taxes:</para></td>
-		<td><para style="P11a">[[ '%.2f' % o.amount_tax ]] [[o.currency_id.code ]]</para></td>
-		</tr>
-		<tr>
-		<td><para style="P13">Total <font>(Incl. taxes):</font></para></td>
-		<td><para style="P12"><u>[[ '%.2f' % o.amount_total ]] [[o.currency_id.code ]]</u></para></td>
-		</tr>
-	</blockTable>
-</td>
-</tr>
-</blockTable>
-<blockTable colWidths="251.0,290.0" style="Tableau3">
-<tr>
-<td>
-<blockTable colWidths="81.0,73.0,65.0" style="Tableau4">
-	<tr>
-	<td><para style="P10">Tax</para></td>
-	<td><para style="P8">Base</para></td>
-	<td><para style="P8">Amount</para></td>
-	</tr>
-	<tr>
-	<td><para style="P10"><font>[[ repeatIn(o.tax_line,'t') ]]</font><font>[[ t.name ]]</font></para></td>
-	<td><para style="P11">[[ '%.2f' % t.base ]]</para></td>
-	<td><para style="P11">[[ '%.2f' % t.amount]]</para></td>
-	</tr>
-</blockTable>
-</td>
-<td>
-	<blockTable colWidths="81.0,73.0,65.0" style="Tableau8">
-		<tr>
-		<td><para style="P10"><font color="white"></font></para></td>
-		<td><para style="P8"><font color="white"></font></para></td>
-		<td><para style="P8"><font color="white"></font></para></td>
-		</tr>
-		<tr>
-		<td><para style="P11a"><font color="white"></font></para></td>
-		<td><para style="P11"><font color="white"></font></para></td>
-		<td><para style="P11"><font color="white"></font></para></td>
-		</tr>
-	</blockTable>
-</td>
-</tr>
-</blockTable>
-<para style="P8b">
-<font color="white"></font>
-</para>
-<para style="P19">[[ format(o.comment) or removeParentNode('para') ]]</para>
-<para style="P19">[[ format(o.payment_term and o.payment_term.note) or removeParentNode('para') ]]</para>
-</story>
-</document>
\ No newline at end of file
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Invoice_General_Header">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_General_Detail_Content">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Invoice_Line_Content">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table8">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Coment_Payment_Term">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Payment_Terms">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="3.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="3.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Drawing" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Header" fontName="Times-Roman"/>
+    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Times-Roman" fontSize="10.0" leading="13"/>
+    <paraStyle name="Addressee" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Signature" fontName="Times-Roman"/>
+    <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 5" fontName="Helvetica-Bold" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 4" fontName="Helvetica-BoldOblique" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Salutation" fontName="Times-Roman"/>
+    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="3.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Detail_another" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Note" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+    <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
+    <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
+    <blockTable colWidths="302.0,237.0" style="Tableau2">
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]]</para>
+          <para style="terp_default_9">[[ o.address_invoice_id.street ]]</para>
+          <para style="terp_default_9">[[ o.address_invoice_id.street2 or '' ]]</para>
+          <para style="terp_default_9">[[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]]</para>
+          <para style="terp_default_9">[[ o.address_invoice_id.state_id and o.address_invoice_id.state_id.name or '' ]]</para>
+          <para style="terp_default_9">[[ o.address_invoice_id.country_id and o.address_invoice_id.country_id.name or '' ]]</para>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+          <para style="terp_default_9">Tel. : [[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">Fax : [[ o.address_invoice_id.fax or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">VAT : [[ o.partner_id.vat or removeParentNode('para') ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_space">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_header">Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+    <para style="terp_header">PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma2') or removeParentNode('para')) and '' ]]</para>
+    <para style="terp_header">Draft Invoice [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</para>
+    <para style="terp_header">Cancelled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+    <para style="terp_header">Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+    <para style="terp_header">Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+    <para style="P2">Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+    <para style="terp_default_space">
+      <font color="white"> </font>
+    </para>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="180.0,179.0,180.0" style="Table_Invoice_General_Header">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Document</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Invoice Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Partner Ref.</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="179.0,179.0,180.0" style="Table_General_Detail_Content">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_9">[[ o.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_9">[[ formatLang(o.date_invoice,date=True) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_9">[[ o.address_invoice_id.partner_id.ref or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="284.0,64.0,64.0,52.0,75.0" style="Tableau6">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Description / Taxes</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Quantity</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Unit Price</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Disc. (%)</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Price</para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(invoice_lines(o), 'a') ]]</para>
+      <blockTable colWidths="4.0,280.0,44.0,21.0,66.0,53.0,51.0,19.0" style="Table_Invoice_Line_Content">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ a['type']=='text' and removeParentNode('blockTable')]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ (a['type']=='title' or a['type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['name'] ]] [[ a['type']=='article' and ('/ (' + a['tax_types'] + ')' ) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['quantity'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['uos'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['price_unit'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_9">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['discount'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]] [[ a['price_subtotal'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['currency'] ]]</para>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">Note: [[ format(a['note']) or removeParentNode('tr') ]]</para>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+      <blockTable colWidths="4.0,278.0,257.0" style="Table1">
+        <tr>
+          <td>
+            <para style="terp_default_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ a['type']=='text' and format(a['name']) or removeParentNode('blockTable') ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ a['type']=='text' and '' ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <pageBreak>[[ a['type']!='break' and removeParentNode('pageBreak')]]</pageBreak>
+      <blockTable colWidths="284.0,64.0,64.0,52.0,75.0" style="Table2">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Description / Taxes [[ a['type']!='break' and removeParentNode('blockTable')]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Centre">Quantity</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Unit Price</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Disc. (%)</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Centre">Price</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_1"/>
+    </section>
+    <para style="terp_default_1">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="405.0,59.0,54.0,20.0" style="Tableau3">
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Net Total:</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_1">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="405.0,59.0,54.0,20.0" style="Table4">
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Taxes:</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_1">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="405.0,59.0,54.0,20.0" style="Table6">
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Total:</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_total) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="57.0,61.0,60.0,360.0" style="Table7">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Tax</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Base</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Amount</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_1">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(o.tax_line,'t') ]]</para>
+      <blockTable colWidths="54.0,61.0,67.0,357.0" style="Table8">
+        <tr>
+          <td>
+            <para style="terp_default_Centre_8">[[ t.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_8">[[ formatLang(t.base) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_8">
+              <font color="white"> </font>
+            </para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="terp_default_space">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="539.0" style="Table_Coment_Payment_Term">
+      <tr>
+        <td>
+          <para style="terp_default_9">[[ format(o.comment or removeParentNode('blockTable')) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_1">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="539.0" style="Table_Payment_Terms">
+      <tr>
+        <td>
+          <para style="terp_default_9">[[ format((o.payment_term and o.payment_term.note) or removeParentNode('blockTable')) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
diff --git a/addons/account_invoice_layout/report/special_message_invoice.py b/addons/account_invoice_layout/report/special_message_invoice.py
index 94dff32a54e..e814461ae44 100644
--- a/addons/account_invoice_layout/report/special_message_invoice.py
+++ b/addons/account_invoice_layout/report/special_message_invoice.py
@@ -132,14 +132,14 @@ class account_invoice_with_message(report_sxw.rml_parse):
                     res['price_subtotal']=''
                     res['currency']=''
                 elif entry.state=='line':
-                    res['quantity']='___________________'
-                    res['price_unit']='______________________'
-                    res['discount']='____________________________________'
-                    res['tax_types']='_____________________'
+                    res['quantity']='_______________'
+                    res['price_unit']='______________'
+                    res['discount']='____________'
+                    res['tax_types']='____________________'
                     res['uos']='_____'
-                    res['name']='______________________________________'
-                    res['price_subtotal']='___________'
-                    res['currency']='_'
+                    res['name']='_______________________________________________'
+                    res['price_subtotal']='____________'
+                    res['currency']='____'
                 elif entry.state=='break':
                     res['type']=entry.state
                     res['name']=entry.name
diff --git a/addons/account_invoice_layout/report/special_message_invoice.rml b/addons/account_invoice_layout/report/special_message_invoice.rml
index b227ee0c3d0..133fffe5c0f 100644
--- a/addons/account_invoice_layout/report/special_message_invoice.rml
+++ b/addons/account_invoice_layout/report/special_message_invoice.rml
@@ -1,272 +1,540 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-<template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
-<pageTemplate id="first">
-<frame id="first" x1="34.0" y1="28.0" width="527" height="786"/>
-</pageTemplate>
-</template>
-<stylesheet>
-<blockTableStyle id="Standard_Outline">
-<blockAlignment value="LEFT"/>
-<blockValign value="TOP"/>
-</blockTableStyle>
-<blockTableStyle id="Tableau2">
-<blockAlignment value="LEFT"/>
-<blockValign value="TOP"/>
-</blockTableStyle>
-<blockTableStyle id="Tableau6">
-<blockAlignment value="LEFT"/>
-<blockValign value="TOP"/>
-  <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,-1"/>
-  <lineStyle kind="LINEBELOW" colorName="#000000" start="1,0" stop="1,-1"/>
-  <lineStyle kind="LINEBELOW" colorName="#000000" start="2,0" stop="2,-1"/>
-  <lineStyle kind="LINEBELOW" colorName="#000000" start="3,0" stop="3,-1"/>
-  <lineStyle kind="LINEBELOW" colorName="#000000" start="4,0" stop="4,-1"/>
-  <lineStyle kind="LINEBELOW" colorName="#000000" start="5,0" stop="5,-1"/>
-</blockTableStyle>
-<blockTableStyle id="Tableau7">
-<blockAlignment value="LEFT"/>
-<blockValign value="TOP"/>
-  <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,0"/>
-  
-  <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,1" stop="-1,1"/>
-  <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,1"/>
-  <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,2" stop="-1,-1"/>
-  <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,2" stop="-1,-1"/>
-</blockTableStyle>
-<blockTableStyle id="Tableau8">
-<blockAlignment value="LEFT"/>
-<blockValign value="TOP"/>
-</blockTableStyle>
-<blockTableStyle id="Tableau3">
-<blockAlignment value="LEFT"/>
-<blockValign value="TOP"/>
-</blockTableStyle>
-<blockTableStyle id="Tableau4">
-<blockAlignment value="LEFT"/>
-<blockValign value="TOP"/>
-<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,0"/>
-<lineStyle kind="LINEBELOW" colorName="#000000" start="1,0" stop="1,0"/>
-<lineStyle kind="LINEBELOW" colorName="#000000" start="2,0" stop="2,0"/>
-
-<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="0,-1"/>
-<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,1" stop="1,-1"/>
-<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,1" stop="2,-1"/>
-</blockTableStyle>
-<blockTableStyle id="Tableau5">
-<blockAlignment value="LEFT"/>
-<blockValign value="TOP"/>
-<lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="2,0"/>
-<lineStyle kind="LINEABOVE" colorName="#000000" start="0,2" stop="2,2"/>
-</blockTableStyle>
-<initialize>
-<paraStyle name="all" alignment="justify"/>
-</initialize>
-<paraStyle name="P1" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P2" fontName="Helvetica" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P4" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P4a" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P5" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P6" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P7" fontName="Helvetica" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P7a" fontName="Helvetica" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-<paraStyle name="P8" fontName="Helvetica-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0" />
-<paraStyle name="P8b" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="0.0"/>
-<paraStyle name="P8a" fontName="Helvetica" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" />
-<paraStyle name="P9" fontName="Times-Italic" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="3.0"/>
-<paraStyle name="P10" fontName="Helvetica-Bold" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P11" fontName="Helvetica-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P11a" fontName="Helvetica" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P12" fontName="Helvetica-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P13" fontName="Helvetica-Bold" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P14" fontName="Helvetica" fontSize="12.0" leading="13" alignment="LEFT"/>
-<paraStyle name="P15" fontName="Helvetica" fontSize="12.0" leading="13" alignment="CENTER"/>
-<paraStyle name="P16" fontName="Helvetica" fontSize="14.0" leading="15" alignment="LEFT"/>
-<paraStyle name="P17" fontName="Helvetica" fontSize="9.0" leading="11"/>
-<paraStyle name="P18" fontName="Helvetica" fontSize="9.0" leading="11"/>
-<paraStyle name="P19" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
-<paraStyle name="P20" fontName="Helvetica" fontSize="6.0" leading="4" spaceBefore="0.0" spaceAfter="0.0"/>
-<paraStyle name="P21" fontName="Helvetica-Bold" fontSize="8.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P22" fontName="Helvetica-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P23" fontName="Helvetica" fontSize="14.0" leading="15" alignment="LEFT"/>
-<paraStyle name="Standard" fontName="Helvetica"/>
-<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="Table Contents" fontName="Helvetica" alignment="CENTER" spaceBefore="2.0" spaceAfter="3.0" leading="10"/>
-<paraStyle name="Table Contents1" fontName="Helvetica" alignment="RIGHT" spaceBefore="2.0" spaceAfter="3.0" leading="10"/>
-<paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="Caption" fontName="Helvetica" fontSize="9.0" leading="11" spaceBefore="6.0" spaceAfter="6.0"/>
-<paraStyle name="Index" fontName="Helvetica"/>
-<paraStyle name="terp_default_Note" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-</stylesheet>
-<images/>
-<story>
-<para style="P1">[[ repeatIn(objects,'o') ]]</para>
-<para style="P1">[[ setLang(o.partner_id.lang) ]]</para>
-<blockTable colWidths="295.0,232.0" style="Tableau2">
-	<tr>
-		<td><para style="P2"><font color="white"> </font></para></td>
-		<td>
-		<para style="Standard">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
-		<para style="Standard">[[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]]</para>
-		<para style="Standard">[[ o.address_invoice_id.street ]]</para>
-		<para style="Standard">[[ o.address_invoice_id.street2 or '' ]]</para>
-		<para style="Standard">[[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]]</para>
-		<para style="Standard">[[ o.address_invoice_id.state_id and o.address_invoice_id.state_id.name or '' ]]</para>
-		<para style="Standard">[[ o.address_invoice_id.country_id and o.address_invoice_id.country_id.name or '' ]]</para>
-		<para style="Standard">
-		<font color="white"> </font>
-		</para>
-		<para style="Standard">Tel.&#xA0;: [[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
-		<para style="Standard">Fax&#xA0;: [[ o.address_invoice_id.fax or removeParentNode('para') ]]</para>
-		<para style="Standard">VAT&#xA0;: [[ o.partner_id.vat or removeParentNode('para') ]]</para>
-		</td>
-	</tr>
-</blockTable>
-<para style="P8b">
-<font color="white"> </font>
-</para>
-<para style="P23">Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
-<para style="P23">PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma') or removeParentNode('para')) and '' ]]</para>
-<para style="P23">Draft Invoice [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</para>
-<para style="P23">Cancelled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
-<para style="P23">Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
-<para style="P23">Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
-<para style="P16"><font>Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]]</font><font>[[ o.number ]]</font></para>
-<para style="P8b">
-<font color="white"> </font>
-</para>
-<para style="P17"><font>Document:</font><font>[[o.name]]</font></para>
-<para style="P8b"><font color="white"> </font></para>
-<para style="P17"><font>Invoice Date: </font><font>[[ formatLang(o.date_invoice,date=True) ]]</font></para>
-<para style="P18"><font>Customer Ref:</font> [[ o.address_invoice_id.partner_id.ref or '/' ]]</para>
-<para style="P8b"><font color="white"> </font></para>
-<blockTable colWidths="274.0,62.0,70.0,67.0,68.0" style="Tableau6">
-<tr>
-<td><para style="P3">Description / Taxes</para></td>
-<td><para style="P3">Quantity</para></td>
-<td><para style="P4">Unit Price</para></td>
-<td><para style="P4">Disc. (%)</para></td>
-<td><para style="P3">Price</para></td>
-</tr>
-</blockTable>
-<section>
-	<para style="P20">[[ repeatIn(invoice_lines(o), 'a') ]]</para>
-	<blockTable colWidths="0.0,240.0,77.5,41.0,39.0,50.0,79.0" style="Tableau7">
-		<tr>
-			<td><para style="P8">[[ a['type']=='text' and removeParentNode('blockTable')]]</para></td>
-			<td><para style="P8a">[[ (a['type']=='title' or a['type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['name'] ]] / ( [[ a['tax_types'] ]] )</para></td>
-			<td><para style="P7a">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['quantity'] ]]</para></td>
-			<td><para style="P5">[[ a['uos'] ]]</para></td>
-			<td><para style="P7">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['price_unit'] ]]</para></td>
-			<td><para style="P7">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['discount'] ]]</para></td>
-			<td><para style="P7">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]]<font>[[ a['price_subtotal'] ]]</font><font> [[ a['currency'] ]]</font></para></td>
-		</tr>
-		<tr>
-			<td><para style="P8"><font color="white"></font></para></td>
-			<td><para style="terp_default_Note">Note : [[ format(a['note']) or removeParentNode('tr') ]]</para></td>
-			<td><para style="Table Contents"><font color="white"></font></para></td>
-			<td><para><font color="white"></font></para></td>
-			<td><para style="P7"><font color="white"></font></para></td>
-			<td><para style="Table Contents1"><font color="white"></font></para></td>
-			<td><para style="Table Contents"><font color="white"></font></para></td>
-		</tr>
-	</blockTable>
-	<blockTable colWidths="453.0,74.0" style="Tableau8">
-		<tr>
-			<td><para style="Table Contents">[[ a['type']=='text' and format(a['name']) or removeParentNode('blockTable') ]]</para></td>
-			<td><para style="P8">[[ a['type']=='text' and '' ]]</para></td>
-		</tr>
-	</blockTable>
-	<pageBreak>[[ a['type']!='break' and removeParentNode('pageBreak')]]</pageBreak>
-	<blockTable colWidths="274.0,62.0,70.0,67.0,68.0" style="Tableau6">
-		<tr>
-			<td><para style="P3">Description/Taxes [[ a['type']!='break' and removeParentNode('blockTable')]]</para></td>
-			<td><para style="P4">Quantity</para></td>
-			<td><para style="P4">Unit Price</para></td>
-			<td><para style="P4">Disc. (%)</para></td>
-			<td><para style="P3">Price</para></td>
-		</tr>
-	</blockTable>
-</section>
-<blockTable colWidths="321.0,210.0" style="Tableau3">
-<tr>
-<td>
-	<blockTable colWidths="100.0,73.0,100.0" style="Tableau8">
-		<tr>
-		<td><para style="P10"><font color="white"></font></para></td>
-		<td><para style="P8"><font color="white"></font></para></td>
-		<td><para style="P8"><font color="white"></font></para></td>
-		</tr>
-		<tr>
-		<td><para style="P11a"><font color="white"></font></para></td>
-		<td><para style="P11"><font color="white"></font></para></td>
-		<td><para style="P11"><font color="white"></font></para></td>
-		</tr>
-	</blockTable>
-</td>
-<td>
-	<blockTable colWidths="110.0,90.0" style="Tableau5">
-		<tr>
-		<td><para style="P13">Total (Excl. taxes):</para></td>
-		<td><para style="P12"><u>[[ '%.2f' % o.amount_untaxed ]] [[o.currency_id.code ]]</u></para></td>
-		</tr>
-		<tr>
-		<td><para style="P13">Taxes:</para></td>
-		<td><para style="P11a">[[ '%.2f' % o.amount_tax ]] [[o.currency_id.code ]]</para></td>
-		</tr>
-		<tr>
-		<td><para style="P13">Total <font>(Incl. taxes):</font></para></td>
-		<td><para style="P12"><u>[[ '%.2f' % o.amount_total ]] [[o.currency_id.code ]]</u></para></td>
-		</tr>
-	</blockTable>
-</td>
-</tr>
-</blockTable>
-<blockTable colWidths="251.0,290.0" style="Tableau3">
-<tr>
-<td>
-<blockTable colWidths="81.0,73.0,65.0" style="Tableau4">
-	<tr>
-	<td><para style="P10">Tax</para></td>
-	<td><para style="P8">Base</para></td>
-	<td><para style="P8">Amount</para></td>
-	</tr>
-	<tr>
-	<td><para style="P10"><font>[[ repeatIn(o.tax_line,'t') ]]</font><font>[[ t.name ]]</font></para></td>
-	<td><para style="P11">[[ '%.2f' % t.base ]]</para></td>
-	<td><para style="P11">[[ '%.2f' % t.amount]]</para></td>
-	</tr>
-</blockTable>
-</td>
-<td>
-	<blockTable colWidths="81.0,73.0,65.0" style="Tableau8">
-		<tr>
-		<td><para style="P10"><font color="white"></font></para></td>
-		<td><para style="P8"><font color="white"></font></para></td>
-		<td><para style="P8"><font color="white"></font></para></td>
-		</tr>
-		<tr>
-		<td><para style="P11a"><font color="white"></font></para></td>
-		<td><para style="P11"><font color="white"></font></para></td>
-		<td><para style="P11"><font color="white"></font></para></td>
-		</tr>
-	</blockTable>
-</td>
-</tr>
-</blockTable>
-<para style="P8b">
-<font color="white"> </font>
-</para>
-<para style="P19">[[ format(o.comment) or removeParentNode('para') ]]</para>
-<para style="P19">[[ format(o.payment_term and o.payment_term.note) or removeParentNode('para') ]]</para>
-<para style="P8b">
-<font color="white"> </font>
-</para>
-<section>
-<para style="P19">[[ repeatIn((spcl_msg(data['form']) and spcl_msg(data['form']).splitlines()) or [], 'note') ]]</para>
-<para style="P19">[[ format(note) or removeParentNode('para') ]]</para>
-</section>
-</story>
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Invoice_General_Header">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_General_Detail_Content">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Invoice_Line_Content">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table8">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Coment_Payment_Term">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Payment_Terms">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="3.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="3.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Drawing" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Header" fontName="Times-Roman"/>
+    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Times-Roman" fontSize="10.0" leading="13"/>
+    <paraStyle name="Addressee" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Signature" fontName="Times-Roman"/>
+    <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 5" fontName="Helvetica-Bold" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 4" fontName="Helvetica-BoldOblique" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Salutation" fontName="Times-Roman"/>
+    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="3.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Detail_another" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Note" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+    <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
+    <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
+    <blockTable colWidths="302.0,237.0" style="Tableau2">
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]]</para>
+          <para style="terp_default_9">[[ o.address_invoice_id.street ]]</para>
+          <para style="terp_default_9">[[ o.address_invoice_id.street2 or '' ]]</para>
+          <para style="terp_default_9">[[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]]</para>
+          <para style="terp_default_9">[[ o.address_invoice_id.state_id and o.address_invoice_id.state_id.name or '' ]]</para>
+          <para style="terp_default_9">[[ o.address_invoice_id.country_id and o.address_invoice_id.country_id.name or '' ]]</para>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+          <para style="terp_default_9">Tel. : [[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">Fax : [[ o.address_invoice_id.fax or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">VAT : [[ o.partner_id.vat or removeParentNode('para') ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_space">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_header">Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+    <para style="terp_header">PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma2') or removeParentNode('para')) and '' ]]</para>
+    <para style="terp_header">Draft Invoice [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</para>
+    <para style="terp_header">Cancelled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+    <para style="terp_header">Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+    <para style="terp_header">Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+    <para style="P3">Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+    <para style="terp_default_space">
+      <font color="white"> </font>
+    </para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="180.0,179.0,180.0" style="Table_Invoice_General_Header">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Document</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Invoice Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Partner Ref.</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="179.0,179.0,180.0" style="Table_General_Detail_Content">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_9">[[ o.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_9">[[ formatLang(o.date_invoice,date=True) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_9">[[ o.address_invoice_id.partner_id.ref or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="284.0,64.0,64.0,52.0,75.0" style="Tableau6">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Description / Taxes</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Quantity</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Unit Price</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Disc. (%)</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Price</para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(invoice_lines(o), 'a') ]]</para>
+      <blockTable colWidths="4.0,280.0,44.0,21.0,66.0,53.0,51.0,19.0" style="Table_Invoice_Line_Content">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ a['type']=='text' and removeParentNode('blockTable')]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ (a['type']=='title' or a['type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['name'] ]] [[ a['type']=='article' and ('/ (' + a['tax_types'] +')' ) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['quantity'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['uos'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['price_unit'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_9">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['discount'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]] [[ a['price_subtotal'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['currency'] ]]</para>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">Note: [[ format(a['note']) or removeParentNode('tr') ]]</para>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+      <blockTable colWidths="4.0,278.0,257.0" style="Table1">
+        <tr>
+          <td>
+            <para style="terp_default_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ a['type']=='text' and format(a['name']) or removeParentNode('blockTable') ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ a['type']=='text' and '' ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <pageBreak>[[ a['type']!='break' and removeParentNode('pageBreak')]]</pageBreak>
+      <blockTable colWidths="284.0,64.0,64.0,52.0,75.0" style="Table2">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Description / Taxes [[ a['type']!='break' and removeParentNode('blockTable')]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Centre">Quantity</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Unit Price</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Disc. (%)</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Centre">Price</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_1"/>
+    </section>
+    <para style="terp_default_1">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="405.0,59.0,54.0,20.0" style="Tableau3">
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Net Total:</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_1">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="405.0,59.0,54.0,20.0" style="Table4">
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Taxes:</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_1">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="405.0,59.0,54.0,20.0" style="Table6">
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Total:</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_total) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="57.0,61.0,60.0,360.0" style="Table7">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Tax</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Base</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Amount</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_1">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(o.tax_line,'t') ]]</para>
+      <blockTable colWidths="54.0,61.0,67.0,357.0" style="Table8">
+        <tr>
+          <td>
+            <para style="terp_default_Centre_8">[[ t.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_8">[[ formatLang(t.base) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_8">
+              <font color="white"> </font>
+            </para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="terp_default_space">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="539.0" style="Table_Coment_Payment_Term">
+      <tr>
+        <td>
+          <para style="terp_default_9">[[ format(o.comment or removeParentNode('blockTable')) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_1">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="539.0" style="Table_Payment_Terms">
+      <tr>
+        <td>
+          <para style="terp_default_9">[[ format((o.payment_term and o.payment_term.note) or removeParentNode('blockTable')) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_1">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="539.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_default_9">[[ repeatIn((spcl_msg(data['form']) and spcl_msg(data['form']).splitlines()) or [], 'note') ]]</para>
+          <para style="terp_default_9">[[ note or removeParentNode('para') ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+  </story>
 </document>

From f00cab1850bff234877034bb30a4e866b450a444 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 18 Nov 2009 12:01:06 +0100
Subject: [PATCH 132/200] Fix indentation in account_tax_code

bzr revid: xmo@tinyerp.com-20091118110106-u5wwbfv7rqwzkdyb
---
 addons/account/report/account_tax_code.py | 28 +++++++++++------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/addons/account/report/account_tax_code.py b/addons/account/report/account_tax_code.py
index f3c3fb75e47..8c1c94552d0 100644
--- a/addons/account/report/account_tax_code.py
+++ b/addons/account/report/account_tax_code.py
@@ -43,20 +43,20 @@ class account_tax_code_report(rml_parse.rml_parse):
         if line_ids:
             move_line_objs = self.pool.get('account.move.line').browse(self.cr,self.uid,line_ids)
             for line in move_line_objs:
-               res['date'] = line.date
-               res['ref'] = line.ref
-               res['acode'] = line.account_id.code
-               res['pname'] = ''
-               res['country'] = ''
-
-               if line.partner_id:
-                   res['pname'] = line.partner_id.name
-                   if line.partner_id.address and line.partner_id.address[0].country_id:
-                           res['country'] = line.partner_id.address[0].country_id.code
-               res['name'] = line.name
-               res['debit'] = line.debit
-               res['credit'] = line.credit
-               result.append(res)
+                res['date'] = line.date
+                res['ref'] = line.ref
+                res['acode'] = line.account_id.code
+                res['pname'] = ''
+                res['country'] = ''
+                
+                if line.partner_id:
+                    res['pname'] = line.partner_id.name
+                    if line.partner_id.address and line.partner_id.address[0].country_id:
+                        res['country'] = line.partner_id.address[0].country_id.code
+                res['name'] = line.name
+                res['debit'] = line.debit
+                res['credit'] = line.credit
+                result.append(res)
 
         return result
         

From f4f099b7942925106d1511c1eafbf51b877bdd1d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 18 Nov 2009 12:03:33 +0100
Subject: [PATCH 133/200] Fix bug in account tax code report.

Res dict created only once at the start of the function, would lead to all result.append appending the same objects, and result being filled only with a bunch of instances of the last iteration round.

Fix by creating new res dict at the start of each round.

bzr revid: xmo@tinyerp.com-20091118110333-tc7vygl2bk7cifer
---
 addons/account/report/account_tax_code.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/report/account_tax_code.py b/addons/account/report/account_tax_code.py
index 8c1c94552d0..3e5efa65e9a 100644
--- a/addons/account/report/account_tax_code.py
+++ b/addons/account/report/account_tax_code.py
@@ -37,12 +37,12 @@ class account_tax_code_report(rml_parse.rml_parse):
         })
         
     def get_line(self,obj):
-        res = {}
         result = []
         line_ids = self.pool.get('account.move.line').search(self.cr,self.uid,[('tax_code_id','=',obj.id)])
         if line_ids:
             move_line_objs = self.pool.get('account.move.line').browse(self.cr,self.uid,line_ids)
             for line in move_line_objs:
+                res = {}
                 res['date'] = line.date
                 res['ref'] = line.ref
                 res['acode'] = line.account_id.code

From 047d799e9794c8983d803d653a866c2f8aa77f9d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 18 Nov 2009 12:10:07 +0100
Subject: [PATCH 134/200] Move unconditional items affectation (and a basic
 conditional one) into res dict litteral

bzr revid: xmo@tinyerp.com-20091118111007-3b1ojrkcmq6wf5sa
---
 addons/account/report/account_tax_code.py | 28 ++++++++++++-----------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/addons/account/report/account_tax_code.py b/addons/account/report/account_tax_code.py
index 3e5efa65e9a..83b948f0cce 100644
--- a/addons/account/report/account_tax_code.py
+++ b/addons/account/report/account_tax_code.py
@@ -42,20 +42,22 @@ class account_tax_code_report(rml_parse.rml_parse):
         if line_ids:
             move_line_objs = self.pool.get('account.move.line').browse(self.cr,self.uid,line_ids)
             for line in move_line_objs:
-                res = {}
-                res['date'] = line.date
-                res['ref'] = line.ref
-                res['acode'] = line.account_id.code
-                res['pname'] = ''
-                res['country'] = ''
+                res = {'date': line.date,
+                       'ref': line.ref,
+                       'acode': line.account_id.code,
+                       'name': line.name,
+                       'debit': line.debit,
+                       'credit': line.credit,
+                       'pname': line.partner_id and line.partner_id.name or '',
+                       }
                 
-                if line.partner_id:
-                    res['pname'] = line.partner_id.name
-                    if line.partner_id.address and line.partner_id.address[0].country_id:
-                        res['country'] = line.partner_id.address[0].country_id.code
-                res['name'] = line.name
-                res['debit'] = line.debit
-                res['credit'] = line.credit
+                if line.partner_id \
+                        and line.partner_id.address \
+                        and line.partner_id.address[0].country_id:
+                    res['country'] = line.partner_id.address[0].country_id.code
+                else:
+                    res['country'] = ''
+
                 result.append(res)
 
         return result

From 00927a64846b188e7c210139e8975f035f733f92 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 18 Nov 2009 12:11:16 +0100
Subject: [PATCH 135/200] Inverse line_ids test to return early and lower
 indentation level of function body

bzr revid: xmo@tinyerp.com-20091118111116-xooviyckwtndpaz2
---
 addons/account/report/account_tax_code.py | 43 ++++++++++++-----------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/addons/account/report/account_tax_code.py b/addons/account/report/account_tax_code.py
index 83b948f0cce..4c284e28528 100644
--- a/addons/account/report/account_tax_code.py
+++ b/addons/account/report/account_tax_code.py
@@ -37,29 +37,30 @@ class account_tax_code_report(rml_parse.rml_parse):
         })
         
     def get_line(self,obj):
-        result = []
         line_ids = self.pool.get('account.move.line').search(self.cr,self.uid,[('tax_code_id','=',obj.id)])
-        if line_ids:
-            move_line_objs = self.pool.get('account.move.line').browse(self.cr,self.uid,line_ids)
-            for line in move_line_objs:
-                res = {'date': line.date,
-                       'ref': line.ref,
-                       'acode': line.account_id.code,
-                       'name': line.name,
-                       'debit': line.debit,
-                       'credit': line.credit,
-                       'pname': line.partner_id and line.partner_id.name or '',
-                       }
+        if not line_ids: return []
+
+        result = []
+        move_line_objs = self.pool.get('account.move.line').browse(self.cr,self.uid,line_ids)
+        for line in move_line_objs:
+            res = {'date': line.date,
+                   'ref': line.ref,
+                   'acode': line.account_id.code,
+                   'name': line.name,
+                   'debit': line.debit,
+                   'credit': line.credit,
+                   'pname': line.partner_id and line.partner_id.name or '',
+                   }
+            
+            if line.partner_id \
+                    and line.partner_id.address \
+                    and line.partner_id.address[0].country_id:
+                res['country'] = line.partner_id.address[0].country_id.code
+            else:
+                res['country'] = ''
+                
+            result.append(res)
                 
-                if line.partner_id \
-                        and line.partner_id.address \
-                        and line.partner_id.address[0].country_id:
-                    res['country'] = line.partner_id.address[0].country_id.code
-                else:
-                    res['country'] = ''
-
-                result.append(res)
-
         return result
         
 report_sxw.report_sxw('report.account.tax.code.entries', 'account.tax.code',

From 63298c2cbf6dc698fe7ef9a0c27a7a43305e1372 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 18 Nov 2009 12:28:55 +0100
Subject: [PATCH 136/200] split get_line into helper functions, map over
 browse_records instead of imperative iteration

bzr revid: xmo@tinyerp.com-20091118112855-2dftiyn131em5nk3
---
 addons/account/report/account_tax_code.py | 45 ++++++++++++-----------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/addons/account/report/account_tax_code.py b/addons/account/report/account_tax_code.py
index 4c284e28528..17b549e1eb1 100644
--- a/addons/account/report/account_tax_code.py
+++ b/addons/account/report/account_tax_code.py
@@ -26,6 +26,25 @@ import copy
 from report import report_sxw
 import re
 
+def _get_country(record):
+    if record.partner_id \
+            and record.partner_id.address \
+            and record.partner_id.address[0].country_id:
+        return record.partner_id.address[0].country_id.code
+    else:
+        return ''
+
+def _record_to_report_line(record):
+    return {'date': record.date,
+            'ref': record.ref,
+            'acode': record.account_id.code,
+            'name': record.name,
+            'debit': record.debit,
+            'credit': record.credit,
+            'pname': record.partner_id and record.partner_id.name or '',
+            'country': _get_country(record)
+            }
+
 class account_tax_code_report(rml_parse.rml_parse):
     #_name = 'report.account.tax.code.entries'
     
@@ -40,28 +59,10 @@ class account_tax_code_report(rml_parse.rml_parse):
         line_ids = self.pool.get('account.move.line').search(self.cr,self.uid,[('tax_code_id','=',obj.id)])
         if not line_ids: return []
 
-        result = []
-        move_line_objs = self.pool.get('account.move.line').browse(self.cr,self.uid,line_ids)
-        for line in move_line_objs:
-            res = {'date': line.date,
-                   'ref': line.ref,
-                   'acode': line.account_id.code,
-                   'name': line.name,
-                   'debit': line.debit,
-                   'credit': line.credit,
-                   'pname': line.partner_id and line.partner_id.name or '',
-                   }
-            
-            if line.partner_id \
-                    and line.partner_id.address \
-                    and line.partner_id.address[0].country_id:
-                res['country'] = line.partner_id.address[0].country_id.code
-            else:
-                res['country'] = ''
-                
-            result.append(res)
-                
-        return result
+        return map(_record_to_report_line,
+                   self.pool.get('account.move.line')\
+                       .browse(self.cr, self.uid, line_ids))
+
         
 report_sxw.report_sxw('report.account.tax.code.entries', 'account.tax.code',
     'addons/account/report/account_tax_code.rml', parser=account_tax_code_report, header=False)

From ccffde3c9b743eba6d30fd5399f59d05ad3be223 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 18 Nov 2009 12:33:23 +0100
Subject: [PATCH 137/200] Small PEP8 and PEP263 fixes

bzr revid: xmo@tinyerp.com-20091118113323-03fo5i7edvcivxmu
---
 addons/account/report/account_tax_code.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account/report/account_tax_code.py b/addons/account/report/account_tax_code.py
index 17b549e1eb1..3dc73cb4999 100644
--- a/addons/account/report/account_tax_code.py
+++ b/addons/account/report/account_tax_code.py
@@ -1,4 +1,5 @@
-# -*- encoding: utf-8 -*-
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution    
@@ -55,15 +56,14 @@ class account_tax_code_report(rml_parse.rml_parse):
             'get_line':self.get_line,
         })
         
-    def get_line(self,obj):
-        line_ids = self.pool.get('account.move.line').search(self.cr,self.uid,[('tax_code_id','=',obj.id)])
+    def get_line(self, obj):
+        line_ids = self.pool.get('account.move.line').search(self.cr, self.uid, [('tax_code_id','=',obj.id)])
         if not line_ids: return []
 
         return map(_record_to_report_line,
                    self.pool.get('account.move.line')\
                        .browse(self.cr, self.uid, line_ids))
 
-        
 report_sxw.report_sxw('report.account.tax.code.entries', 'account.tax.code',
     'addons/account/report/account_tax_code.rml', parser=account_tax_code_report, header=False)
 

From 5e0481ff69f6044b4a80a8cc17da66eb35f10691 Mon Sep 17 00:00:00 2001
From: "ACH(OpenERP)" <>
Date: Wed, 18 Nov 2009 17:40:11 +0530
Subject: [PATCH 138/200] [FIX] Stock : Forecast report: unicode error
 corrected

lp bug: https://launchpad.net/bugs/481524 fixed

bzr revid: jvo@tinyerp.com-20091118121011-i9ggw4sze11f1bem
---
 addons/stock/report/product_stock.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/stock/report/product_stock.py b/addons/stock/report/product_stock.py
index 3f1b65b21fb..b5ca5aae0ee 100644
--- a/addons/stock/report/product_stock.py
+++ b/addons/stock/report/product_stock.py
@@ -57,6 +57,8 @@ class report_stock(report_int):
         dt_to = now
 
         names = dict(pooler.get_pool(cr.dbname).get('product.product').name_get(cr, uid, product_ids))
+        for name in names:
+            names[name] = names[name].encode('utf8')
         products = {}
         prods = pooler.get_pool(cr.dbname).get('stock.location')._product_all_get(cr, uid, location_id, product_ids)
 

From ba6ab77a901091275de159039f3eab9f33c81742 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Thu, 19 Nov 2009 12:33:10 +0530
Subject: [PATCH 139/200] [FIX] Stock : Added translations

bzr revid: jvo@tinyerp.com-20091119070310-qamq5vgahyau0ax3
---
 addons/stock/i18n/de_DE.po  | 5 +++++
 addons/stock/i18n/fr_FR.po  | 5 +++++
 addons/stock/i18n/stock.pot | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/addons/stock/i18n/de_DE.po b/addons/stock/i18n/de_DE.po
index 7fbdee98828..6385b61f358 100644
--- a/addons/stock/i18n/de_DE.po
+++ b/addons/stock/i18n/de_DE.po
@@ -646,6 +646,11 @@ msgstr "Erledigt am"
 msgid "Expected Shipping Date"
 msgstr "Erwartete Auslieferung"
 
+#. module: stock
+#: rml:stock.picking.list:0
+msgid "Shipping Address :"
+msgstr "Lieferanschrift:"
+
 #. module: stock
 #: view:stock.tracking:0
 msgid "Tracking/Serial"
diff --git a/addons/stock/i18n/fr_FR.po b/addons/stock/i18n/fr_FR.po
index 7a522d0ae68..ede2e856faa 100644
--- a/addons/stock/i18n/fr_FR.po
+++ b/addons/stock/i18n/fr_FR.po
@@ -646,6 +646,11 @@ msgstr "Date de fin"
 msgid "Expected Shipping Date"
 msgstr "Date d'envoi prévue"
 
+#. module: stock
+#: rml:stock.picking.list:0
+msgid "Shipping Address :"
+msgstr "Adresse de livraison :"
+
 #. module: stock
 #: view:stock.tracking:0
 msgid "Tracking/Serial"
diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot
index f7efc219bb1..b33a6e18ff1 100644
--- a/addons/stock/i18n/stock.pot
+++ b/addons/stock/i18n/stock.pot
@@ -646,6 +646,11 @@ msgstr ""
 msgid "Expected Shipping Date"
 msgstr ""
 
+#. module: stock
+#: rml:stock.picking.list:0
+msgid "Shipping Address :"
+msgstr ""
+
 #. module: stock
 #: view:stock.tracking:0
 msgid "Tracking/Serial"

From 7fc05f47d1d224be45adbc971951d147d6aa14d8 Mon Sep 17 00:00:00 2001
From: "VRA(OpenERP)" <>
Date: Thu, 19 Nov 2009 12:39:17 +0530
Subject: [PATCH 140/200] [FIX] Sale : Passing customer ref. of picking to
 invoice

lp bug: https://launchpad.net/bugs/443132 fixed

bzr revid: jvo@tinyerp.com-20091119070917-b8p0hzgki08pyhij
---
 addons/sale/stock.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index 9e3cd377f03..af1bfb2aa69 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -131,13 +131,19 @@ class stock_picking(osv.osv):
         for invoice in invoice_obj.browse(cursor, user, invoice_ids,
                 context=context):
             invoices[invoice.id] = invoice
-
+            
         for picking in picking_obj.browse(cursor, user, picking_ids,
                 context=context):
 
             if not picking.sale_id:
                 continue
             sale_lines = picking.sale_id.order_line
+            invoice_created = invoices[result[picking.id]]
+            
+            if picking.sale_id.client_order_ref:
+                inv_name = picking.sale_id.client_order_ref + " : " + invoice_created.name
+                invoice_obj.write(cursor, user, [invoice_created.id], {'name': inv_name}, context=context)
+            
             for sale_line in sale_lines:
                 if sale_line.product_id.type == 'service' and sale_line.invoiced == False:
                     if group:

From 47aae24a3a0b6a61412f2b5b1429b74935ea4293 Mon Sep 17 00:00:00 2001
From: "VRA(OpenERP)" <>
Date: Thu, 19 Nov 2009 12:45:19 +0530
Subject: [PATCH 141/200] [FIX] Sale/Purcghase : Function fields did not have
 digits attribute for precision accuracy

lp bug: https://launchpad.net/bugs/483583 fixed

bzr revid: jvo@tinyerp.com-20091119071519-x938niic7c4uayms
---
 addons/purchase/purchase.py | 6 +++---
 addons/sale/sale.py         | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 521549cf472..46a17ea5ada 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -181,15 +181,15 @@ class purchase_order(osv.osv):
                 "Manual: no invoice will be pre-generated. The accountant will have to encode manually."
         ),
         'minimum_planned_date':fields.function(_minimum_planned_date, fnct_inv=_set_minimum_planned_date, method=True,store=True, string='Planned Date', type='datetime', help="This is computed as the minimum scheduled date of all purchase order lines' products."),
-        'amount_untaxed': fields.function(_amount_all, method=True, string='Untaxed Amount',
+        'amount_untaxed': fields.function(_amount_all, method=True, digits=(16, int(config['price_accuracy'])), string='Untaxed Amount',
             store={
                 'purchase.order.line': (_get_order, None, 10),
             }, multi="sums"),
-        'amount_tax': fields.function(_amount_all, method=True, string='Taxes',
+        'amount_tax': fields.function(_amount_all, method=True, digits=(16, int(config['price_accuracy'])), string='Taxes',
             store={
                 'purchase.order.line': (_get_order, None, 10),
             }, multi="sums"),
-        'amount_total': fields.function(_amount_all, method=True, string='Total',
+        'amount_total': fields.function(_amount_all, method=True, digits=(16, int(config['price_accuracy'])), string='Total',
             store={
                 'purchase.order.line': (_get_order, None, 10),
             }, multi="sums"),
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index d43c7533e86..0b3116f5fe0 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -234,19 +234,19 @@ class sale_order(osv.osv):
             fnct_search=_invoiced_search, type='boolean'),
         'note': fields.text('Notes'),
 
-        'amount_untaxed': fields.function(_amount_all, method=True, string='Untaxed Amount',
+        'amount_untaxed': fields.function(_amount_all, method=True, digits=(16, int(config['price_accuracy'])), string='Untaxed Amount',
             store = {
                 'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
                 'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
             },
             multi='sums'),
-        'amount_tax': fields.function(_amount_all, method=True, string='Taxes',
+        'amount_tax': fields.function(_amount_all, method=True, digits=(16, int(config['price_accuracy'])), string='Taxes',
             store = {
                 'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
                 'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
             },
             multi='sums'),
-        'amount_total': fields.function(_amount_all, method=True, string='Total',
+        'amount_total': fields.function(_amount_all, method=True, digits=(16, int(config['price_accuracy'])), string='Total',
             store = {
                 'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
                 'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),

From 2a72c47e521d066f3ce1c2ecc23c4b6e6054d9fd Mon Sep 17 00:00:00 2001
From: "VRA(OpenERP)" <>
Date: Fri, 20 Nov 2009 10:56:20 +0530
Subject: [PATCH 142/200] [FIX] Account : Ledger Report Landscape report
 adjusted for A4.

lp bug: https://launchpad.net/bugs/458030 fixed

bzr revid: jvo@tinyerp.com-20091120052620-qd1i52t33m6zzg4g
---
 addons/account/report/general_ledger_landscape.rml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/report/general_ledger_landscape.rml b/addons/account/report/general_ledger_landscape.rml
index b0b2181550c..9e937a72baf 100644
--- a/addons/account/report/general_ledger_landscape.rml
+++ b/addons/account/report/general_ledger_landscape.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-   <template pageSize="(1120.0,770.0)" title="Test" author="Martin Simon" allowSplitting="20" >
+   <template pageSize="(1120.5,767.8)" title="Test" author="Martin Simon" allowSplitting="20" >
     <pageTemplate id="first">
       <frame id="first" x1="22.0" y1="31.0" width="1080" height="680"/>
 			<pageGraphics>

From 61e671294bd0ff907401c86abd7b88bf952f5f4f Mon Sep 17 00:00:00 2001
From: "ACH(OpenERP)" <>
Date: Fri, 20 Nov 2009 16:36:02 +0530
Subject: [PATCH 143/200] [FIX] Account : Total field on supplier invoice set
 to 0.0 to amke it Web-client compatible

lp bug: https://launchpad.net/bugs/479886 fixed

bzr revid: jvo@tinyerp.com-20091120110602-orotvym68gl7mb5i
---
 addons/account/invoice.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index ca8b36fbdfe..8d9b905d6c3 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -319,6 +319,7 @@ class account_invoice(osv.osv):
                 self.pool.get('res.users').browse(cr, uid, uid,
                     context=context).company_id.id,
         'reference_type': lambda *a: 'none',
+        'check_total': lambda *a: 0.0,
     }
 
     def unlink(self, cr, uid, ids, context=None):

From 3386915923dd924f1f2b6afd4d769b9eac190328 Mon Sep 17 00:00:00 2001
From: "GPA(OpenERP)" <>
Date: Fri, 20 Nov 2009 16:50:04 +0530
Subject: [PATCH 144/200] [FIX] Stock : Moves offer onchange on UOM to affect
 UOS

lp bug: https://launchpad.net/bugs/425671 fixed

bzr revid: jvo@tinyerp.com-20091120112004-e4akeqcchiekygqs
---
 addons/stock/stock.py       | 25 ++++++++++++++++++++++++-
 addons/stock/stock_view.xml | 20 ++++++++++----------
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 6410bb16d09..b41a41149bf 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1023,15 +1023,38 @@ class stock_move(osv.osv):
                 'message': 'You are moving %.2f products but only %.2f available in this lot.' % (product_qty, prodlot.stock_available or 0.0)
             }
         return {'warning': warning}
-
+    
+    def onchange_quantity(self, cr, uid, ids, product_id, product_qty, product_uom, product_uos):
+        result = {
+                  'product_uos_qty': 0.00
+          }
+        
+        if (not product_id) or (product_qty <=0.0):
+            return {'value': result}
+            
+        product_obj = self.pool.get('product.product')
+        uos_coeff = product_obj.read(cr, uid, product_id, ['uos_coeff'])
+        
+        if product_uos and product_uom and (product_uom != product_uos):
+            result['product_uos_qty'] = product_qty * uos_coeff['uos_coeff']
+        else:
+            result['product_uos_qty'] = product_qty
+        
+        return {'value': result}
+    
     def onchange_product_id(self, cr, uid, ids, prod_id=False, loc_id=False, loc_dest_id=False):
         if not prod_id:
             return {}
         product = self.pool.get('product.product').browse(cr, uid, [prod_id])[0]
+        uos_id  = product.uos_id and product.uos_id.id or False
         result = {
             'name': product.name,
             'product_uom': product.uom_id.id,
+            'product_uos': uos_id,
+            'product_qty': 1.00,
+            'product_uos_qty' : self.pool.get('stock.move').onchange_quantity(cr, uid, ids, prod_id, 1.00, product.uom_id.id, uos_id)['value']['product_uos_qty']
         }
+        
         if loc_id:
             result['location_id'] = loc_id
         if loc_dest_id:
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index ca2aeeb4f3e..2f6eb80fd87 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -535,9 +535,9 @@
                                     <field name="location_id" select="1" domain="[('usage','=','internal')]"/>
                                     <field name="location_dest_id" select="1" domain="[('usage','=','internal')]"/>
                                     <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
-                                    <field name="product_qty" select="1"/>
+                                    <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                     <field name="product_uom" select="1"/>
-                                    <field groups="product.group_uos" name="product_uos"/>
+                                    <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                     <field groups="product.group_uos" name="product_uos_qty"/>
                                     <field colspan="4" invisible="1" name="name" select="1"/>
                                     <field invisible="1" name="date"/>
@@ -634,9 +634,9 @@
                                     <field name="location_id" select="1" domain="[('usage','=','internal')]"/>
                                     <field name="location_dest_id" select="1" domain="[('usage','&lt;&gt;','view')]"/>
                                     <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
-                                    <field name="product_qty" select="1"/>
+                                    <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                     <field name="product_uom" select="1"/>
-                                    <field groups="product.group_uos" name="product_uos"/>
+                                    <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                     <field groups="product.group_uos" name="product_uos_qty"/>
                                     <field colspan="4" invisible="1" name="name" select="1"/>
                                     <field invisible="1" name="date"/>
@@ -827,9 +827,9 @@
                                     <field name="location_id" select="1" domain="[('usage','=','internal')]"/>
                                     <field name="location_dest_id" select="1" domain="[('usage','&lt;&gt;','view')]"/>
                                     <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
-                                    <field name="product_qty" select="1"/>
+                                    <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" />
                                     <field name="product_uom" select="1"/>
-                                    <field groups="product.group_uos" name="product_uos"/>
+                                    <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                     <field groups="product.group_uos" name="product_uos_qty"/>
                                     <field colspan="4" invisible="1" name="name" select="1"/>
                                     <field invisible="1" name="date"/>
@@ -1016,9 +1016,9 @@
                                     <field name="location_id" select="1" domain="[('usage','&lt;&gt;','view')]"/>
                                     <field domain="[('usage','=','internal')]" name="location_dest_id" select="1"/>
                                     <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
-                                    <field name="product_qty" select="1"/>
+                                    <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                     <field name="product_uom" select="1"/>
-                                    <field groups="product.group_uos" name="product_uos"/>
+                                    <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                     <field groups="product.group_uos" name="product_uos_qty"/>
                                     <field colspan="4" invisible="1" name="name" select="1"/>
                                     <field groups="base.group_extended" name="date_planned"/>
@@ -1214,7 +1214,7 @@
                 <tree color="grey:state=='cancel'" string="Moves">
                     <field name="name"/>
                     <field name="product_id"/>
-                    <field name="product_qty"/>
+                    <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                     <field name="product_uom" string="UOM"/>
                     <field name="picking_id" select="1"/>
                     <field name="prodlot_id"/>
@@ -1239,7 +1239,7 @@
                     <field name="location_id" select="1"/>
                     <field name="location_dest_id" select="1"/>
                     <field colspan="4" name="product_id" select="1"/>
-                    <field name="product_qty" select="2"/>
+                    <field name="product_qty" select="2" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                     <field name="product_uom" select="2"/>
                     <field colspan="4" name="name" select="2"/>
                     <field name="date"/>

From faa99510cbb391216ebbb135b6d6e44f6f67de5e Mon Sep 17 00:00:00 2001
From: Lionel <>
Date: Fri, 20 Nov 2009 20:31:56 +0530
Subject: [PATCH 145/200] [FIX] Stock : Wizard improvements from Lionel

lp bug: https://launchpad.net/bugs/474340 fixed

bzr revid: jvo@tinyerp.com-20091120150156-g3384ajf55082yxk
---
 addons/stock/stock.py                         | 2 +-
 addons/stock/wizard/wizard_partial_picking.py | 2 +-
 addons/stock/wizard/wizard_return.py          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index b41a41149bf..5259c2b0e0b 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1048,7 +1048,7 @@ class stock_move(osv.osv):
         product = self.pool.get('product.product').browse(cr, uid, [prod_id])[0]
         uos_id  = product.uos_id and product.uos_id.id or False
         result = {
-            'name': product.name,
+            'name': product.partner_ref,
             'product_uom': product.uom_id.id,
             'product_uos': uos_id,
             'product_qty': 1.00,
diff --git a/addons/stock/wizard/wizard_partial_picking.py b/addons/stock/wizard/wizard_partial_picking.py
index 6efde5782cf..38424f52852 100644
--- a/addons/stock/wizard/wizard_partial_picking.py
+++ b/addons/stock/wizard/wizard_partial_picking.py
@@ -65,7 +65,7 @@ def _get_moves(self, cr, uid, data, context):
 
         _moves_arch_lst.append('<field name="move%s" />' % (m.id,))
         _moves_fields['move%s' % m.id] = {
-                'string': '%s - %s' % (_to_xml(m.product_id.code or '/'), _to_xml(m.product_id.name)),
+                'string': _to_xml(m.name),
                 'type' : 'float', 'required' : True, 'default' : make_default(quantity)}
 
         if (pick.type == 'in') and (m.product_id.cost_method == 'average'):
diff --git a/addons/stock/wizard/wizard_return.py b/addons/stock/wizard/wizard_return.py
index 38c58eb03cc..64e0852578e 100644
--- a/addons/stock/wizard/wizard_return.py
+++ b/addons/stock/wizard/wizard_return.py
@@ -47,7 +47,7 @@ def _get_returns(self, cr, uid, data, context):
     for m in [line for line in pick.move_lines]:
         quantity=m.product_qty
         arch_lst.append('<field name="return%s"/>\n<newline/>' % (m.id,))
-        fields['return%s' % m.id]={'string':m.product_id.name, 'type':'float', 'required':True, 'default':make_default(quantity)}
+        fields['return%s' % m.id]={'string':m.name, 'type':'float', 'required':True, 'default':make_default(quantity)}
         res.setdefault('returns', []).append(m.id)
     arch_lst.append('<field name="invoice_state"/>\n<newline/>')
     if pick.invoice_state=='invoiced':

From f73c1fa1737d6571079e0b79efb00fc3d4e21371 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Fri, 20 Nov 2009 20:51:57 +0530
Subject: [PATCH 146/200] [FIX] CRM : Case form view priority issue resolved

lp bug: https://launchpad.net/bugs/483723 fixed

bzr revid: jvo@tinyerp.com-20091120152157-ftil2vxe5m4x4pjk
---
 addons/crm/crm_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index d39ad143358..7f62d43922b 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -276,6 +276,7 @@
             <field name="name">crm.case.form</field>
             <field name="model">crm.case</field>
             <field name="type">form</field>
+            <field name="priority" eval="1"/>
             <field name="arch" type="xml">
                 <form string="Cases">
                     <field colspan="4" name="name" select="1"/>

From 239e3b954acd2abaede2913378c4f766637bd3ca Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Mon, 23 Nov 2009 10:58:35 +0530
Subject: [PATCH 147/200] [FIX] Hr_holidays: Spell mistake corrected

lp bug: https://launchpad.net/bugs/486794 fixed

bzr revid: jvo@tinyerp.com-20091123052835-90pw4igpze7m3d1k
---
 addons/hr_holidays/i18n/ar_AR.po                   | 2 +-
 addons/hr_holidays/i18n/bg_BG.po                   | 2 +-
 addons/hr_holidays/i18n/bs_BS.po                   | 2 +-
 addons/hr_holidays/i18n/ca_ES.po                   | 2 +-
 addons/hr_holidays/i18n/cs_CZ.po                   | 2 +-
 addons/hr_holidays/i18n/de_DE.po                   | 2 +-
 addons/hr_holidays/i18n/es_AR.po                   | 2 +-
 addons/hr_holidays/i18n/es_ES.po                   | 2 +-
 addons/hr_holidays/i18n/et_EE.po                   | 2 +-
 addons/hr_holidays/i18n/fi_FI.po                   | 2 +-
 addons/hr_holidays/i18n/fr_FR.po                   | 2 +-
 addons/hr_holidays/i18n/hr_HR.po                   | 2 +-
 addons/hr_holidays/i18n/hr_holidays.pot            | 2 +-
 addons/hr_holidays/i18n/hu_HU.po                   | 2 +-
 addons/hr_holidays/i18n/id_ID.po                   | 2 +-
 addons/hr_holidays/i18n/it_IT.po                   | 2 +-
 addons/hr_holidays/i18n/lt_LT.po                   | 2 +-
 addons/hr_holidays/i18n/nl_BE.po                   | 2 +-
 addons/hr_holidays/i18n/nl_NL.po                   | 2 +-
 addons/hr_holidays/i18n/pl_PL.po                   | 2 +-
 addons/hr_holidays/i18n/pt_BR.po                   | 2 +-
 addons/hr_holidays/i18n/pt_PT.po                   | 2 +-
 addons/hr_holidays/i18n/ro_RO.po                   | 2 +-
 addons/hr_holidays/i18n/ru_RU.po                   | 2 +-
 addons/hr_holidays/i18n/sl_SL.po                   | 2 +-
 addons/hr_holidays/i18n/sq_AL.po                   | 2 +-
 addons/hr_holidays/i18n/sv_SE.po                   | 2 +-
 addons/hr_holidays/i18n/tr_TR.po                   | 2 +-
 addons/hr_holidays/i18n/uk_UA.po                   | 2 +-
 addons/hr_holidays/i18n/vi_VN.po                   | 2 +-
 addons/hr_holidays/i18n/zh_CN.po                   | 2 +-
 addons/hr_holidays/i18n/zh_TW.po                   | 2 +-
 addons/hr_holidays/process/hr_holidays_process.xml | 2 +-
 33 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/addons/hr_holidays/i18n/ar_AR.po b/addons/hr_holidays/i18n/ar_AR.po
index a749e8d9168..8286153bf21 100644
--- a/addons/hr_holidays/i18n/ar_AR.po
+++ b/addons/hr_holidays/i18n/ar_AR.po
@@ -515,7 +515,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
+msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/bg_BG.po b/addons/hr_holidays/i18n/bg_BG.po
index ad661ef5602..3939bd25e26 100644
--- a/addons/hr_holidays/i18n/bg_BG.po
+++ b/addons/hr_holidays/i18n/bg_BG.po
@@ -515,7 +515,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
+msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/bs_BS.po b/addons/hr_holidays/i18n/bs_BS.po
index 1816b15db50..8085fc1ff2e 100644
--- a/addons/hr_holidays/i18n/bs_BS.po
+++ b/addons/hr_holidays/i18n/bs_BS.po
@@ -515,7 +515,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
+msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/ca_ES.po b/addons/hr_holidays/i18n/ca_ES.po
index 64249cc1876..7ad3ca1e5b5 100644
--- a/addons/hr_holidays/i18n/ca_ES.po
+++ b/addons/hr_holidays/i18n/ca_ES.po
@@ -515,7 +515,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
+msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/cs_CZ.po b/addons/hr_holidays/i18n/cs_CZ.po
index 4ab0d436454..e303dbaa7ae 100644
--- a/addons/hr_holidays/i18n/cs_CZ.po
+++ b/addons/hr_holidays/i18n/cs_CZ.po
@@ -515,7 +515,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
+msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/de_DE.po b/addons/hr_holidays/i18n/de_DE.po
index aea28d8b5a4..37b5b1fbfa3 100644
--- a/addons/hr_holidays/i18n/de_DE.po
+++ b/addons/hr_holidays/i18n/de_DE.po
@@ -515,7 +515,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
+msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/es_AR.po b/addons/hr_holidays/i18n/es_AR.po
index 7f93da55f6c..b87c450d067 100644
--- a/addons/hr_holidays/i18n/es_AR.po
+++ b/addons/hr_holidays/i18n/es_AR.po
@@ -515,7 +515,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
+msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/es_ES.po b/addons/hr_holidays/i18n/es_ES.po
index 4c8ade05332..bb25b6322cd 100644
--- a/addons/hr_holidays/i18n/es_ES.po
+++ b/addons/hr_holidays/i18n/es_ES.po
@@ -515,7 +515,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
+msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/et_EE.po b/addons/hr_holidays/i18n/et_EE.po
index 95e18592b11..e6238dedce9 100644
--- a/addons/hr_holidays/i18n/et_EE.po
+++ b/addons/hr_holidays/i18n/et_EE.po
@@ -515,7 +515,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
+msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/fi_FI.po b/addons/hr_holidays/i18n/fi_FI.po
index 95c25d3da87..7428e97993e 100644
--- a/addons/hr_holidays/i18n/fi_FI.po
+++ b/addons/hr_holidays/i18n/fi_FI.po
@@ -515,7 +515,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
+msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/fr_FR.po b/addons/hr_holidays/i18n/fr_FR.po
index e570e038ded..01ad752c773 100644
--- a/addons/hr_holidays/i18n/fr_FR.po
+++ b/addons/hr_holidays/i18n/fr_FR.po
@@ -515,7 +515,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
+msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/hr_HR.po b/addons/hr_holidays/i18n/hr_HR.po
index 1bc2df8eb39..bb19383c02d 100644
--- a/addons/hr_holidays/i18n/hr_HR.po
+++ b/addons/hr_holidays/i18n/hr_HR.po
@@ -515,7 +515,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
+msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot
index d411768243a..ad383dd500d 100644
--- a/addons/hr_holidays/i18n/hr_holidays.pot
+++ b/addons/hr_holidays/i18n/hr_holidays.pot
@@ -515,7 +515,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
+msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/hu_HU.po b/addons/hr_holidays/i18n/hu_HU.po
index f25b29d46d9..616407aa591 100644
--- a/addons/hr_holidays/i18n/hu_HU.po
+++ b/addons/hr_holidays/i18n/hu_HU.po
@@ -515,7 +515,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
+msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/id_ID.po b/addons/hr_holidays/i18n/id_ID.po
index 682d1b61d50..29c43c740f5 100644
--- a/addons/hr_holidays/i18n/id_ID.po
+++ b/addons/hr_holidays/i18n/id_ID.po
@@ -515,7 +515,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
+msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/it_IT.po b/addons/hr_holidays/i18n/it_IT.po
index b19fb6becc9..9dde9e418e7 100644
--- a/addons/hr_holidays/i18n/it_IT.po
+++ b/addons/hr_holidays/i18n/it_IT.po
@@ -515,7 +515,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
+msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/lt_LT.po b/addons/hr_holidays/i18n/lt_LT.po
index a580902b4c6..14987ab1e66 100644
--- a/addons/hr_holidays/i18n/lt_LT.po
+++ b/addons/hr_holidays/i18n/lt_LT.po
@@ -515,7 +515,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
+msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/nl_BE.po b/addons/hr_holidays/i18n/nl_BE.po
index 1dd40093f4a..f93f2dc5b6e 100644
--- a/addons/hr_holidays/i18n/nl_BE.po
+++ b/addons/hr_holidays/i18n/nl_BE.po
@@ -515,7 +515,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
+msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/nl_NL.po b/addons/hr_holidays/i18n/nl_NL.po
index 8fd6dda7550..2cb7924f59e 100644
--- a/addons/hr_holidays/i18n/nl_NL.po
+++ b/addons/hr_holidays/i18n/nl_NL.po
@@ -515,7 +515,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
+msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/pl_PL.po b/addons/hr_holidays/i18n/pl_PL.po
index 50a91f7a0e1..5211271ab7c 100644
--- a/addons/hr_holidays/i18n/pl_PL.po
+++ b/addons/hr_holidays/i18n/pl_PL.po
@@ -515,7 +515,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
+msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/pt_BR.po b/addons/hr_holidays/i18n/pt_BR.po
index e0f3696b6df..da72d9b7e43 100644
--- a/addons/hr_holidays/i18n/pt_BR.po
+++ b/addons/hr_holidays/i18n/pt_BR.po
@@ -515,7 +515,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
+msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/pt_PT.po b/addons/hr_holidays/i18n/pt_PT.po
index 89db8902387..7566311d7e7 100644
--- a/addons/hr_holidays/i18n/pt_PT.po
+++ b/addons/hr_holidays/i18n/pt_PT.po
@@ -515,7 +515,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
+msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/ro_RO.po b/addons/hr_holidays/i18n/ro_RO.po
index 5ba08ba35dc..8b34ccc3b31 100644
--- a/addons/hr_holidays/i18n/ro_RO.po
+++ b/addons/hr_holidays/i18n/ro_RO.po
@@ -515,7 +515,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
+msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/ru_RU.po b/addons/hr_holidays/i18n/ru_RU.po
index a9c6023383f..e56d213ccae 100644
--- a/addons/hr_holidays/i18n/ru_RU.po
+++ b/addons/hr_holidays/i18n/ru_RU.po
@@ -515,7 +515,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
+msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/sl_SL.po b/addons/hr_holidays/i18n/sl_SL.po
index fa28ccaa808..69dc49e573a 100644
--- a/addons/hr_holidays/i18n/sl_SL.po
+++ b/addons/hr_holidays/i18n/sl_SL.po
@@ -515,7 +515,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
+msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/sq_AL.po b/addons/hr_holidays/i18n/sq_AL.po
index ba7442f793e..bdd4a4aad01 100644
--- a/addons/hr_holidays/i18n/sq_AL.po
+++ b/addons/hr_holidays/i18n/sq_AL.po
@@ -515,7 +515,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
+msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/sv_SE.po b/addons/hr_holidays/i18n/sv_SE.po
index 9348fa32d14..102de0ea056 100644
--- a/addons/hr_holidays/i18n/sv_SE.po
+++ b/addons/hr_holidays/i18n/sv_SE.po
@@ -515,7 +515,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
+msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/tr_TR.po b/addons/hr_holidays/i18n/tr_TR.po
index 36af8cd5b12..53b1651a51f 100644
--- a/addons/hr_holidays/i18n/tr_TR.po
+++ b/addons/hr_holidays/i18n/tr_TR.po
@@ -515,7 +515,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
+msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/uk_UA.po b/addons/hr_holidays/i18n/uk_UA.po
index d13ef2722e2..669cd5af40b 100644
--- a/addons/hr_holidays/i18n/uk_UA.po
+++ b/addons/hr_holidays/i18n/uk_UA.po
@@ -515,7 +515,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
+msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/vi_VN.po b/addons/hr_holidays/i18n/vi_VN.po
index 955ef791062..0f32529fe87 100644
--- a/addons/hr_holidays/i18n/vi_VN.po
+++ b/addons/hr_holidays/i18n/vi_VN.po
@@ -515,7 +515,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
+msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/zh_CN.po b/addons/hr_holidays/i18n/zh_CN.po
index 9f6b4281584..bbae75e67ca 100644
--- a/addons/hr_holidays/i18n/zh_CN.po
+++ b/addons/hr_holidays/i18n/zh_CN.po
@@ -515,7 +515,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
+msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/zh_TW.po b/addons/hr_holidays/i18n/zh_TW.po
index fba79e0f2f6..6c4ad367e6d 100644
--- a/addons/hr_holidays/i18n/zh_TW.po
+++ b/addons/hr_holidays/i18n/zh_TW.po
@@ -515,7 +515,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
+msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/process/hr_holidays_process.xml b/addons/hr_holidays/process/hr_holidays_process.xml
index 61e0e2a51ff..278197fc007 100755
--- a/addons/hr_holidays/process/hr_holidays_process.xml
+++ b/addons/hr_holidays/process/hr_holidays_process.xml
@@ -164,7 +164,7 @@
 		<record id="process_transition_action_reufse0" model="process.transition.action">
 			<field eval="&quot;&quot;&quot;holidays_refuse&quot;&quot;&quot;" name="action"/>
 			<field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
-			<field eval="&quot;&quot;&quot;Reufse&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Refuse&quot;&quot;&quot;" name="name"/>
 			<field name="transition_id" ref="process_transition_refusedrequest0"/>
 		</record>
 		

From 491ace5bcad228ea01d4d3128860588c5802cafd Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Mon, 23 Nov 2009 11:51:40 +0530
Subject: [PATCH 148/200] [FIX] Point_of_sale : Report for Reciept corrected

lp bug: https://launchpad.net/bugs/486783 fixed

bzr revid: jvo@tinyerp.com-20091123062140-1647mmwykfd7dcpa
---
 addons/point_of_sale/i18n/ar_AR.po          |  5 +----
 addons/point_of_sale/i18n/bg_BG.po          |  5 +----
 addons/point_of_sale/i18n/bs_BS.po          |  5 +----
 addons/point_of_sale/i18n/ca_ES.po          |  5 +----
 addons/point_of_sale/i18n/cs_CZ.po          |  5 +----
 addons/point_of_sale/i18n/de_DE.po          |  5 +----
 addons/point_of_sale/i18n/es_AR.po          |  5 +----
 addons/point_of_sale/i18n/es_ES.po          |  5 +----
 addons/point_of_sale/i18n/et_EE.po          |  5 +----
 addons/point_of_sale/i18n/fi_FI.po          |  5 +----
 addons/point_of_sale/i18n/fr_FR.po          |  5 +----
 addons/point_of_sale/i18n/hr_HR.po          |  5 +----
 addons/point_of_sale/i18n/hu_HU.po          |  5 +----
 addons/point_of_sale/i18n/id_ID.po          |  5 +----
 addons/point_of_sale/i18n/it_IT.po          |  5 +----
 addons/point_of_sale/i18n/lt_LT.po          |  5 +----
 addons/point_of_sale/i18n/nl_BE.po          |  5 +----
 addons/point_of_sale/i18n/nl_NL.po          |  5 +----
 addons/point_of_sale/i18n/pl_PL.po          |  5 +----
 addons/point_of_sale/i18n/point_of_sale.pot |  5 +----
 addons/point_of_sale/i18n/pt_BR.po          |  5 +----
 addons/point_of_sale/i18n/pt_PT.po          |  5 +----
 addons/point_of_sale/i18n/ro_RO.po          |  5 +----
 addons/point_of_sale/i18n/ru_RU.po          |  5 +----
 addons/point_of_sale/i18n/sl_SL.po          |  5 +----
 addons/point_of_sale/i18n/sq_AL.po          |  5 +----
 addons/point_of_sale/i18n/sv_SE.po          |  5 +----
 addons/point_of_sale/i18n/tr_TR.po          |  5 +----
 addons/point_of_sale/i18n/uk_UA.po          |  5 +----
 addons/point_of_sale/i18n/vi_VN.po          |  5 +----
 addons/point_of_sale/i18n/zh_CN.po          |  5 +----
 addons/point_of_sale/i18n/zh_TW.po          |  5 +----
 addons/point_of_sale/report/pos_receipt.rml | 25 ++++++++++-----------
 33 files changed, 44 insertions(+), 141 deletions(-)

diff --git a/addons/point_of_sale/i18n/ar_AR.po b/addons/point_of_sale/i18n/ar_AR.po
index d4aabea1933..c00dce9730e 100644
--- a/addons/point_of_sale/i18n/ar_AR.po
+++ b/addons/point_of_sale/i18n/ar_AR.po
@@ -138,10 +138,7 @@ msgstr ""
 msgid "Partner Ref."
 msgstr ""
 
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
diff --git a/addons/point_of_sale/i18n/bg_BG.po b/addons/point_of_sale/i18n/bg_BG.po
index 021e27fce38..e028e7ff44a 100644
--- a/addons/point_of_sale/i18n/bg_BG.po
+++ b/addons/point_of_sale/i18n/bg_BG.po
@@ -138,10 +138,7 @@ msgstr ""
 msgid "Partner Ref."
 msgstr ""
 
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
diff --git a/addons/point_of_sale/i18n/bs_BS.po b/addons/point_of_sale/i18n/bs_BS.po
index 3b304237ebd..dcd9d407cee 100644
--- a/addons/point_of_sale/i18n/bs_BS.po
+++ b/addons/point_of_sale/i18n/bs_BS.po
@@ -138,10 +138,7 @@ msgstr ""
 msgid "Partner Ref."
 msgstr ""
 
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
diff --git a/addons/point_of_sale/i18n/ca_ES.po b/addons/point_of_sale/i18n/ca_ES.po
index 3c4574a2cde..843a4c94b64 100644
--- a/addons/point_of_sale/i18n/ca_ES.po
+++ b/addons/point_of_sale/i18n/ca_ES.po
@@ -138,10 +138,7 @@ msgstr "Subtotal"
 msgid "Partner Ref."
 msgstr "Ref. empresa"
 
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
diff --git a/addons/point_of_sale/i18n/cs_CZ.po b/addons/point_of_sale/i18n/cs_CZ.po
index c6a6ef89ffa..8061b6481cd 100644
--- a/addons/point_of_sale/i18n/cs_CZ.po
+++ b/addons/point_of_sale/i18n/cs_CZ.po
@@ -138,10 +138,7 @@ msgstr ""
 msgid "Partner Ref."
 msgstr ""
 
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
diff --git a/addons/point_of_sale/i18n/de_DE.po b/addons/point_of_sale/i18n/de_DE.po
index 77e5b721824..5ce4cb762d5 100644
--- a/addons/point_of_sale/i18n/de_DE.po
+++ b/addons/point_of_sale/i18n/de_DE.po
@@ -138,10 +138,7 @@ msgstr "Zwischensumme"
 msgid "Partner Ref."
 msgstr "Partner Ref."
 
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
diff --git a/addons/point_of_sale/i18n/es_AR.po b/addons/point_of_sale/i18n/es_AR.po
index b20b9c70624..29d4906eee4 100644
--- a/addons/point_of_sale/i18n/es_AR.po
+++ b/addons/point_of_sale/i18n/es_AR.po
@@ -138,10 +138,7 @@ msgstr ""
 msgid "Partner Ref."
 msgstr ""
 
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
diff --git a/addons/point_of_sale/i18n/es_ES.po b/addons/point_of_sale/i18n/es_ES.po
index 1d440a94df7..aabfe8fb361 100644
--- a/addons/point_of_sale/i18n/es_ES.po
+++ b/addons/point_of_sale/i18n/es_ES.po
@@ -138,10 +138,7 @@ msgstr "Subtotal"
 msgid "Partner Ref."
 msgstr "Ref. empresa"
 
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
diff --git a/addons/point_of_sale/i18n/et_EE.po b/addons/point_of_sale/i18n/et_EE.po
index 7218fdf7c37..9703bffb589 100644
--- a/addons/point_of_sale/i18n/et_EE.po
+++ b/addons/point_of_sale/i18n/et_EE.po
@@ -138,10 +138,7 @@ msgstr "Vahesumma"
 msgid "Partner Ref."
 msgstr "Partneri viide."
 
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
diff --git a/addons/point_of_sale/i18n/fi_FI.po b/addons/point_of_sale/i18n/fi_FI.po
index 840842e2db4..46936b49a14 100644
--- a/addons/point_of_sale/i18n/fi_FI.po
+++ b/addons/point_of_sale/i18n/fi_FI.po
@@ -138,10 +138,7 @@ msgstr ""
 msgid "Partner Ref."
 msgstr ""
 
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
diff --git a/addons/point_of_sale/i18n/fr_FR.po b/addons/point_of_sale/i18n/fr_FR.po
index 19ba59e12c7..28e3ff23639 100644
--- a/addons/point_of_sale/i18n/fr_FR.po
+++ b/addons/point_of_sale/i18n/fr_FR.po
@@ -138,10 +138,7 @@ msgstr "Sous-total"
 msgid "Partner Ref."
 msgstr "Réf. Partenaire"
 
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
diff --git a/addons/point_of_sale/i18n/hr_HR.po b/addons/point_of_sale/i18n/hr_HR.po
index b41ad69899d..5cec28b9606 100644
--- a/addons/point_of_sale/i18n/hr_HR.po
+++ b/addons/point_of_sale/i18n/hr_HR.po
@@ -138,10 +138,7 @@ msgstr ""
 msgid "Partner Ref."
 msgstr ""
 
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
diff --git a/addons/point_of_sale/i18n/hu_HU.po b/addons/point_of_sale/i18n/hu_HU.po
index ba904ddc5f6..515a72ebae2 100644
--- a/addons/point_of_sale/i18n/hu_HU.po
+++ b/addons/point_of_sale/i18n/hu_HU.po
@@ -138,10 +138,7 @@ msgstr ""
 msgid "Partner Ref."
 msgstr ""
 
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
diff --git a/addons/point_of_sale/i18n/id_ID.po b/addons/point_of_sale/i18n/id_ID.po
index 44e011caeda..02edbd08ab8 100644
--- a/addons/point_of_sale/i18n/id_ID.po
+++ b/addons/point_of_sale/i18n/id_ID.po
@@ -138,10 +138,7 @@ msgstr ""
 msgid "Partner Ref."
 msgstr ""
 
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
diff --git a/addons/point_of_sale/i18n/it_IT.po b/addons/point_of_sale/i18n/it_IT.po
index 2f939669bc0..8058190eaa2 100644
--- a/addons/point_of_sale/i18n/it_IT.po
+++ b/addons/point_of_sale/i18n/it_IT.po
@@ -138,10 +138,7 @@ msgstr "Subtotale"
 msgid "Partner Ref."
 msgstr ""
 
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
diff --git a/addons/point_of_sale/i18n/lt_LT.po b/addons/point_of_sale/i18n/lt_LT.po
index 40da4a0db4e..c83387824e3 100644
--- a/addons/point_of_sale/i18n/lt_LT.po
+++ b/addons/point_of_sale/i18n/lt_LT.po
@@ -138,10 +138,7 @@ msgstr ""
 msgid "Partner Ref."
 msgstr ""
 
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
diff --git a/addons/point_of_sale/i18n/nl_BE.po b/addons/point_of_sale/i18n/nl_BE.po
index 74aab5605cb..1aa3dd2c3be 100644
--- a/addons/point_of_sale/i18n/nl_BE.po
+++ b/addons/point_of_sale/i18n/nl_BE.po
@@ -138,10 +138,7 @@ msgstr ""
 msgid "Partner Ref."
 msgstr ""
 
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
diff --git a/addons/point_of_sale/i18n/nl_NL.po b/addons/point_of_sale/i18n/nl_NL.po
index 7d7f406efba..b1726218e2b 100644
--- a/addons/point_of_sale/i18n/nl_NL.po
+++ b/addons/point_of_sale/i18n/nl_NL.po
@@ -138,10 +138,7 @@ msgstr ""
 msgid "Partner Ref."
 msgstr ""
 
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
diff --git a/addons/point_of_sale/i18n/pl_PL.po b/addons/point_of_sale/i18n/pl_PL.po
index 92f1c018364..b0df6ae2943 100644
--- a/addons/point_of_sale/i18n/pl_PL.po
+++ b/addons/point_of_sale/i18n/pl_PL.po
@@ -138,10 +138,7 @@ msgstr ""
 msgid "Partner Ref."
 msgstr ""
 
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
diff --git a/addons/point_of_sale/i18n/point_of_sale.pot b/addons/point_of_sale/i18n/point_of_sale.pot
index 36fc6d1f6ce..dc642bc5183 100644
--- a/addons/point_of_sale/i18n/point_of_sale.pot
+++ b/addons/point_of_sale/i18n/point_of_sale.pot
@@ -138,10 +138,7 @@ msgstr ""
 msgid "Partner Ref."
 msgstr ""
 
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
diff --git a/addons/point_of_sale/i18n/pt_BR.po b/addons/point_of_sale/i18n/pt_BR.po
index 67056cdc629..a3c93c9e68d 100644
--- a/addons/point_of_sale/i18n/pt_BR.po
+++ b/addons/point_of_sale/i18n/pt_BR.po
@@ -138,10 +138,7 @@ msgstr "Subtotal"
 msgid "Partner Ref."
 msgstr "Código parceiro"
 
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
diff --git a/addons/point_of_sale/i18n/pt_PT.po b/addons/point_of_sale/i18n/pt_PT.po
index 0eb9392fa44..3f3033b06b7 100644
--- a/addons/point_of_sale/i18n/pt_PT.po
+++ b/addons/point_of_sale/i18n/pt_PT.po
@@ -138,10 +138,7 @@ msgstr "Sub-total"
 msgid "Partner Ref."
 msgstr "Ref. do Parceiro"
 
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
diff --git a/addons/point_of_sale/i18n/ro_RO.po b/addons/point_of_sale/i18n/ro_RO.po
index 4baea1c603f..9017718c238 100644
--- a/addons/point_of_sale/i18n/ro_RO.po
+++ b/addons/point_of_sale/i18n/ro_RO.po
@@ -138,10 +138,7 @@ msgstr ""
 msgid "Partner Ref."
 msgstr ""
 
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
diff --git a/addons/point_of_sale/i18n/ru_RU.po b/addons/point_of_sale/i18n/ru_RU.po
index aba2fe83477..a940c848e62 100644
--- a/addons/point_of_sale/i18n/ru_RU.po
+++ b/addons/point_of_sale/i18n/ru_RU.po
@@ -138,10 +138,7 @@ msgstr "Подитог"
 msgid "Partner Ref."
 msgstr ""
 
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
diff --git a/addons/point_of_sale/i18n/sl_SL.po b/addons/point_of_sale/i18n/sl_SL.po
index fdab9ca8c4a..b6c0430b22b 100644
--- a/addons/point_of_sale/i18n/sl_SL.po
+++ b/addons/point_of_sale/i18n/sl_SL.po
@@ -138,10 +138,7 @@ msgstr "Delna vsota"
 msgid "Partner Ref."
 msgstr ""
 
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
diff --git a/addons/point_of_sale/i18n/sq_AL.po b/addons/point_of_sale/i18n/sq_AL.po
index e20e52b162c..8cddc433cfa 100644
--- a/addons/point_of_sale/i18n/sq_AL.po
+++ b/addons/point_of_sale/i18n/sq_AL.po
@@ -138,10 +138,7 @@ msgstr ""
 msgid "Partner Ref."
 msgstr ""
 
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
diff --git a/addons/point_of_sale/i18n/sv_SE.po b/addons/point_of_sale/i18n/sv_SE.po
index dc9a95215b0..9577daed78c 100644
--- a/addons/point_of_sale/i18n/sv_SE.po
+++ b/addons/point_of_sale/i18n/sv_SE.po
@@ -138,10 +138,7 @@ msgstr ""
 msgid "Partner Ref."
 msgstr ""
 
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
diff --git a/addons/point_of_sale/i18n/tr_TR.po b/addons/point_of_sale/i18n/tr_TR.po
index dcc67be7072..4ce1c71ebcf 100644
--- a/addons/point_of_sale/i18n/tr_TR.po
+++ b/addons/point_of_sale/i18n/tr_TR.po
@@ -138,10 +138,7 @@ msgstr ""
 msgid "Partner Ref."
 msgstr ""
 
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
diff --git a/addons/point_of_sale/i18n/uk_UA.po b/addons/point_of_sale/i18n/uk_UA.po
index d26353bf053..df6071bbc13 100644
--- a/addons/point_of_sale/i18n/uk_UA.po
+++ b/addons/point_of_sale/i18n/uk_UA.po
@@ -138,10 +138,7 @@ msgstr ""
 msgid "Partner Ref."
 msgstr ""
 
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
diff --git a/addons/point_of_sale/i18n/vi_VN.po b/addons/point_of_sale/i18n/vi_VN.po
index 633bccc52cf..8d8267cccf8 100644
--- a/addons/point_of_sale/i18n/vi_VN.po
+++ b/addons/point_of_sale/i18n/vi_VN.po
@@ -138,10 +138,7 @@ msgstr ""
 msgid "Partner Ref."
 msgstr ""
 
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
diff --git a/addons/point_of_sale/i18n/zh_CN.po b/addons/point_of_sale/i18n/zh_CN.po
index a34ea332aa7..6d4bb1f19fb 100644
--- a/addons/point_of_sale/i18n/zh_CN.po
+++ b/addons/point_of_sale/i18n/zh_CN.po
@@ -138,10 +138,7 @@ msgstr ""
 msgid "Partner Ref."
 msgstr ""
 
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
diff --git a/addons/point_of_sale/i18n/zh_TW.po b/addons/point_of_sale/i18n/zh_TW.po
index 02de6f7a851..162b26ddbed 100644
--- a/addons/point_of_sale/i18n/zh_TW.po
+++ b/addons/point_of_sale/i18n/zh_TW.po
@@ -138,10 +138,7 @@ msgstr ""
 msgid "Partner Ref."
 msgstr ""
 
-#. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
diff --git a/addons/point_of_sale/report/pos_receipt.rml b/addons/point_of_sale/report/pos_receipt.rml
index 984d47bb61e..6dd8df26924 100644
--- a/addons/point_of_sale/report/pos_receipt.rml
+++ b/addons/point_of_sale/report/pos_receipt.rml
@@ -92,7 +92,7 @@
     <para style="terp_default_8">[[ setLang(o.user_id.context_lang) ]]</para>
     <para style="terp_header_Centre">[[o.user_id.company_id.name]]</para>
     <para style="terp_default_Centre_9">[[ address and address.street ]], [[ address and address.zip ]] [[ address and address.city ]]</para>
-    <para style="terp_default_Centre_9">Tel : + 32 (0) 2 231 04 35</para>
+    <para style="terp_default_Centre_9">Tel : [[ address and address.phone ]]</para>
     <para style="terp_default_Centre_9">Fax : [[ address and address.fax ]]</para>
     <para style="terp_default_Centre_9">E-mail : [[ address and address.email ]]</para>
     <para style="terp_default_Centre_9">
@@ -158,18 +158,17 @@
               </td>
             </tr>
           </blockTable>
-    <blockTable colWidths="105.0,78.0" style="Table_Amount">
-      <tr>
-        <td>
-          <para style="terp_default_2">[[ repeatIn(o.payments,'d') ]]</para>
-          <para style="terp_default_Bold_9_Right1">[[ d.journal_id.name ]]:</para>
-          </td>
-        <td>
-          <para style="terp_default_Bold_9_Right2">[[ d.amount ]]</para>
-        </td>
-      </tr>
-	</blockTable>
-
+	<blockTable colWidths="105.0,78.0" style="Table_Amount">
+	      <tr>
+	        <td>
+	          <para style="terp_default_2">[[ repeatIn(o.payments,'d') or removeParentNode('blockTable') ]]</para>
+	          <para style="terp_default_Bold_9_Right1">[[ d.journal_id.name ]]:</para>
+	        </td>
+	        <td>
+	          <para style="terp_default_Bold_9_Right2">[[ d.amount ]]</para>
+	        </td>
+	      </tr>
+		</blockTable>
           <para style="terp_default_2">
             <font color="white"> </font>
           </para>

From b4fdda88f20ad4cd00d5d7e4e9abced1c0f0fb83 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Mon, 23 Nov 2009 12:04:27 +0530
Subject: [PATCH 149/200] [FIX] Base_contact : Making Email field of address
 visible on Address form view

bzr revid: jvo@tinyerp.com-20091123063427-rz3tw515auk5ap1z
---
 addons/base_contact/base_contact_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 9b2a9c179fc..8c9740f2be9 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -281,7 +281,7 @@
         <field name="inherit_id" ref="base.view_partner_address_form1"/>
         <field name='type'>form</field>
         <field name='arch' type='xml'>
-            <field name="email" position="replace">
+            <field name="email" position="after">
                 <field name="job_ids" mode="tree,form" colspan="4">
                     <tree string="Contacts" editable="top">
                         <field name="contact_id"/>

From 360d52e45b2342607c15854194ed146dc085f05a Mon Sep 17 00:00:00 2001
From: "ACH(OpenERP)" <>
Date: Mon, 23 Nov 2009 17:57:36 +0530
Subject: [PATCH 150/200] [FIX] Expression : Making search easier for
 'child_of'- Recursivity on field used as a Left operand

bzr revid: jvo@tinyerp.com-20091123122736-591bz55oke4ot5mj
---
 bin/osv/expression.py | 63 ++++++++++++++++++++++++++++---------------
 1 file changed, 41 insertions(+), 22 deletions(-)

diff --git a/bin/osv/expression.py b/bin/osv/expression.py
index d695fc62230..135559706ba 100644
--- a/bin/osv/expression.py
+++ b/bin/osv/expression.py
@@ -141,6 +141,12 @@ class expression(object):
                 if field._type == 'many2one':
                     right = field_obj.search(cr, uid, [(fargs[1], operator, right)], context=context)
                     self.__exp[i] = (fargs[0], 'in', right)
+                # Making search easier when there is a left operand as field.o2m or field.m2m
+                if field._type in ['many2many','one2many']:
+                    right = field_obj.search(cr, uid, [(fargs[1], operator, right)], context=context)
+                    right1 = table.search(cr, uid, [(fargs[0],'in', right)], context=context)
+                    self.__exp[i] = ('id', 'in', right1)                    
+                
                 continue
 
             if field._properties:
@@ -163,32 +169,45 @@ class expression(object):
 
 
             elif field._type == 'one2many':
-                call_null = True
-                
-                if right:
+                # Applying recursivity on field(one2many)
+                if operator == 'child_of':
                     if isinstance(right, basestring):
-                        ids2 = [x[0] for x in field_obj.name_search(cr, uid, right, [], operator, limit=None)]
-                        operator = 'in' 
+                        ids2 = [x[0] for x in field_obj.name_search(cr, uid, right, [], 'like', limit=None)]
                     else:
-                        if not isinstance(right,list):
-                            ids2 = [right]
-                        else:
-                            ids2 = right    
-                    if not ids2:
-                        call_null = True
-                        operator = 'in' # operator changed because ids are directly related to main object
+                        ids2 = list(right)
+                    if field._obj != working_table._name:
+                        dom = _rec_get(ids2, field_obj, left=left, prefix=field._obj)
                     else:
-                        call_null = False
-                        o2m_op = 'in'
-                        if operator in  ['not like','not ilike','not in','<>','!=']:
-                            o2m_op = 'not in'
-                        self.__exp[i] = ('id', o2m_op, self.__execute_recursive_in(cr, field._fields_id, field_obj._table, 'id', ids2, operator, field._type))
+                        dom = _rec_get(ids2, working_table, parent=left)
+                    self.__exp = self.__exp[:i] + dom + self.__exp[i+1:]
                 
-                if call_null:
-                    o2m_op = 'not in'
-                    if operator in  ['not like','not ilike','not in','<>','!=']:
-                        o2m_op = 'in'                         
-                    self.__exp[i] = ('id', o2m_op, self.__execute_recursive_in(cr, field._fields_id, field_obj._table, 'id', [], operator, field._type) or [0])      
+                else:    
+                    call_null = True
+                    
+                    if right:
+                        if isinstance(right, basestring):
+                            ids2 = [x[0] for x in field_obj.name_search(cr, uid, right, [], operator, limit=None)]
+                            operator = 'in' 
+                        else:
+                            if not isinstance(right,list):
+                                ids2 = [right]
+                            else:
+                                ids2 = right    
+                        if not ids2:
+                            call_null = True
+                            operator = 'in' # operator changed because ids are directly related to main object
+                        else:
+                            call_null = False
+                            o2m_op = 'in'
+                            if operator in  ['not like','not ilike','not in','<>','!=']:
+                                o2m_op = 'not in'
+                            self.__exp[i] = ('id', o2m_op, self.__execute_recursive_in(cr, field._fields_id, field_obj._table, 'id', ids2, operator, field._type))
+                    
+                    if call_null:
+                        o2m_op = 'not in'
+                        if operator in  ['not like','not ilike','not in','<>','!=']:
+                            o2m_op = 'in'                         
+                        self.__exp[i] = ('id', o2m_op, self.__execute_recursive_in(cr, field._fields_id, field_obj._table, 'id', [], operator, field._type) or [0])      
 
             elif field._type == 'many2many':
                 #FIXME

From 3dbbb61c0d39731f3f98d7b819ed0c004577c2db Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@tinyerp.com>
Date: Mon, 23 Nov 2009 18:05:09 +0100
Subject: [PATCH 151/200] [IMP] better connection pool (global)

bzr revid: chs@tinyerp.com-20091123170509-qe5keihqjoa71ppd
---
 bin/addons/base/ir/ir_cron.py |   2 +-
 bin/service/web_services.py   |  24 ++--
 bin/sql_db.py                 | 218 +++++++++++++++++++++++-----------
 3 files changed, 159 insertions(+), 85 deletions(-)

diff --git a/bin/addons/base/ir/ir_cron.py b/bin/addons/base/ir/ir_cron.py
index 86d4bd57c0e..3e3f2e1e50b 100644
--- a/bin/addons/base/ir/ir_cron.py
+++ b/bin/addons/base/ir/ir_cron.py
@@ -97,8 +97,8 @@ class ir_cron(osv.osv, netsvc.Agent):
             db, pool = pooler.get_db_and_pool(db_name)
         except:
             return False        
+        cr = db.cursor()
         try:
-            cr = db.cursor()
             if not pool._init:
                 now = DateTime.now()
                 cr.execute('select * from ir_cron where numbercall<>0 and active and nextcall<=now() order by priority')
diff --git a/bin/service/web_services.py b/bin/service/web_services.py
index 46a66594162..a3280719f2c 100644
--- a/bin/service/web_services.py
+++ b/bin/service/web_services.py
@@ -72,13 +72,14 @@ class db(netsvc.Service):
         self.actions[id] = {'clean': False}
 
         db = sql_db.db_connect('template1')
-        cr = db.serialized_cursor()
+        cr = db.cursor()
         try:
-            cr.autocommit(True) # XXX inhibit the effect of a serialized cursor. is it what we want ?
+            cr.autocommit(True) # avoid transaction block
             cr.execute('CREATE DATABASE "%s" ENCODING \'unicode\'' % db_name)
         finally:
             cr.close()
-            sql_db.close_db('template1')
+            del db
+
         class DBInitialize(object):
             def __call__(self, serv, id, db_name, demo, lang, user_password='admin'):
                 cr = None
@@ -153,8 +154,8 @@ class db(netsvc.Service):
         logger = netsvc.Logger()
 
         db = sql_db.db_connect('template1')
-        cr = db.serialized_cursor()
-        cr.autocommit(True) # XXX inhibit the effect of a serialized cursor. is it what we want ?
+        cr = db.cursor()
+        cr.autocommit(True) # avoid transaction block
         try:
             try:
                 cr.execute('DROP DATABASE "%s"' % db_name)
@@ -166,9 +167,7 @@ class db(netsvc.Service):
                 logger.notifyChannel("web-services", netsvc.LOG_INFO,
                     'DROP DB: %s' % (db_name))
         finally:
-            cr.commit()
             cr.close()
-            sql_db.close_db('template1')
         return True
 
     def _set_pg_psw_env_var(self):
@@ -222,13 +221,13 @@ class db(netsvc.Service):
             raise Exception, "Database already exists"
 
         db = sql_db.db_connect('template1')
-        cr = db.serialized_cursor()
-        cr.autocommit(True) # XXX inhibit the effect of a serialized cursor. is it what we want ?
+        cr = db.cursor()
+        cr.autocommit(True) # avoid transaction block
         try:
             cr.execute("""CREATE DATABASE "%s" ENCODING 'unicode' TEMPLATE "template0" """ % db_name)
         finally:
             cr.close()
-            sql_db.close_db('template1')
+            del db
 
         cmd = ['pg_restore', '--no-owner']
         if tools.config['db_user']:
@@ -267,7 +266,7 @@ class db(netsvc.Service):
         logger = netsvc.Logger()
 
         db = sql_db.db_connect('template1')
-        cr = db.serialized_cursor()
+        cr = db.cursor()
         try:
             try:
                 cr.execute('ALTER DATABASE "%s" RENAME TO "%s"' % (old_name, new_name))
@@ -283,9 +282,7 @@ class db(netsvc.Service):
                 logger.notifyChannel("web-services", netsvc.LOG_INFO,
                     'RENAME DB: %s -> %s' % (old_name, new_name))
         finally:
-            cr.commit()
             cr.close()
-            sql_db.close_db('template1')
         return True
 
     def db_exist(self, db_name):
@@ -317,7 +314,6 @@ class db(netsvc.Service):
                 res = []
         finally:
             cr.close()
-            sql_db.close_db('template1')
         res.sort()
         return res
 
diff --git a/bin/sql_db.py b/bin/sql_db.py
index 679ce2da7ac..5c288efd817 100644
--- a/bin/sql_db.py
+++ b/bin/sql_db.py
@@ -20,10 +20,12 @@
 #
 ##############################################################################
 
+__all__ = ['db_connect', 'close_db']
+
 import netsvc
 from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT, ISOLATION_LEVEL_READ_COMMITTED, ISOLATION_LEVEL_SERIALIZABLE
-from psycopg2.pool import ThreadedConnectionPool
 from psycopg2.psycopg1 import cursor as psycopg1cursor
+from psycopg2.pool import PoolError
 
 import psycopg2.extensions
 
@@ -49,26 +51,23 @@ psycopg2.extensions.register_type(psycopg2.extensions.new_type((700, 701, 1700,)
 
 
 import tools
-import re
+from tools.func import wraps
+from datetime import datetime as mdt
+import threading
 
-from mx import DateTime as mdt
+import re
 re_from = re.compile('.* from "?([a-zA-Z_0-9]+)"? .*$');
 re_into = re.compile('.* into "?([a-zA-Z_0-9]+)"? .*$');
 
+
 def log(msg, lvl=netsvc.LOG_DEBUG):
     logger = netsvc.Logger()
     logger.notifyChannel('sql', lvl, msg)
 
 class Cursor(object):
     IN_MAX = 1000
-    sql_from_log = {}
-    sql_into_log = {}
-    sql_log = False
-    count = 0
-    
-    def check(f):
-        from tools.func import wraps
 
+    def check(f):
         @wraps(f)
         def wrapper(self, *args, **kwargs):
             if self.__closed:
@@ -76,36 +75,41 @@ class Cursor(object):
             return f(self, *args, **kwargs)
         return wrapper
 
-    def __init__(self, pool, serialized=False):
+    def __init__(self, pool, dbname, serialized=False):
+        self.sql_from_log = {}
+        self.sql_into_log = {}
+        self.sql_log = False
+        self.sql_log_count = 0
+
+        self.__closed = True    # avoid the call of close() (by __del__) if an exception
+                                # is raised by any of the following initialisations
         self._pool = pool
+        self.dbname = dbname
         self._serialized = serialized
-        self._cnx = pool.getconn()
+        self._cnx = pool.borrow(dsn(dbname))
         self._obj = self._cnx.cursor(cursor_factory=psycopg1cursor)
-        self.__closed = False
+        self.__closed = False   # real initialisation value
         self.autocommit(False)
-        self.dbname = pool.dbname
 
         if tools.config['log_level'] in (netsvc.LOG_DEBUG, netsvc.LOG_DEBUG_RPC):
             from inspect import stack
             self.__caller = tuple(stack()[2][1:3])
-        
+
     def __del__(self):
         if not self.__closed:
+            # Oops. 'self' has not been closed explicitly.
+            # The cursor will be deleted by the garbage collector,
+            # but the database connection is not put back into the connection
+            # pool, preventing some operation on the database like dropping it.
+            # This can also lead to a server overload.
             if tools.config['log_level'] in (netsvc.LOG_DEBUG, netsvc.LOG_DEBUG_RPC):
-                # Oops. 'self' has not been closed explicitly.
-                # The cursor will be deleted by the garbage collector, 
-                # but the database connection is not put back into the connection
-                # pool, preventing some operation on the database like dropping it.
-                # This can also lead to a server overload.
                 msg = "Cursor not closed explicitly\n"  \
                       "Cursor was created at %s:%s" % self.__caller
-
                 log(msg, netsvc.LOG_WARNING)
             self.close()
 
     @check
     def execute(self, query, params=None):
-        self.count+=1
         if '%d' in query or '%f' in query:
             log(query, netsvc.LOG_WARNING)
             log("SQL queries mustn't contain %d or %f anymore. Use only %s", netsvc.LOG_WARNING)
@@ -125,7 +129,7 @@ class Cursor(object):
 
         if self.sql_log:
             log("query: %s" % self._obj.query)
-            self.count+=1
+            self.sql_log_count+=1
             res_from = re_from.match(query.lower())
             if res_from:
                 self.sql_from_log.setdefault(res_from.group(1), [0, 0])
@@ -139,6 +143,9 @@ class Cursor(object):
         return res
 
     def print_log(self):
+        if not self.sql_log:
+            return
+
         def process(type):
             sqllogs = {'from':self.sql_from_log, 'into':self.sql_into_log}
             if not sqllogs[type]:
@@ -150,17 +157,23 @@ class Cursor(object):
             for r in sqllogitems:
                 log("table: %s: %s/%s" %(r[0], str(r[1][1]), r[1][0]))
                 sum+= r[1][1]
-            log("SUM:%s/%d" % (sum, self.count))
+            log("SUM:%s/%d" % (sum, self.sql_log_count))
             sqllogs[type].clear()
         process('from')
         process('into')
-        self.count = 0
+        self.sql_log_count = 0
         self.sql_log = False
 
     @check
     def close(self):
-        self.rollback() # Ensure we close the current transaction.
+        if not self._obj:
+            return
+
         self.print_log()
+
+        if not self._serialized:
+            self.rollback() # Ensure we close the current transaction.
+
         self._obj.close()
 
         # This force the cursor to be freed, and thus, available again. It is
@@ -170,8 +183,8 @@ class Cursor(object):
         # part because browse records keep a reference to the cursor.
         del self._obj
         self.__closed = True
-        self._pool.putconn(self._cnx)
-    
+        self._pool.give_back(self._cnx)
+
     @check
     def autocommit(self, on):
         offlevel = [ISOLATION_LEVEL_READ_COMMITTED, ISOLATION_LEVEL_SERIALIZABLE][bool(self._serialized)]
@@ -189,63 +202,128 @@ class Cursor(object):
     def __getattr__(self, name):
         return getattr(self._obj, name)
 
+
 class ConnectionPool(object):
-    def __init__(self, pool, dbname):
+
+    def locked(fun):
+        @wraps(fun)
+        def _locked(self, *args, **kwargs):
+            self._lock.acquire()
+            try:
+                return fun(self, *args, **kwargs)
+            finally:
+                self._lock.release()
+        return _locked
+
+
+    def __init__(self, maxconn=64):
+        self._connections = []
+        self._maxconn = max(maxconn, 1)
+        self._lock = threading.Lock()
+        self._logger = netsvc.Logger()
+
+    def _log(self, msg):
+        #self._logger.notifyChannel('ConnectionPool', netsvc.LOG_INFO, msg)
+        pass
+    def _debug(self, msg):
+        #self._logger.notifyChannel('ConnectionPool', netsvc.LOG_DEBUG, msg)
+        pass
+
+    @locked
+    def borrow(self, dsn):
+        self._log('Borrow connection to %s' % (dsn,))
+
+        result = None
+        for i, (cnx, used) in enumerate(self._connections):
+            if not used and cnx.dsn == dsn:
+                self._debug('Existing connection found at index %d' % i)
+
+                self._connections.pop(i)
+                self._connections.append((cnx, True))
+
+                result = cnx
+                break
+        if result:
+            return result
+
+        if len(self._connections) >= self._maxconn:
+            # try to remove the older connection not used
+            for i, (cnx, used) in enumerate(self._connections):
+                if not used:
+                    self._debug('Removing old connection at index %d: %s' % (i, cnx.dsn))
+                    self._connections.pop(i)
+                    break
+            else:
+                # note: this code is called only if the for loop has completed (no break)
+                raise PoolError('Connection Pool Full')
+
+        self._debug('Create new connection')
+        result = psycopg2.connect(dsn=dsn)
+        self._connections.append((result, True))
+        return result
+
+    @locked
+    def give_back(self, connection):
+        self._log('Give back connection to %s' % (connection.dsn,))
+        for i, (cnx, used) in enumerate(self._connections):
+            if cnx is connection:
+                self._connections.pop(i)
+                self._connections.append((cnx, False))
+                break
+        else:
+            raise PoolError('This connection does not below to the pool')
+
+    @locked
+    def close_all(self, dsn):
+        for i, (cnx, used) in tools.reverse_enumerate(self._connections):
+            if cnx.dsn == dsn:
+                cnx.close()
+                self._connections.pop(i)
+
+
+class Connection(object):
+    __LOCKS = {}
+
+    def __init__(self, pool, dbname, unique=False):
         self.dbname = dbname
         self._pool = pool
+        self._unique = unique
+        if unique:
+            if dbname not in self.__LOCKS:
+                self.__LOCKS[dbname] = threading.Lock()
+            self.__LOCKS[dbname].acquire()
 
-    def cursor(self):
-        return Cursor(self)
+    def __del__(self):
+        if self._unique:
+            self.__LOCKS[self.dbname].release()
+
+    def cursor(self, serialized=False):
+        return Cursor(self._pool, self.dbname, serialized=serialized)
 
     def serialized_cursor(self):
-        return Cursor(self, True)
+        return self.cursor(True)
 
-    def __getattr__(self, name):
-        return getattr(self._pool, name)
 
-class PoolManager(object):
-    _pools = {}
-    _dsn = None
-    maxconn =  int(tools.config['db_maxconn']) or 64
-    
-    @classmethod 
-    def dsn(cls, db_name):
-        if cls._dsn is None:
-            cls._dsn = ''
-            for p in ('host', 'port', 'user', 'password'):
-                cfg = tools.config['db_' + p]
-                if cfg:
-                    cls._dsn += '%s=%s ' % (p, cfg)
-        return '%s dbname=%s' % (cls._dsn, db_name)
+_dsn = ''
+for p in ('host', 'port', 'user', 'password'):
+    cfg = tools.config['db_' + p]
+    if cfg:
+        _dsn += '%s=%s ' % (p, cfg)
 
-    @classmethod
-    def get(cls, db_name):
-        if db_name not in cls._pools:
-            logger = netsvc.Logger()
-            try:
-                logger.notifyChannel('dbpool', netsvc.LOG_INFO, 'Connecting to %s' % (db_name,))
-                cls._pools[db_name] = ConnectionPool(ThreadedConnectionPool(1, cls.maxconn, cls.dsn(db_name)), db_name)
-            except Exception, e:
-                logger.notifyChannel('dbpool', netsvc.LOG_ERROR, 'Unable to connect to %s: %s' %
-                                     (db_name, str(e)))
-                raise
-        return cls._pools[db_name]
+def dsn(db_name):
+    return '%sdbname=%s' % (_dsn, db_name)
 
-    @classmethod
-    def close(cls, db_name):
-        if db_name in cls._pools:
-            logger = netsvc.Logger()
-            logger.notifyChannel('dbpool', netsvc.LOG_INFO, 'Closing all connections to %s' % (db_name,))
-            cls._pools[db_name].closeall()
-            del cls._pools[db_name]
+
+_Pool = ConnectionPool(int(tools.config['db_maxconn']))
 
 def db_connect(db_name):
-    return PoolManager.get(db_name)
+    unique = db_name in ['template1', 'template0']
+    return Connection(_Pool, db_name, unique)
 
 def close_db(db_name):
-    PoolManager.close(db_name)
+    _Pool.close_all(dsn(db_name))
     tools.cache.clean_caches_for_db(db_name)
-    
+
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

From fc75b394c78af90182454f69939df2c684052414 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Tue, 24 Nov 2009 16:02:48 +0530
Subject: [PATCH 152/200] [FIX] Upgrade could have failed when its a change in
 name field,added cascade

bzr revid: jvo@tinyerp.com-20091124103248-dvq9f5n1m68c0y46
---
 bin/osv/orm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 5318c242ad2..32006111fc6 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1853,7 +1853,7 @@ class orm(orm_template):
                                 cr.execute('ALTER TABLE "%s" RENAME COLUMN "%s" TO temp_change_size' % (self._table, k))
                                 cr.execute('ALTER TABLE "%s" ADD COLUMN "%s" VARCHAR(%d)' % (self._table, k, f.size))
                                 cr.execute('UPDATE "%s" SET "%s"=temp_change_size::VARCHAR(%d)' % (self._table, k, f.size))
-                                cr.execute('ALTER TABLE "%s" DROP COLUMN temp_change_size' % (self._table,))
+                                cr.execute('ALTER TABLE "%s" DROP COLUMN temp_change_size CASCADE' % (self._table,))
                                 cr.commit()
                             for c in casts:
                                 if (f_pg_type==c[0]) and (f._type==c[1]):

From 459b4639a8b5f9c69d6da936fc0140557bf0d848 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dukai=20G=C3=A1bor?= <>
Date: Tue, 24 Nov 2009 18:23:28 +0530
Subject: [PATCH 153/200] [FIX] Stock :Invoice created from manual picking
 might miss UoS.

lp bug: https://launchpad.net/bugs/487091 fixed

bzr revid: jvo@tinyerp.com-20091124125328-mrsw98pqp5cprzkx
---
 addons/stock/stock.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 5259c2b0e0b..11d72428ab8 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -743,13 +743,18 @@ class stock_picking(osv.osv):
                 tax_ids = self._get_taxes_invoice(cursor, user, move_line, type)
                 account_analytic_id = self._get_account_analytic_invoice(cursor,
                         user, picking, move_line)
+                
+                #set UoS if it's a sale and the picking doesn't have one
+                uos_id = move_line.product_uos and move_line.product_uos.id or False
+                if not uos_id and type in ('out_invoice', 'out_refund'):
+                    uos_id = move_line.product_uom.id
 
                 account_id = self.pool.get('account.fiscal.position').map_account(cursor, user, partner.property_account_position, account_id)
                 invoice_line_id = invoice_line_obj.create(cursor, user, {
                     'name': name,
                     'origin': origin,
                     'invoice_id': invoice_id,
-                    'uos_id': move_line.product_uos.id,
+                    'uos_id': uos_id,
                     'product_id': move_line.product_id.id,
                     'account_id': account_id,
                     'price_unit': price_unit,

From fcbe52c0a036a1db08ea45d1c4c05e808db94587 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Tue, 24 Nov 2009 20:20:23 +0530
Subject: [PATCH 154/200] [FIX] Stock : Added Product UoS to the Stock Move
 view

bzr revid: jvo@tinyerp.com-20091124145023-p7vb6hc0pp1587s9
---
 addons/stock/stock_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 2f6eb80fd87..382a8f87bba 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1241,6 +1241,7 @@
                     <field colspan="4" name="product_id" select="1"/>
                     <field name="product_qty" select="2" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                     <field name="product_uom" select="2"/>
+                    <field name="product_uos" select="2"/>
                     <field colspan="4" name="name" select="2"/>
                     <field name="date"/>
                     <field name="date_planned"/>

From 3fd8dfcd79d0926580599ed15035a1754c521446 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Wed, 25 Nov 2009 15:05:04 +0530
Subject: [PATCH 155/200] [FIX] Custom Object xml arch needed encoding.

lp bug: https://launchpad.net/bugs/487836 fixed

bzr revid: jvo@tinyerp.com-20091125093504-2tdb5sx3hltpxnjq
---
 bin/addons/base/ir/ir_translation.py | 4 ++--
 bin/osv/orm.py                       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/addons/base/ir/ir_translation.py b/bin/addons/base/ir/ir_translation.py
index b90fe79ef4e..8d4959f72b7 100644
--- a/bin/addons/base/ir/ir_translation.py
+++ b/bin/addons/base/ir/ir_translation.py
@@ -133,14 +133,14 @@ class ir_translation(osv.osv):
                         'and type=%s ' \
                         'and name=%s ' \
                         'and src=%s',
-                    (lang, tt, str(name), source))
+                    (lang, tt, tools.ustr(name), source))
         else:
             cr.execute('select value ' \
                     'from ir_translation ' \
                     'where lang=%s ' \
                         'and type=%s ' \
                         'and name=%s',
-                    (lang, tt, str(name)))
+                    (lang, tt, tools.ustr(name)))
         res = cr.fetchone()
         trad = res and res[0] or ''
         return trad
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 32006111fc6..c8469c1ccc5 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1326,7 +1326,7 @@ class orm_template(object):
                 xml = self.__get_default_calendar_view()
             else:
                 xml = ''
-            result['arch'] = etree.fromstring(xml)
+            result['arch'] = etree.fromstring(encode(xml))
             result['name'] = 'default'
             result['field_parent'] = False
             result['view_id'] = 0

From 6e6202a0f6f2c414c7d24f3f58246396fa7d5e01 Mon Sep 17 00:00:00 2001
From: "VRA(OpenERP)" <>
Date: Wed, 25 Nov 2009 15:10:31 +0530
Subject: [PATCH 156/200] [FIX] Amount to text conversions made better

lp bug: https://launchpad.net/bugs/453269 fixed

bzr revid: jvo@tinyerp.com-20091125094031-oh9p5uxhx9ov99f7
---
 bin/tools/amount_to_text.py    | 237 +++++++++++++++------------------
 bin/tools/amount_to_text_en.py | 133 ++++++++----------
 2 files changed, 166 insertions(+), 204 deletions(-)

diff --git a/bin/tools/amount_to_text.py b/bin/tools/amount_to_text.py
index f933ae263e7..22c46a40bf8 100644
--- a/bin/tools/amount_to_text.py
+++ b/bin/tools/amount_to_text.py
@@ -24,147 +24,128 @@
 # French
 #-------------------------------------------------------------
 
-unites = {
-    0: '', 1:'un', 2:'deux', 3:'trois', 4:'quatre', 5:'cinq', 6:'six', 7:'sept', 8:'huit', 9:'neuf',
-    10:'dix', 11:'onze', 12:'douze', 13:'treize', 14:'quatorze', 15:'quinze', 16:'seize',
-    21:'vingt et un', 31:'trente et un', 41:'quarante et un', 51:'cinquante et un', 61:'soixante et un',
-    71:'septante et un', 91:'nonante et un', 80:'quatre-vingts'
-}
 
-dizaine = {
-    1: 'dix', 2:'vingt', 3:'trente',4:'quarante', 5:'cinquante', 6:'soixante', 7:'septante', 8:'quatre-vingt', 9:'nonante'
-}
+to_19_fr = ( 'zéro',  'un',   'deux',  'trois', 'quatre',   'cinq',   'six',
+          'sept', 'huit', 'neuf', 'dix',   'onze', 'douze', 'treize',
+          'quatorze', 'quinze', 'seize', 'dix-sept', 'dix-huit', 'dix-neuf' )
+tens_fr  = ( 'vingt', 'trente', 'quarante', 'Cinquante', 'Soixante', 'Soixante-dix', 'Quatre-vingts', 'Quatre-vingt Dix')
+denom_fr = ( '',
+          'Mille',     'Millions',         'Milliards',       'Billions',       'Quadrillions',
+          'Quintillion',  'Sextillion',      'Septillion',    'Octillion',      'Nonillion',
+          'Décillion',    'Undecillion',     'Duodecillion',  'Tredecillion',   'Quattuordecillion',
+          'Sexdecillion', 'Septendecillion', 'Octodecillion', 'Icosillion', 'Vigintillion' )
 
-centaine = {
-    0:'', 1: 'cent', 2:'deux cent', 3:'trois cent',4:'quatre cent', 5:'cinq cent', 6:'six cent', 7:'sept cent', 8:'huit cent', 9:'neuf cent'
-}
+# convert a value < 100 to French.
+def _convert_nn_fr(val):
+    if val < 20:
+        return to_19_fr[val]
+    for (dcap, dval) in ((k, 20 + (10 * v)) for (v, k) in enumerate(tens_fr)):
+        if dval + 10 > val:
+            if val % 10:
+                return dcap + '-' + to_19_fr[val % 10]
+            return dcap
 
-mille = {
-    0:'', 1:'mille'
-}
+# convert a value < 1000 to french, special cased because it is the level that kicks 
+# off the < 100 special case.  The rest are more general.  This also allows you to
+# get strings in the form of 'forty-five hundred' if called directly.
+def _convert_nnn_fr(val):
+    word = ''
+    (mod, rem) = (val % 100, val // 100)
+    if rem > 0:
+        word = to_19_fr[rem] + ' Cent'
+        if mod > 0:
+            word = word + ' '
+    if mod > 0:
+        word = word + _convert_nn_fr(mod)
+    return word
 
-def _100_to_text_fr(chiffre):
-    if chiffre in unites:
-        return unites[chiffre]
-    else:
-        if chiffre%10>0:
-            return dizaine[chiffre / 10]+'-'+unites[chiffre % 10]
-        else:
-            return dizaine[chiffre / 10]
+def french_number(val):
+    if val < 100:
+        return _convert_nn_fr(val)
+    if val < 1000:
+         return _convert_nnn_fr(val)
+    for (didx, dval) in ((v - 1, 1000 ** v) for v in range(len(denom_fr))):
+        if dval > val:
+            mod = 1000 ** didx
+            l = val // mod
+            r = val - (l * mod)
+            ret = _convert_nnn_fr(l) + ' ' + denom_fr[didx]
+            if r > 0:
+                ret = ret + ', ' + french_number(r)
+            return ret
 
-def _1000_to_text_fr(chiffre):
-    d = _100_to_text_fr(chiffre % 100)
-    d2 = chiffre/100
-    if d2>0 and d:
-        return centaine[d2]+' '+d
-    elif d2>1 and not(d):
-        return centaine[d2]+'s'
-    else:
-        return centaine[d2] or d
-
-def _10000_to_text_fr(chiffre):
-    if chiffre==0:
-        return 'zero'
-    part1 = _1000_to_text_fr(chiffre % 1000)
-    part2 = mille.get(chiffre / 1000,  _1000_to_text_fr(chiffre / 1000)+' mille')
-    if part2 and part1:
-        part1 = ' '+part1
-    return part2+part1
-    
 def amount_to_text_fr(number, currency):
-    units_number = int(number)
     units_name = currency
-    if units_number > 1:
-        units_name += 's'
-    units = _10000_to_text_fr(units_number)
-    units = units_number and '%s %s' % (units, units_name) or ''
-    
-    cents_number = int(number * 100) % 100
-    cents_name = (cents_number > 1) and 'cents' or 'cent'
-    cents = _100_to_text_fr(cents_number)
-    cents = cents_number and '%s %s' % (cents, cents_name) or ''
-    
-    if units and cents:
-        cents = ' '+cents
-        
-    return units + cents
+    list = str(number).split('.')
+    start_word = french_number(abs(int(list[0])))
+    end_word = french_number(int(list[1]))
+    cents_number = int(list[1])
+    cents_name = (cents_number > 1) and ' Cents' or ' Cent'
+    final_result = start_word +' '+units_name+' '+ end_word +' '+cents_name
+    return final_result
 
 #-------------------------------------------------------------
 # Dutch
 #-------------------------------------------------------------
 
-units_nl = {
-    0:'', 1:'een', 2:'twee', 3:'drie', 4:'vier', 5:'vijf', 6:'zes', 7:'zeven', 8:'acht', 9:'negen',
-    10:'tien', 11:'elf', 12:'twaalf', 13:'dertien', 14:'veertien' 
-}
+to_19_nl = ( 'Nul',  'Een',   'Twee',  'Drie', 'Vier',   'Vijf',   'Zes',
+          'Zeven', 'Acht', 'Negen', 'Tien',   'Elf', 'Twaalf', 'Dertien',
+          'Veertien', 'Vijftien', 'Zestien', 'Zeventien', 'Achttien', 'Negentien' )
+tens_nl  = ( 'Twintig', 'Dertig', 'Veertig', 'Vijftig', 'Zestig', 'Zeventig', 'Tachtig', 'Negentig')
+denom_nl = ( '',
+          'Duizend', 'Miljoen', 'Miljard', 'Triljoen', 'Quadriljoen',
+           'Quintillion', 'Sextiljoen', 'Septillion', 'Octillion', 'Nonillion',
+           'Decillion', 'Undecillion', 'Duodecillion', 'Tredecillion', 'Quattuordecillion',
+           'Sexdecillion', 'Septendecillion', 'Octodecillion', 'Novemdecillion', 'Vigintillion' )
 
-tens_nl = {
-    1: 'tien', 2:'twintig', 3:'dertig',4:'veertig', 5:'vijftig', 6:'zestig', 7:'zeventig', 8:'tachtig', 9:'negentig'
-}
+# convert a value < 100 to Dutch.
+def _convert_nn_nl(val):
+    if val < 20:
+        return to_19_nl[val]
+    for (dcap, dval) in ((k, 20 + (10 * v)) for (v, k) in enumerate(tens_nl)):
+        if dval + 10 > val:
+            if val % 10:
+                return dcap + '-' + to_19_nl[val % 10]
+            return dcap
 
-hundreds_nl = {
-    0:'', 1: 'honderd', 
-}
+# convert a value < 1000 to Dutch, special cased because it is the level that kicks 
+# off the < 100 special case.  The rest are more general.  This also allows you to
+# get strings in the form of 'forty-five hundred' if called directly.
+def _convert_nnn_nl(val):
+    word = ''
+    (mod, rem) = (val % 100, val // 100)
+    if rem > 0:
+        word = to_19_nl[rem] + ' Honderd'
+        if mod > 0:
+            word = word + ' '
+    if mod > 0:
+        word = word + _convert_nn_nl(mod)
+    return word
 
-thousands_nl = {
-    0:'', 1:'duizend'
-}
+def dutch_number(val):
+    if val < 100:
+        return _convert_nn_nl(val)
+    if val < 1000:
+         return _convert_nnn_nl(val)
+    for (didx, dval) in ((v - 1, 1000 ** v) for v in range(len(denom_nl))):
+        if dval > val:
+            mod = 1000 ** didx
+            l = val // mod
+            r = val - (l * mod)
+            ret = _convert_nnn_nl(l) + ' ' + denom_nl[didx]
+            if r > 0:
+                ret = ret + ', ' + dutch_number(r)
+            return ret
 
-def _100_to_text_nl(number):
-    if number in units_nl:
-        return units_nl[number]
-    else:
-        if number%10 > 0:
-            if number>10 and number<20:
-                return units_nl[number % 10]+tens_nl[number / 10]
-            else:
-                units = units_nl[number % 10]
-                if units[-1] == 'e':
-                    joinword = 'ën'
-                else:
-                    joinword = 'en'
-                return units+joinword+tens_nl[number / 10]
-        else:
-            return tens_nl[number / 10]
-
-def _1000_to_text_nl(number):
-    part1 = _100_to_text_nl(number % 100)
-    part2 = hundreds_nl.get(number / 100, units_nl[number/100] + hundreds_nl[1])
-    if part2 and part1:
-        part1 = ' ' + part1
-    return part2 + part1
-
-def _10000_to_text_nl(number):
-    if number==0:
-        return 'nul'
-    part1 = _1000_to_text_nl(number % 1000)
-    if thousands_nl.has_key(number / 1000):
-        part2 = thousands_nl[number / 1000]
-    else:
-        if (number / 1000 % 100 > 0) and (number / 1000 > 100):
-            space = ' '
-        else:
-            space = ''
-        part2 = _1000_to_text_nl(number / 1000) + space + thousands_nl[1]
-    if part2 and part1:
-        part1 = ' ' + part1
-    return part2 + part1
-    
 def amount_to_text_nl(number, currency):
-    units_number = int(number)
     units_name = currency
-    units = _10000_to_text_nl(units_number)
-    units = units_number and '%s %s' % (units, units_name) or ''
-    
-    cents_number = int(number * 100) % 100
-    cents_name = 'cent'
-    cents = _100_to_text_nl(cents_number)
-    cents = cents_number and '%s %s' % (cents, cents_name) or ''
-
-    if units and cents:
-        cents = ' ' + cents
-        
-    return units + cents
+    list = str(number).split('.')
+    start_word = dutch_number(int(list[0]))
+    end_word = dutch_number(int(list[1]))
+    cents_number = int(list[1])
+    cents_name = (cents_number > 1) and 'cent' or 'cent'
+    final_result = start_word +' '+units_name+' '+ end_word +' '+cents_name
+    return final_result
 
 #-------------------------------------------------------------
 # Generic functions
@@ -183,17 +164,17 @@ def amount_to_text(nbr, lang='fr', currency='euro'):
     Example:
         1654: mille six cent cinquante-quatre.
     """
-    if nbr > 1000000:
-#TODO: use logger   
-        print "WARNING: number too large '%d', can't translate it!" % (nbr,)
-        return str(nbr)
+#    if nbr > 1000000:
+##TODO: use logger   
+#        print "WARNING: number too large '%d', can't translate it!" % (nbr,)
+#        return str(nbr)
     
     if not _translate_funcs.has_key(lang):
 #TODO: use logger   
         print "WARNING: no translation function found for lang: '%s'" % (lang,)
 #TODO: (default should be en) same as above
         lang = 'fr'
-    return _translate_funcs[lang](nbr, currency)
+    return _translate_funcs[lang](abs(nbr), currency)
 
 if __name__=='__main__':
     from sys import argv
diff --git a/bin/tools/amount_to_text_en.py b/bin/tools/amount_to_text_en.py
index 45168bb2d9f..51e7e379d95 100644
--- a/bin/tools/amount_to_text_en.py
+++ b/bin/tools/amount_to_text_en.py
@@ -23,85 +23,66 @@
 #-------------------------------------------------------------
 #ENGLISH
 #-------------------------------------------------------------
+from tools.translate import _
 
-ones = {
-    0: '', 1:'One', 2:'Two', 3:'Three', 4:'Four', 5:'Five', 6:'Six', 7:'Seven', 8:'Eight', 9:'Nine',
-    10:'Ten', 11:'Eleven', 12:'Twelve', 13:'Thirteen', 14:'Forteen', 15:'Fifteen', 16:'Sixteen', 17:"Seventeen",18:"Eighteen",19:"Nineteen",
-}
+to_19 = ( 'Zero',  'One',   'Two',  'Three', 'Four',   'Five',   'Six',
+          'Seven', 'Eight', 'Nine', 'Ten',   'Eleven', 'Twelve', 'Thirteen',
+          'Fourteen', 'Fifteen', 'Sixteen', 'Seventeen', 'Eighteen', 'Nineteen' )
+tens  = ( 'Twenty', 'Thirty', 'Forty', 'Fifty', 'Sixty', 'Seventy', 'Eighty', 'Ninety')
+denom = ( '',
+          'Thousand',     'Million',         'Billion',       'Trillion',       'Quadrillion',
+          'Quintillion',  'Sextillion',      'Septillion',    'Octillion',      'Nonillion',
+          'Decillion',    'Undecillion',     'Duodecillion',  'Tredecillion',   'Quattuordecillion',
+          'Sexdecillion', 'Septendecillion', 'Octodecillion', 'Novemdecillion', 'Vigintillion' )
 
-tens = {
-    1: 'Ten', 2: 'Twenty ', 3:'Thirty', 4:'Forty', 5:'Fifty', 6: 'Sixty', 7 : 'Seventy', 8:'Eighty' ,9: 'Ninety'}
+# convert a value < 100 to English.
+def _convert_nn(val):
+    if val < 20:
+        return to_19[val]
+    for (dcap, dval) in ((k, 20 + (10 * v)) for (v, k) in enumerate(tens)):
+        if dval + 10 > val:
+            if val % 10:
+                return dcap + '-' + to_19[val % 10]
+            return dcap
 
-hundred = {
-     0:'',1: 'One Hundred', 2: 'Two Hundred', 3: 'Three Hundred', 4 :'Four Hundred', 5: 'Five Hundred', 6: 'Six Hundred', 7 :'Seven Hundred', 8:' Eight Hundred ', 9:'Nine Hundred '
-}
-
-thousands ={
-     0:'',1: 'One Thousand'
-}
-
-lacs = {
-     0:'',1: 'Lac'
-}
-
-def _100_to_text(number):
-    if number in ones:
-        return ones[number]
-    else:
-        if number%10>0:
-            return tens[number / 10]+'-'+ones[number % 10]
-        else:
-            return tens[number / 10]
-
-def _1000_to_text(number):
-    d = _100_to_text(number % 100)
-    d2 = number/100
-    if d2>0 and d:
-        return hundred[d2]+' '+d
-    elif d2>1 and not(d):
-        return hundred[d2]+'s'
-    else:
-        return hundred[d2] or d
-
-def _10000_to_text(number):
-    if number==0:
-        return 'zero'
-    part1 = _1000_to_text(number % 1000)
-    part2 = thousands.get(number / 1000,  _1000_to_text(number / 1000)+' Thousands')
-    if part2 and part1:
-        part1 = ' '+part1
-    return part2+part1
-
-def _1000000_to_text(number):
-    if number==0:
-        return 'zero'
-    part1 = _10000_to_text(number % 100000)
-    part2 = lacs.get(number / 100000,  _10000_to_text(number / 100000)+' Lacs')
-    if part2 and part1:
-        part1 = ' '+part1
-    return part2+part1
+# convert a value < 1000 to english, special cased because it is the level that kicks 
+# off the < 100 special case.  The rest are more general.  This also allows you to
+# get strings in the form of 'forty-five hundred' if called directly.
+def _convert_nnn(val):
+    word = ''
+    (mod, rem) = (val % 100, val // 100)
+    if rem > 0:
+        word = to_19[rem] + ' Hundred'
+        if mod > 0:
+            word = word + ' '
+    if mod > 0:
+        word = word + _convert_nn(mod)
+    return word
 
+def english_number(val):
+    if val < 100:
+        return _convert_nn(val)
+    if val < 1000:
+         return _convert_nnn(val)
+    for (didx, dval) in ((v - 1, 1000 ** v) for v in range(len(denom))):
+        if dval > val:
+            mod = 1000 ** didx
+            l = val // mod
+            r = val - (l * mod)
+            ret = _convert_nnn(l) + ' ' + denom[didx]
+            if r > 0:
+                ret = ret + ', ' + english_number(r)
+            return ret
 
 def amount_to_text(number, currency):
-    lacs_number = int(number)
     units_name = currency
-    if lacs_number > 1:
-        units_name += 's'
-    
-    lacs = _1000000_to_text(lacs_number)
-    lacs = lacs_number and '%s %s' % (lacs, units_name) or ''
-    
-    units_number = int(number * 10000) % 10000
-    units = _10000_to_text(units_number)
-    units = units_number and '%s %s' % (units, units_name) or ''
-    
-    cents_number = int(number * 100) % 100
-    cents_name = (cents_number > 1) and 'cents' or 'cent'
-    cents = _100_to_text(cents_number)
-    cents = cents_number and '%s %s' % (cents.lower(), cents_name) or ''
-    if cents:
-        lacs += ' and %s' % (cents, )
-    return lacs
+    list = str(number).split('.')
+    start_word = english_number(int(list[0]))
+    end_word = english_number(int(list[1]))
+    cents_number = int(list[1])
+    cents_name = (cents_number > 1) and 'Cents' or 'Cent'
+    final_result = start_word +' '+units_name+' and ' + end_word +' '+cents_name
+    return final_result
 
 
 #-------------------------------------------------------------
@@ -119,15 +100,15 @@ def amount_to_text(nbr, lang='en', currency='euro'):
         1654: thousands six cent cinquante-quatre.
     """
     import netsvc
-    if nbr > 10000000:
-        netsvc.Logger().notifyChannel('translate', netsvc.LOG_WARNING, _("Number too large '%d', can not translate it"))
-        return str(nbr)
+#    if nbr > 10000000:
+#        netsvc.Logger().notifyChannel('translate', netsvc.LOG_WARNING, _("Number too large '%d', can not translate it"))
+#        return str(nbr)
     
     if not _translate_funcs.has_key(lang):
         netsvc.Logger().notifyChannel('translate', netsvc.LOG_WARNING, _("no translation function found for lang: '%s'" % (lang,)))
         #TODO: (default should be en) same as above
         lang = 'en'
-    return _translate_funcs[lang](nbr, currency)
+    return _translate_funcs[lang](abs(nbr), currency)
 
 if __name__=='__main__':
     from sys import argv

From 3543bb2f62e42c7d1defb59d71ef9dde8f7fe301 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Wed, 25 Nov 2009 22:29:52 +0530
Subject: [PATCH 157/200] [FIX]: fix the problem of menus uring installation

bzr revid: mga@tinyerp.com-20091125165952-virgd1mv2jyoputk
---
 addons/hr_expense/hr_expense_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index e822d52558b..591fef5984f 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -113,7 +113,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','draft')]</field>
         </record>
-        <menuitem action="expense_all_draft" id="menu_expense_all_draft" parent="hr_expense.menu_expense_all"/>
+        <menuitem action="expense_all_draft" id="menu_expense_all_draft" parent="menu_expense_all"/>
         <record id="expense_all_confirm" model="ir.actions.act_window">
             <field name="name">Expenses waiting validation</field>
             <field name="res_model">hr.expense.expense</field>
@@ -121,7 +121,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','confirm')]</field>
         </record>
-        <menuitem action="expense_all_confirm" id="menu_expense_all_confirm" parent="hr_expense.menu_expense_all"/>
+        <menuitem action="expense_all_confirm" id="menu_expense_all_confirm" parent="menu_expense_all"/>
         <record id="expense_all_valid" model="ir.actions.act_window">
             <field name="name">Expenses waiting invoice</field>
             <field name="res_model">hr.expense.expense</field>
@@ -129,7 +129,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','accepted')]</field>
         </record>
-        <menuitem action="expense_all_valid" id="menu_expense_all_valid" parent="hr_expense.menu_expense_all"/>
+        <menuitem action="expense_all_valid" id="menu_expense_all_valid" parent="menu_expense_all"/>
         <record id="expense_all_invoiced" model="ir.actions.act_window">
             <field name="name">Expenses waiting payment</field>
             <field name="res_model">hr.expense.expense</field>
@@ -137,7 +137,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','invoiced')]</field>
         </record>
-        <menuitem action="expense_all_invoiced" id="menu_expense_all_invoiced" parent="hr_expense.menu_expense_all"/>
+        <menuitem action="expense_all_invoiced" id="menu_expense_all_invoiced" parent="menu_expense_all"/>
         
         <!--
 		My expenses menu

From 2f20758f02fabab6e9b8bd8115e6f6714cba7a88 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Thu, 26 Nov 2009 16:09:55 +0530
Subject: [PATCH 158/200] [FIX] quality_integration_server: wrong web-service
 name

bzr revid: hmo@tinyerp.com-20091126103955-389b05nutd4r2gkj
---
 .../quality_integration_server/base_quality_interrogation.py    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/quality_integration_server/base_quality_interrogation.py b/bin/addons/quality_integration_server/base_quality_interrogation.py
index 0c82a9d4263..7da74e74e8c 100755
--- a/bin/addons/quality_integration_server/base_quality_interrogation.py
+++ b/bin/addons/quality_integration_server/base_quality_interrogation.py
@@ -160,7 +160,7 @@ def check_quality(uri, user, pwd, dbname, modules, quality_logs):
 
 def wait(id,url=''):
     progress=0.0
-    sock2 = xmlrpclib.ServerProxy(url+'/db')
+    sock2 = xmlrpclib.ServerProxy(url+'/xmlrpc/db')
     while not progress==1.0:
         progress,users = execute(sock2,'get_progress',admin_passwd, id)
     return True

From 38488751615e19fc217c78ca451793f52f96d721 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Fri, 27 Nov 2009 12:13:46 +0530
Subject: [PATCH 159/200] [IMP] quality_integration_server: added net_port
 option in script

bzr revid: hmo@tinyerp.com-20091127064346-xlxow28w0y7sdk05
---
 Makefile                                      | 15 ++++---
 .../base_quality_interrogation.py             | 39 +++++++++++--------
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/Makefile b/Makefile
index 7b410d19dee..b4a57c2859b 100644
--- a/Makefile
+++ b/Makefile
@@ -14,31 +14,30 @@ login := admin
 password := admin
 
 start:        
-	python $(interrogation_file) start-server --root-path=$(root-path) --addons-path=$(addons-path) --port=$(port)
+	python $(interrogation_file) start-server --root-path=$(root-path) --addons-path=$(addons-path) --port=$(port) --net_port=$(net_port)
 
 create-db:
-	python $(interrogation_file) create-db --database=$(database) --root-path=$(root-path) --addons-path=$(addons-path) --port=$(port) --login=$(login) --password=$(password)
+	python $(interrogation_file) create-db --database=$(database) --root-path=$(root-path) --addons-path=$(addons-path) --port=$(port) --net_port=$(net_port) --login=$(login) --password=$(password)
 
 drop-db:
-	python $(interrogation_file) drop-db --database=$(database) --root-path=$(root-path) --addons-path=$(addons-path) --port=$(port)
+	python $(interrogation_file) drop-db --database=$(database) --root-path=$(root-path) --addons-path=$(addons-path) --port=$(port) --net_port=$(net_port)
 
 install-module:	
-	python $(interrogation_file) install-module --modules=$(module) --database=$(database) --root-path=$(root-path) --addons-path=$(addons-path) --extra-addons=$(extra-addons) --port=$(port) --login=$(login) --password=$(password)
+	python $(interrogation_file) install-module --modules=$(module) --database=$(database) --root-path=$(root-path) --addons-path=$(addons-path) --extra-addons=$(extra-addons) --net_port=$(net_port) --port=$(port) --login=$(login) --password=$(password)
 
 upgrade-module:	
-	python $(interrogation_file) upgrade-module --modules=$(module) --database=$(database) --root-path=$(root-path) --addons-path=$(addons-path) --port=$(port) --login=$(login) --password=$(password)
+	python $(interrogation_file) upgrade-module --modules=$(module) --database=$(database) --root-path=$(root-path) --addons-path=$(addons-path) --port=$(port) --net_port=$(net_port) --login=$(login)  --password=$(password)
 	
 
 install-translation:    
-	python $(interrogation_file) install-translation --database=$(database) --translate-in=$(i18n-import) --port=$(port) --login=$(login) --password=$(password) --root-path=$(root-path) --addons-path=$(addons-path)
+	python $(interrogation_file) install-translation --database=$(database) --translate-in=$(i18n-import) --net_port=$(net_port) --port=$(port) --login=$(login) --password=$(password) --root-path=$(root-path) --addons-path=$(addons-path)
     
 
 version:
 	python bin/openerp-server.py --version
 
 check-quality:	
-	python $(interrogation_file) check-quality --database=$(database) --modules=$(module) --port=$(port) --login=$(login) --password=$(password) --addons-path=$(addons-path) --root-path=$(root-path)
+	python $(interrogation_file) check-quality --database=$(database) --modules=$(module)  --net_port=$(net_port)        --port=$(port) --login=$(login) --password=$(password) --addons-path=$(addons-path) --root-path=$(root-path)
 	
 
 
-
diff --git a/bin/addons/quality_integration_server/base_quality_interrogation.py b/bin/addons/quality_integration_server/base_quality_interrogation.py
index 7da74e74e8c..eb141b09453 100755
--- a/bin/addons/quality_integration_server/base_quality_interrogation.py
+++ b/bin/addons/quality_integration_server/base_quality_interrogation.py
@@ -49,8 +49,8 @@ def to_decode(s):
             except UnicodeError:
                 return s
 
-def start_server(root_path, port, addons_path):
-    os.system('python2.5 %sopenerp-server.py  --pidfile=openerp.pid  --port=%s --no-netrpc --addons-path=%s' %(root_path, str(port), addons_path))
+def start_server(root_path, port, netport, addons_path):
+    os.system('python2.5 %sopenerp-server.py  --pidfile=openerp.pid  --port=%s --net_port=%s --addons-path=%s' %(root_path, str(port),str(netport),addons_path))
 def clean():
     if os.path.isfile('openerp.pid'):
         ps = open('openerp.pid')
@@ -209,20 +209,23 @@ def drop_db(uri, dbname):
 def make_links(uri, uid, dbname, source, destination, module, user, pwd):
     if module in ('base','quality_integration_server'):
         return True
-    if not os.path.islink(destination + '/' + module):
-        if not os.path.isdir(destination + '/' + module):
-            for path in source:
-                if os.path.isdir(path + '/' + module):
-                    os.symlink(path + '/' + module, destination + '/' + module)
-                    obj_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/object')
-                    execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'update_list')
-                    module_ids = execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'search', [('name','=',module)])
-                    if len(module_ids):
-                        data = execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'read', module_ids[0],['name','dependencies_id'])
-                        dep_datas = execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module.dependency', 'read', data['dependencies_id'],['name'])
-                        for dep_data in dep_datas:
-                            make_links(uri, uid, dbname, source, destination, dep_data['name'], user, pwd)
-                    return True
+    for path in source:
+        if os.path.isdir(path + '/' + module):
+            if not os.path.islink(destination + '/' + module):
+                os.symlink(path + '/' + module, destination + '/' + module)
+                obj_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/object')
+                execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'update_list')
+                module_ids = execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'search', [('name','=',module)])
+                if len(module_ids):
+                    data = execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'read', module_ids[0],['name','dependencies_id'])
+                    dep_datas = execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module.dependency', 'read', data['dependencies_id'],['name'])
+                    for dep_data in dep_datas:
+                        make_links(uri, uid, dbname, source, destination, dep_data['name'], user, pwd)
+                break
+        else:
+            if os.path.islink(destination + '/' + module):
+               os.unlink(destination + '/' + module)
+               break
     return False
 
 def install_module(uri, dbname, modules, addons='', extra_addons='',  user='admin', pwd='admin'):
@@ -292,6 +295,7 @@ parser.add_option("--addons-path", dest="addons_path", help="specify the addons
 parser.add_option("--quality-logs", dest="quality_logs", help="specify the path of quality logs files which has to stores")
 parser.add_option("--root-path", dest="root_path", help="specify the root path")
 parser.add_option("-p", "--port", dest="port", help="specify the TCP port", type="int")
+parser.add_option("--net_port", dest="netport",help="specify the TCP port for netrpc")
 parser.add_option("-d", "--database", dest="db_name", help="specify the database name")
 parser.add_option("--login", dest="login", help="specify the User Login")
 parser.add_option("--password", dest="pwd", help="specify the User Password")
@@ -324,6 +328,7 @@ options = {
     'root-path' : opt.root_path or '',
     'translate-in': [],
     'port' : opt.port or 8069,
+    'netport':opt.netport or 8070,
     'database': opt.db_name or 'terp',
     'modules' : opt.modules or [],
     'login' : opt.login or 'admin',
@@ -346,7 +351,7 @@ if opt.translate_in:
 uri = 'http://localhost:' + str(options['port'])
 
 server_thread = threading.Thread(target=start_server,
-                args=(options['root-path'], options['port'], options['addons-path']))
+                args=(options['root-path'], options['port'],options['netport'], options['addons-path']))
 try:
     server_thread.start()
     if command == 'create-db':

From 2081fa095961bfa5685b38e17024a77070aceae9 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@tinyerp.com>
Date: Sat, 28 Nov 2009 00:11:26 +0100
Subject: [PATCH 160/200] [FIX] connection pool when database password is
 provided (thanks to Syleam Crew)

lp bug: https://launchpad.net/bugs/488234 fixed

bzr revid: chs@tinyerp.com-20091127231126-lbdmz9i9tm50k8f7
---
 bin/sql_db.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/bin/sql_db.py b/bin/sql_db.py
index 5c288efd817..b36634c5956 100644
--- a/bin/sql_db.py
+++ b/bin/sql_db.py
@@ -235,7 +235,7 @@ class ConnectionPool(object):
 
         result = None
         for i, (cnx, used) in enumerate(self._connections):
-            if not used and cnx.dsn == dsn:
+            if not used and dsn_are_equals(cnx.dsn, dsn):
                 self._debug('Existing connection found at index %d' % i)
 
                 self._connections.pop(i)
@@ -276,7 +276,7 @@ class ConnectionPool(object):
     @locked
     def close_all(self, dsn):
         for i, (cnx, used) in tools.reverse_enumerate(self._connections):
-            if cnx.dsn == dsn:
+            if dsn_are_equals(cnx.dsn, dsn):
                 cnx.close()
                 self._connections.pop(i)
 
@@ -295,6 +295,7 @@ class Connection(object):
 
     def __del__(self):
         if self._unique:
+            close_db(self.dbname)
             self.__LOCKS[self.dbname].release()
 
     def cursor(self, serialized=False):
@@ -313,6 +314,13 @@ for p in ('host', 'port', 'user', 'password'):
 def dsn(db_name):
     return '%sdbname=%s' % (_dsn, db_name)
 
+def dsn_are_equals(first, second):
+    def key(dsn):
+        k = dict(x.split('=', 1) for x in dsn.strip().split())
+        k.pop('password', None) # password is not relevant
+        return k
+    return key(first) == key(second)
+
 
 _Pool = ConnectionPool(int(tools.config['db_maxconn']))
 

From f51520986054b7cc0eb84958c46840901b49d9ef Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@tinyerp.com>
Date: Sat, 28 Nov 2009 00:47:26 +0100
Subject: [PATCH 161/200] [IMP] sql_log

bzr revid: chs@tinyerp.com-20091127234726-1k4g37h036x0hy7a
---
 bin/sql_db.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/bin/sql_db.py b/bin/sql_db.py
index b36634c5956..6d2d8b779ef 100644
--- a/bin/sql_db.py
+++ b/bin/sql_db.py
@@ -53,6 +53,7 @@ psycopg2.extensions.register_type(psycopg2.extensions.new_type((700, 701, 1700,)
 import tools
 from tools.func import wraps
 from datetime import datetime as mdt
+from datetime import timedelta
 import threading
 
 import re
@@ -128,18 +129,21 @@ class Cursor(object):
             raise
 
         if self.sql_log:
+            delay = mdt.now() - now
+            delay = delay.seconds * 1E6 + delay.microseconds
+
             log("query: %s" % self._obj.query)
             self.sql_log_count+=1
             res_from = re_from.match(query.lower())
             if res_from:
                 self.sql_from_log.setdefault(res_from.group(1), [0, 0])
                 self.sql_from_log[res_from.group(1)][0] += 1
-                self.sql_from_log[res_from.group(1)][1] += mdt.now() - now
+                self.sql_from_log[res_from.group(1)][1] += delay
             res_into = re_into.match(query.lower())
             if res_into:
                 self.sql_into_log.setdefault(res_into.group(1), [0, 0])
                 self.sql_into_log[res_into.group(1)][0] += 1
-                self.sql_into_log[res_into.group(1)][1] += mdt.now() - now
+                self.sql_into_log[res_into.group(1)][1] += delay
         return res
 
     def print_log(self):
@@ -155,9 +159,11 @@ class Cursor(object):
             sum = 0
             log("SQL LOG %s:" % (type,))
             for r in sqllogitems:
-                log("table: %s: %s/%s" %(r[0], str(r[1][1]), r[1][0]))
+                delay = timedelta(microseconds=r[1][1])
+                log("table: %s: %s/%s" %(r[0], str(delay), r[1][0]))
                 sum+= r[1][1]
-            log("SUM:%s/%d" % (sum, self.sql_log_count))
+            sum = timedelta(microseconds=sum)
+            log("SUM:%s/%d" % (str(sum), self.sql_log_count))
             sqllogs[type].clear()
         process('from')
         process('into')

From c0b1b09a9f2cbc81e9a4bda7140597f55d1ec637 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Sat, 28 Nov 2009 13:23:37 +0100
Subject: [PATCH 162/200] [FIX] Project : remove unused import causing a
 DeprecationWarning under Python 2.6

bzr revid: xmo@tinyerp.com-20091128122337-mmhl1p149gg4mg59
---
 addons/project/report/gantt_report.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/project/report/gantt_report.py b/addons/project/report/gantt_report.py
index 62ab354ae42..feece1d2a70 100644
--- a/addons/project/report/gantt_report.py
+++ b/addons/project/report/gantt_report.py
@@ -20,7 +20,6 @@
 #
 ##############################################################################
 
-from sets import Set
 from mx.DateTime import *
 
 import StringIO

From d2d1bece582510038dc19e73359203997a401575 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Mon, 30 Nov 2009 13:15:16 +0530
Subject: [PATCH 163/200] [REF] Stock : corrected spelling mistakes

bzr revid: jvo@tinyerp.com-20091130074516-pnlejuvh0g0xdwh5
---
 addons/stock/stock.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 11d72428ab8..b6f33aaf908 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -436,7 +436,7 @@ class stock_picking(osv.osv):
             ('confirmed', 'Confirmed'),
             ('assigned', 'Available'),
             ('done', 'Done'),
-            ('cancel', 'Canceled'),
+            ('cancel', 'Cancelled'),
             ], 'Status', readonly=True, select=True),
         'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date",
                  method=True, store=True, type='datetime', string='Planned Date', select=1),
@@ -959,7 +959,7 @@ class stock_move(osv.osv):
 
         'note': fields.text('Notes'),
 
-        'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Canceled')], 'Status', readonly=True, select=True),
+        'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Status', readonly=True, select=True),
         'price_unit': fields.float('Unit Price',
             digits=(16, int(config['price_accuracy']))),
     }

From bed149310f6c9cea3990b34412f619559968021c Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Mon, 30 Nov 2009 13:16:22 +0530
Subject: [PATCH 164/200] [FIX] Sale : State was written wrongly

lp bug: https://launchpad.net/bugs/488809 fixed

bzr revid: jvo@tinyerp.com-20091130074622-m3p60lsti3dn3shv
---
 addons/sale/sale.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 0b3116f5fe0..a7814e110ac 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -517,7 +517,7 @@ class sale_order(osv.osv):
                 for move in stock_move_obj.browse( cr, uid, move_ids ):
                     #if one of the related order lines is in state draft, auto or confirmed
                     #this order line is not yet delivered
-                    if move.state in ('draft', 'auto', 'confirmed'):
+                    if move.state in ('draft', 'waiting', 'confirmed'):
                         pending_deliveries = True
                 # Reason => if there are no move lines,the following condition will always set to be true,and will set SO to 'DONE'.
                 # Added move_ids check to SOLVE.

From e38f58aadddc3dae20069ea5c4802e9d497d6906 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Mon, 30 Nov 2009 13:49:53 +0530
Subject: [PATCH 165/200] [FIX] Account: text made translatable

bzr revid: jvo@tinyerp.com-20091130081953-17h7g0wuzxct2uo0
---
 addons/account/account.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index ff344b0256b..4b2766c53ac 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -930,7 +930,7 @@ class account_move(osv.osv):
             line_id = res[0]
         else:
             line_id = self.pool.get('account.move.line').create(cr, uid, {
-                'name': 'Centralisation '+mode,
+                'name': _('Centralisation ') + mode,
                 'centralisation': mode,
                 'account_id': account_id,
                 'move_id': move.id,

From bfa9ea99e377000edd1dfce38bdd2234f440bc3b Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Mon, 30 Nov 2009 14:11:25 +0530
Subject: [PATCH 166/200] [FIX] Module informtion was not getting updated on
 upgrading module

lp bug: https://launchpad.net/bugs/487723 fixed

bzr revid: jvo@tinyerp.com-20091130084125-1kqrxbdti3a6jxga
---
 bin/addons/__init__.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index 11503306743..0ac375fcde1 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -82,7 +82,7 @@ class Graph(dict):
 
         ## and we update the default values with values from the database
         additional_data.update(dict([(x.pop('name'), x) for x in cr.dictfetchall()]))
-
+        
         for package in self.values():
             for k, v in additional_data[package.name].items():
                 setattr(package, k, v)
@@ -602,6 +602,16 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, **kwargs):
         if hasattr(package, 'init') or hasattr(package, 'update') or package.state in ('to install', 'to upgrade'):
             has_updates = True
             for kind in ('init', 'update'):
+                if package.state=='to upgrade':
+                    # upgrading the module information
+                    modobj.write(cr, 1, [mid], {
+                    'description': package.data.get('description', ''),
+                    'shortdesc': package.data.get('name', ''),
+                    'author': package.data.get('author', 'Unknown'),
+                    'website': package.data.get('website', ''),
+                    'license': package.data.get('license', 'GPL-2'),
+                    'certificate': package.data.get('certificate') or None,
+                    })
                 for filename in package.data.get('%s_xml' % kind, []):
                     logger.notifyChannel('init', netsvc.LOG_INFO, 'module %s: loading %s' % (m, filename))
                     name, ext = os.path.splitext(filename)

From 31ca8f15540822ecd3bef307fd7c5e781e352e53 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Mon, 30 Nov 2009 16:26:32 +0530
Subject: [PATCH 167/200] [FIX] Hr_timesheet_sheet : setting type=workflow to 2
 buttons

bzr revid: jvo@tinyerp.com-20091130105632-ddmocm50z9f7v66j
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index dad78eb0f7f..42983f161ce 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -166,8 +166,8 @@
                     <group col="4" colspan="2">
                         <button name="button_confirm" states="draft" string="Confirm" type="object"/>
                         <button name="action_set_to_draft" states="done" string="Set to Draft" type="object"/>
-                        <button name="cancel" states="confirm" string="Refuse"/>
-                        <button name="done" states="confirm" string="Accept"/>
+                        <button name="cancel" states="confirm" string="Refuse" type="workflow"/>
+                        <button name="done" states="confirm" string="Accept" type="workflow"/>
                     </group>
                 </form>
             </field>

From 9ce8c62491631fce5ea16fb448058dd3c4553271 Mon Sep 17 00:00:00 2001
From: Quentin De Paoli <qdp@cyan>
Date: Mon, 30 Nov 2009 16:55:51 +0100
Subject: [PATCH 168/200] [FIX] l10n_be: corrected internal type of vat account
 in l10n_be: set other instead of payable/receivable

bzr revid: qdp@cyan-20091130155551-a840sv09ou430tpd
---
 addons/l10n_be/account_pcmn_belgium.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/l10n_be/account_pcmn_belgium.xml b/addons/l10n_be/account_pcmn_belgium.xml
index d3ec2a73f69..e657d259e60 100644
--- a/addons/l10n_be/account_pcmn_belgium.xml
+++ b/addons/l10n_be/account_pcmn_belgium.xml
@@ -3093,28 +3093,28 @@
         <record id="vat_refund0" model="account.account.template">
             <field name="name">T.V.A. due 0%</field>
             <field name="code">411000</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tax"/>
             <field ref="a4110" name="parent_id"/>
         </record>
         <record id="vat_refund06" model="account.account.template">
             <field name="name">T.V.A. due 6%</field>
             <field name="code">4110001</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tax"/>
             <field ref="a4110" name="parent_id"/>
         </record>
         <record id="vat_refund12" model="account.account.template">
             <field name="name">T.V.A. due 12%</field>
             <field name="code">4110002</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tax"/>
             <field ref="a4110" name="parent_id"/>
         </record>
         <record id="vat_refund21" model="account.account.template">
             <field name="name">T.V.A. due 21%</field>
             <field name="code">4110003</field>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tax"/>
             <field ref="a4110" name="parent_id"/>
         </record>
@@ -3689,28 +3689,28 @@
         <record id="vat_payable0" model="account.account.template">
             <field name="name">T.V.A. due 0%</field>
             <field name="code">451000</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tax"/>
             <field ref="a4510" name="parent_id"/>
         </record>
         <record id="vat_payable06" model="account.account.template">
             <field name="name">T.V.A. due 6%</field>
             <field name="code">4510001</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tax"/>
             <field ref="a4510" name="parent_id"/>
         </record>
         <record id="vat_payable12" model="account.account.template">
             <field name="name">T.V.A. due 12%</field>
             <field name="code">4510002</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tax"/>
             <field ref="a4510" name="parent_id"/>
         </record>
         <record id="vat_payable21" model="account.account.template">
             <field name="name">T.V.A. due 21%</field>
             <field name="code">4510003</field>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="user_type_tax"/>
             <field ref="a4510" name="parent_id"/>
         </record>

From 21749941eef20aeaf0173619ea7bf48c6957feb4 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Mon, 30 Nov 2009 17:01:31 +0100
Subject: [PATCH 169/200] [FIX] fields: '_fnct_write' should pass context
 object to the 'write' method

lp bug: https://launchpad.net/bugs/489355 fixed

bzr revid: olt@tinyerp.com-20091130160131-bv9g7y9vf0gdpa53
---
 bin/osv/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index dc5e2a9fd4a..92c9c634365 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -721,7 +721,7 @@ class related(function):
                         t_id=t_data['id']
                         t_data = t_data[self.arg[i]]
                 if t_id:
-                    obj.pool.get(field_detail['object']).write(cr,uid,[t_id],{args[-1]:values})
+                    obj.pool.get(field_detail['object']).write(cr,uid,[t_id],{args[-1]:values}, context=context)
 
     def _fnct_read(self, obj, cr, uid, ids, field_name, args, context=None):
         self._field_get2(cr, uid, obj, context)

From 8c349adead71e10a6b8df173d1b291081b8f982e Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Mon, 30 Nov 2009 17:02:20 +0100
Subject: [PATCH 170/200] [FIX] account, invoice, sale: description (product
 sold, invoice line and account entry line) was not translated

lp bug: https://launchpad.net/bugs/489355 fixed

bzr revid: olt@tinyerp.com-20091130160220-t0nroni5p0ufy5wi
---
 addons/account/account.py | 14 +++++++++-----
 addons/account/invoice.py |  2 +-
 addons/sale/sale.py       |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 4b2766c53ac..9dc9e5ac2aa 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -906,7 +906,10 @@ class account_move(osv.osv):
             amount+= (line.debit - line.credit)
         return amount
 
-    def _centralise(self, cr, uid, move, mode):
+    def _centralise(self, cr, uid, move, mode, context=None):
+        if context is None:
+            context = {}
+
         if mode=='credit':
             account_id = move.journal_id.default_debit_account_id.id
             mode2 = 'debit'
@@ -929,8 +932,9 @@ class account_move(osv.osv):
         if res:
             line_id = res[0]
         else:
+            context.update({'journal_id': move.journal_id.id, 'period_id': move.period_id.id})
             line_id = self.pool.get('account.move.line').create(cr, uid, {
-                'name': _('Centralisation ') + mode,
+                'name': _t(cr, None, 'selection', context.get('lang'), source=(mode.capitalize()+' Centralisation')) or (mode.capitalize()+' Centralisation'),
                 'centralisation': mode,
                 'account_id': account_id,
                 'move_id': move.id,
@@ -939,7 +943,7 @@ class account_move(osv.osv):
                 'date': move.period_id.date_stop,
                 'debit': 0.0,
                 'credit': 0.0,
-            }, {'journal_id': move.journal_id.id, 'period_id': move.period_id.id})
+            }, context)
 
         # find the first line of this move with the other mode
         # so that we can exclude it from our calculation
@@ -1021,8 +1025,8 @@ class account_move(osv.osv):
                 #
                 continue
             if journal.centralisation:
-                self._centralise(cr, uid, move, 'debit')
-                self._centralise(cr, uid, move, 'credit')
+                self._centralise(cr, uid, move, 'debit', context=context)
+                self._centralise(cr, uid, move, 'credit', context=context)
                 self.pool.get('account.move.line').write(cr, uid, line_draft_ids, {
                     'state': 'valid'
                 }, context, check=False)
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 8d9b905d6c3..e9484ff312d 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -679,7 +679,7 @@ class account_invoice(osv.osv):
                 for i in line:
                     i[2]['period_id'] = period_id
 
-            move_id = self.pool.get('account.move').create(cr, uid, move)
+            move_id = self.pool.get('account.move').create(cr, uid, move, context=context)
             new_move_name = self.pool.get('account.move').browse(cr, uid, move_id).name
             # make the invoice point to that move
             self.write(cr, uid, [inv.id], {'move_id': move_id,'period_id':period_id, 'move_name':new_move_name})
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index a7814e110ac..8e4426fd02b 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -955,7 +955,7 @@ class sale_order_line(osv.osv):
             partner = partner_obj.browse(cr, uid, partner_id)
             result['tax_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, product_obj.taxes_id)
         if not flag:
-            result['name'] = product_obj.partner_ref
+            result['name'] = self.pool.get('product.product').name_get(cr, uid, [product_obj.id], context=context)[0][1]
         domain = {}
         if (not uom) and (not uos):
             result['product_uom'] = product_obj.uom_id.id

From 0858a7c066fd793cd33c116752d825cc3f59b840 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Tue, 1 Dec 2009 12:05:57 +0530
Subject: [PATCH 171/200] [FIX] quality_integration_server : fixed bug on make
 link

bzr revid: hmo@tinyerp.com-20091201063557-j0k6ocjkt2djbq84
---
 .../base_quality_interrogation.py             | 31 +++++++++----------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/bin/addons/quality_integration_server/base_quality_interrogation.py b/bin/addons/quality_integration_server/base_quality_interrogation.py
index eb141b09453..6350789a9e9 100755
--- a/bin/addons/quality_integration_server/base_quality_interrogation.py
+++ b/bin/addons/quality_integration_server/base_quality_interrogation.py
@@ -209,23 +209,20 @@ def drop_db(uri, dbname):
 def make_links(uri, uid, dbname, source, destination, module, user, pwd):
     if module in ('base','quality_integration_server'):
         return True
-    for path in source:
-        if os.path.isdir(path + '/' + module):
-            if not os.path.islink(destination + '/' + module):
-                os.symlink(path + '/' + module, destination + '/' + module)
-                obj_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/object')
-                execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'update_list')
-                module_ids = execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'search', [('name','=',module)])
-                if len(module_ids):
-                    data = execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'read', module_ids[0],['name','dependencies_id'])
-                    dep_datas = execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module.dependency', 'read', data['dependencies_id'],['name'])
-                    for dep_data in dep_datas:
-                        make_links(uri, uid, dbname, source, destination, dep_data['name'], user, pwd)
-                break
-        else:
-            if os.path.islink(destination + '/' + module):
-               os.unlink(destination + '/' + module)
-               break
+    if not os.path.islink(destination + '/' + module):
+        if not os.path.isdir(destination + '/' + module):
+            for path in source:
+                if os.path.isdir(path + '/' + module):
+                    os.symlink(path + '/' + module, destination + '/' + module)
+                    obj_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/object')
+                    execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'update_list')
+                    module_ids = execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'search', [('name','=',module)])
+                    if len(module_ids):
+                        data = execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'read', module_ids[0],['name','dependencies_id'])
+                        dep_datas = execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module.dependency', 'read', data['dependencies_id'],['name'])
+                        for dep_data in dep_datas:
+                            make_links(uri, uid, dbname, source, destination, dep_data['name'], user, pwd)
+                    return True
     return False
 
 def install_module(uri, dbname, modules, addons='', extra_addons='',  user='admin', pwd='admin'):

From 162c3e320db78f7d2e7b38fbaa36d565ed111b8a Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Tue, 1 Dec 2009 12:23:16 +0530
Subject: [PATCH 172/200] [FIX] Stock/MRP : Track line wizard improved

lp bug: https://launchpad.net/bugs/488869 fixed

bzr revid: jvo@tinyerp.com-20091201065316-k1tgyj1vn5mr2hbi
---
 addons/mrp/wizard/wizard_track_line.py   | 9 ++++++++-
 addons/stock/wizard/wizard_track_line.py | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/wizard/wizard_track_line.py b/addons/mrp/wizard/wizard_track_line.py
index 26236c55e13..0866212549a 100644
--- a/addons/mrp/wizard/wizard_track_line.py
+++ b/addons/mrp/wizard/wizard_track_line.py
@@ -48,6 +48,13 @@ fields = {
         }
 }
 
+def _check_picking(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    move_obj = pool.get('stock.move').browse(cr, uid, data['id'])
+    if not move_obj.picking_id:
+        raise wizard.except_wizard(_('Caution!'), _('Before splitting the production lots,make sure this move has a Picking attached !\nYou must save the move before performing this operation.'))
+    return data['form']
+
 def _track_lines(self, cr, uid, data, context):
     move_id = data['id']
 
@@ -115,7 +122,7 @@ def _track_lines(self, cr, uid, data, context):
 class wizard_track_move(wizard.interface):
     states = {
         'init': {
-            'actions': [],
+            'actions': [_check_picking],
             'result': {'type': 'form', 'arch': track_form, 'fields': fields, 'state': [('end', 'Cancel', 'gtk-cancel'), ('track', 'Ok', 'gtk-ok')]},
             },
         'track': {
diff --git a/addons/stock/wizard/wizard_track_line.py b/addons/stock/wizard/wizard_track_line.py
index 79c105b962b..9576a9cb2f0 100644
--- a/addons/stock/wizard/wizard_track_line.py
+++ b/addons/stock/wizard/wizard_track_line.py
@@ -48,6 +48,13 @@ fields = {
         }
 }
 
+def _check_picking(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    move_obj = pool.get('stock.move').browse(cr, uid, data['id'])
+    if not move_obj.picking_id:
+        raise wizard.except_wizard(_('Caution!'), _('Before splitting the production lots,make sure this move has a Picking attached !\nYou must save the move before performing this operation.'))
+    return data['form']    
+
 def _track_lines(self, cr, uid, data, context):
     move_id = data['id']
 
@@ -116,7 +123,7 @@ def _track_lines(self, cr, uid, data, context):
 class wizard_track_move(wizard.interface):
     states = {
         'init': {
-            'actions': [],
+            'actions': [_check_picking],
             'result': {'type': 'form', 'arch': track_form, 'fields': fields, 'state': [('end', 'Cancel', 'gtk-cancel'), ('track', 'Ok', 'gtk-ok')]},
             },
         'track': {

From 8d74cfc70a09b84022b3cc908e7ceea239dd8fd0 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Tue, 1 Dec 2009 15:11:35 +0530
Subject: [PATCH 173/200] [FIX] Reverted bad commit from Joel@CamptoCamp

lp bug: https://launchpad.net/bugs/490327 fixed

bzr revid: jvo@tinyerp.com-20091201094135-otqj886a6l43bohz
---
 addons/account/account_view.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 56019d04cc4..6673d12c75d 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -335,7 +335,6 @@
                                     <field name="date"/>
                                     <field name="ref"/>
                                     <field name="name"/>
-                                    <field name="account_id"/>
                                     <field name="type"/>
                                     <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
                                     <field domain="[('journal_id','=',parent.journal_id)]" name="account_id"/>
@@ -346,7 +345,6 @@
                                 <form string="Statement lines">
                                     <field name="date"/>
                                     <field name="name"/>
-                                     <field name="account_id"/>
                                     <field name="type"/>
                                     <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
                                     <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>

From 06e17ce62f9635a67822e0daa251e2a727b081b2 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Tue, 1 Dec 2009 15:27:30 +0530
Subject: [PATCH 174/200] [FIX] Account : Ondelete=cascade added to bank
 statement line

lp bug: https://launchpad.net/bugs/490318 fixed

bzr revid: jvo@tinyerp.com-20091201095730-d7rbj3duxgcvsmhc
---
 addons/account/account_bank_statement.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index a4431518a08..d1cf95604bf 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -574,7 +574,7 @@ class account_bank_statement_line(osv.osv):
         'account_id': fields.many2one('account.account','Account',
             required=True),
         'statement_id': fields.many2one('account.bank.statement', 'Statement',
-            select=True, required=True),
+            select=True, required=True, ondelete='cascade'),
         'reconcile_id': fields.many2one('account.bank.statement.reconcile',
             'Reconcile', states={'confirm':[('readonly',True)]}),
         'move_ids': fields.many2many('account.move',

From bb6e26450e975a218434f46ede4b98cb0c701fc8 Mon Sep 17 00:00:00 2001
From: "R.Messier" <>
Date: Tue, 1 Dec 2009 16:31:49 +0530
Subject: [PATCH 175/200] [FIX] RAW reports creation corrected

lp bug: https://launchpad.net/bugs/490604 fixed

bzr revid: jvo@tinyerp.com-20091201110149-2flhfi59r9t909n4
---
 bin/report/interface.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/report/interface.py b/bin/report/interface.py
index 09ea80720ac..cd548301c26 100644
--- a/bin/report/interface.py
+++ b/bin/report/interface.py
@@ -88,14 +88,14 @@ class report_rml(report_int):
     def create(self, cr, uid, ids, datas, context):
         xml = self.create_xml(cr, uid, ids, datas, context)
         xml = tools.ustr(xml).encode('utf8')
-        if datas.get('report_type', 'pdf') == 'raw':
-            return xml
+        report_type = datas.get('report_type', 'pdf')
+        if report_type == 'raw':
+            return (xml,report_type)
         rml = self.create_rml(cr, xml, uid, context)
         pool = pooler.get_pool(cr.dbname)
         ir_actions_report_xml_obj = pool.get('ir.actions.report.xml')
         report_xml_ids = ir_actions_report_xml_obj.search(cr, uid, [('report_name', '=', self.name[7:])], context=context)
         self.title = report_xml_ids and ir_actions_report_xml_obj.browse(cr,uid,report_xml_ids)[0].name or 'OpenERP Report'
-        report_type = datas.get('report_type', 'pdf')
         create_doc = self.generators[report_type]
         pdf = create_doc(rml, title=self.title)
         return (pdf, report_type)

From b69980a384766e1ec94c13ed9b83d9faff340302 Mon Sep 17 00:00:00 2001
From: "GPA(OpenERP)" <>
Date: Tue, 1 Dec 2009 16:45:09 +0530
Subject: [PATCH 176/200] [FIX] Account :customer refund was displaying
 supplier invoice view, corrected

lp bug: https://launchpad.net/bugs/489083 fixed

bzr revid: jvo@tinyerp.com-20091201111509-uoeu0pqzb02fnaiv
---
 addons/account/account_invoice_view.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index add20bc4636..77ffbb6f61e 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -401,6 +401,20 @@
             <field name="domain">[('type','=','out_refund')]</field>
             <field name="context">{'type':'out_refund'}</field>
         </record>
+        
+        <record id="action_invoice_tree3_view1" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="act_window_id" ref="action_invoice_tree3"/>
+        </record>
+        
+        <record id="action_invoice_tree3_view2" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="invoice_form"/>
+            <field name="act_window_id" ref="action_invoice_tree3"/>
+        </record>
+        
         <menuitem action="action_invoice_tree3" id="menu_action_invoice_tree3" parent="account.menu_finance_invoice"/>
 
         <record id="action_invoice_tree3_new" model="ir.actions.act_window">

From 229c73d741a2d902ae64335ec5bdeeb58d8fa54e Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@tinyerp.com>
Date: Tue, 1 Dec 2009 14:19:08 +0100
Subject: [PATCH 177/200] [FIX] allow related fields to point to one2many and
 many2many fields

lp bug: https://launchpad.net/bugs/356628 fixed

bzr revid: chs@tinyerp.com-20091201131908-k5l5tmtpjq3m975x
---
 bin/osv/fields.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index 92c9c634365..e1d70978181 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -744,7 +744,7 @@ class related(function):
                 except:
                     t_data = False
                     break
-                if field_detail['type'] in ('one2many', 'many2many'):
+                if field_detail['type'] in ('one2many', 'many2many') and i != len(self.arg) - 1:
                     t_data = t_data[self.arg[i]][0]
                 else:
                     t_data = t_data[self.arg[i]]
@@ -760,6 +760,12 @@ class related(function):
                 for r in res:
                     if res[r]:
                         res[r] = (res[r], ng[res[r]])
+        elif self._type in ('one2many', 'many2many'):
+            for r in res:
+                if res[r]:
+                    res[r] = [x.id for x in res[r]]
+
+            
         return res
 
     def __init__(self, *arg, **args):

From e345e91365f2ab3c9130a3903715b1e1db5a477d Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@tinyerp.com>
Date: Tue, 1 Dec 2009 14:32:14 +0100
Subject: [PATCH 178/200] [FIX] db_exist method works as expected

bzr revid: chs@tinyerp.com-20091201133214-8c6i1ohk5t5u79dz
---
 bin/service/web_services.py | 7 ++-----
 bin/sql_db.py               | 9 +++++++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/bin/service/web_services.py b/bin/service/web_services.py
index a3280719f2c..ebd7f063d39 100644
--- a/bin/service/web_services.py
+++ b/bin/service/web_services.py
@@ -286,11 +286,8 @@ class db(netsvc.Service):
         return True
 
     def db_exist(self, db_name):
-        try:
-            db = sql_db.db_connect(db_name)
-            return True
-        except:
-            return False
+        ## Not True: in fact, check if connection to database is possible. The database may exists
+        return bool(sql_db.db_connect(db_name))
 
     def list(self):
         db = sql_db.db_connect('template1')
diff --git a/bin/sql_db.py b/bin/sql_db.py
index 6d2d8b779ef..59d7bcaac1f 100644
--- a/bin/sql_db.py
+++ b/bin/sql_db.py
@@ -310,6 +310,15 @@ class Connection(object):
     def serialized_cursor(self):
         return self.cursor(True)
 
+    def __nonzero__(self):
+        """Check if connection is possible"""
+        try:
+            cr = self.cursor()
+            cr.close()
+            return True
+        except:
+            return False
+
 
 _dsn = ''
 for p in ('host', 'port', 'user', 'password'):

From 0b44aff80b1585c7beea473abc120058fd327398 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Tue, 1 Dec 2009 19:25:39 +0530
Subject: [PATCH 179/200] [FIX] Account : making the default_get() eTiny
 compatible

lp bug: https://launchpad.net/bugs/490342 fixed

bzr revid: jvo@tinyerp.com-20091201135539-33qrq2g81un1lyr8
---
 addons/account/account_move_line.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index f31fca91a44..e263bc674ed 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -104,9 +104,10 @@ class account_move_line(osv.osv):
 
             total_new=0.00
             for i in context['lines']:
-                total_new +=(i[2]['debit'] or 0.00)- (i[2]['credit'] or 0.00)
-                for item in i[2]:
-                        data[item]=i[2][item]
+                if i[2]:
+                    total_new +=(i[2]['debit'] or 0.00)- (i[2]['credit'] or 0.00)
+                    for item in i[2]:
+                            data[item]=i[2][item]
             if context['journal']:
                 journal_obj=self.pool.get('account.journal').browse(cr,uid,context['journal'])
                 if journal_obj.type == 'purchase':

From 5eb3b61c14ecc99562269d722d7e748129fe4608 Mon Sep 17 00:00:00 2001
From: "VRA(OpenERP)" <>
Date: Wed, 2 Dec 2009 12:45:24 +0530
Subject: [PATCH 180/200] [FIX] Stock : Removal of picking shuold affect
 product stock

lp bug: https://launchpad.net/bugs/491241 fixed

bzr revid: jvo@tinyerp.com-20091202071524-csct9ktra6u9ytgw
---
 addons/stock/stock.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index b6f33aaf908..e8fcd34eb82 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -784,6 +784,17 @@ class stock_picking(osv.osv):
                 if move.state not in ('cancel',):
                     return False
         return True
+    
+    def unlink(self, cr, uid, ids, context=None):
+        for pick in self.browse(cr, uid, ids, context=context):
+            if pick.state in ['done','cancel']:
+                raise osv.except_osv(_('Error'), _('You cannot remove the picking which is in %s state !')%(pick.state,))
+            elif pick.state in ['confirmed','assigned']:
+                ids2 = [move.id for move in pick.move_lines]
+                self.pool.get('stock.move').action_cancel(cr, uid, ids2, context)
+            else:
+                continue    
+        return super(stock_picking, self).unlink(cr, uid, ids, context=context)
 
 stock_picking()
 

From 2f6de41fbfc211c2938f70110898d461bb1df54d Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Wed, 2 Dec 2009 09:09:50 +0100
Subject: [PATCH 181/200] [FIX] base: wrong fr_FR translation for 'Delete
 Permission'

bzr revid: olt@tinyerp.com-20091202080950-p3e68ch77ofgw74n
---
 bin/addons/base/i18n/fr_FR.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/addons/base/i18n/fr_FR.po b/bin/addons/base/i18n/fr_FR.po
index 37de9712074..6c489f2901d 100644
--- a/bin/addons/base/i18n/fr_FR.po
+++ b/bin/addons/base/i18n/fr_FR.po
@@ -5247,7 +5247,7 @@ msgstr "Compter"
 #. module: base
 #: field:ir.model.access,perm_create:0
 msgid "Create Access"
-msgstr "Accès en Création"
+msgstr "Accès en création"
 
 #. module: base
 #: code:addons/addons/use_control/module.py:0
@@ -10394,7 +10394,7 @@ msgstr ">"
 #. module: base
 #: field:ir.model.access,perm_unlink:0
 msgid "Delete Permission"
-msgstr "Supprimer une permission"
+msgstr "Accès en suppression"
 
 #. module: base
 #: code:addons/addons/account_budget/wizard/wizard_budget_report.py:0
@@ -11369,4 +11369,4 @@ msgstr "Erreur de contrainte"
 #. module: base
 #: selection:ir.translation,type:0
 msgid "SQL Constraint"
-msgstr "SQL Contrainte"
\ No newline at end of file
+msgstr "SQL Contrainte"

From 2365847b50a4128217719e0431eb3ced3b7892d6 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Wed, 2 Dec 2009 14:47:10 +0530
Subject: [PATCH 182/200] [FIX] Purchase : MOQ-pricing problem corrected

lp bug: https://launchpad.net/bugs/487641 fixed

bzr revid: jvo@tinyerp.com-20091202091710-59p7ojxsyvcfgr6v
---
 addons/purchase/purchase.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 46a17ea5ada..34f3a0d0692 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -480,12 +480,7 @@ class purchase_order_line(osv.osv):
             uom = prod_uom_po
         if not date_order:
             date_order = time.strftime('%Y-%m-%d')
-        price = self.pool.get('product.pricelist').price_get(cr,uid,[pricelist],
-                product, qty or 1.0, partner_id, {
-                    'uom': uom,
-                    'date': date_order,
-                    })[pricelist]
-
+        
         qty = qty or 1.0
         seller_delay = 0
         for s in prod.seller_ids:
@@ -495,6 +490,11 @@ class purchase_order_line(osv.osv):
                 if qty < temp_qty: # If the supplier quantity is greater than entered from user, set minimal.
                     qty = temp_qty
 
+        price = self.pool.get('product.pricelist').price_get(cr,uid,[pricelist],
+                product, qty or 1.0, partner_id, {
+                    'uom': uom,
+                    'date': date_order,
+                    })[pricelist]
         dt = (DateTime.now() + DateTime.RelativeDateTime(days=seller_delay or 0.0)).strftime('%Y-%m-%d %H:%M:%S')
         prod_name = prod.partner_ref
 

From 9bb02a1bb021b98aa4b3530e43f89721a6a02bb4 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 2 Dec 2009 11:06:58 +0100
Subject: [PATCH 183/200] [fix] use env for python shebang rather than
 hardcoding /usr/bin/python

bzr revid: xmo@tinyerp.com-20091202100658-d2q66mu6kihgj8h5
---
 bin/addons/module_graph.py             | 2 +-
 bin/netsvc.py                          | 2 +-
 bin/openerp-server.py                  | 2 +-
 bin/osv/orm.py                         | 2 +-
 bin/report/render/odt2odt/__init__.py  | 2 +-
 bin/report/render/rml2html/rml2html.py | 2 +-
 bin/tools/graph.py                     | 2 +-
 doc/tests/check_profile_l10n_all.py    | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bin/addons/module_graph.py b/bin/addons/module_graph.py
index 68cfb679804..6a21e053ccf 100755
--- a/bin/addons/module_graph.py
+++ b/bin/addons/module_graph.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
diff --git a/bin/netsvc.py b/bin/netsvc.py
index 56d0eb2918a..66c4d9e3dea 100644
--- a/bin/netsvc.py
+++ b/bin/netsvc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
diff --git a/bin/openerp-server.py b/bin/openerp-server.py
index 3971f2fa779..d6f1bf260bc 100755
--- a/bin/openerp-server.py
+++ b/bin/openerp-server.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index c8469c1ccc5..df843225ad7 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -3074,4 +3074,4 @@ class orm(orm_template):
                     return False
         return True
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/bin/report/render/odt2odt/__init__.py b/bin/report/render/odt2odt/__init__.py
index 9163b6eb222..b033149a972 100644
--- a/bin/report/render/odt2odt/__init__.py
+++ b/bin/report/render/odt2odt/__init__.py
@@ -19,4 +19,4 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from odt2odt import parseNode
\ No newline at end of file
+from odt2odt import parseNode
diff --git a/bin/report/render/rml2html/rml2html.py b/bin/report/render/rml2html/rml2html.py
index 5e7bb5cf4e9..8f0197b32df 100644
--- a/bin/report/render/rml2html/rml2html.py
+++ b/bin/report/render/rml2html/rml2html.py
@@ -458,4 +458,4 @@ if __name__=="__main__":
         print 'Usage: trml2pdf input.rml >output.pdf'
         print 'Try \'trml2pdf --help\' for more information.'
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/bin/tools/graph.py b/bin/tools/graph.py
index 9d246e4037f..d6a26deb3c2 100644
--- a/bin/tools/graph.py
+++ b/bin/tools/graph.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
diff --git a/doc/tests/check_profile_l10n_all.py b/doc/tests/check_profile_l10n_all.py
index f85ebfeb946..610c2b494cf 100644
--- a/doc/tests/check_profile_l10n_all.py
+++ b/doc/tests/check_profile_l10n_all.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #

From 2eb649ebc29d0e5d76cd7e0ab86dece72c80d66d Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Wed, 2 Dec 2009 17:38:08 +0530
Subject: [PATCH 184/200] [FIX] Encoding error corrected for
 client_action(ir_values-tree view)

lp bug: https://launchpad.net/bugs/435933 fixed

bzr revid: jvo@tinyerp.com-20091202120808-xdqj1iie1wvqd2zw
---
 bin/addons/base/ir/ir_values.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/ir/ir_values.py b/bin/addons/base/ir/ir_values.py
index b2eb1aa24cd..6641759f1eb 100644
--- a/bin/addons/base/ir/ir_values.py
+++ b/bin/addons/base/ir/ir_values.py
@@ -24,6 +24,7 @@ from osv import osv,fields
 from osv.orm import except_orm
 import pickle
 from tools.translate import _
+import tools
 
 class ir_values(osv.osv):
     _name = 'ir.values'
@@ -235,7 +236,7 @@ class ir_values(osv.osv):
                     #ir_del(cr, uid, x[0])
                     return False
             else:
-                datas = pickle.loads(str(x[2]))
+                datas = pickle.loads(tools.ustr(x[2]))
             if meta:
                 meta2 = pickle.loads(x[4])
                 return (x[0],x[1],datas,meta2)

From 6f363d43e9ec17fa77bee0734436ffb220370575 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Thu, 3 Dec 2009 12:34:21 +0530
Subject: [PATCH 185/200] [FIX] Pickling issue solved with ir_values (get
 method)

lp bug: https://launchpad.net/bugs/491462 fixed

bzr revid: jvo@tinyerp.com-20091203070421-0jt19rjqcqto7dlh
---
 bin/addons/base/ir/ir_values.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bin/addons/base/ir/ir_values.py b/bin/addons/base/ir/ir_values.py
index 6641759f1eb..585b9398f10 100644
--- a/bin/addons/base/ir/ir_values.py
+++ b/bin/addons/base/ir/ir_values.py
@@ -24,7 +24,6 @@ from osv import osv,fields
 from osv.orm import except_orm
 import pickle
 from tools.translate import _
-import tools
 
 class ir_values(osv.osv):
     _name = 'ir.values'
@@ -236,7 +235,7 @@ class ir_values(osv.osv):
                     #ir_del(cr, uid, x[0])
                     return False
             else:
-                datas = pickle.loads(tools.ustr(x[2]))
+                datas = pickle.loads(str(x[2].encode('utf-8')))
             if meta:
                 meta2 = pickle.loads(x[4])
                 return (x[0],x[1],datas,meta2)

From 8d26b4be3e55850b4d496c8228b7cf8de68937b5 Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Thu, 3 Dec 2009 14:41:03 +0530
Subject: [PATCH 186/200] [FIX] : translation: modify msg id where it contains
 python code in translations po files

bzr revid: mra@tinyerp.com-20091203091103-z6mwz3uai04wy957
---
 bin/addons/base/i18n/ar_AR.po | 58 ++++-------------------------------
 bin/addons/base/i18n/base.pot | 58 ++++-------------------------------
 bin/addons/base/i18n/bg_BG.po | 58 ++++-------------------------------
 bin/addons/base/i18n/bs_BS.po | 58 ++++-------------------------------
 bin/addons/base/i18n/ca_ES.po | 58 ++++-------------------------------
 bin/addons/base/i18n/cs_CZ.po | 58 ++++-------------------------------
 bin/addons/base/i18n/de_DE.po | 58 ++++-------------------------------
 bin/addons/base/i18n/es_AR.po | 58 ++++-------------------------------
 bin/addons/base/i18n/es_ES.po | 58 ++++-------------------------------
 bin/addons/base/i18n/et_EE.po | 58 ++++-------------------------------
 bin/addons/base/i18n/fi_FI.po | 58 ++++-------------------------------
 bin/addons/base/i18n/fr_FR.po | 58 ++++-------------------------------
 bin/addons/base/i18n/hr_HR.po | 58 ++++-------------------------------
 bin/addons/base/i18n/hu_HU.po | 58 ++++-------------------------------
 bin/addons/base/i18n/id_ID.po | 58 ++++-------------------------------
 bin/addons/base/i18n/it_IT.po | 58 ++++-------------------------------
 bin/addons/base/i18n/lt_LT.po | 58 ++++-------------------------------
 bin/addons/base/i18n/nl_BE.po | 58 ++++-------------------------------
 bin/addons/base/i18n/nl_NL.po | 58 ++++-------------------------------
 bin/addons/base/i18n/pl_PL.po | 58 ++++-------------------------------
 bin/addons/base/i18n/pt_BR.po | 58 ++++-------------------------------
 bin/addons/base/i18n/pt_PT.po | 58 ++++-------------------------------
 bin/addons/base/i18n/ro_RO.po | 58 ++++-------------------------------
 bin/addons/base/i18n/ru_RU.po | 58 ++++-------------------------------
 bin/addons/base/i18n/sl_SL.po | 58 ++++-------------------------------
 bin/addons/base/i18n/sq_AL.po | 58 ++++-------------------------------
 bin/addons/base/i18n/sv_SE.po | 58 ++++-------------------------------
 bin/addons/base/i18n/tr_TR.po | 58 ++++-------------------------------
 bin/addons/base/i18n/uk_UA.po | 58 ++++-------------------------------
 bin/addons/base/i18n/vi_VN.po | 58 ++++-------------------------------
 bin/addons/base/i18n/zh_CN.po | 58 ++++-------------------------------
 bin/addons/base/i18n/zh_TW.po | 58 ++++-------------------------------
 32 files changed, 192 insertions(+), 1664 deletions(-)

diff --git a/bin/addons/base/i18n/ar_AR.po b/bin/addons/base/i18n/ar_AR.po
index 388e147bde6..b82a872aa91 100644
--- a/bin/addons/base/i18n/ar_AR.po
+++ b/bin/addons/base/i18n/ar_AR.po
@@ -365,16 +365,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/purchase/purchase.py:0
 #, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!' % s['state']))\n"
-"        return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def button_dummy(self, cr, uid, ids, context={}):\n"
-"        return True\n"
-"\n"
-"    def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n"
-"        if not adr_id:\n"
-"            return {}\n"
-"        part_id = self.pool.get('res.partner.address"
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1301,14 +1292,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None,context=None):\n"
-"        if not default:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
+msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1363,21 +1347,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "Model %s Does not Exist !\" % vals['relation']))\n"
-"                 \n"
-"            if self.pool.get(vals['model']):\n"
-"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-"                self.pool.get(vals['model'])._auto_init(cr, {})\n"
-"                \n"
-"        return res\n"
-"ir_model_fields()\n"
-"\n"
-"class ir_model_access(osv.osv):\n"
-"    _name = 'ir.model.access'\n"
-"    _columns = {\n"
-"        'name': fields.char('Name', size=64, required=True),\n"
-"        'model_id': fields.many2one('ir.model', 'Object', required=True),\n"
-"        'group_id': fields.many2one('res.groups', 'Group"
+msgid "Model %s Does not Exist !"
 msgstr ""
 
 #. module: base
@@ -7738,13 +7708,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py:0
 #, python-format
-msgid "There are no Analytic lines related to Account %s' % name))\n"
-"        return {}\n"
-"\n"
-"    states = {\n"
-"        'init': {\n"
-"            'actions': [],\n"
-"            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel"
+msgid "There are no Analytic lines related to Account %s"
 msgstr ""
 
 #. module: base
@@ -10352,12 +10316,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
-msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies.\"\"\" % (line.account_id.code, line.account_id.name)))\n"
-"\n"
-"            if abs(amount) < 0.0001:\n"
-"                if not len(line_draft_ids):\n"
-"                    continue\n"
-"                self.pool.get('account.move.line"
+msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
 
 #. module: base
@@ -11280,12 +11239,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-"        if product_id:\n"
-"            w=self.pool.get('product.product"
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/base.pot b/bin/addons/base/i18n/base.pot
index 9c64334abbc..451aacfc900 100644
--- a/bin/addons/base/i18n/base.pot
+++ b/bin/addons/base/i18n/base.pot
@@ -365,16 +365,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/purchase/purchase.py:0
 #, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!' % s['state']))\n"
-"        return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def button_dummy(self, cr, uid, ids, context={}):\n"
-"        return True\n"
-"\n"
-"    def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n"
-"        if not adr_id:\n"
-"            return {}\n"
-"        part_id = self.pool.get('res.partner.address"
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1301,14 +1292,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None,context=None):\n"
-"        if not default:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
+msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1363,21 +1347,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "Model %s Does not Exist !\" % vals['relation']))\n"
-"                 \n"
-"            if self.pool.get(vals['model']):\n"
-"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-"                self.pool.get(vals['model'])._auto_init(cr, {})\n"
-"                \n"
-"        return res\n"
-"ir_model_fields()\n"
-"\n"
-"class ir_model_access(osv.osv):\n"
-"    _name = 'ir.model.access'\n"
-"    _columns = {\n"
-"        'name': fields.char('Name', size=64, required=True),\n"
-"        'model_id': fields.many2one('ir.model', 'Object', required=True),\n"
-"        'group_id': fields.many2one('res.groups', 'Group"
+msgid "Model %s Does not Exist !"
 msgstr ""
 
 #. module: base
@@ -7738,13 +7708,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py:0
 #, python-format
-msgid "There are no Analytic lines related to Account %s' % name))\n"
-"        return {}\n"
-"\n"
-"    states = {\n"
-"        'init': {\n"
-"            'actions': [],\n"
-"            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel"
+msgid "There are no Analytic lines related to Account %s"
 msgstr ""
 
 #. module: base
@@ -10352,12 +10316,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
-msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies.\"\"\" % (line.account_id.code, line.account_id.name)))\n"
-"\n"
-"            if abs(amount) < 0.0001:\n"
-"                if not len(line_draft_ids):\n"
-"                    continue\n"
-"                self.pool.get('account.move.line"
+msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
 
 #. module: base
@@ -11280,12 +11239,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-"        if product_id:\n"
-"            w=self.pool.get('product.product"
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/bg_BG.po b/bin/addons/base/i18n/bg_BG.po
index c5c85f8fee3..31e68877577 100644
--- a/bin/addons/base/i18n/bg_BG.po
+++ b/bin/addons/base/i18n/bg_BG.po
@@ -365,16 +365,7 @@ msgstr "Име на поле"
 #. module: base
 #: code:addons/addons/purchase/purchase.py:0
 #, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!' % s['state']))\n"
-"        return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def button_dummy(self, cr, uid, ids, context={}):\n"
-"        return True\n"
-"\n"
-"    def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n"
-"        if not adr_id:\n"
-"            return {}\n"
-"        part_id = self.pool.get('res.partner.address"
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1302,14 +1293,7 @@ msgstr "ir.exports.line"
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None,context=None):\n"
-"        if not default:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
+msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1364,21 +1348,7 @@ msgstr "STOCK_COPY"
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "Model %s Does not Exist !\" % vals['relation']))\n"
-"                 \n"
-"            if self.pool.get(vals['model']):\n"
-"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-"                self.pool.get(vals['model'])._auto_init(cr, {})\n"
-"                \n"
-"        return res\n"
-"ir_model_fields()\n"
-"\n"
-"class ir_model_access(osv.osv):\n"
-"    _name = 'ir.model.access'\n"
-"    _columns = {\n"
-"        'name': fields.char('Name', size=64, required=True),\n"
-"        'model_id': fields.many2one('ir.model', 'Object', required=True),\n"
-"        'group_id': fields.many2one('res.groups', 'Group"
+msgid "Model %s Does not Exist !"
 msgstr ""
 
 #. module: base
@@ -7740,13 +7710,7 @@ msgstr "Действия на прозореца"
 #. module: base
 #: code:addons/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py:0
 #, python-format
-msgid "There are no Analytic lines related to Account %s' % name))\n"
-"        return {}\n"
-"\n"
-"    states = {\n"
-"        'init': {\n"
-"            'actions': [],\n"
-"            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel"
+msgid "There are no Analytic lines related to Account %s"
 msgstr ""
 
 #. module: base
@@ -10354,12 +10318,7 @@ msgstr "Телефон"
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
-msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies.\"\"\" % (line.account_id.code, line.account_id.name)))\n"
-"\n"
-"            if abs(amount) < 0.0001:\n"
-"                if not len(line_draft_ids):\n"
-"                    continue\n"
-"                self.pool.get('account.move.line"
+msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
 
 #. module: base
@@ -11282,12 +11241,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-"        if product_id:\n"
-"            w=self.pool.get('product.product"
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/bs_BS.po b/bin/addons/base/i18n/bs_BS.po
index 93a32db691e..0004725a5ce 100644
--- a/bin/addons/base/i18n/bs_BS.po
+++ b/bin/addons/base/i18n/bs_BS.po
@@ -365,16 +365,7 @@ msgstr "Naziv polja"
 #. module: base
 #: code:addons/addons/purchase/purchase.py:0
 #, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!' % s['state']))\n"
-"        return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def button_dummy(self, cr, uid, ids, context={}):\n"
-"        return True\n"
-"\n"
-"    def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n"
-"        if not adr_id:\n"
-"            return {}\n"
-"        part_id = self.pool.get('res.partner.address"
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1302,14 +1293,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None,context=None):\n"
-"        if not default:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
+msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1364,21 +1348,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "Model %s Does not Exist !\" % vals['relation']))\n"
-"                 \n"
-"            if self.pool.get(vals['model']):\n"
-"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-"                self.pool.get(vals['model'])._auto_init(cr, {})\n"
-"                \n"
-"        return res\n"
-"ir_model_fields()\n"
-"\n"
-"class ir_model_access(osv.osv):\n"
-"    _name = 'ir.model.access'\n"
-"    _columns = {\n"
-"        'name': fields.char('Name', size=64, required=True),\n"
-"        'model_id': fields.many2one('ir.model', 'Object', required=True),\n"
-"        'group_id': fields.many2one('res.groups', 'Group"
+msgid "Model %s Does not Exist !"
 msgstr ""
 
 #. module: base
@@ -7739,13 +7709,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py:0
 #, python-format
-msgid "There are no Analytic lines related to Account %s' % name))\n"
-"        return {}\n"
-"\n"
-"    states = {\n"
-"        'init': {\n"
-"            'actions': [],\n"
-"            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel"
+msgid "There are no Analytic lines related to Account %s"
 msgstr ""
 
 #. module: base
@@ -10353,12 +10317,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
-msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies.\"\"\" % (line.account_id.code, line.account_id.name)))\n"
-"\n"
-"            if abs(amount) < 0.0001:\n"
-"                if not len(line_draft_ids):\n"
-"                    continue\n"
-"                self.pool.get('account.move.line"
+msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
 
 #. module: base
@@ -11281,12 +11240,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-"        if product_id:\n"
-"            w=self.pool.get('product.product"
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/ca_ES.po b/bin/addons/base/i18n/ca_ES.po
index 97030eeb51b..8bd311ef3f2 100644
--- a/bin/addons/base/i18n/ca_ES.po
+++ b/bin/addons/base/i18n/ca_ES.po
@@ -370,16 +370,7 @@ msgstr "Nom camp"
 #. module: base
 #: code:addons/addons/purchase/purchase.py:0
 #, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!' % s['state']))\n"
-"        return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def button_dummy(self, cr, uid, ids, context={}):\n"
-"        return True\n"
-"\n"
-"    def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n"
-"        if not adr_id:\n"
-"            return {}\n"
-"        part_id = self.pool.get('res.partner.address"
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1307,14 +1298,7 @@ msgstr "ir.export.línia"
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None,context=None):\n"
-"        if not default:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
+msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1369,21 +1353,7 @@ msgstr "STOCK_COPY"
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "Model %s Does not Exist !\" % vals['relation']))\n"
-"                 \n"
-"            if self.pool.get(vals['model']):\n"
-"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-"                self.pool.get(vals['model'])._auto_init(cr, {})\n"
-"                \n"
-"        return res\n"
-"ir_model_fields()\n"
-"\n"
-"class ir_model_access(osv.osv):\n"
-"    _name = 'ir.model.access'\n"
-"    _columns = {\n"
-"        'name': fields.char('Name', size=64, required=True),\n"
-"        'model_id': fields.many2one('ir.model', 'Object', required=True),\n"
-"        'group_id': fields.many2one('res.groups', 'Group"
+msgid "Model %s Does not Exist !"
 msgstr ""
 
 #. module: base
@@ -7749,13 +7719,7 @@ msgstr "Accions de finestra"
 #. module: base
 #: code:addons/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py:0
 #, python-format
-msgid "There are no Analytic lines related to Account %s' % name))\n"
-"        return {}\n"
-"\n"
-"    states = {\n"
-"        'init': {\n"
-"            'actions': [],\n"
-"            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel"
+msgid "There are no Analytic lines related to Account %s"
 msgstr ""
 
 #. module: base
@@ -10366,12 +10330,7 @@ msgstr "Telèfon"
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
-msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies.\"\"\" % (line.account_id.code, line.account_id.name)))\n"
-"\n"
-"            if abs(amount) < 0.0001:\n"
-"                if not len(line_draft_ids):\n"
-"                    continue\n"
-"                self.pool.get('account.move.line"
+msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
 
 #. module: base
@@ -11294,12 +11253,7 @@ msgstr "Utilitzat per seleccionar automàticament l'adreça correcta segons e
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-"        if product_id:\n"
-"            w=self.pool.get('product.product"
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/cs_CZ.po b/bin/addons/base/i18n/cs_CZ.po
index 15a3571fa79..b3b5b36c503 100644
--- a/bin/addons/base/i18n/cs_CZ.po
+++ b/bin/addons/base/i18n/cs_CZ.po
@@ -365,16 +365,7 @@ msgstr "Název pole"
 #. module: base
 #: code:addons/addons/purchase/purchase.py:0
 #, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!' % s['state']))\n"
-"        return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def button_dummy(self, cr, uid, ids, context={}):\n"
-"        return True\n"
-"\n"
-"    def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n"
-"        if not adr_id:\n"
-"            return {}\n"
-"        part_id = self.pool.get('res.partner.address"
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1301,14 +1292,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None,context=None):\n"
-"        if not default:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
+msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1363,21 +1347,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "Model %s Does not Exist !\" % vals['relation']))\n"
-"                 \n"
-"            if self.pool.get(vals['model']):\n"
-"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-"                self.pool.get(vals['model'])._auto_init(cr, {})\n"
-"                \n"
-"        return res\n"
-"ir_model_fields()\n"
-"\n"
-"class ir_model_access(osv.osv):\n"
-"    _name = 'ir.model.access'\n"
-"    _columns = {\n"
-"        'name': fields.char('Name', size=64, required=True),\n"
-"        'model_id': fields.many2one('ir.model', 'Object', required=True),\n"
-"        'group_id': fields.many2one('res.groups', 'Group"
+msgid "Model %s Does not Exist !"
 msgstr ""
 
 #. module: base
@@ -7738,13 +7708,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py:0
 #, python-format
-msgid "There are no Analytic lines related to Account %s' % name))\n"
-"        return {}\n"
-"\n"
-"    states = {\n"
-"        'init': {\n"
-"            'actions': [],\n"
-"            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel"
+msgid "There are no Analytic lines related to Account %s"
 msgstr ""
 
 #. module: base
@@ -10352,12 +10316,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
-msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies.\"\"\" % (line.account_id.code, line.account_id.name)))\n"
-"\n"
-"            if abs(amount) < 0.0001:\n"
-"                if not len(line_draft_ids):\n"
-"                    continue\n"
-"                self.pool.get('account.move.line"
+msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
 
 #. module: base
@@ -11280,12 +11239,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-"        if product_id:\n"
-"            w=self.pool.get('product.product"
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/de_DE.po b/bin/addons/base/i18n/de_DE.po
index 398a2fd6e2b..fecf7841a24 100644
--- a/bin/addons/base/i18n/de_DE.po
+++ b/bin/addons/base/i18n/de_DE.po
@@ -369,16 +369,7 @@ msgstr "Bezeichnung Feld"
 #. module: base
 #: code:addons/addons/purchase/purchase.py:0
 #, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!' % s['state']))\n"
-"        return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def button_dummy(self, cr, uid, ids, context={}):\n"
-"        return True\n"
-"\n"
-"    def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n"
-"        if not adr_id:\n"
-"            return {}\n"
-"        part_id = self.pool.get('res.partner.address"
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1306,14 +1297,7 @@ msgstr "ir.exports.line"
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None,context=None):\n"
-"        if not default:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
+msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1368,21 +1352,7 @@ msgstr "STOCK_COPY"
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "Model %s Does not Exist !\" % vals['relation']))\n"
-"                 \n"
-"            if self.pool.get(vals['model']):\n"
-"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-"                self.pool.get(vals['model'])._auto_init(cr, {})\n"
-"                \n"
-"        return res\n"
-"ir_model_fields()\n"
-"\n"
-"class ir_model_access(osv.osv):\n"
-"    _name = 'ir.model.access'\n"
-"    _columns = {\n"
-"        'name': fields.char('Name', size=64, required=True),\n"
-"        'model_id': fields.many2one('ir.model', 'Object', required=True),\n"
-"        'group_id': fields.many2one('res.groups', 'Group"
+msgid "Model %s Does not Exist !"
 msgstr ""
 
 #. module: base
@@ -7749,13 +7719,7 @@ msgstr "Schließe/Öffne Fenster..."
 #. module: base
 #: code:addons/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py:0
 #, python-format
-msgid "There are no Analytic lines related to Account %s' % name))\n"
-"        return {}\n"
-"\n"
-"    states = {\n"
-"        'init': {\n"
-"            'actions': [],\n"
-"            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel"
+msgid "There are no Analytic lines related to Account %s"
 msgstr ""
 
 #. module: base
@@ -10367,12 +10331,7 @@ msgstr "Tel"
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
-msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies.\"\"\" % (line.account_id.code, line.account_id.name)))\n"
-"\n"
-"            if abs(amount) < 0.0001:\n"
-"                if not len(line_draft_ids):\n"
-"                    continue\n"
-"                self.pool.get('account.move.line"
+msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
 
 #. module: base
@@ -11295,12 +11254,7 @@ msgstr "Wird angewendet um automatisch die eingestellten Zuordnungen wählen zu
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-"        if product_id:\n"
-"            w=self.pool.get('product.product"
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/es_AR.po b/bin/addons/base/i18n/es_AR.po
index 887595f74c8..37ebe6ea68e 100644
--- a/bin/addons/base/i18n/es_AR.po
+++ b/bin/addons/base/i18n/es_AR.po
@@ -365,16 +365,7 @@ msgstr "Nombre del Campo"
 #. module: base
 #: code:addons/addons/purchase/purchase.py:0
 #, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!' % s['state']))\n"
-"        return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def button_dummy(self, cr, uid, ids, context={}):\n"
-"        return True\n"
-"\n"
-"    def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n"
-"        if not adr_id:\n"
-"            return {}\n"
-"        part_id = self.pool.get('res.partner.address"
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1301,14 +1292,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None,context=None):\n"
-"        if not default:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
+msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1363,21 +1347,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "Model %s Does not Exist !\" % vals['relation']))\n"
-"                 \n"
-"            if self.pool.get(vals['model']):\n"
-"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-"                self.pool.get(vals['model'])._auto_init(cr, {})\n"
-"                \n"
-"        return res\n"
-"ir_model_fields()\n"
-"\n"
-"class ir_model_access(osv.osv):\n"
-"    _name = 'ir.model.access'\n"
-"    _columns = {\n"
-"        'name': fields.char('Name', size=64, required=True),\n"
-"        'model_id': fields.many2one('ir.model', 'Object', required=True),\n"
-"        'group_id': fields.many2one('res.groups', 'Group"
+msgid "Model %s Does not Exist !"
 msgstr ""
 
 #. module: base
@@ -7738,13 +7708,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py:0
 #, python-format
-msgid "There are no Analytic lines related to Account %s' % name))\n"
-"        return {}\n"
-"\n"
-"    states = {\n"
-"        'init': {\n"
-"            'actions': [],\n"
-"            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel"
+msgid "There are no Analytic lines related to Account %s"
 msgstr ""
 
 #. module: base
@@ -10352,12 +10316,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
-msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies.\"\"\" % (line.account_id.code, line.account_id.name)))\n"
-"\n"
-"            if abs(amount) < 0.0001:\n"
-"                if not len(line_draft_ids):\n"
-"                    continue\n"
-"                self.pool.get('account.move.line"
+msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
 
 #. module: base
@@ -11280,12 +11239,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-"        if product_id:\n"
-"            w=self.pool.get('product.product"
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/es_ES.po b/bin/addons/base/i18n/es_ES.po
index 7c22db16012..56436571789 100644
--- a/bin/addons/base/i18n/es_ES.po
+++ b/bin/addons/base/i18n/es_ES.po
@@ -370,16 +370,7 @@ msgstr "Nombre campo"
 #. module: base
 #: code:addons/addons/purchase/purchase.py:0
 #, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!' % s['state']))\n"
-"        return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def button_dummy(self, cr, uid, ids, context={}):\n"
-"        return True\n"
-"\n"
-"    def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n"
-"        if not adr_id:\n"
-"            return {}\n"
-"        part_id = self.pool.get('res.partner.address"
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1307,14 +1298,7 @@ msgstr "ir.export.linea"
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None,context=None):\n"
-"        if not default:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
+msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1369,21 +1353,7 @@ msgstr "STOCK_COPY"
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "Model %s Does not Exist !\" % vals['relation']))\n"
-"                 \n"
-"            if self.pool.get(vals['model']):\n"
-"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-"                self.pool.get(vals['model'])._auto_init(cr, {})\n"
-"                \n"
-"        return res\n"
-"ir_model_fields()\n"
-"\n"
-"class ir_model_access(osv.osv):\n"
-"    _name = 'ir.model.access'\n"
-"    _columns = {\n"
-"        'name': fields.char('Name', size=64, required=True),\n"
-"        'model_id': fields.many2one('ir.model', 'Object', required=True),\n"
-"        'group_id': fields.many2one('res.groups', 'Group"
+msgid "Model %s Does not Exist !"
 msgstr ""
 
 #. module: base
@@ -7749,13 +7719,7 @@ msgstr "Acciones de ventana"
 #. module: base
 #: code:addons/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py:0
 #, python-format
-msgid "There are no Analytic lines related to Account %s' % name))\n"
-"        return {}\n"
-"\n"
-"    states = {\n"
-"        'init': {\n"
-"            'actions': [],\n"
-"            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel"
+msgid "There are no Analytic lines related to Account %s"
 msgstr ""
 
 #. module: base
@@ -10366,12 +10330,7 @@ msgstr "Teléfono"
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
-msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies.\"\"\" % (line.account_id.code, line.account_id.name)))\n"
-"\n"
-"            if abs(amount) < 0.0001:\n"
-"                if not len(line_draft_ids):\n"
-"                    continue\n"
-"                self.pool.get('account.move.line"
+msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
 
 #. module: base
@@ -11294,12 +11253,7 @@ msgstr "Utilizado para seleccionar automáticamente la dirección correcta se
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-"        if product_id:\n"
-"            w=self.pool.get('product.product"
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/et_EE.po b/bin/addons/base/i18n/et_EE.po
index 93562f1377e..75787c5fb6f 100644
--- a/bin/addons/base/i18n/et_EE.po
+++ b/bin/addons/base/i18n/et_EE.po
@@ -369,16 +369,7 @@ msgstr "Välja nimi"
 #. module: base
 #: code:addons/addons/purchase/purchase.py:0
 #, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!' % s['state']))\n"
-"        return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def button_dummy(self, cr, uid, ids, context={}):\n"
-"        return True\n"
-"\n"
-"    def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n"
-"        if not adr_id:\n"
-"            return {}\n"
-"        part_id = self.pool.get('res.partner.address"
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1306,14 +1297,7 @@ msgstr "ir.exports.line"
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None,context=None):\n"
-"        if not default:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
+msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1368,21 +1352,7 @@ msgstr "STOCK_COPY"
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "Model %s Does not Exist !\" % vals['relation']))\n"
-"                 \n"
-"            if self.pool.get(vals['model']):\n"
-"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-"                self.pool.get(vals['model'])._auto_init(cr, {})\n"
-"                \n"
-"        return res\n"
-"ir_model_fields()\n"
-"\n"
-"class ir_model_access(osv.osv):\n"
-"    _name = 'ir.model.access'\n"
-"    _columns = {\n"
-"        'name': fields.char('Name', size=64, required=True),\n"
-"        'model_id': fields.many2one('ir.model', 'Object', required=True),\n"
-"        'group_id': fields.many2one('res.groups', 'Group"
+msgid "Model %s Does not Exist !"
 msgstr ""
 
 #. module: base
@@ -7748,13 +7718,7 @@ msgstr "Akna toimingud"
 #. module: base
 #: code:addons/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py:0
 #, python-format
-msgid "There are no Analytic lines related to Account %s' % name))\n"
-"        return {}\n"
-"\n"
-"    states = {\n"
-"        'init': {\n"
-"            'actions': [],\n"
-"            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel"
+msgid "There are no Analytic lines related to Account %s"
 msgstr ""
 
 #. module: base
@@ -10365,12 +10329,7 @@ msgstr "Telefon"
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
-msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies.\"\"\" % (line.account_id.code, line.account_id.name)))\n"
-"\n"
-"            if abs(amount) < 0.0001:\n"
-"                if not len(line_draft_ids):\n"
-"                    continue\n"
-"                self.pool.get('account.move.line"
+msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
 
 #. module: base
@@ -11293,12 +11252,7 @@ msgstr "Kasutatakse, et valida automaatselt õige aadress vastavalt müügi- ja
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-"        if product_id:\n"
-"            w=self.pool.get('product.product"
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/fi_FI.po b/bin/addons/base/i18n/fi_FI.po
index 0a101c2d29d..0f176e40787 100644
--- a/bin/addons/base/i18n/fi_FI.po
+++ b/bin/addons/base/i18n/fi_FI.po
@@ -369,16 +369,7 @@ msgstr "Kentän nimi"
 #. module: base
 #: code:addons/addons/purchase/purchase.py:0
 #, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!' % s['state']))\n"
-"        return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def button_dummy(self, cr, uid, ids, context={}):\n"
-"        return True\n"
-"\n"
-"    def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n"
-"        if not adr_id:\n"
-"            return {}\n"
-"        part_id = self.pool.get('res.partner.address"
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1306,14 +1297,7 @@ msgstr "ir.exports.line"
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None,context=None):\n"
-"        if not default:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
+msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1368,21 +1352,7 @@ msgstr "STOCK_COPY"
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "Model %s Does not Exist !\" % vals['relation']))\n"
-"                 \n"
-"            if self.pool.get(vals['model']):\n"
-"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-"                self.pool.get(vals['model'])._auto_init(cr, {})\n"
-"                \n"
-"        return res\n"
-"ir_model_fields()\n"
-"\n"
-"class ir_model_access(osv.osv):\n"
-"    _name = 'ir.model.access'\n"
-"    _columns = {\n"
-"        'name': fields.char('Name', size=64, required=True),\n"
-"        'model_id': fields.many2one('ir.model', 'Object', required=True),\n"
-"        'group_id': fields.many2one('res.groups', 'Group"
+msgid "Model %s Does not Exist !"
 msgstr ""
 
 #. module: base
@@ -7748,13 +7718,7 @@ msgstr "Ikkunatoiminnot"
 #. module: base
 #: code:addons/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py:0
 #, python-format
-msgid "There are no Analytic lines related to Account %s' % name))\n"
-"        return {}\n"
-"\n"
-"    states = {\n"
-"        'init': {\n"
-"            'actions': [],\n"
-"            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel"
+msgid "There are no Analytic lines related to Account %s"
 msgstr ""
 
 #. module: base
@@ -10365,12 +10329,7 @@ msgstr "Puhelin"
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
-msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies.\"\"\" % (line.account_id.code, line.account_id.name)))\n"
-"\n"
-"            if abs(amount) < 0.0001:\n"
-"                if not len(line_draft_ids):\n"
-"                    continue\n"
-"                self.pool.get('account.move.line"
+msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
 
 #. module: base
@@ -11297,12 +11256,7 @@ msgstr "Käytetään oikean osoitteen automaattiseen valintaan asiayhteydestä r
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-"        if product_id:\n"
-"            w=self.pool.get('product.product"
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/fr_FR.po b/bin/addons/base/i18n/fr_FR.po
index 6c489f2901d..49bc89970eb 100644
--- a/bin/addons/base/i18n/fr_FR.po
+++ b/bin/addons/base/i18n/fr_FR.po
@@ -369,16 +369,7 @@ msgstr "Nom du champ"
 #. module: base
 #: code:addons/addons/purchase/purchase.py:0
 #, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!' % s['state']))\n"
-"        return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def button_dummy(self, cr, uid, ids, context={}):\n"
-"        return True\n"
-"\n"
-"    def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n"
-"        if not adr_id:\n"
-"            return {}\n"
-"        part_id = self.pool.get('res.partner.address"
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1306,14 +1297,7 @@ msgstr "ir.exports.line"
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None,context=None):\n"
-"        if not default:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
+msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1368,21 +1352,7 @@ msgstr "STOCK_COPY"
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "Model %s Does not Exist !\" % vals['relation']))\n"
-"                 \n"
-"            if self.pool.get(vals['model']):\n"
-"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-"                self.pool.get(vals['model'])._auto_init(cr, {})\n"
-"                \n"
-"        return res\n"
-"ir_model_fields()\n"
-"\n"
-"class ir_model_access(osv.osv):\n"
-"    _name = 'ir.model.access'\n"
-"    _columns = {\n"
-"        'name': fields.char('Name', size=64, required=True),\n"
-"        'model_id': fields.many2one('ir.model', 'Object', required=True),\n"
-"        'group_id': fields.many2one('res.groups', 'Group"
+msgid "Model %s Does not Exist !"
 msgstr ""
 
 #. module: base
@@ -7748,13 +7718,7 @@ msgstr "Actions de la fênetre"
 #. module: base
 #: code:addons/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py:0
 #, python-format
-msgid "There are no Analytic lines related to Account %s' % name))\n"
-"        return {}\n"
-"\n"
-"    states = {\n"
-"        'init': {\n"
-"            'actions': [],\n"
-"            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel"
+msgid "There are no Analytic lines related to Account %s"
 msgstr ""
 
 #. module: base
@@ -10365,12 +10329,7 @@ msgstr "Numéro de téléphone"
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
-msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies.\"\"\" % (line.account_id.code, line.account_id.name)))\n"
-"\n"
-"            if abs(amount) < 0.0001:\n"
-"                if not len(line_draft_ids):\n"
-"                    continue\n"
-"                self.pool.get('account.move.line"
+msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
 
 #. module: base
@@ -11293,12 +11252,7 @@ msgstr "Utiliser pour sélectionner automatiquement la bonne adresse en regards
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-"        if product_id:\n"
-"            w=self.pool.get('product.product"
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/hr_HR.po b/bin/addons/base/i18n/hr_HR.po
index 612b783b32b..b896e3900ae 100644
--- a/bin/addons/base/i18n/hr_HR.po
+++ b/bin/addons/base/i18n/hr_HR.po
@@ -365,16 +365,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/purchase/purchase.py:0
 #, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!' % s['state']))\n"
-"        return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def button_dummy(self, cr, uid, ids, context={}):\n"
-"        return True\n"
-"\n"
-"    def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n"
-"        if not adr_id:\n"
-"            return {}\n"
-"        part_id = self.pool.get('res.partner.address"
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1301,14 +1292,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None,context=None):\n"
-"        if not default:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
+msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1363,21 +1347,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "Model %s Does not Exist !\" % vals['relation']))\n"
-"                 \n"
-"            if self.pool.get(vals['model']):\n"
-"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-"                self.pool.get(vals['model'])._auto_init(cr, {})\n"
-"                \n"
-"        return res\n"
-"ir_model_fields()\n"
-"\n"
-"class ir_model_access(osv.osv):\n"
-"    _name = 'ir.model.access'\n"
-"    _columns = {\n"
-"        'name': fields.char('Name', size=64, required=True),\n"
-"        'model_id': fields.many2one('ir.model', 'Object', required=True),\n"
-"        'group_id': fields.many2one('res.groups', 'Group"
+msgid "Model %s Does not Exist !"
 msgstr ""
 
 #. module: base
@@ -7738,13 +7708,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py:0
 #, python-format
-msgid "There are no Analytic lines related to Account %s' % name))\n"
-"        return {}\n"
-"\n"
-"    states = {\n"
-"        'init': {\n"
-"            'actions': [],\n"
-"            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel"
+msgid "There are no Analytic lines related to Account %s"
 msgstr ""
 
 #. module: base
@@ -10352,12 +10316,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
-msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies.\"\"\" % (line.account_id.code, line.account_id.name)))\n"
-"\n"
-"            if abs(amount) < 0.0001:\n"
-"                if not len(line_draft_ids):\n"
-"                    continue\n"
-"                self.pool.get('account.move.line"
+msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
 
 #. module: base
@@ -11280,12 +11239,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-"        if product_id:\n"
-"            w=self.pool.get('product.product"
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/hu_HU.po b/bin/addons/base/i18n/hu_HU.po
index 7f4a5b34a7b..cd7003e2861 100644
--- a/bin/addons/base/i18n/hu_HU.po
+++ b/bin/addons/base/i18n/hu_HU.po
@@ -365,16 +365,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/purchase/purchase.py:0
 #, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!' % s['state']))\n"
-"        return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def button_dummy(self, cr, uid, ids, context={}):\n"
-"        return True\n"
-"\n"
-"    def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n"
-"        if not adr_id:\n"
-"            return {}\n"
-"        part_id = self.pool.get('res.partner.address"
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1301,14 +1292,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None,context=None):\n"
-"        if not default:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
+msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1363,21 +1347,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "Model %s Does not Exist !\" % vals['relation']))\n"
-"                 \n"
-"            if self.pool.get(vals['model']):\n"
-"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-"                self.pool.get(vals['model'])._auto_init(cr, {})\n"
-"                \n"
-"        return res\n"
-"ir_model_fields()\n"
-"\n"
-"class ir_model_access(osv.osv):\n"
-"    _name = 'ir.model.access'\n"
-"    _columns = {\n"
-"        'name': fields.char('Name', size=64, required=True),\n"
-"        'model_id': fields.many2one('ir.model', 'Object', required=True),\n"
-"        'group_id': fields.many2one('res.groups', 'Group"
+msgid "Model %s Does not Exist !"
 msgstr ""
 
 #. module: base
@@ -7738,13 +7708,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py:0
 #, python-format
-msgid "There are no Analytic lines related to Account %s' % name))\n"
-"        return {}\n"
-"\n"
-"    states = {\n"
-"        'init': {\n"
-"            'actions': [],\n"
-"            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel"
+msgid "There are no Analytic lines related to Account %s"
 msgstr ""
 
 #. module: base
@@ -10352,12 +10316,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
-msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies.\"\"\" % (line.account_id.code, line.account_id.name)))\n"
-"\n"
-"            if abs(amount) < 0.0001:\n"
-"                if not len(line_draft_ids):\n"
-"                    continue\n"
-"                self.pool.get('account.move.line"
+msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
 
 #. module: base
@@ -11280,12 +11239,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-"        if product_id:\n"
-"            w=self.pool.get('product.product"
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/id_ID.po b/bin/addons/base/i18n/id_ID.po
index 352d8115c21..4fb4e498ec1 100644
--- a/bin/addons/base/i18n/id_ID.po
+++ b/bin/addons/base/i18n/id_ID.po
@@ -365,16 +365,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/purchase/purchase.py:0
 #, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!' % s['state']))\n"
-"        return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def button_dummy(self, cr, uid, ids, context={}):\n"
-"        return True\n"
-"\n"
-"    def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n"
-"        if not adr_id:\n"
-"            return {}\n"
-"        part_id = self.pool.get('res.partner.address"
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1301,14 +1292,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None,context=None):\n"
-"        if not default:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
+msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1363,21 +1347,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "Model %s Does not Exist !\" % vals['relation']))\n"
-"                 \n"
-"            if self.pool.get(vals['model']):\n"
-"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-"                self.pool.get(vals['model'])._auto_init(cr, {})\n"
-"                \n"
-"        return res\n"
-"ir_model_fields()\n"
-"\n"
-"class ir_model_access(osv.osv):\n"
-"    _name = 'ir.model.access'\n"
-"    _columns = {\n"
-"        'name': fields.char('Name', size=64, required=True),\n"
-"        'model_id': fields.many2one('ir.model', 'Object', required=True),\n"
-"        'group_id': fields.many2one('res.groups', 'Group"
+msgid "Model %s Does not Exist !"
 msgstr ""
 
 #. module: base
@@ -7738,13 +7708,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py:0
 #, python-format
-msgid "There are no Analytic lines related to Account %s' % name))\n"
-"        return {}\n"
-"\n"
-"    states = {\n"
-"        'init': {\n"
-"            'actions': [],\n"
-"            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel"
+msgid "There are no Analytic lines related to Account %s"
 msgstr ""
 
 #. module: base
@@ -10352,12 +10316,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
-msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies.\"\"\" % (line.account_id.code, line.account_id.name)))\n"
-"\n"
-"            if abs(amount) < 0.0001:\n"
-"                if not len(line_draft_ids):\n"
-"                    continue\n"
-"                self.pool.get('account.move.line"
+msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
 
 #. module: base
@@ -11280,12 +11239,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-"        if product_id:\n"
-"            w=self.pool.get('product.product"
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/it_IT.po b/bin/addons/base/i18n/it_IT.po
index 77527c76ef1..044be801603 100644
--- a/bin/addons/base/i18n/it_IT.po
+++ b/bin/addons/base/i18n/it_IT.po
@@ -369,16 +369,7 @@ msgstr "Nome Campo"
 #. module: base
 #: code:addons/addons/purchase/purchase.py:0
 #, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!' % s['state']))\n"
-"        return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def button_dummy(self, cr, uid, ids, context={}):\n"
-"        return True\n"
-"\n"
-"    def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n"
-"        if not adr_id:\n"
-"            return {}\n"
-"        part_id = self.pool.get('res.partner.address"
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1306,14 +1297,7 @@ msgstr "ir.exports.line"
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None,context=None):\n"
-"        if not default:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
+msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1368,21 +1352,7 @@ msgstr "STOCK_COPY"
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "Model %s Does not Exist !\" % vals['relation']))\n"
-"                 \n"
-"            if self.pool.get(vals['model']):\n"
-"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-"                self.pool.get(vals['model'])._auto_init(cr, {})\n"
-"                \n"
-"        return res\n"
-"ir_model_fields()\n"
-"\n"
-"class ir_model_access(osv.osv):\n"
-"    _name = 'ir.model.access'\n"
-"    _columns = {\n"
-"        'name': fields.char('Name', size=64, required=True),\n"
-"        'model_id': fields.many2one('ir.model', 'Object', required=True),\n"
-"        'group_id': fields.many2one('res.groups', 'Group"
+msgid "Model %s Does not Exist !"
 msgstr ""
 
 #. module: base
@@ -7744,13 +7714,7 @@ msgstr "Azioni Finestra"
 #. module: base
 #: code:addons/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py:0
 #, python-format
-msgid "There are no Analytic lines related to Account %s' % name))\n"
-"        return {}\n"
-"\n"
-"    states = {\n"
-"        'init': {\n"
-"            'actions': [],\n"
-"            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel"
+msgid "There are no Analytic lines related to Account %s"
 msgstr ""
 
 #. module: base
@@ -10361,12 +10325,7 @@ msgstr "Telefono"
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
-msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies.\"\"\" % (line.account_id.code, line.account_id.name)))\n"
-"\n"
-"            if abs(amount) < 0.0001:\n"
-"                if not len(line_draft_ids):\n"
-"                    continue\n"
-"                self.pool.get('account.move.line"
+msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
 
 #. module: base
@@ -11289,12 +11248,7 @@ msgstr "Utilizzato per selezionare automaticamente l'indirizzo corretto in base
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-"        if product_id:\n"
-"            w=self.pool.get('product.product"
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/lt_LT.po b/bin/addons/base/i18n/lt_LT.po
index 8b7b9faeefb..d12a8679788 100644
--- a/bin/addons/base/i18n/lt_LT.po
+++ b/bin/addons/base/i18n/lt_LT.po
@@ -365,16 +365,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/purchase/purchase.py:0
 #, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!' % s['state']))\n"
-"        return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def button_dummy(self, cr, uid, ids, context={}):\n"
-"        return True\n"
-"\n"
-"    def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n"
-"        if not adr_id:\n"
-"            return {}\n"
-"        part_id = self.pool.get('res.partner.address"
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1301,14 +1292,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None,context=None):\n"
-"        if not default:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
+msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1363,21 +1347,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "Model %s Does not Exist !\" % vals['relation']))\n"
-"                 \n"
-"            if self.pool.get(vals['model']):\n"
-"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-"                self.pool.get(vals['model'])._auto_init(cr, {})\n"
-"                \n"
-"        return res\n"
-"ir_model_fields()\n"
-"\n"
-"class ir_model_access(osv.osv):\n"
-"    _name = 'ir.model.access'\n"
-"    _columns = {\n"
-"        'name': fields.char('Name', size=64, required=True),\n"
-"        'model_id': fields.many2one('ir.model', 'Object', required=True),\n"
-"        'group_id': fields.many2one('res.groups', 'Group"
+msgid "Model %s Does not Exist !"
 msgstr ""
 
 #. module: base
@@ -7738,13 +7708,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py:0
 #, python-format
-msgid "There are no Analytic lines related to Account %s' % name))\n"
-"        return {}\n"
-"\n"
-"    states = {\n"
-"        'init': {\n"
-"            'actions': [],\n"
-"            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel"
+msgid "There are no Analytic lines related to Account %s"
 msgstr ""
 
 #. module: base
@@ -10352,12 +10316,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
-msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies.\"\"\" % (line.account_id.code, line.account_id.name)))\n"
-"\n"
-"            if abs(amount) < 0.0001:\n"
-"                if not len(line_draft_ids):\n"
-"                    continue\n"
-"                self.pool.get('account.move.line"
+msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
 
 #. module: base
@@ -11280,12 +11239,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-"        if product_id:\n"
-"            w=self.pool.get('product.product"
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/nl_BE.po b/bin/addons/base/i18n/nl_BE.po
index 25a435134b0..ac5a536e2b3 100644
--- a/bin/addons/base/i18n/nl_BE.po
+++ b/bin/addons/base/i18n/nl_BE.po
@@ -370,16 +370,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/purchase/purchase.py:0
 #, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!' % s['state']))\n"
-"        return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def button_dummy(self, cr, uid, ids, context={}):\n"
-"        return True\n"
-"\n"
-"    def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n"
-"        if not adr_id:\n"
-"            return {}\n"
-"        part_id = self.pool.get('res.partner.address"
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1306,14 +1297,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None,context=None):\n"
-"        if not default:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
+msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1368,21 +1352,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "Model %s Does not Exist !\" % vals['relation']))\n"
-"                 \n"
-"            if self.pool.get(vals['model']):\n"
-"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-"                self.pool.get(vals['model'])._auto_init(cr, {})\n"
-"                \n"
-"        return res\n"
-"ir_model_fields()\n"
-"\n"
-"class ir_model_access(osv.osv):\n"
-"    _name = 'ir.model.access'\n"
-"    _columns = {\n"
-"        'name': fields.char('Name', size=64, required=True),\n"
-"        'model_id': fields.many2one('ir.model', 'Object', required=True),\n"
-"        'group_id': fields.many2one('res.groups', 'Group"
+msgid "Model %s Does not Exist !"
 msgstr ""
 
 #. module: base
@@ -7743,13 +7713,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py:0
 #, python-format
-msgid "There are no Analytic lines related to Account %s' % name))\n"
-"        return {}\n"
-"\n"
-"    states = {\n"
-"        'init': {\n"
-"            'actions': [],\n"
-"            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel"
+msgid "There are no Analytic lines related to Account %s"
 msgstr ""
 
 #. module: base
@@ -10357,12 +10321,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
-msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies.\"\"\" % (line.account_id.code, line.account_id.name)))\n"
-"\n"
-"            if abs(amount) < 0.0001:\n"
-"                if not len(line_draft_ids):\n"
-"                    continue\n"
-"                self.pool.get('account.move.line"
+msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
 
 #. module: base
@@ -11285,12 +11244,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-"        if product_id:\n"
-"            w=self.pool.get('product.product"
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/nl_NL.po b/bin/addons/base/i18n/nl_NL.po
index 54ab21aabb6..41146fddba2 100644
--- a/bin/addons/base/i18n/nl_NL.po
+++ b/bin/addons/base/i18n/nl_NL.po
@@ -370,16 +370,7 @@ msgstr "Veldnaam"
 #. module: base
 #: code:addons/addons/purchase/purchase.py:0
 #, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!' % s['state']))\n"
-"        return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def button_dummy(self, cr, uid, ids, context={}):\n"
-"        return True\n"
-"\n"
-"    def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n"
-"        if not adr_id:\n"
-"            return {}\n"
-"        part_id = self.pool.get('res.partner.address"
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1307,14 +1298,7 @@ msgstr "ir.exports.line"
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None,context=None):\n"
-"        if not default:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
+msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1369,21 +1353,7 @@ msgstr "STOCK_COPY"
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "Model %s Does not Exist !\" % vals['relation']))\n"
-"                 \n"
-"            if self.pool.get(vals['model']):\n"
-"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-"                self.pool.get(vals['model'])._auto_init(cr, {})\n"
-"                \n"
-"        return res\n"
-"ir_model_fields()\n"
-"\n"
-"class ir_model_access(osv.osv):\n"
-"    _name = 'ir.model.access'\n"
-"    _columns = {\n"
-"        'name': fields.char('Name', size=64, required=True),\n"
-"        'model_id': fields.many2one('ir.model', 'Object', required=True),\n"
-"        'group_id': fields.many2one('res.groups', 'Group"
+msgid "Model %s Does not Exist !"
 msgstr ""
 
 #. module: base
@@ -7749,13 +7719,7 @@ msgstr "Venster Acties"
 #. module: base
 #: code:addons/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py:0
 #, python-format
-msgid "There are no Analytic lines related to Account %s' % name))\n"
-"        return {}\n"
-"\n"
-"    states = {\n"
-"        'init': {\n"
-"            'actions': [],\n"
-"            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel"
+msgid "There are no Analytic lines related to Account %s"
 msgstr ""
 
 #. module: base
@@ -10366,12 +10330,7 @@ msgstr "Telefoon"
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
-msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies.\"\"\" % (line.account_id.code, line.account_id.name)))\n"
-"\n"
-"            if abs(amount) < 0.0001:\n"
-"                if not len(line_draft_ids):\n"
-"                    continue\n"
-"                self.pool.get('account.move.line"
+msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
 
 #. module: base
@@ -11294,12 +11253,7 @@ msgstr "Wordt gebruikt om automatisch het juiste adres te kiezen afhankelijk van
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-"        if product_id:\n"
-"            w=self.pool.get('product.product"
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/pl_PL.po b/bin/addons/base/i18n/pl_PL.po
index d4723c0c34d..1aab4716da0 100644
--- a/bin/addons/base/i18n/pl_PL.po
+++ b/bin/addons/base/i18n/pl_PL.po
@@ -365,16 +365,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/purchase/purchase.py:0
 #, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!' % s['state']))\n"
-"        return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def button_dummy(self, cr, uid, ids, context={}):\n"
-"        return True\n"
-"\n"
-"    def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n"
-"        if not adr_id:\n"
-"            return {}\n"
-"        part_id = self.pool.get('res.partner.address"
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1301,14 +1292,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None,context=None):\n"
-"        if not default:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
+msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1363,21 +1347,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "Model %s Does not Exist !\" % vals['relation']))\n"
-"                 \n"
-"            if self.pool.get(vals['model']):\n"
-"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-"                self.pool.get(vals['model'])._auto_init(cr, {})\n"
-"                \n"
-"        return res\n"
-"ir_model_fields()\n"
-"\n"
-"class ir_model_access(osv.osv):\n"
-"    _name = 'ir.model.access'\n"
-"    _columns = {\n"
-"        'name': fields.char('Name', size=64, required=True),\n"
-"        'model_id': fields.many2one('ir.model', 'Object', required=True),\n"
-"        'group_id': fields.many2one('res.groups', 'Group"
+msgid "Model %s Does not Exist !"
 msgstr ""
 
 #. module: base
@@ -7738,13 +7708,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py:0
 #, python-format
-msgid "There are no Analytic lines related to Account %s' % name))\n"
-"        return {}\n"
-"\n"
-"    states = {\n"
-"        'init': {\n"
-"            'actions': [],\n"
-"            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel"
+msgid "There are no Analytic lines related to Account %s"
 msgstr ""
 
 #. module: base
@@ -10352,12 +10316,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
-msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies.\"\"\" % (line.account_id.code, line.account_id.name)))\n"
-"\n"
-"            if abs(amount) < 0.0001:\n"
-"                if not len(line_draft_ids):\n"
-"                    continue\n"
-"                self.pool.get('account.move.line"
+msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
 
 #. module: base
@@ -11280,12 +11239,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-"        if product_id:\n"
-"            w=self.pool.get('product.product"
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/pt_BR.po b/bin/addons/base/i18n/pt_BR.po
index bde721794e7..820750bcfde 100644
--- a/bin/addons/base/i18n/pt_BR.po
+++ b/bin/addons/base/i18n/pt_BR.po
@@ -369,16 +369,7 @@ msgstr "Nome do campo"
 #. module: base
 #: code:addons/addons/purchase/purchase.py:0
 #, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!' % s['state']))\n"
-"        return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def button_dummy(self, cr, uid, ids, context={}):\n"
-"        return True\n"
-"\n"
-"    def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n"
-"        if not adr_id:\n"
-"            return {}\n"
-"        part_id = self.pool.get('res.partner.address"
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1306,14 +1297,7 @@ msgstr "ir.exports.line"
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None,context=None):\n"
-"        if not default:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
+msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1368,21 +1352,7 @@ msgstr "STOCK_COPY"
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "Model %s Does not Exist !\" % vals['relation']))\n"
-"                 \n"
-"            if self.pool.get(vals['model']):\n"
-"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-"                self.pool.get(vals['model'])._auto_init(cr, {})\n"
-"                \n"
-"        return res\n"
-"ir_model_fields()\n"
-"\n"
-"class ir_model_access(osv.osv):\n"
-"    _name = 'ir.model.access'\n"
-"    _columns = {\n"
-"        'name': fields.char('Name', size=64, required=True),\n"
-"        'model_id': fields.many2one('ir.model', 'Object', required=True),\n"
-"        'group_id': fields.many2one('res.groups', 'Group"
+msgid "Model %s Does not Exist !"
 msgstr ""
 
 #. module: base
@@ -7744,13 +7714,7 @@ msgstr "Ações da janela"
 #. module: base
 #: code:addons/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py:0
 #, python-format
-msgid "There are no Analytic lines related to Account %s' % name))\n"
-"        return {}\n"
-"\n"
-"    states = {\n"
-"        'init': {\n"
-"            'actions': [],\n"
-"            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel"
+msgid "There are no Analytic lines related to Account %s"
 msgstr ""
 
 #. module: base
@@ -10361,12 +10325,7 @@ msgstr "Telefone"
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
-msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies.\"\"\" % (line.account_id.code, line.account_id.name)))\n"
-"\n"
-"            if abs(amount) < 0.0001:\n"
-"                if not len(line_draft_ids):\n"
-"                    continue\n"
-"                self.pool.get('account.move.line"
+msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
 
 #. module: base
@@ -11289,12 +11248,7 @@ msgstr "Usado para selecionar automaticamento o endereço certo de acordo com o
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-"        if product_id:\n"
-"            w=self.pool.get('product.product"
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/pt_PT.po b/bin/addons/base/i18n/pt_PT.po
index 3c674dc7426..813e8c2ebbf 100644
--- a/bin/addons/base/i18n/pt_PT.po
+++ b/bin/addons/base/i18n/pt_PT.po
@@ -369,16 +369,7 @@ msgstr "Nome do campo"
 #. module: base
 #: code:addons/addons/purchase/purchase.py:0
 #, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!' % s['state']))\n"
-"        return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def button_dummy(self, cr, uid, ids, context={}):\n"
-"        return True\n"
-"\n"
-"    def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n"
-"        if not adr_id:\n"
-"            return {}\n"
-"        part_id = self.pool.get('res.partner.address"
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1306,14 +1297,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None,context=None):\n"
-"        if not default:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
+msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1368,21 +1352,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "Model %s Does not Exist !\" % vals['relation']))\n"
-"                 \n"
-"            if self.pool.get(vals['model']):\n"
-"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-"                self.pool.get(vals['model'])._auto_init(cr, {})\n"
-"                \n"
-"        return res\n"
-"ir_model_fields()\n"
-"\n"
-"class ir_model_access(osv.osv):\n"
-"    _name = 'ir.model.access'\n"
-"    _columns = {\n"
-"        'name': fields.char('Name', size=64, required=True),\n"
-"        'model_id': fields.many2one('ir.model', 'Object', required=True),\n"
-"        'group_id': fields.many2one('res.groups', 'Group"
+msgid "Model %s Does not Exist !"
 msgstr ""
 
 #. module: base
@@ -7744,13 +7714,7 @@ msgstr "Acções de janelas"
 #. module: base
 #: code:addons/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py:0
 #, python-format
-msgid "There are no Analytic lines related to Account %s' % name))\n"
-"        return {}\n"
-"\n"
-"    states = {\n"
-"        'init': {\n"
-"            'actions': [],\n"
-"            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel"
+msgid "There are no Analytic lines related to Account %s"
 msgstr ""
 
 #. module: base
@@ -10361,12 +10325,7 @@ msgstr "Telefone"
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
-msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies.\"\"\" % (line.account_id.code, line.account_id.name)))\n"
-"\n"
-"            if abs(amount) < 0.0001:\n"
-"                if not len(line_draft_ids):\n"
-"                    continue\n"
-"                self.pool.get('account.move.line"
+msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
 
 #. module: base
@@ -11289,12 +11248,7 @@ msgstr "Usado para seleccionar automaticamente o endereço correcto de acordo co
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-"        if product_id:\n"
-"            w=self.pool.get('product.product"
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/ro_RO.po b/bin/addons/base/i18n/ro_RO.po
index 8cd79e886e1..f3faf8f91b7 100644
--- a/bin/addons/base/i18n/ro_RO.po
+++ b/bin/addons/base/i18n/ro_RO.po
@@ -365,16 +365,7 @@ msgstr "Nume cimp"
 #. module: base
 #: code:addons/addons/purchase/purchase.py:0
 #, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!' % s['state']))\n"
-"        return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def button_dummy(self, cr, uid, ids, context={}):\n"
-"        return True\n"
-"\n"
-"    def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n"
-"        if not adr_id:\n"
-"            return {}\n"
-"        part_id = self.pool.get('res.partner.address"
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1301,14 +1292,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None,context=None):\n"
-"        if not default:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
+msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1363,21 +1347,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "Model %s Does not Exist !\" % vals['relation']))\n"
-"                 \n"
-"            if self.pool.get(vals['model']):\n"
-"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-"                self.pool.get(vals['model'])._auto_init(cr, {})\n"
-"                \n"
-"        return res\n"
-"ir_model_fields()\n"
-"\n"
-"class ir_model_access(osv.osv):\n"
-"    _name = 'ir.model.access'\n"
-"    _columns = {\n"
-"        'name': fields.char('Name', size=64, required=True),\n"
-"        'model_id': fields.many2one('ir.model', 'Object', required=True),\n"
-"        'group_id': fields.many2one('res.groups', 'Group"
+msgid "Model %s Does not Exist !"
 msgstr ""
 
 #. module: base
@@ -7738,13 +7708,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py:0
 #, python-format
-msgid "There are no Analytic lines related to Account %s' % name))\n"
-"        return {}\n"
-"\n"
-"    states = {\n"
-"        'init': {\n"
-"            'actions': [],\n"
-"            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel"
+msgid "There are no Analytic lines related to Account %s"
 msgstr ""
 
 #. module: base
@@ -10352,12 +10316,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
-msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies.\"\"\" % (line.account_id.code, line.account_id.name)))\n"
-"\n"
-"            if abs(amount) < 0.0001:\n"
-"                if not len(line_draft_ids):\n"
-"                    continue\n"
-"                self.pool.get('account.move.line"
+msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
 
 #. module: base
@@ -11280,12 +11239,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-"        if product_id:\n"
-"            w=self.pool.get('product.product"
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/ru_RU.po b/bin/addons/base/i18n/ru_RU.po
index 47339b55625..b045a08804b 100644
--- a/bin/addons/base/i18n/ru_RU.po
+++ b/bin/addons/base/i18n/ru_RU.po
@@ -365,16 +365,7 @@ msgstr "Название поля"
 #. module: base
 #: code:addons/addons/purchase/purchase.py:0
 #, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!' % s['state']))\n"
-"        return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def button_dummy(self, cr, uid, ids, context={}):\n"
-"        return True\n"
-"\n"
-"    def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n"
-"        if not adr_id:\n"
-"            return {}\n"
-"        part_id = self.pool.get('res.partner.address"
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1302,14 +1293,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None,context=None):\n"
-"        if not default:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
+msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1364,21 +1348,7 @@ msgstr "STOCK_COPY"
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "Model %s Does not Exist !\" % vals['relation']))\n"
-"                 \n"
-"            if self.pool.get(vals['model']):\n"
-"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-"                self.pool.get(vals['model'])._auto_init(cr, {})\n"
-"                \n"
-"        return res\n"
-"ir_model_fields()\n"
-"\n"
-"class ir_model_access(osv.osv):\n"
-"    _name = 'ir.model.access'\n"
-"    _columns = {\n"
-"        'name': fields.char('Name', size=64, required=True),\n"
-"        'model_id': fields.many2one('ir.model', 'Object', required=True),\n"
-"        'group_id': fields.many2one('res.groups', 'Group"
+msgid "Model %s Does not Exist !"
 msgstr ""
 
 #. module: base
@@ -7740,13 +7710,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py:0
 #, python-format
-msgid "There are no Analytic lines related to Account %s' % name))\n"
-"        return {}\n"
-"\n"
-"    states = {\n"
-"        'init': {\n"
-"            'actions': [],\n"
-"            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel"
+msgid "There are no Analytic lines related to Account %s"
 msgstr ""
 
 #. module: base
@@ -10354,12 +10318,7 @@ msgstr "Телефон"
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
-msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies.\"\"\" % (line.account_id.code, line.account_id.name)))\n"
-"\n"
-"            if abs(amount) < 0.0001:\n"
-"                if not len(line_draft_ids):\n"
-"                    continue\n"
-"                self.pool.get('account.move.line"
+msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
 
 #. module: base
@@ -11282,12 +11241,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-"        if product_id:\n"
-"            w=self.pool.get('product.product"
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/sl_SL.po b/bin/addons/base/i18n/sl_SL.po
index f7f953267ec..d8af48b75b1 100644
--- a/bin/addons/base/i18n/sl_SL.po
+++ b/bin/addons/base/i18n/sl_SL.po
@@ -365,16 +365,7 @@ msgstr "Naziv polja"
 #. module: base
 #: code:addons/addons/purchase/purchase.py:0
 #, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!' % s['state']))\n"
-"        return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def button_dummy(self, cr, uid, ids, context={}):\n"
-"        return True\n"
-"\n"
-"    def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n"
-"        if not adr_id:\n"
-"            return {}\n"
-"        part_id = self.pool.get('res.partner.address"
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1302,14 +1293,7 @@ msgstr "ir.exports.line"
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None,context=None):\n"
-"        if not default:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
+msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1364,21 +1348,7 @@ msgstr "STOCK_COPY"
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "Model %s Does not Exist !\" % vals['relation']))\n"
-"                 \n"
-"            if self.pool.get(vals['model']):\n"
-"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-"                self.pool.get(vals['model'])._auto_init(cr, {})\n"
-"                \n"
-"        return res\n"
-"ir_model_fields()\n"
-"\n"
-"class ir_model_access(osv.osv):\n"
-"    _name = 'ir.model.access'\n"
-"    _columns = {\n"
-"        'name': fields.char('Name', size=64, required=True),\n"
-"        'model_id': fields.many2one('ir.model', 'Object', required=True),\n"
-"        'group_id': fields.many2one('res.groups', 'Group"
+msgid "Model %s Does not Exist !"
 msgstr ""
 
 #. module: base
@@ -7740,13 +7710,7 @@ msgstr "Okenske akcije"
 #. module: base
 #: code:addons/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py:0
 #, python-format
-msgid "There are no Analytic lines related to Account %s' % name))\n"
-"        return {}\n"
-"\n"
-"    states = {\n"
-"        'init': {\n"
-"            'actions': [],\n"
-"            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel"
+msgid "There are no Analytic lines related to Account %s"
 msgstr ""
 
 #. module: base
@@ -10355,12 +10319,7 @@ msgstr "Telefon"
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
-msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies.\"\"\" % (line.account_id.code, line.account_id.name)))\n"
-"\n"
-"            if abs(amount) < 0.0001:\n"
-"                if not len(line_draft_ids):\n"
-"                    continue\n"
-"                self.pool.get('account.move.line"
+msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
 
 #. module: base
@@ -11283,12 +11242,7 @@ msgstr "Običajno se samodejno izbere pravi naslov glede na kontest prodajnih in
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-"        if product_id:\n"
-"            w=self.pool.get('product.product"
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/sq_AL.po b/bin/addons/base/i18n/sq_AL.po
index 27d212ca8ca..02499f452a8 100644
--- a/bin/addons/base/i18n/sq_AL.po
+++ b/bin/addons/base/i18n/sq_AL.po
@@ -365,16 +365,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/purchase/purchase.py:0
 #, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!' % s['state']))\n"
-"        return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def button_dummy(self, cr, uid, ids, context={}):\n"
-"        return True\n"
-"\n"
-"    def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n"
-"        if not adr_id:\n"
-"            return {}\n"
-"        part_id = self.pool.get('res.partner.address"
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1301,14 +1292,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None,context=None):\n"
-"        if not default:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
+msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1363,21 +1347,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "Model %s Does not Exist !\" % vals['relation']))\n"
-"                 \n"
-"            if self.pool.get(vals['model']):\n"
-"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-"                self.pool.get(vals['model'])._auto_init(cr, {})\n"
-"                \n"
-"        return res\n"
-"ir_model_fields()\n"
-"\n"
-"class ir_model_access(osv.osv):\n"
-"    _name = 'ir.model.access'\n"
-"    _columns = {\n"
-"        'name': fields.char('Name', size=64, required=True),\n"
-"        'model_id': fields.many2one('ir.model', 'Object', required=True),\n"
-"        'group_id': fields.many2one('res.groups', 'Group"
+msgid "Model %s Does not Exist !"
 msgstr ""
 
 #. module: base
@@ -7738,13 +7708,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py:0
 #, python-format
-msgid "There are no Analytic lines related to Account %s' % name))\n"
-"        return {}\n"
-"\n"
-"    states = {\n"
-"        'init': {\n"
-"            'actions': [],\n"
-"            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel"
+msgid "There are no Analytic lines related to Account %s"
 msgstr ""
 
 #. module: base
@@ -10352,12 +10316,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
-msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies.\"\"\" % (line.account_id.code, line.account_id.name)))\n"
-"\n"
-"            if abs(amount) < 0.0001:\n"
-"                if not len(line_draft_ids):\n"
-"                    continue\n"
-"                self.pool.get('account.move.line"
+msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
 
 #. module: base
@@ -11280,12 +11239,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-"        if product_id:\n"
-"            w=self.pool.get('product.product"
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/sv_SE.po b/bin/addons/base/i18n/sv_SE.po
index bf8873b1c6e..86dd1458bc4 100644
--- a/bin/addons/base/i18n/sv_SE.po
+++ b/bin/addons/base/i18n/sv_SE.po
@@ -365,16 +365,7 @@ msgstr "Fältnamn"
 #. module: base
 #: code:addons/addons/purchase/purchase.py:0
 #, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!' % s['state']))\n"
-"        return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def button_dummy(self, cr, uid, ids, context={}):\n"
-"        return True\n"
-"\n"
-"    def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n"
-"        if not adr_id:\n"
-"            return {}\n"
-"        part_id = self.pool.get('res.partner.address"
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1301,14 +1292,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None,context=None):\n"
-"        if not default:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
+msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1363,21 +1347,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "Model %s Does not Exist !\" % vals['relation']))\n"
-"                 \n"
-"            if self.pool.get(vals['model']):\n"
-"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-"                self.pool.get(vals['model'])._auto_init(cr, {})\n"
-"                \n"
-"        return res\n"
-"ir_model_fields()\n"
-"\n"
-"class ir_model_access(osv.osv):\n"
-"    _name = 'ir.model.access'\n"
-"    _columns = {\n"
-"        'name': fields.char('Name', size=64, required=True),\n"
-"        'model_id': fields.many2one('ir.model', 'Object', required=True),\n"
-"        'group_id': fields.many2one('res.groups', 'Group"
+msgid "Model %s Does not Exist !"
 msgstr ""
 
 #. module: base
@@ -7738,13 +7708,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py:0
 #, python-format
-msgid "There are no Analytic lines related to Account %s' % name))\n"
-"        return {}\n"
-"\n"
-"    states = {\n"
-"        'init': {\n"
-"            'actions': [],\n"
-"            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel"
+msgid "There are no Analytic lines related to Account %s"
 msgstr ""
 
 #. module: base
@@ -10352,12 +10316,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
-msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies.\"\"\" % (line.account_id.code, line.account_id.name)))\n"
-"\n"
-"            if abs(amount) < 0.0001:\n"
-"                if not len(line_draft_ids):\n"
-"                    continue\n"
-"                self.pool.get('account.move.line"
+msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
 
 #. module: base
@@ -11280,12 +11239,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-"        if product_id:\n"
-"            w=self.pool.get('product.product"
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/tr_TR.po b/bin/addons/base/i18n/tr_TR.po
index f1c2b1f7686..6ba9ff04ef8 100644
--- a/bin/addons/base/i18n/tr_TR.po
+++ b/bin/addons/base/i18n/tr_TR.po
@@ -365,16 +365,7 @@ msgstr "Alan Adı"
 #. module: base
 #: code:addons/addons/purchase/purchase.py:0
 #, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!' % s['state']))\n"
-"        return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def button_dummy(self, cr, uid, ids, context={}):\n"
-"        return True\n"
-"\n"
-"    def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n"
-"        if not adr_id:\n"
-"            return {}\n"
-"        part_id = self.pool.get('res.partner.address"
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1301,14 +1292,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None,context=None):\n"
-"        if not default:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
+msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1363,21 +1347,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "Model %s Does not Exist !\" % vals['relation']))\n"
-"                 \n"
-"            if self.pool.get(vals['model']):\n"
-"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-"                self.pool.get(vals['model'])._auto_init(cr, {})\n"
-"                \n"
-"        return res\n"
-"ir_model_fields()\n"
-"\n"
-"class ir_model_access(osv.osv):\n"
-"    _name = 'ir.model.access'\n"
-"    _columns = {\n"
-"        'name': fields.char('Name', size=64, required=True),\n"
-"        'model_id': fields.many2one('ir.model', 'Object', required=True),\n"
-"        'group_id': fields.many2one('res.groups', 'Group"
+msgid "Model %s Does not Exist !"
 msgstr ""
 
 #. module: base
@@ -7738,13 +7708,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py:0
 #, python-format
-msgid "There are no Analytic lines related to Account %s' % name))\n"
-"        return {}\n"
-"\n"
-"    states = {\n"
-"        'init': {\n"
-"            'actions': [],\n"
-"            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel"
+msgid "There are no Analytic lines related to Account %s"
 msgstr ""
 
 #. module: base
@@ -10352,12 +10316,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
-msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies.\"\"\" % (line.account_id.code, line.account_id.name)))\n"
-"\n"
-"            if abs(amount) < 0.0001:\n"
-"                if not len(line_draft_ids):\n"
-"                    continue\n"
-"                self.pool.get('account.move.line"
+msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
 
 #. module: base
@@ -11280,12 +11239,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-"        if product_id:\n"
-"            w=self.pool.get('product.product"
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/uk_UA.po b/bin/addons/base/i18n/uk_UA.po
index 8d829b19b77..821d2aee32f 100644
--- a/bin/addons/base/i18n/uk_UA.po
+++ b/bin/addons/base/i18n/uk_UA.po
@@ -369,16 +369,7 @@ msgstr "Назва поля"
 #. module: base
 #: code:addons/addons/purchase/purchase.py:0
 #, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!' % s['state']))\n"
-"        return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def button_dummy(self, cr, uid, ids, context={}):\n"
-"        return True\n"
-"\n"
-"    def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n"
-"        if not adr_id:\n"
-"            return {}\n"
-"        part_id = self.pool.get('res.partner.address"
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1306,14 +1297,7 @@ msgstr "ir.exports.line"
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None,context=None):\n"
-"        if not default:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
+msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1368,21 +1352,7 @@ msgstr "STOCK_COPY"
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "Model %s Does not Exist !\" % vals['relation']))\n"
-"                 \n"
-"            if self.pool.get(vals['model']):\n"
-"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-"                self.pool.get(vals['model'])._auto_init(cr, {})\n"
-"                \n"
-"        return res\n"
-"ir_model_fields()\n"
-"\n"
-"class ir_model_access(osv.osv):\n"
-"    _name = 'ir.model.access'\n"
-"    _columns = {\n"
-"        'name': fields.char('Name', size=64, required=True),\n"
-"        'model_id': fields.many2one('ir.model', 'Object', required=True),\n"
-"        'group_id': fields.many2one('res.groups', 'Group"
+msgid "Model %s Does not Exist !"
 msgstr ""
 
 #. module: base
@@ -7744,13 +7714,7 @@ msgstr "Дії вікна"
 #. module: base
 #: code:addons/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py:0
 #, python-format
-msgid "There are no Analytic lines related to Account %s' % name))\n"
-"        return {}\n"
-"\n"
-"    states = {\n"
-"        'init': {\n"
-"            'actions': [],\n"
-"            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel"
+msgid "There are no Analytic lines related to Account %s"
 msgstr ""
 
 #. module: base
@@ -10359,12 +10323,7 @@ msgstr "Телефон"
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
-msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies.\"\"\" % (line.account_id.code, line.account_id.name)))\n"
-"\n"
-"            if abs(amount) < 0.0001:\n"
-"                if not len(line_draft_ids):\n"
-"                    continue\n"
-"                self.pool.get('account.move.line"
+msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
 
 #. module: base
@@ -11287,12 +11246,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-"        if product_id:\n"
-"            w=self.pool.get('product.product"
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/vi_VN.po b/bin/addons/base/i18n/vi_VN.po
index 217a8cee7ec..6862928e572 100644
--- a/bin/addons/base/i18n/vi_VN.po
+++ b/bin/addons/base/i18n/vi_VN.po
@@ -365,16 +365,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/purchase/purchase.py:0
 #, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!' % s['state']))\n"
-"        return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def button_dummy(self, cr, uid, ids, context={}):\n"
-"        return True\n"
-"\n"
-"    def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n"
-"        if not adr_id:\n"
-"            return {}\n"
-"        part_id = self.pool.get('res.partner.address"
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1301,14 +1292,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None,context=None):\n"
-"        if not default:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
+msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1363,21 +1347,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "Model %s Does not Exist !\" % vals['relation']))\n"
-"                 \n"
-"            if self.pool.get(vals['model']):\n"
-"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-"                self.pool.get(vals['model'])._auto_init(cr, {})\n"
-"                \n"
-"        return res\n"
-"ir_model_fields()\n"
-"\n"
-"class ir_model_access(osv.osv):\n"
-"    _name = 'ir.model.access'\n"
-"    _columns = {\n"
-"        'name': fields.char('Name', size=64, required=True),\n"
-"        'model_id': fields.many2one('ir.model', 'Object', required=True),\n"
-"        'group_id': fields.many2one('res.groups', 'Group"
+msgid "Model %s Does not Exist !"
 msgstr ""
 
 #. module: base
@@ -7738,13 +7708,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py:0
 #, python-format
-msgid "There are no Analytic lines related to Account %s' % name))\n"
-"        return {}\n"
-"\n"
-"    states = {\n"
-"        'init': {\n"
-"            'actions': [],\n"
-"            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel"
+msgid "There are no Analytic lines related to Account %s"
 msgstr ""
 
 #. module: base
@@ -10352,12 +10316,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
-msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies.\"\"\" % (line.account_id.code, line.account_id.name)))\n"
-"\n"
-"            if abs(amount) < 0.0001:\n"
-"                if not len(line_draft_ids):\n"
-"                    continue\n"
-"                self.pool.get('account.move.line"
+msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
 
 #. module: base
@@ -11280,12 +11239,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-"        if product_id:\n"
-"            w=self.pool.get('product.product"
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index 9f2464e4694..c7c62b90563 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.po
@@ -365,16 +365,7 @@ msgstr "名称字段"
 #. module: base
 #: code:addons/addons/purchase/purchase.py:0
 #, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!' % s['state']))\n"
-"        return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def button_dummy(self, cr, uid, ids, context={}):\n"
-"        return True\n"
-"\n"
-"    def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n"
-"        if not adr_id:\n"
-"            return {}\n"
-"        part_id = self.pool.get('res.partner.address"
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1301,14 +1292,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None,context=None):\n"
-"        if not default:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
+msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1363,21 +1347,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "Model %s Does not Exist !\" % vals['relation']))\n"
-"                 \n"
-"            if self.pool.get(vals['model']):\n"
-"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-"                self.pool.get(vals['model'])._auto_init(cr, {})\n"
-"                \n"
-"        return res\n"
-"ir_model_fields()\n"
-"\n"
-"class ir_model_access(osv.osv):\n"
-"    _name = 'ir.model.access'\n"
-"    _columns = {\n"
-"        'name': fields.char('Name', size=64, required=True),\n"
-"        'model_id': fields.many2one('ir.model', 'Object', required=True),\n"
-"        'group_id': fields.many2one('res.groups', 'Group"
+msgid "Model %s Does not Exist !"
 msgstr ""
 
 #. module: base
@@ -7738,13 +7708,7 @@ msgstr "窗口动作"
 #. module: base
 #: code:addons/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py:0
 #, python-format
-msgid "There are no Analytic lines related to Account %s' % name))\n"
-"        return {}\n"
-"\n"
-"    states = {\n"
-"        'init': {\n"
-"            'actions': [],\n"
-"            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel"
+msgid "There are no Analytic lines related to Account %s"
 msgstr ""
 
 #. module: base
@@ -10352,12 +10316,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
-msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies.\"\"\" % (line.account_id.code, line.account_id.name)))\n"
-"\n"
-"            if abs(amount) < 0.0001:\n"
-"                if not len(line_draft_ids):\n"
-"                    continue\n"
-"                self.pool.get('account.move.line"
+msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
 
 #. module: base
@@ -11280,12 +11239,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-"        if product_id:\n"
-"            w=self.pool.get('product.product"
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/zh_TW.po b/bin/addons/base/i18n/zh_TW.po
index 229dfde1389..15270f8e5e7 100644
--- a/bin/addons/base/i18n/zh_TW.po
+++ b/bin/addons/base/i18n/zh_TW.po
@@ -365,16 +365,7 @@ msgstr "名称字段"
 #. module: base
 #: code:addons/addons/purchase/purchase.py:0
 #, python-format
-msgid "Cannot delete Purchase Order(s) which are in %s State!' % s['state']))\n"
-"        return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def button_dummy(self, cr, uid, ids, context={}):\n"
-"        return True\n"
-"\n"
-"    def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n"
-"        if not adr_id:\n"
-"            return {}\n"
-"        part_id = self.pool.get('res.partner.address"
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1301,14 +1292,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None,context=None):\n"
-"        if not default:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
+msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base
@@ -1363,21 +1347,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "Model %s Does not Exist !\" % vals['relation']))\n"
-"                 \n"
-"            if self.pool.get(vals['model']):\n"
-"                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
-"                self.pool.get(vals['model'])._auto_init(cr, {})\n"
-"                \n"
-"        return res\n"
-"ir_model_fields()\n"
-"\n"
-"class ir_model_access(osv.osv):\n"
-"    _name = 'ir.model.access'\n"
-"    _columns = {\n"
-"        'name': fields.char('Name', size=64, required=True),\n"
-"        'model_id': fields.many2one('ir.model', 'Object', required=True),\n"
-"        'group_id': fields.many2one('res.groups', 'Group"
+msgid "Model %s Does not Exist !"
 msgstr ""
 
 #. module: base
@@ -7738,13 +7708,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py:0
 #, python-format
-msgid "There are no Analytic lines related to Account %s' % name))\n"
-"        return {}\n"
-"\n"
-"    states = {\n"
-"        'init': {\n"
-"            'actions': [],\n"
-"            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel"
+msgid "There are no Analytic lines related to Account %s"
 msgstr ""
 
 #. module: base
@@ -10352,12 +10316,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
-msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies.\"\"\" % (line.account_id.code, line.account_id.name)))\n"
-"\n"
-"            if abs(amount) < 0.0001:\n"
-"                if not len(line_draft_ids):\n"
-"                    continue\n"
-"                self.pool.get('account.move.line"
+msgid "\"\"Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
 
 #. module: base
@@ -11280,12 +11239,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
 #, python-format
-msgid "Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-"        if product_id:\n"
-"            w=self.pool.get('product.product"
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: base

From 160b545067b1fd15bbd808f9142a28a43ab8f2ce Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Thu, 3 Dec 2009 17:39:14 +0530
Subject: [PATCH 187/200] [FIX] Translation: Error parsing .po files when
 application puts comments in a single line

lp bug: https://launchpad.net/bugs/491365 fixed

bzr revid: mra@tinyerp.com-20091203120914-cx2kv7gk7zg65248
---
 bin/tools/translate.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bin/tools/translate.py b/bin/tools/translate.py
index ca833dfee6e..e41a5d99217 100644
--- a/bin/tools/translate.py
+++ b/bin/tools/translate.py
@@ -188,7 +188,12 @@ class TinyPoFile(object):
                     raise StopIteration()
                 line = self.lines.pop(0).strip()
                 if line.startswith('#:'): 
-                    tmp_tnrs.append( line[2:].strip().split(':') )
+                    for item in line[2:].strip().split(' '):
+                        value = item.split(':')
+                        if len(value) == 3:
+                            if value[2].endswith(','):
+                                value[2] = value[2][:-1]
+                            tmp_tnrs.append( value )
                 if line.startswith('#'):
                     line = None
 

From a04aba460dee881901a04a304eec2b24d029ce02 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@tinyerp.com>
Date: Thu, 3 Dec 2009 13:59:08 +0100
Subject: [PATCH 188/200] [IMP] add option to disable the database listing

bzr revid: chs@tinyerp.com-20091203125908-98rwtrslkzes2lxq
---
 bin/service/web_services.py | 3 +++
 bin/tools/config.py         | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/bin/service/web_services.py b/bin/service/web_services.py
index ebd7f063d39..5a3c750f3f4 100644
--- a/bin/service/web_services.py
+++ b/bin/service/web_services.py
@@ -290,6 +290,9 @@ class db(netsvc.Service):
         return bool(sql_db.db_connect(db_name))
 
     def list(self):
+        if not tools.config['list_db']:
+            raise Exception('AccessDenied')
+
         db = sql_db.db_connect('template1')
         cr = db.cursor()
         try:
diff --git a/bin/tools/config.py b/bin/tools/config.py
index 1621a11f9c2..05cf7be1c25 100644
--- a/bin/tools/config.py
+++ b/bin/tools/config.py
@@ -79,6 +79,7 @@ class configmanager(object):
             'assert_exit_level': logging.WARNING, # level above which a failed assert will be raise
             'cache_timeout': 100000,
             'login_message': False,
+            'list_db': True,
         }
 
         hasSSL = check_ssl()
@@ -115,6 +116,8 @@ class configmanager(object):
         parser.add_option("--assert-exit-level", dest='assert_exit_level', type="choice", choices=self._LOGLEVELS.keys(),
                           help="specify the level at which a failed assertion will stop the server. Accepted values: %s" % (self._LOGLEVELS.keys(),))
         parser.add_option('--price_accuracy', dest='price_accuracy', default='2', help='specify the price accuracy')
+        parser.add_option('--no-database-list', action="store_false", dest='list_db', default=True, help="disable the ability to return the list of databases")
+
         if hasSSL:
             group = optparse.OptionGroup(parser, "SSL Configuration")
             group.add_option("-S", "--secure", dest="secure",
@@ -228,7 +231,7 @@ class configmanager(object):
                 self.options[arg] = getattr(opt, arg)
 
         keys = ['language', 'translate_out', 'translate_in', 'debug_mode',
-                'stop_after_init', 'without_demo', 'netrpc', 'xmlrpc', 'syslog']
+                'stop_after_init', 'without_demo', 'netrpc', 'xmlrpc', 'syslog', 'list_db']
 
         if hasSSL and not  self.options['secure']:
             keys.append('secure')

From 9a3b004ae4cf26691f8eba1edf9f9822ceda5930 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@tinyerp.com>
Date: Thu, 3 Dec 2009 14:51:08 +0100
Subject: [PATCH 189/200] [REL] 5.0.7

bzr revid: chs@tinyerp.com-20091203135108-9enz6ke9f35y0u2x
---
 bin/PKG-INFO   |   2 +-
 bin/release.py |   2 +-
 doc/Changelog  | 332 +++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 334 insertions(+), 2 deletions(-)

diff --git a/bin/PKG-INFO b/bin/PKG-INFO
index b13a196bcff..0cc1f0aa9fc 100644
--- a/bin/PKG-INFO
+++ b/bin/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: OpenERP
-Version: 5.0.4
+Version: 5.0.7
 Author: Tiny.be
 Author-email: fp at tiny be
 Maintainer: Tiny.be
diff --git a/bin/release.py b/bin/release.py
index 935d2136460..f53ffa302f1 100644
--- a/bin/release.py
+++ b/bin/release.py
@@ -22,7 +22,7 @@
 ##############################################################################
 
 name = 'openerp-server'
-version = '5.0.6'
+version = '5.0.7'
 major_version = '5.0'
 description = 'OpenERP Server'
 long_desc = '''\
diff --git a/doc/Changelog b/doc/Changelog
index e8866ff37b1..85f3271ebc6 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,335 @@
+2009-12-03: 5.0.7
+=================
+
+Bugfixes (server)
+-----------------
+
+ * Not linked to a bug report:
+   * translation: modify msg id where it contains python code in translations po files
+   * use env for python shebang rather than hardcoding /usr/bin/python
+   * base: wrong fr_FR translation for 'Delete Permission'
+   * db_exist method works as expected
+   * quality_integration_server : fixed bug on make link
+   * quality_integration_server: wrong web-service name
+   * Upgrade could have failed when its a change in name field,added cascade
+   * Expression : Making search easier for 'child_of'- Recursivity on field used as a Left operand
+   * solve problem of importing data from csv with constraints available on object
+   * act_window False domain problem - produce after dom to lxml conversion
+   * On update, fields with only numeric/int/float could have digits
+   * On Update, if only the size of column is changed,it should reflect into DB
+   * quality_integration_server : fixed problem in integration server on translation checking if translation file is changed on base module
+   * Avoid crash when no args
+   * Config : wrong calculation if cached_timeout comes from config file
+   * Expression : domain calculation failes, max. recursion error protected
+   * recursive calls
+   * allow to call write without ids on osv_memory objects
+   * Specify the name of the argument for the context, to avoir a critical bug
+   * <seq> problem Report Engine
+   * Workflow button desactivation regarding user roles
+   * Improved Previous bad commit for pagelayout error
+   * Import : Context of the action/screen passed,taken into consideration while importing
+   * quality_integration_server: ascci encoding problem in quality html log
+   * recursive child_of on one2many and many2many
+   * default context
+ * https://launchpad.net/bugs/463415
+ * https://launchpad.net/bugs/490604
+   * RAW reports creation corrected
+ * https://launchpad.net/bugs/430133
+   * Name_search() is having now record limit to be 80 instead of None
+ * https://launchpad.net/bugs/434341
+   * Export : Selection field gets imported by its external name  if export is not import compatible
+ * https://launchpad.net/bugs/489355
+   * fields: '_fnct_write' should pass context object to the 'write' method
+ * https://launchpad.net/bugs/410191
+   * Record rule : domain evaluation problem corrected
+ * https://launchpad.net/bugs/420507
+   * Domain was getting failed when trying to work upon M2M,O2M field of object
+ * https://launchpad.net/bugs/453269
+   * Amount to text conversions made better
+ * https://launchpad.net/bugs/488234
+   * connection pool when database password is provided (thanks to Syleam Crew)
+ * https://launchpad.net/bugs/430805
+   * Import made successful when field is O2M and it has relation under that.
+ * https://launchpad.net/bugs/480301
+   * M2M : values filtering on set()
+ * https://launchpad.net/bugs/462506
+   * Priority on fields.function with store dictionary made working.
+ * https://launchpad.net/bugs/433886
+   * Update Module : Float8 to float and numeric to float casting made possible
+ * https://launchpad.net/bugs/491365
+   * Translation: Error parsing .po files when application puts comments in a single line
+ * https://launchpad.net/bugs/460560
+   * Ir_attachment : Context updation corrected on preview
+ * https://launchpad.net/bugs/356628
+   * allow related fields to point to one2many and many2many fields
+ * https://launchpad.net/bugs/483527
+ * https://launchpad.net/bugs/435933
+   * Encoding error corrected for client_action(ir_values-tree view)
+ * https://launchpad.net/bugs/430728
+   * Allowing sql keywords as fields(don't use them in order by clause)
+ * https://launchpad.net/bugs/487836
+   * Custom Object xml arch needed encoding.
+ * https://launchpad.net/bugs/487723
+   * Module informtion was not getting updated on upgrading module
+ * https://launchpad.net/bugs/480782
+ * https://launchpad.net/bugs/478724
+   * Export : M2M field name was missing last character
+ * https://launchpad.net/bugs/437729
+   * Export Translation : Warning on Non-existing record instead of breaking flow
+ * https://launchpad.net/bugs/429519
+ * https://launchpad.net/bugs/433395
+ * https://launchpad.net/bugs/479915
+   * Added lxml as required module on setup
+ * https://launchpad.net/bugs/400614
+   * Use an alternative for the locale.RADIXCHAR if this one doesn't exist
+ * https://launchpad.net/bugs/491462
+   * Pickling issue solved with ir_values (get method)
+
+
+Improvements (server)
+---------------------
+
+ * add option to disable the database listing
+ * sql_log
+ * quality_integration_server: added net_port option in script
+ * better connection pool (global)
+ * ir_cron : added active feild on list view
+ * Allow to specify the view via the context
+ * cron: check the arguments to avoid security issues
+ * cron: failed jobs are logged
+ * cron: clean code
+ * base_quality_interrrogation: put message if the score of quality less then minimal and remove unit test condition
+ * quality_integration_server: quality log : add new option to specify qualitylog path to store html pages of log
+ * default value for module
+
+
+Bugfixes (addons)
+-----------------
+
+ * Not linked to a bug report:
+   * Project : remove unused import causing a DeprecationWarning under Python 2.6
+   * l10n_be: corrected internal type of vat account in l10n_be: set other instead of payable/receivable
+   * Hr_timesheet_sheet : setting type=workflow to 2 buttons
+   * Account: text made translatable
+   * Stock : Added Product UoS to the Stock Move view
+   * fix the problem of menus uring installation
+   * Base_contact : Making Email field of address visible on Address form view
+   * Stock : Added translations
+   * Account_invoice_layout : Reports improved and SXWs made compatible to RML
+   * membership: invoice membership wizard now calculate tax corectly and on product membership fields make readonly to false
+   * membership: change membership product date from and date to value with current year on demo data
+   * membership: solve problem of deleting membership invoice created with old membership product
+   * Account: Wizards were missing translation import statement
+   * Residual amount into invoice is now correct in every case and avoid rounding trouble even if rating has changed
+   * account: avoid translate tool missing import on strictier Python 2.6 versions; bare in mind that mx.Datetime should be eraticated from the surface of the earth
+   * account: removed pdb now that things are claimed fixed (after the commits messages)
+   * account_analytic_plans: Use etree instead of xml.dom
+   * fix the problem that appers in to the account move due to accout voucher
+   * Account_date_check : correction on a method
+   * Account_voucher : Typo corrected for Voucher type.
+   * Account : Corrected the malformed report of Partner Ledger
+   * purchase_manual: Import OSV
+   * python2.6 compatibility
+   * AuditTrail : View Logs should only show logs of current object and resources
+   * fix the problem of the reports account voucher
+   * #TODO: fix me sale module can not be used here,
+   * Import OSV in the wizard
+   * purchase: Use the price_accuracy
+   * Base_Report_Creator : xml record was malformed, corrected
+   * hr_expense: corrected error message
+   * account: avoid ZeroDivisionError
+   * Specify the name of the argument for the context, to avoir a critical bug
+   * CRM : Mailgate script added option -he was conflicting,improved
+   * Account :Invoice report had Partner name displayed at wrong position
+   * bugfix residual computation and multi-currencies
+   * Base_report_creator : Calendar view problems on custom report
+   * typo
+   * workcenter load graph
+   * set the access right
+   * base_module_quality: speed test if read method has exception
+   * account_analytic_plans: avoid encoding errors
+ * https://launchpad.net/bugs/458415
+   * document_ics : solved accent problem
+ * https://launchpad.net/bugs/447402
+   * Project_timesheet : Wrong synchro on analytic line creation fro tasks(for name).
+ * https://launchpad.net/bugs/490318
+   * Account : Ondelete=cascade added to bank statement line
+ * https://launchpad.net/bugs/446520
+   * [account_followup] wrong sender for email
+ * https://launchpad.net/bugs/454536
+   * Warning : Onchange Methods were malfunctioned.Corrected and made messages available for translations
+ * https://launchpad.net/bugs/450180
+   * Hr_timesheet_invoice : Wrong domain was sent for opening invoices created
+ * https://launchpad.net/bugs/383057
+   * Stock-MRP : Split production wizard made individual to mrp if mrp is not installed
+ * https://launchpad.net/bugs/488869
+   * Stock/MRP : Track line wizard improved
+ * https://launchpad.net/bugs/446681
+   * Account : Refund wuzard malfunctioned with modify invoice option
+ * https://launchpad.net/bugs/446391
+   * Base_report_creator : Allowing to use current userid
+ * https://launchpad.net/bugs/479747
+ * https://launchpad.net/bugs/470359
+ * https://launchpad.net/bugs/460701
+   * Document : Attachment with document can now be deleted
+ * https://launchpad.net/bugs/439469
+   * Product : Pricelist types getting translated on Pricelist
+ * https://launchpad.net/bugs/489355
+   * account, invoice, sale: description (product sold, invoice line and account entry line) was not translated
+ * https://launchpad.net/bugs/435160
+   * [IMP] Correct write-off date, add analytic account, better interface between all way to reconcile
+ * https://launchpad.net/bugs/481524
+   * Stock : Forecast report: unicode error corrected
+ * https://launchpad.net/bugs/458553
+   * Account : Onchange of amount/base amount of Invocie tax corrected
+ * https://launchpad.net/bugs/438705
+   * Stock : Stock move lines on Production Order well-structured
+ * https://launchpad.net/bugs/441609
+   * Account : Fiscal Position Template was missing a requireed field in form view
+ * https://launchpad.net/bugs/467880
+   * MRP : Procurement can only be confirmed when qty>0.0
+ * https://launchpad.net/bugs/486783
+   * Point_of_sale : Report for Reciept corrected
+ * https://launchpad.net/bugs/448591
+   * Account : Refund wizard wasnt calculating taxes for new invoices
+ * https://launchpad.net/bugs/395160
+   * Project_timesheet : Analytic line creation/edition takes user based information
+ * https://launchpad.net/bugs/436008
+   * Sale: Passing Contact address for invoices from SO
+ * https://launchpad.net/bugs/428926
+   * account_payment when importing payment lines (currency not set correctly)
+ * https://launchpad.net/bugs/439041
+   * Report_project :wrong average of closing days counting
+ * https://launchpad.net/bugs/396637
+   * account_analytic_analysis : Analytic account functional field methods corrected.
+   * Account : Analytic account functional field methods corrected.
+ * https://launchpad.net/bugs/445547
+   * Stock: Picking report correction
+ * https://launchpad.net/bugs/443069
+   * Project: wrong domain for 'Tasks in Progress' menuitem
+ * https://launchpad.net/bugs/483723
+   * CRM : Case form view priority issue resolved
+ * https://launchpad.net/bugs/427869
+   * Residual amount in invoice when currency rating change
+ * https://launchpad.net/bugs/416810
+   * Document: attachment linked with Files
+ * https://launchpad.net/bugs/461801
+   * Sale : Workflow behaviour fixed when order is set to draft
+ * https://launchpad.net/bugs/461720
+   * Scrum : Wrong view,widgetless fields on scrum view made correct
+ * https://launchpad.net/bugs/474337
+   * [CRITICAL] warning : missing import statement for "_"
+ * https://launchpad.net/bugs/443132
+   * Sale : Passing customer ref. of picking to invoice
+ * https://launchpad.net/bugs/488809
+   * Sale : State was written wrongly
+ * https://launchpad.net/bugs/465010
+   * Stock : Notification Message made translatable
+ * https://launchpad.net/bugs/490342
+   * Account : making the default_get() eTiny compatible
+ * https://launchpad.net/bugs/453030
+   * Avoid display write-off in pay invoice wizard : take care of partial payment
+   * Avoid display write-off in pay invoice wizard. Put the right date and currency for conversion
+ * https://launchpad.net/bugs/445267
+   * Mrp_subproduct : Wrong calculation of QTYs corrected(Product qty,UOS qty)
+ * https://launchpad.net/bugs/401035
+   * Audittrail : Assigned Access Rights to non-admin user.
+ * https://launchpad.net/bugs/421636
+   * Account : Restricting Payment term lines percentage insertion from 0 to 1
+ * https://launchpad.net/bugs/425671
+   * Stock : Moves offer onchange on UOM to affect UOS
+ * https://launchpad.net/bugs/489083
+   * Account :customer refund was displaying supplier invoice view, corrected
+ * https://launchpad.net/bugs/480856
+   * Warning : the super of onchange may return {},covered the same
+ * https://launchpad.net/bugs/459196
+   * Account : Partner Ledger Report formatting problem solved
+ * https://launchpad.net/bugs/483583
+   * Sale/Purcghase : Function fields did not have digits attribute for precision accuracy
+ * https://launchpad.net/bugs/475135
+   * Account : Warning message was missing _ import
+ * https://launchpad.net/bugs/457188
+   * Account_analytic_analysis : Summary of Months calculation Corrected
+ * https://launchpad.net/bugs/435178
+   * [CRITICAL]subscription: crash subscription process
+ * https://launchpad.net/bugs/480035
+   * CRM : action name improved
+ * https://launchpad.net/bugs/487091
+   * Stock :Invoice created from manual picking might miss UoS.
+ * https://launchpad.net/bugs/435298
+   * Subscription : Disallowed to change the Object linked to the document type.
+ * https://launchpad.net/bugs/436651
+   * mrp : workcentre load report had a query malformed
+ * https://launchpad.net/bugs/479886
+   * Account : Total field on supplier invoice set to 0.0 to amke it Web-client compatible
+ * https://launchpad.net/bugs/479195
+   * Base_vat : Romania VAT validation corrected
+ * https://launchpad.net/bugs/351083
+   * Account : Partner Balance report gets printed with respect to the company selected
+ * https://launchpad.net/bugs/451310
+ * https://launchpad.net/bugs/449583
+   * Sale : Better error message when account is missing from SOL for Invioce
+ * https://launchpad.net/bugs/486794
+   * Hr_holidays: Spell mistake corrected
+ * https://launchpad.net/bugs/351167
+ * https://launchpad.net/bugs/438725
+   * Purchase : Setting the value of payment term while creatying invoice from PO
+ * https://launchpad.net/bugs/471052
+   * Product : Pricelist Item cannot use Main pricelist as the other pricelist
+ * https://launchpad.net/bugs/481372
+   * Project : If company has no Project time unit,it would have crashed.
+ * https://launchpad.net/bugs/458030
+   * Account : Ledger Report Landscape report adjusted for A4.
+ * https://launchpad.net/bugs/446205
+   * CRM : Mailgate script has host as parameter now onwards
+ * https://launchpad.net/bugs/487641
+   * Purchase : MOQ-pricing problem corrected
+ * https://launchpad.net/bugs/476428
+   * Stock : Partial Picking wizard was missing translation import statement
+ * https://launchpad.net/bugs/366944
+   * Base_vat : Spanish numbers validation corrected
+ * https://launchpad.net/bugs/466658
+   * Account : Action window of anlytic entries was missing name
+ * https://launchpad.net/bugs/440557
+   * Purchase : POL had a wrong tree view which is unused till now
+ * https://launchpad.net/bugs/452854
+   * Correct the validate function for balanced move into account.py (after Fabien Warning)
+   * Use price_accuracy to verify balanced entry insteed of fixed '0,0001'. Add price_accuracy on debit and credit move lines
+ * https://launchpad.net/bugs/491241
+   * Stock : Removal of picking shuold affect product stock
+ * https://launchpad.net/bugs/490327
+   * Reverted bad commit from Joel@CamptoCamp
+ * https://launchpad.net/bugs/440734
+   * Stock : Picking did not have 'type' field on display(inconsistent behavior from eTiny,koo) to work upon domain.
+ * https://launchpad.net/bugs/436174
+   * Account: Supplier invoices was not taking product price on onchange of product
+ * https://launchpad.net/bugs/474340
+   * Stock : Wizard improvements from Lionel
+ * https://launchpad.net/bugs/440711
+   * Purchase : PO with different pricelists should not be merged
+ * https://launchpad.net/bugs/439208
+   * Hr_timesheet : Allowing user to enter Analytic Journal if not linked with employee(Working hours tree view)
+ * https://launchpad.net/bugs/379118
+   * Stock : Partial Picking wizard was making the back order reference jump to 2 numbers,notification given on packing done.
+ * https://launchpad.net/bugs/476343
+ * https://launchpad.net/bugs/419720
+   * Sale : Delivery Date delay computation made corrected when days are passed with fractions
+
+
+Improvements (addons)
+---------------------
+
+ * MRP : mrp.routing.workcenter made deletable on cascade effect
+ * Account : Entry Line action Name Improved
+ * Stock : Improved names of Stock move tree view
+ * account: make comment mandatory. Since it has a default value anyway, it doesn't reall y change anything, but makes the reconciliation UI looks consistent accross the whole OpenERP (eg invoice payment)
+ * Add support of analytic account into bank statement to be convenient with other method
+ * Add account field into bank statement line
+ * better python2.5/2.6 compatibility handling
+ * base_module_quality: styles on different tests
+ * base_module_quality: modify all tests result display for buildpot, use class on tag instead of css file
+ * base_module_quality: pylint test result display for buildpot, use class on tag instead of css file
+
 
 2009-09-22: 5.0.6
 =================

From 37dcaa1b10edef12d5d2a3cd806e1ae50d87c377 Mon Sep 17 00:00:00 2001
From: "GPA(OpenERP)" <>
Date: Thu, 3 Dec 2009 20:26:23 +0530
Subject: [PATCH 190/200] [FIX] Purchase : Fields set readonly on done state

lp bug: https://launchpad.net/bugs/491898 fixed

bzr revid: jvo@tinyerp.com-20091203145623-td3buc0y2ho5xqn6
---
 addons/purchase/purchase.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 34f3a0d0692..194c1d8bbcc 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -150,9 +150,9 @@ class purchase_order(osv.osv):
             help="Reference of the document that generated this purchase order request."
         ),
         'partner_ref': fields.char('Partner Ref.', size=64),
-        'date_order':fields.date('Date', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, help="Date on which this document has been created."),
+        'date_order':fields.date('Date', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, help="Date on which this document has been created."),
         'date_approve':fields.date('Date Approved', readonly=1),
-        'partner_id':fields.many2one('res.partner', 'Supplier', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, change_default=True),
+        'partner_id':fields.many2one('res.partner', 'Supplier', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, change_default=True),
         'partner_address_id':fields.many2one('res.partner.address', 'Address', required=True, states={'posted':[('readonly',True)]}),
 
         'dest_address_id':fields.many2one('res.partner.address', 'Destination Address', states={'posted':[('readonly',True)]},
@@ -162,10 +162,10 @@ class purchase_order(osv.osv):
         'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', states={'posted':[('readonly',True)]}),
         'location_id': fields.many2one('stock.location', 'Destination', required=True),
 
-        'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, help="The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."),
+        'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, help="The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."),
 
         'state': fields.selection([('draft', 'Request for Quotation'), ('wait', 'Waiting'), ('confirmed', 'Confirmed'), ('approved', 'Approved'),('except_picking', 'Shipping Exception'), ('except_invoice', 'Invoice Exception'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Order Status', readonly=True, help="The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception.", select=True),
-        'order_line': fields.one2many('purchase.order.line', 'order_id', 'Order Lines', states={'approved':[('readonly',True)]}),
+        'order_line': fields.one2many('purchase.order.line', 'order_id', 'Order Lines', states={'approved':[('readonly',True)],'done':[('readonly',True)]}),
         'validator' : fields.many2one('res.users', 'Validated by', readonly=True),
         'notes': fields.text('Notes'),
         'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True),

From b78474e6806329f89a60459ceb760189a9a211f1 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Thu, 3 Dec 2009 21:01:45 +0530
Subject: [PATCH 191/200] [FIX] fields.related were misbehaving

lp bug: https://launchpad.net/bugs/491867 fixed

bzr revid: jvo@tinyerp.com-20091203153145-441wddbmddz5qvbk
---
 bin/osv/fields.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index e1d70978181..7c240854c28 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -744,7 +744,7 @@ class related(function):
                 except:
                     t_data = False
                     break
-                if field_detail['type'] in ('one2many', 'many2many') and i != len(self.arg) - 1:
+                if field_detail['type'] in ('one2many', 'many2many'):# and i != len(self.arg) - 1:
                     t_data = t_data[self.arg[i]][0]
                 else:
                     t_data = t_data[self.arg[i]]
@@ -760,10 +760,10 @@ class related(function):
                 for r in res:
                     if res[r]:
                         res[r] = (res[r], ng[res[r]])
-        elif self._type in ('one2many', 'many2many'):
-            for r in res:
-                if res[r]:
-                    res[r] = [x.id for x in res[r]]
+#        elif self._type in ('one2many', 'many2many'):
+#            for r in res:
+#                if res[r]:
+#                    res[r] = [x.id for x in res[r]]
 
             
         return res

From 198bc602895b8e7c28c60a1d84a3ff6debbd6461 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 3 Dec 2009 18:31:13 +0100
Subject: [PATCH 192/200] [FIX] Regression in SO from Jeroen and Jay, picked
 state see bug #491375

bzr revid: fp@tinyerp.com-20091203173113-a6j7av8brwf36ao9
---
 addons/sale/sale.py | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 0b3116f5fe0..2d58ee3d9e3 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -506,23 +506,9 @@ class sale_order(osv.osv):
         write_cancel_ids = []
         stock_move_obj = self.pool.get('stock.move')
         for order in self.browse(cr, uid, ids, context={}):
-            
-            #check for pending deliveries 
-            pending_deliveries = False
-            # check => if order_lines do not exist,don't proceed for any mode.
-            if not order.order_line:
-                return False
-            for line in order.order_line:    
-                move_ids = stock_move_obj.search(cr, uid, [('sale_line_id','=', line.id)])
-                for move in stock_move_obj.browse( cr, uid, move_ids ):
-                    #if one of the related order lines is in state draft, auto or confirmed
-                    #this order line is not yet delivered
-                    if move.state in ('draft', 'auto', 'confirmed'):
-                        pending_deliveries = True
-                # Reason => if there are no move lines,the following condition will always set to be true,and will set SO to 'DONE'.
-                # Added move_ids check to SOLVE.
-                if move_ids and ((not line.procurement_id) or (line.procurement_id.state=='done')) and not pending_deliveries:
-#                    finished = True
+            for line in order.order_line:
+                if (not line.procurement_id) or (line.procurement_id.state=='done'):
+                    finished = True
                     if line.state != 'done':
                         write_done_ids.append(line.id)
                 else:

From 457b377f899fb74a470c20c8e5504b2ca379189d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 3 Dec 2009 21:53:21 +0100
Subject: [PATCH 193/200] [FIX] picked in SO

bzr revid: fp@tinyerp.com-20091203205321-ujfh08p383ezb7m4
---
 addons/sale/sale.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 56af40df442..63ccc2ea80a 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -506,9 +506,9 @@ class sale_order(osv.osv):
         write_cancel_ids = []
         stock_move_obj = self.pool.get('stock.move')
         for order in self.browse(cr, uid, ids, context={}):
+            print order.name, mode
             for line in order.order_line:
                 if (not line.procurement_id) or (line.procurement_id.state=='done'):
-                    finished = True
                     if line.state != 'done':
                         write_done_ids.append(line.id)
                 else:
@@ -525,6 +525,7 @@ class sale_order(osv.osv):
         if write_cancel_ids:
             self.pool.get('sale.order.line').write(cr, uid, write_cancel_ids, {'state': 'exception'})
 
+        print finished
         if mode == 'finished':
             return finished
         elif mode == 'canceled':

From 2cc7f42c5a8eb9f72497a89ed5343f72a07106b0 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 3 Dec 2009 23:05:24 +0100
Subject: [PATCH 194/200] [FIX] removed print statement

bzr revid: fp@tinyerp.com-20091203220524-2p3k0rbd2vgyvzco
---
 addons/sale/sale.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 63ccc2ea80a..b225596b855 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -504,9 +504,7 @@ class sale_order(osv.osv):
         notcanceled = False
         write_done_ids = []
         write_cancel_ids = []
-        stock_move_obj = self.pool.get('stock.move')
         for order in self.browse(cr, uid, ids, context={}):
-            print order.name, mode
             for line in order.order_line:
                 if (not line.procurement_id) or (line.procurement_id.state=='done'):
                     if line.state != 'done':
@@ -525,7 +523,6 @@ class sale_order(osv.osv):
         if write_cancel_ids:
             self.pool.get('sale.order.line').write(cr, uid, write_cancel_ids, {'state': 'exception'})
 
-        print finished
         if mode == 'finished':
             return finished
         elif mode == 'canceled':

From be06b834e1f915590185a770e34c0003fc8d13e1 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@tinyerp.com>
Date: Fri, 4 Dec 2009 11:36:36 +0100
Subject: [PATCH 195/200] [FIX] revert bad fix

lp bug: https://launchpad.net/bugs/491867 fixed

bzr revid: chs@tinyerp.com-20091204103636-um11n2qj52rbdqqs
---
 bin/osv/fields.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index 7c240854c28..e1d70978181 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -744,7 +744,7 @@ class related(function):
                 except:
                     t_data = False
                     break
-                if field_detail['type'] in ('one2many', 'many2many'):# and i != len(self.arg) - 1:
+                if field_detail['type'] in ('one2many', 'many2many') and i != len(self.arg) - 1:
                     t_data = t_data[self.arg[i]][0]
                 else:
                     t_data = t_data[self.arg[i]]
@@ -760,10 +760,10 @@ class related(function):
                 for r in res:
                     if res[r]:
                         res[r] = (res[r], ng[res[r]])
-#        elif self._type in ('one2many', 'many2many'):
-#            for r in res:
-#                if res[r]:
-#                    res[r] = [x.id for x in res[r]]
+        elif self._type in ('one2many', 'many2many'):
+            for r in res:
+                if res[r]:
+                    res[r] = [x.id for x in res[r]]
 
             
         return res

From d6cb9466a3a445d6c5f95d7b11a49f087728db28 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@tinyerp.com>
Date: Fri, 4 Dec 2009 11:45:24 +0100
Subject: [PATCH 196/200] [FIX] base_contact: fix bad related field

lp bug: https://launchpad.net/bugs/491867 fixed

bzr revid: chs@tinyerp.com-20091204104524-36gioov0qr1h1s5g
---
 addons/base_contact/base_contact.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index b00a5745935..4e6712010f5 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -34,6 +34,13 @@ class res_partner_contact(osv.osv):
         res = [(r['shortcut'], r['name']) for r in res if r['domain']=='contact']
         return res
 
+    def _main_job(self, cr, uid, ids, fields, arg, context=None):
+        res = dict.fromkeys(ids, False)
+        for contact in self.browse(cr, uid, ids, context):
+            if contact.job_ids:
+                res[contact.id] = contact.job_ids[0].name_get()[0]
+        return res
+
     _columns = {
         'name': fields.char('Last Name', size=30,required=True),
         'first_name': fields.char('First Name', size=30),
@@ -47,7 +54,7 @@ class res_partner_contact(osv.osv):
         'active' : fields.boolean('Active'),
         'partner_id':fields.related('job_ids','address_id','partner_id',type='many2one', relation='res.partner', string='Main Employer'),
         'function_id':fields.related('job_ids','function_id',type='many2one', relation='res.partner.function', string='Main Function'),
-        'job_id':fields.related('job_ids',type='many2one', relation='res.partner.job', string='Main Job'),
+        'job_id': fields.function(_main_job, method=True, type='many2one', relation='res.partner.job', string='Main Job'),
         'email': fields.char('E-Mail', size=240),
     }
     _defaults = {

From 47591d7819e7c559d5386d76a6a34515502bc6c6 Mon Sep 17 00:00:00 2001
From: "GPA(OpenERP)" <>
Date: Fri, 4 Dec 2009 18:15:47 +0530
Subject: [PATCH 197/200] [FIX] Base_report_creator : encoding eror corrected
 on adding filters

lp bug: https://launchpad.net/bugs/492174 fixed

bzr revid: jvo@tinyerp.com-20091204124547-an9oinq59mcacc42
---
 .../base_report_creator/wizard/wiz_set_filter_fields.py  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/base_report_creator/wizard/wiz_set_filter_fields.py b/addons/base_report_creator/wizard/wiz_set_filter_fields.py
index 0303bea8d3f..851eed0dbb1 100644
--- a/addons/base_report_creator/wizard/wiz_set_filter_fields.py
+++ b/addons/base_report_creator/wizard/wiz_set_filter_fields.py
@@ -23,6 +23,7 @@
 import wizard
 import netsvc
 import pooler
+import tools
 
 relation_type=['one2many','many2one','many2many']
 char_type = ['char','text','selection']
@@ -122,7 +123,7 @@ def _set_filter_value(self, cr, uid, data, context):
     model_pool = pooler.get_pool(cr.dbname).get(model_name)
     table_name = model_pool._table
     model_name = model_pool._description
-    
+
     if field_type:
         if field_type == 'boolean':
             if value_data == 1:
@@ -139,12 +140,12 @@ def _set_filter_value(self, cr, uid, data, context):
             fields_list = set_field_operator(self,table_name+"."+field_data['name'],field_data['ttype'],form_data['operator'],value_data)
         if fields_list:
             create_dict = {
-                           'name':model_name + "/" +field_data['field_description'] +" "+ mapping_fields[form_data['operator']] + " " + str(fields_list[2]) + " ",
-                           'expression':' '.join(map(str,fields_list)),
+                           'name':model_name + "/" +field_data['field_description'] +" "+ mapping_fields[form_data['operator']] + " " + tools.ustr(fields_list[2]) + " ",
+                           'expression':' '.join(map(tools.ustr,fields_list)),
                            'report_id':data['id'],
                            'condition' : form_data['condition']
                            }
-            pooler.get_pool(cr.dbname).get('base_report_creator.report.filter').create(cr,uid,create_dict)
+            pooler.get_pool(cr.dbname).get('base_report_creator.report.filter').create(cr,uid,create_dict,context)
         #end if field_type == 'many2many' and value_data and len(value_data):
 #       pooler.get_pool(cr.dbname).get('custom.report.filter').create(cr,uid,form_data)
     #end if field_type:

From 7eaa92708a910e88fb2236ef957e6b0e9b1d5d00 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Fri, 4 Dec 2009 18:42:57 +0530
Subject: [PATCH 198/200] [FIX] MRP : procurement does not need cancel button
 when its Running

lp bug: https://launchpad.net/bugs/492211 fixed

bzr revid: jvo@tinyerp.com-20091204131257-2dmur1fwdscquup7
---
 addons/mrp/mrp_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 83a1b4423a8..0d6a39aa899 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -698,9 +698,8 @@
                         <group col="7" colspan="2">
                             <button name="button_confirm" states="draft" string="Confirm"/>
                             <button name="button_restart" states="exception" string="Retry"/>
-                            <button name="button_cancel" states="exception,waiting" string="Cancel"/>
+                            <button name="button_cancel" states="draft,exception,waiting" string="Cancel"/>
                             <button name="button_check" states="confirmed" string="Run procurement"/>
-                            <button name="button_cancel" states="draft,running" string="Cancel"/>
                         </group>
                     </page>
                     <page string="Extra Information">

From c9a07db7c06cd161363d1aa496ddc503e5e506e7 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Fri, 4 Dec 2009 19:42:46 +0530
Subject: [PATCH 199/200] [FIX] MRP: Proper context value passed for PO
 creation from packing via SO

lp bug: https://launchpad.net/bugs/490883 fixed

bzr revid: jvo@tinyerp.com-20091204141246-ek5f8axx0zvg121q
---
 addons/mrp/mrp.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 33e3eb0d242..e87962e9ab6 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -1078,11 +1078,13 @@ class mrp_procurement(osv.osv):
             newdate = newdate - DateTime.RelativeDateTime(days=company.po_lead)
             newdate = newdate - procurement.product_id.seller_ids[0].delay
 
-            context.update({'lang':partner.lang})
+            #Passing partner_id to context for purchase order line integrity of Line name
+            context.update({'lang':partner.lang, 'partner_id':partner_id})
+            
             product=self.pool.get('product.product').browse(cr,uid,procurement.product_id.id,context=context)
 
             line = {
-                'name': product.name,
+                'name': product.partner_ref,
                 'product_qty': qty,
                 'product_id': procurement.product_id.id,
                 'product_uom': uom_id,

From 7af597ffedea00dfe700c2876630f330e3cf16a7 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Mon, 7 Dec 2009 20:38:52 +0530
Subject: [PATCH 200/200] [FIX]: fix a problem Point of sale create outgoing
 shipments incl. service items

lp bug: https://launchpad.net/bugs/433898 fixed

bzr revid: mga@tinyerp.com-20091207150852-dax23h6nfa1t6640
---
 addons/point_of_sale/pos.py | 43 +++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index be588a156dd..88466970905 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -339,28 +339,29 @@ class pos_order(osv.osv):
 
             if new:
                 for line in order.lines:
-                    prop_ids = self.pool.get("ir.property").search(cr, uid,
-                            [('name', '=', 'property_stock_customer')])
-                    val = self.pool.get("ir.property").browse(cr, uid,
-                            prop_ids[0]).value
-                    location_id = order.shop_id.warehouse_id.lot_stock_id.id
-                    stock_dest_id = int(val.split(',')[1])
-                    if line.qty < 0:
-                        (location_id, stock_dest_id)= (stock_dest_id, location_id)
+                    if line.product_id.type != 'service':
+                        prop_ids = self.pool.get("ir.property").search(cr, uid,
+                                [('name', '=', 'property_stock_customer')])
+                        val = self.pool.get("ir.property").browse(cr, uid,
+                                prop_ids[0]).value
+                        location_id = order.shop_id.warehouse_id.lot_stock_id.id
+                        stock_dest_id = int(val.split(',')[1])
+                        if line.qty < 0:
+                            (location_id, stock_dest_id)= (stock_dest_id, location_id)
 
-                    self.pool.get('stock.move').create(cr, uid, {
-                        'name': 'Stock move (POS %d)' % (order.id, ),
-                        'product_uom': line.product_id.uom_id.id,
-                        'product_uos': line.product_id.uom_id.id,
-                        'picking_id': picking_id,
-                        'product_id': line.product_id.id,
-                        'product_uos_qty': abs(line.qty),
-                        'product_qty': abs(line.qty),
-                        'tracking_id': False,
-                        'state': 'waiting',
-                        'location_id': location_id,
-                        'location_dest_id': stock_dest_id,
-                    })
+                        self.pool.get('stock.move').create(cr, uid, {
+                            'name': 'Stock move (POS %d)' % (order.id, ),
+                            'product_uom': line.product_id.uom_id.id,
+                            'product_uos': line.product_id.uom_id.id,
+                            'picking_id': picking_id,
+                            'product_id': line.product_id.id,
+                            'product_uos_qty': abs(line.qty),
+                            'product_qty': abs(line.qty),
+                            'tracking_id': False,
+                            'state': 'waiting',
+                            'location_id': location_id,
+                            'location_dest_id': stock_dest_id,
+                        })
 
             wf_service = netsvc.LocalService("workflow")
             wf_service.trg_validate(uid, 'stock.picking',