From 0d565d8882c50555677fd9cbece509796e44e1e5 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Tue, 15 Sep 2009 11:14:50 +0530
Subject: [PATCH 01/74] [ADD]: add new data file which will add over due
 payment message to company

bzr revid: mga@tinyerp.com-20090915054450-1ju59ok5ev4pw8yg
---
 addons/account_followup/__terp__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account_followup/__terp__.py b/addons/account_followup/__terp__.py
index 00e86ef2d96..5122204fa68 100644
--- a/addons/account_followup/__terp__.py
+++ b/addons/account_followup/__terp__.py
@@ -53,6 +53,7 @@
         'wizard/wizard_view.xml',
         'followup_report_view.xml',
         'followup_view.xml',
+        'followup_data.xml'
     ],
     'demo_xml': ['followup_demo.xml'],
     'installable': True,

From d16353aad85dd6c66005f972b8f2ac108823b86a Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Tue, 15 Sep 2009 11:15:34 +0530
Subject: [PATCH 02/74] [IMP]: add new filed to company object which will store
 the mesages

bzr revid: mga@tinyerp.com-20090915054534-7ancl4t5bcqsif7q
---
 addons/account_followup/followup.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/addons/account_followup/followup.py b/addons/account_followup/followup.py
index 459e3e38e3c..9efd1d0a1ff 100644
--- a/addons/account_followup/followup.py
+++ b/addons/account_followup/followup.py
@@ -55,6 +55,29 @@ class account_move_line(osv.osv):
     }
 account_move_line()
 
+class res_company(osv.osv):
+    _inherit = "res.company"
+    _columns = {
+        'follow_up_msg' : fields.text('Follow-up Message', translate=True),
+    }
+
+    _defaults = {
+        'overdue_msg': lambda *a: '''
+Date : %(date)s
+
+Dear %(partner_name)s,
+
+Please find in attachment a reminder of all your unpaid invoices, for a total amount due of:
+
+%(followup_amount).2f %(company_currency)s
+
+Thanks,
+--
+%(user_signature)s
+%(company_name)s
+        '''
+    }
+res_company()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

From 2168cad83e586daa9d0b5d1694812fd0dc0794b8 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Tue, 15 Sep 2009 11:16:21 +0530
Subject: [PATCH 03/74] [IMP]: add inherited view for company

bzr revid: mga@tinyerp.com-20090915054621-7iyfnle7otqkday3
---
 addons/account_followup/followup_view.xml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/addons/account_followup/followup_view.xml b/addons/account_followup/followup_view.xml
index 1b2d40a7cd9..cd02355dc7e 100644
--- a/addons/account_followup/followup_view.xml
+++ b/addons/account_followup/followup_view.xml
@@ -125,7 +125,6 @@
             </field>
         </record>
         
-        
         <act_window domain="[('partner_id', '=', active_id),('reconcile_id','=',False),('account_id.reconcile', '=', True)]" id="account.act_account_partner_account_move_unreconciled" name="Receivables &amp; Payables" res_model="account.move.line" view="account_move_line_partner_tree"/>
         
         <act_window domain="[('reconcile_id', '=', False),('account_id.type','=','receivable')]" id="act_account_partner_account_move_all" name="All receivable entries" res_model="account.move.line" src_model="" view="account_move_line_partner_tree"/>
@@ -136,6 +135,17 @@
         
         <menuitem action="act_account_partner_account_move_payable_all" id="menu_account_move_open_unreconcile_payable" parent="account_followup.menu_action_followup_stat"/>
         
-        
+        <record model="ir.ui.view" id="view_company_inherit_followup_form">
+			<field name="name">res.company.followup.form.inherit</field>
+			<field name="inherit_id" ref="account.view_company_inherit_form"/>
+			<field name="model">res.company</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+            	<field name="overdue_msg" nolabel="1" colspan ="4" position="after">
+            	    <separator string="Follow-up Message" colspan="4"/>
+                    <field name="follow_up_msg" nolabel="1" colspan ="4"/>
+                </field>
+            </field>
+		</record>
     </data>
 </openerp>

From 24233606a20a6422abc6f0b5c3aae895f4320401 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Tue, 15 Sep 2009 11:16:42 +0530
Subject: [PATCH 04/74] [CHANGE]: change a logic to read the message from
 company configuration

bzr revid: mga@tinyerp.com-20090915054642-qg0zz31wkgdv24u8
---
 addons/account_followup/wizard/wizard_followup_print.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/account_followup/wizard/wizard_followup_print.py b/addons/account_followup/wizard/wizard_followup_print.py
index e271d1dbd27..9d1f4c6deef 100644
--- a/addons/account_followup/wizard/wizard_followup_print.py
+++ b/addons/account_followup/wizard/wizard_followup_print.py
@@ -256,8 +256,10 @@ class followup_all_print(wizard.interface):
                 if partner_id not in partner_list:
                     partner_list.append(partner_id)
                 to_update[str(id)] = fups[followup_line_id][1]
-
-        return {'partner_ids': partner_list, 'to_update': to_update}
+        
+        message = pool.get('res.users').browse(cr, uid, uid).company_id.follow_up_msg
+        
+        return {'partner_ids': partner_list, 'to_update': to_update, 'email_body':message}
 
     def _get_screen1_values(self, cr, uid, data, context):
         pool = pooler.get_pool(cr.dbname)

From 323d71fecb5a61c9bdd9be3faf0ed21a26f865f5 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Tue, 15 Sep 2009 12:43:23 +0530
Subject: [PATCH 06/74] [IMP] Rng : Accepting Groups under/after/replacing
 Buttons

bzr revid: jvo@tinyerp.com-20090915071323-c4hcvh1uzg18p7si
---
 bin/addons/base/rng/view.rng | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/addons/base/rng/view.rng b/bin/addons/base/rng/view.rng
index 78944519593..d69c09df72a 100644
--- a/bin/addons/base/rng/view.rng
+++ b/bin/addons/base/rng/view.rng
@@ -378,6 +378,7 @@
                     <rng:ref name="page" />
                     <rng:ref name="separator"/>
                     <rng:ref name="button"/>
+                    <rng:ref name="group"/>
                     <rng:element name="properties"><rng:empty/></rng:element>
                     <rng:element name="newline"><rng:empty/></rng:element>
                 </rng:choice>

From 4c3b285cbfed2c5920a5aed97e214b29e722b76c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 15 Sep 2009 09:42:59 +0200
Subject: [PATCH 07/74] [FIX] #416908 computation of invoice lines

bzr revid: fp@tinyerp.com-20090915074259-bbnrkmbftvawuz9d
---
 addons/account/invoice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index be9b4f63246..467bf02f661 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -435,7 +435,7 @@ class account_invoice(osv.osv):
             for taxe in ait_obj.compute(cr, uid, id, context=context).values():
                 ait_obj.create(cr, uid, taxe)
          # Update the stored value (fields.function), so we write to trigger recompute
-        self.pool.get('account.invoice').write(cr, uid, ids, {}, context=context)    
+        self.pool.get('account.invoice').write(cr, uid, ids, {'invoice_line':[]}, context=context)    
 #        self.pool.get('account.invoice').write(cr, uid, ids, {}, context=context)
         return True
 

From dbc2adadf22d414d3fa5881293d5ee8c7ac71f2f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 15 Sep 2009 10:17:44 +0200
Subject: [PATCH 08/74] [FIX] regression in fields.function computation

bzr revid: fp@tinyerp.com-20090915081744-0l9k2v8a86fl036l
---
 bin/osv/orm.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 08086f5d49b..f5be539a6d6 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -2469,9 +2469,10 @@ class orm(orm_template):
             if c[0].startswith('default_'):
                 del rel_context[c[0]]
 
+        result = []
         for field in upd_todo:
             for id in ids:
-                self._columns[field].set(cr, self, id, field, vals[field], user, context=rel_context)
+                result += self._columns[field].set(cr, self, id, field, vals[field], user, context=rel_context) or []
 
         for table in self._inherits:
             col = self._inherits[table]
@@ -2533,7 +2534,7 @@ class orm(orm_template):
                         cr.execute('update '+self._table+' set parent_right=parent_right+%s where parent_right>=%s', (distance, position))
                         cr.execute('update '+self._table+' set parent_left=parent_left-%s, parent_right=parent_right-%s where parent_left>=%s and parent_left<%s', (pleft-position+distance,pleft-position+distance, pleft+distance, pright+distance))
 
-        result = self._store_get_values(cr, user, ids, vals.keys(), context)
+        result += self._store_get_values(cr, user, ids, vals.keys(), context)
         for order, object, ids, fields in result:
             self.pool.get(object)._store_set_values(cr, user, ids, fields, context)
 

From 1bb8131a248921265139984f7008bb1494cab70c Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Tue, 15 Sep 2009 15:16:27 +0530
Subject: [PATCH 09/74] [ADD]: add missing file for the followup date

bzr revid: mga@tinyerp.com-20090915094627-kqjklsjvaqcehsgh
---
 addons/account_followup/followup_data.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 addons/account_followup/followup_data.xml

diff --git a/addons/account_followup/followup_data.xml b/addons/account_followup/followup_data.xml
new file mode 100644
index 00000000000..2a33e65b2c8
--- /dev/null
+++ b/addons/account_followup/followup_data.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="res.company" id="base.main_company">
+            <field name="follow_up_msg">Date : %(date)s
+
+Dear %(partner_name)s,
+
+Please find in attachment a reminder of all your unpaid invoices, for a total amount due of:
+
+%(followup_amount).2f %(company_currency)s
+
+Thanks,
+--
+%(user_signature)s
+%(company_name)s</field>
+        </record>
+    </data>
+</openerp>

From 7955f8e23c26ba519e07a99747636cbaef40242b Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Tue, 15 Sep 2009 15:21:33 +0530
Subject: [PATCH 10/74] [FIX]: fix problem to get the detault message

bzr revid: mga@tinyerp.com-20090915095133-52t8294uj75h7a9i
---
 addons/account_followup/wizard/wizard_followup_print.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/account_followup/wizard/wizard_followup_print.py b/addons/account_followup/wizard/wizard_followup_print.py
index 9d1f4c6deef..004f62503bd 100644
--- a/addons/account_followup/wizard/wizard_followup_print.py
+++ b/addons/account_followup/wizard/wizard_followup_print.py
@@ -156,6 +156,7 @@ class followup_all_print(wizard.interface):
                             if adr.email:
                                 dest = [adr.email]
                 src = tools.config.options['smtp_user']
+                #TODO : fix me to get message according to the partner language
                 body=data['form']['email_body']
                 total_amt = followup_data.debit - followup_data.credit
                 move_line = ''
@@ -257,7 +258,7 @@ class followup_all_print(wizard.interface):
                     partner_list.append(partner_id)
                 to_update[str(id)] = fups[followup_line_id][1]
         
-        message = pool.get('res.users').browse(cr, uid, uid).company_id.follow_up_msg
+        message = pool.get('res.users').browse(cr, uid, uid, context=context).company_id.follow_up_msg
         
         return {'partner_ids': partner_list, 'to_update': to_update, 'email_body':message}
 

From c2d470b4f77966cc71cbea9bcba8d79a32cc935f Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Tue, 15 Sep 2009 15:38:24 +0530
Subject: [PATCH 11/74] [FIX]: fix a problem for the overdue payment message
 message should be depending on the partner language and not according to the
 company language

bzr revid: mga@tinyerp.com-20090915100824-618bu2tot1l5jlwu
---
 addons/account/company.py         | 2 +-
 addons/account/report/overdue.py  | 8 +++++++-
 addons/account/report/overdue.rml | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/addons/account/company.py b/addons/account/company.py
index 403b886e012..e724b3a9775 100644
--- a/addons/account/company.py
+++ b/addons/account/company.py
@@ -25,7 +25,7 @@ from osv import fields, osv
 class res_company(osv.osv):
     _inherit = "res.company"
     _columns = {
-        'overdue_msg' : fields.text('Overdue Payments Message'),
+        'overdue_msg' : fields.text('Overdue Payments Message', translate=True),
     }
 
     _defaults = {
diff --git a/addons/account/report/overdue.py b/addons/account/report/overdue.py
index 76ebbe7efa4..861ad82ef9c 100644
--- a/addons/account/report/overdue.py
+++ b/addons/account/report/overdue.py
@@ -35,6 +35,7 @@ class Overdue(report_sxw.rml_parse):
             'adr_get' : self._adr_get,
             'getLines' : self._lines_get,
             'tel_get' : self._tel_get,
+            'message' : self._message,
         })
         self.context = context
     def _adr_get(self, partner, type):
@@ -80,7 +81,12 @@ class Overdue(report_sxw.rml_parse):
                     ('state', '<>', 'draft'), ('reconcile_id', '=', False)])
         movelines = moveline_obj.browse(self.cr, self.uid, movelines)
         return movelines
-
+        
+    def _message(self, obj, company):
+        company_pool = pooler.get_pool(self.cr.dbname).get('res.company')
+        message = company_pool.browse(self.cr, self.uid, company.id, {'lang':obj.lang}).overdue_msg 
+        return message
+        
 report_sxw.report_sxw('report.account.overdue', 'res.partner',
         'addons/account/report/overdue.rml', parser=Overdue)
 
diff --git a/addons/account/report/overdue.rml b/addons/account/report/overdue.rml
index df4c69c45b4..2713b665d06 100644
--- a/addons/account/report/overdue.rml
+++ b/addons/account/report/overdue.rml
@@ -127,7 +127,7 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">[[ company.overdue_msg ]]</para>
+    <para style="terp_default_9">[[ message(o, company) ]]</para>
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>

From 4e81bf70fc1c9d48d40648fb723441eab681af1b Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Tue, 15 Sep 2009 15:53:46 +0530
Subject: [PATCH 12/74] [FIX]: fix the problem of message depending on the
 partner language

bzr revid: mga@tinyerp.com-20090915102346-dk516xhreyex04w9
---
 .../wizard/wizard_followup_print.py            | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/addons/account_followup/wizard/wizard_followup_print.py b/addons/account_followup/wizard/wizard_followup_print.py
index 004f62503bd..70f90f2d6ae 100644
--- a/addons/account_followup/wizard/wizard_followup_print.py
+++ b/addons/account_followup/wizard/wizard_followup_print.py
@@ -60,8 +60,9 @@ _followup_wizard_all_form = """<?xml version="1.0"?>
         </page>
         <page string="Email Settings">
             <field name="email_conf" colspan="4"/>
+            <field name="partner_lang" colspan="4"/>
             <field name="email_subject" colspan="4"/>
-            <separator string="Email body" colspan="4"/>
+            <separator string="Email body" colspan="4" attrs="{'readonly':[('partner_lang','=',True)]}"/>
             <field name="email_body" colspan="4" nolabel="1"/>
             <separator string="Legend" colspan="4"/>
 
@@ -94,6 +95,12 @@ _followup_wizard_all_fields = {
         'size': 64,
         'default': 'Invoices Reminder'
         },
+    'partner_lang':{
+        'string': "Send Email in Partner Language",
+        'type': 'boolean',
+        'default':True,
+        'help':'Do not change message text, if you want to send email in partner language, or configre from company'
+    },
     'email_body': {
         'string': "Email body",
         'type': 'text',
@@ -156,8 +163,13 @@ class followup_all_print(wizard.interface):
                             if adr.email:
                                 dest = [adr.email]
                 src = tools.config.options['smtp_user']
-                #TODO : fix me to get message according to the partner language
-                body=data['form']['email_body']
+                if not data['form']['partner_lang']:
+                    body = data['form']['email_body']
+                else:
+                    cxt = context.copy()
+                    cxt['lang'] = partner.lang
+                    body = pool.get('res.users').browse(cr, uid, uid, context=cxt).company_id.follow_up_msg
+                    
                 total_amt = followup_data.debit - followup_data.credit
                 move_line = ''
                 subtotal_due = 0.0

From 8316098a65481a400d00d10320301b699be4d210 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Tue, 15 Sep 2009 16:00:41 +0530
Subject: [PATCH 13/74] [IMP]quality_integration_server: get message from
 base_quality_module if module can not success to reach minimun score

bzr revid: hmo@tinyerp.com-20090915103041-ehna9rq1sm9q1xyt
---
 .../quality_integration_server/base_quality_interrogation.py   | 3 ++-
 1 file changed, 2 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 48c2ef29278..a5a69898752 100755
--- a/bin/addons/quality_integration_server/base_quality_interrogation.py
+++ b/bin/addons/quality_integration_server/base_quality_interrogation.py
@@ -114,6 +114,7 @@ def check_quality(uri, user, pwd, dbname, modules):
         for module in modules:            
             quality_result = execute(conn,'execute', dbname, uid, pwd,'module.quality.check','check_quality',module)
             detail_html = ''
+            msg = detail.get('message','')
             html = '''<html><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'])
@@ -124,7 +125,7 @@ def check_quality(uri, user, pwd, dbname, modules):
                 score = round(float(detail.get('score',0)),2)
                 html += "<li><a href=\"#%s\">%s</a></li>"%(test.replace(' ','-'),test)
                 detail_html +="<div id=\"%s\"><h3>%s (Score : %s)</h3>%s</div>"%(test.replace(' ','-'),test,score,detail.get('detail'))                
-                test_detail[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)

From 7cb036f0e13e7816685cb8a24e18950247d487a5 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 15 Sep 2009 13:24:51 +0200
Subject: [PATCH 14/74] [IMP] changed interval CRM calls to 4 hours instead of
 one -> efficient connection pooling with cron

bzr revid: fp@tinyerp.com-20090915112451-xf4j2q3pttfy2brh
---
 addons/crm/crm_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index 7ba270d268f..5fc5ad1bd94 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -58,7 +58,7 @@
         
         <record id="ir_cron_crm_action" model="ir.cron">
             <field name="name">Check cases rules</field>
-            <field name="interval_number">1</field>
+            <field name="interval_number">4</field>
             <field name="interval_type">hours</field>
             <field name="numbercall">-1</field>
             <field eval="False" name="doall"/>

From a5c907c11a712e976144bb03f1908f64eb0b9d47 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Tue, 15 Sep 2009 17:17:48 +0530
Subject: [PATCH 15/74] [FIX]quality_integration_server: get message from
 base_quality_module if module can not success to reach minimun score

bzr revid: hmo@tinyerp.com-20090915114748-qk1mwa5s98j1x0wu
---
 .../quality_integration_server/base_quality_interrogation.py  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/quality_integration_server/base_quality_interrogation.py b/bin/addons/quality_integration_server/base_quality_interrogation.py
index a5a69898752..65bb7f5f849 100755
--- a/bin/addons/quality_integration_server/base_quality_interrogation.py
+++ b/bin/addons/quality_integration_server/base_quality_interrogation.py
@@ -113,8 +113,7 @@ def check_quality(uri, user, pwd, dbname, modules):
         test_detail = {}
         for module in modules:            
             quality_result = execute(conn,'execute', dbname, uid, pwd,'module.quality.check','check_quality',module)
-            detail_html = ''
-            msg = detail.get('message','')
+            detail_html = ''            
             html = '''<html><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'])
@@ -122,6 +121,7 @@ def check_quality(uri, user, pwd, dbname, modules):
             html += "<ul>"
             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)
                 detail_html +="<div id=\"%s\"><h3>%s (Score : %s)</h3>%s</div>"%(test.replace(' ','-'),test,score,detail.get('detail'))                

From 5ecb23eb538ca750e7ec2f80844b35c1f5cd702c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 15 Sep 2009 15:01:18 +0200
Subject: [PATCH 16/74] [IMP] Invoice Supplier Control per line/manual

bzr revid: fp@tinyerp.com-20090915130118-p7ynmca1tp9wyer0
---
 addons/purchase_manual/__init__.py            |  25 +++
 addons/purchase_manual/__terp__.py            |  42 +++++
 addons/purchase_manual/purchase_manual.py     |  78 +++++++++
 .../purchase_manual/purchase_manual_view.xml  | 117 +++++++++++++
 .../purchase_manual_wizard.xml                |  14 ++
 addons/purchase_manual/wizard/__init__.py     |   1 +
 .../wizard/wizard_purchase_line_invoice.py    | 161 ++++++++++++++++++
 addons/sale/sale.py                           |   2 +-
 8 files changed, 439 insertions(+), 1 deletion(-)
 create mode 100644 addons/purchase_manual/__init__.py
 create mode 100644 addons/purchase_manual/__terp__.py
 create mode 100644 addons/purchase_manual/purchase_manual.py
 create mode 100644 addons/purchase_manual/purchase_manual_view.xml
 create mode 100644 addons/purchase_manual/purchase_manual_wizard.xml
 create mode 100644 addons/purchase_manual/wizard/__init__.py
 create mode 100644 addons/purchase_manual/wizard/wizard_purchase_line_invoice.py

diff --git a/addons/purchase_manual/__init__.py b/addons/purchase_manual/__init__.py
new file mode 100644
index 00000000000..c15d258564d
--- /dev/null
+++ b/addons/purchase_manual/__init__.py
@@ -0,0 +1,25 @@
+# -*- 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 purchase_manual
+import wizard
+
diff --git a/addons/purchase_manual/__terp__.py b/addons/purchase_manual/__terp__.py
new file mode 100644
index 00000000000..d9c3087c86c
--- /dev/null
+++ b/addons/purchase_manual/__terp__.py
@@ -0,0 +1,42 @@
+# -*- 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/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Purchase Management - Manual Control of Invoice',
+    'version': '1.1',
+    'category': 'Generic Modules/Sales & Purchases',
+    'description': """Module for purchase management, manual control of invoice""",
+    'author': 'Tiny',
+    'website': 'http://www.openerp.com',
+    'depends': ['purchase'],
+    'init_xml': [],
+    'update_xml': [
+        'purchase_manual_view.xml',
+        'purchase_manual_wizard.xml',
+    ],
+    'demo_xml': [],
+    'installable': True,
+    'active': False,
+    'certificate': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase_manual/purchase_manual.py b/addons/purchase_manual/purchase_manual.py
new file mode 100644
index 00000000000..e5d32ca49cc
--- /dev/null
+++ b/addons/purchase_manual/purchase_manual.py
@@ -0,0 +1,78 @@
+# -*- 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/>.
+#
+##############################################################################
+
+from osv import fields
+from osv import osv
+import netsvc
+
+class purchase_order_line(osv.osv):
+    _inherit='purchase.order.line'
+    _columns = {
+        'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Status', required=True, readonly=True),
+        'invoice_lines': fields.many2many('account.invoice.line', 'purchase_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
+        'invoiced': fields.boolean('Invoiced', readonly=True),
+        'partner_id': fields.related('order_id','partner_id',string='Partner',readonly=True,type="many2one", relation="res.partner"),
+        'date_order': fields.related('order_id','date_order',string='Order Date',readonly=True,type="date")
+    }
+    _defaults = {
+        'state': lambda *args: 'draft',
+        'invoiced': lambda *a: 0,
+
+    }
+    def copy_data(self, cr, uid, id, default=None, context={}):
+        print 'copy called'
+        if not default:
+            default = {}
+        default.update({
+            'state':'draft',
+            'invoiced':0,
+            'invoice_lines':[],
+        })
+        return super(purchase_order_line, self).copy_data(cr, uid, id, default, context)
+ 
+    def action_confirm(self, cr, uid, ids, context={}):
+        self.write(cr, uid, ids, {'state': 'confirmed'}, context)
+        return True
+purchase_order_line()
+
+class purchase_order(osv.osv):
+    _inherit='purchase.order'
+    def action_invoice_create(self, cr, uid, ids, context={}):
+        print 'Invoice Create'
+        res = super(purchase_order, self).action_invoice_create(cr, uid, ids, context)
+        for po in self.browse(cr, uid, ids, context):
+            todo = []
+            for line in po.order_line:
+                todo.append(line.id)
+            self.pool.get('purchase.order.line').write(cr, uid, todo, {'invoiced':True}, context)
+        return res
+
+    def wkf_confirm_order(self, cr, uid, ids, context={}):
+        res = super(purchase_order, self).wkf_confirm_order(cr, uid, ids, context)
+        todo = []
+        for po in self.browse(cr, uid, ids, context):
+            for line in po.order_line:
+                if line.state=='draft':
+                    todo.append(line.id)
+        self.pool.get('purchase.order.line').action_confirm(cr, uid, todo, context)
+        return res
+purchase_order()
diff --git a/addons/purchase_manual/purchase_manual_view.xml b/addons/purchase_manual/purchase_manual_view.xml
new file mode 100644
index 00000000000..5ef2d7ac3bb
--- /dev/null
+++ b/addons/purchase_manual/purchase_manual_view.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        #
+        # Define PO Line Views
+        #
+        <record id="purchase_order_line_form" model="ir.ui.view">
+            <field name="name">purchase.order.line.form</field>
+            <field name="model">purchase.order.line</field>
+            <field name="type">form</field>
+            <field name="priority">20</field>
+            <field name="arch" type="xml">
+                <form string="Purchase Order Line">
+                    <group colspan="4" col="6">
+                        <field name="order_id" select="1"/>
+                        <field name="partner_id" select="1"/>
+                        <field name="date_order" select="1"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Order Line">
+                            <field colspan="4" context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order, parent.fiscal_position)" select="1"/>
+                            <field context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" name="product_qty" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order, parent.fiscal_position)"/>
+                            <field name="product_uom" on_change="product_uom_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order)"/>
+                            <field colspan="4" name="name"/>
+                            <field name="date_planned" select="2"/>
+                            <field name="price_unit"/>
+                            <field name="account_analytic_id"/>
+                            <field name="price_subtotal" readonly="1"/>
+                            <field colspan="4" name="taxes_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','sale')]"/>
+                        </page>
+                        <page string="Notes">
+                            <field colspan="4" name="notes" nolabel="1"/>
+                        </page>
+                        <page string="History" groups="base.group_extended">
+                               <separator colspan="4" string="Stock Moves"/>
+                               <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
+                               <separator colspan="4" string="Manual Invoices"/>
+                               <field name="invoiced"/>
+                               <field name="state"/><newline/>
+                               <field colspan="4" name="invoice_lines" nolabel="1" widget="many2many"/>
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
+
+        <record id="purchase_order_line_tree" model="ir.ui.view">
+            <field name="name">purchase.order.line.tree</field>
+            <field name="model">purchase.order.line</field>
+            <field name="type">tree</field>
+            <field name="priority">20</field>
+            <field name="arch" type="xml">
+                <tree colors="red:date_planned&lt;=current_date" string="Purchase Order Line">
+                    <field name="date_order"/>
+                    <field name="order_id"/>
+                    <field name="partner_id"/>
+                    <field name="product_id"/>
+                    <field name="product_qty"/>
+                    <field name="product_uom"/>
+                    <field name="price_unit"/>
+                    <field name="price_subtotal"/>
+                    <field name="invoiced"/>
+                    <field name="date_planned"/>
+                </tree>
+            </field>
+        </record>
+
+ 
+        #
+        # Inherit PO view to get buttons
+        #
+
+        <record id="purchase_line_form_action" model="ir.actions.act_window">
+            <field name="name">Purchase Order Lines</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">purchase.order.line</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <record id="purchase_line_form_action_tree" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="purchase_order_line_tree"/>
+            <field name="act_window_id" ref="purchase_line_form_action"/>
+        </record>
+        <record id="purchase_line_form_action_form" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="purchase_order_line_form"/>
+            <field name="act_window_id" ref="purchase_line_form_action"/>
+        </record>
+        <menuitem action="purchase_line_form_action" id="menu_purchase_line_form_action" parent="purchase.menu_purchase_root"/>
+
+        <record id="purchase_line_form_action2" model="ir.actions.act_window">
+            <field name="name">Uninvoiced Purchase Order Lines</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">purchase.order.line</field>
+            <field name="domain">[('state','in',('confirmed','done')), ('invoiced','=',False)]</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <record id="purchase_line_form_action_tree2" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="purchase_order_line_tree"/>
+            <field name="act_window_id" ref="purchase_line_form_action2"/>
+        </record>
+        <record id="purchase_line_form_action_form2" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="purchase_order_line_form"/>
+            <field name="act_window_id" ref="purchase_line_form_action2"/>
+        </record>
+         <menuitem action="purchase_line_form_action2" id="menu_purchase_line_order_draft" parent="menu_purchase_line_form_action"/>
+
+    </data>
+</openerp>
diff --git a/addons/purchase_manual/purchase_manual_wizard.xml b/addons/purchase_manual/purchase_manual_wizard.xml
new file mode 100644
index 00000000000..62771cf9fbb
--- /dev/null
+++ b/addons/purchase_manual/purchase_manual_wizard.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <wizard
+            id="wizard_purchase_order_line_invoice"
+            keyword="client_action_multi"
+            model="purchase.order.line"
+            name="purchase.order.line.make_invoice"
+            multi="True"
+            string="Invoice Received"/>
+
+    </data>
+</openerp>
diff --git a/addons/purchase_manual/wizard/__init__.py b/addons/purchase_manual/wizard/__init__.py
new file mode 100644
index 00000000000..616c5c7090c
--- /dev/null
+++ b/addons/purchase_manual/wizard/__init__.py
@@ -0,0 +1 @@
+import wizard_purchase_line_invoice
diff --git a/addons/purchase_manual/wizard/wizard_purchase_line_invoice.py b/addons/purchase_manual/wizard/wizard_purchase_line_invoice.py
new file mode 100644
index 00000000000..89d7d188287
--- /dev/null
+++ b/addons/purchase_manual/wizard/wizard_purchase_line_invoice.py
@@ -0,0 +1,161 @@
+# -*- 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 ir
+import pooler
+
+invoice_form = """<?xml version="1.0"?>
+<form string="Control invoices">
+    <separator colspan="4" string="Do you want to generate the supplier invoices ?" />
+</form>
+"""
+
+invoice_fields = {
+}
+
+def _makeInvoices(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    res = False
+    invoices = {}
+
+    def make_invoice(order, lines):
+        a = order.partner_id.property_account_payable.id
+        if order.partner_id and order.partner_id.property_payment_term.id:
+            pay_term = order.partner_id.property_payment_term.id
+        else:
+            pay_term = False
+        inv = {
+            'name': order.name,
+            'origin': order.name,
+            'type': 'in_invoice',
+            'reference': "P%dPO%d" % (order.partner_id.id, order.id),
+            'account_id': a,
+            'partner_id': order.partner_id.id,
+            'address_invoice_id': order.partner_address_id.id,
+            'address_contact_id': order.partner_address_id.id,
+            'invoice_line': [(6,0,lines)],
+            'currency_id' : order.pricelist_id.currency_id.id,
+            'comment': order.notes,
+            'payment_term': pay_term,
+            'fiscal_position': order.partner_id.property_account_position.id
+        }
+        inv_id = pool.get('account.invoice').create(cr, uid, inv)
+        return inv_id
+
+    for line in pool.get('purchase.order.line').browse(cr,uid,data['ids']):
+        if (not line.invoiced) and (line.state not in ('draft','cancel')):
+            if not line.order_id.id in invoices:
+                invoices[line.order_id.id] = []
+            if line.product_id:
+                a = line.product_id.product_tmpl_id.property_account_expense.id
+                if not a:
+                    a = line.product_id.categ_id.property_account_expense_categ.id
+                if not a:
+                    raise osv.except_osv(_('Error !'),
+                            _('There is no expense account defined ' \
+                                    'for this product: "%s" (id:%d)') % \
+                                    (line.product_id.name, line.product_id.id,))
+            else:
+                a = pool.get('ir.property').get(cr, uid,
+                        'property_account_expense_categ', 'product.category',
+                        context=context)
+            fpos = line.order_id.fiscal_position or False
+            a = pool.get('account.fiscal.position').map_account(cr, uid, fpos, a)
+            inv_id = pool.get('account.invoice.line').create(cr, uid, {
+                'name': line.name,
+                'origin': line.order_id.name,
+                'account_id': a,
+                'price_unit': line.price_unit,
+                'quantity': line.product_qty,
+                'uos_id': line.product_uom.id,
+                'product_id': line.product_id.id or False,
+                'invoice_line_tax_id': [(6, 0, [x.id for x in line.taxes_id])],
+                'note': line.notes,
+                'account_analytic_id': line.account_analytic_id and line.account_analytic_id.id or False,
+            })
+            cr.execute('insert into purchase_order_line_invoice_rel (order_line_id,invoice_id) values (%s,%s)', (line.id, inv_id))
+            pool.get('purchase.order.line').write(cr, uid, [line.id], {'invoiced': True})
+            invoices[line.order_id.id].append((line,inv_id))
+
+    res = []
+    for result in invoices.values():
+        order = result[0][0].order_id
+        il = map(lambda x: x[1], result)
+        res.append(make_invoice(order, il))
+    return {'invoice_ids': res}
+
+    return {
+        'domain': "[('id','in', ["+','.join(map(str,res))+"])]",
+        'name': _('Supplier Invoices'),
+        'view_type': 'form',
+        'view_mode': 'tree,form',
+        'res_model': 'account.invoice',
+        'view_id': False,
+        'context': "{'type':'in_invoice'}",
+        'type': 'ir.actions.act_window'
+    }
+
+class line_make_invoice(wizard.interface):
+    def _open_invoice(self, cr, uid, data, context):
+        pool_obj = pooler.get_pool(cr.dbname)
+        model_data_ids = pool_obj.get('ir.model.data').search(cr,uid,[('model','=','ir.ui.view'),('name','=','invoice_supplier_form')])
+        resource_id = pool_obj.get('ir.model.data').read(cr,uid,model_data_ids,fields=['res_id'])[0]['res_id']
+        return {
+            'domain': "[('id','in', ["+','.join(map(str,data['form']['invoice_ids']))+"])]",
+            'name': 'Invoices',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'account.invoice',
+            'views': [(False,'tree'),(resource_id,'form')],
+            'context': "{'type':'in_invoice'}",
+            'type': 'ir.actions.act_window'
+        }
+
+    states = {
+        'init' : {
+            'actions': [],
+            'result': {
+                'type': 'form',
+                'arch': invoice_form,
+                'fields': invoice_fields,
+                'state': [
+                    ('end', 'Cancel'),
+                    ('invoice', 'Create invoices')
+                ]
+            }
+        },
+        'invoice' : {
+            'actions' : [_makeInvoices],
+            'result' : {'type': 'state', 'state': 'open'}
+        },
+        'open': {
+            'actions': [],
+            'result': {'type':'action', 'action':_open_invoice, 'state':'end'}
+        }
+    }
+
+line_make_invoice("purchase.order.line.make_invoice")
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 1492143a7d0..6b50cd3cb48 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -829,7 +829,7 @@ class sale_order_line(osv.osv):
                     'product_id': line.product_id.id or False,
                     'invoice_line_tax_id': [(6, 0, [x.id for x in line.tax_id])],
                     'note': line.notes,
-                    'account_analytic_id': line.order_id.project_id.id,
+                    'account_analytic_id': line.order_id.project_id and line.order_id.project_id.id or False,
                 })
                 cr.execute('insert into sale_order_line_invoice_rel (order_line_id,invoice_id) values (%s,%s)', (line.id, inv_id))
                 self.write(cr, uid, [line.id], {'invoiced': True})

From 7a3717d54ce772c5ba61fbf30f85b64a36d26409 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Tue, 15 Sep 2009 21:09:38 +0530
Subject: [PATCH 17/74] [FIX] Hr_timesheet_invoice : Query calculation
 corrected

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

bzr revid: jvo@tinyerp.com-20090915153938-2lcgt5kwwhvmayse
---
 addons/hr_timesheet_invoice/hr_timesheet_invoice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 6f29c056d34..0c16fb4ffd4 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -44,7 +44,7 @@ class account_analytic_account(osv.osv):
         res = {}
         for account in self.browse(cr, uid, ids):
             invoiced = {}
-            cr.execute('select distinct l.invoice_id from hr_analytic_timesheet h left join account_analytic_line l on (h.line_id=l.id) where account_id=1', (account.id,))
+            cr.execute('select distinct(l.invoice_id) from hr_analytic_timesheet h left join account_analytic_line l on (h.line_id=l.id) where account_id=%s', (account.id,))
             invoice_ids = filter(None, map(lambda x: x[0], cr.fetchall()))
             for invoice in self.pool.get('account.invoice').browse(cr, uid, invoice_ids, context):
                 res.setdefault(account.id, 0.0)

From d3206b046ab59987d80ac535a164d50632d36a78 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Wed, 16 Sep 2009 12:46:34 +0530
Subject: [PATCH 18/74] [FIX] Base_report_creator : Print screen report is now
 available for custom reports

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

bzr revid: jvo@tinyerp.com-20090916071634-43xkyf15v1stzn4q
---
 addons/base_report_creator/base_report_creator.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/base_report_creator/base_report_creator.py b/addons/base_report_creator/base_report_creator.py
index 9959c3638db..af7049bd894 100644
--- a/addons/base_report_creator/base_report_creator.py
+++ b/addons/base_report_creator/base_report_creator.py
@@ -51,7 +51,7 @@ from tools.translate import _
 class report_creator(osv.osv):
     _name = "base_report_creator.report"
     _description = "Report"
-
+    model_set_id = False
     #
     # Should request only used fields
     #
@@ -131,7 +131,9 @@ class report_creator(osv.osv):
         if (not context) or 'report_id' not in context:
             return super(report_creator, self).read(cr, user, ids, fields, context, load)
         ctx = context or {}
-        wp = [self._id_get(cr, user, context['report_id'], context)+(' in (%s)' % (','.join(map(lambda x: "'"+str(x)+"'",ids))))]
+        wp = ''
+        if self.model_set_id:
+            wp = [self._id_get(cr, user, context['report_id'], context)+(' in (%s)' % (','.join(map(lambda x: "'"+str(x)+"'",ids))))]
         report = self._sql_query_get(cr, user, [context['report_id']], 'sql_query', None, ctx, where_plus = wp)
         sql_query = report[context['report_id']]
         cr.execute(sql_query)

From bc39c5a14b65902348b5a5ddc15b1e6a93e39ba5 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Wed, 16 Sep 2009 12:47:08 +0530
Subject: [PATCH 19/74] [FIX] Print screen : Correction when text for report is
 already encoded

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

bzr revid: jvo@tinyerp.com-20090916071708-xc93saplay5apvjn
---
 bin/report/printscreen/ps_list.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/report/printscreen/ps_list.py b/bin/report/printscreen/ps_list.py
index 8534fd5c887..d2f946e6715 100644
--- a/bin/report/printscreen/ps_list.py
+++ b/bin/report/printscreen/ps_list.py
@@ -51,7 +51,10 @@ class report_printscreen_list(report_int):
         return result
 
     def _parse_string(self, view):
-        dom = etree.XML(view)
+        try:
+            dom = etree.XML(view.encode('utf-8'))
+        except:
+            dom = etree.XML(view)   
         return self._parse_node(dom)
 
     def create(self, cr, uid, ids, datas, context=None):

From 81b8e008d3a99f0bd7e4ca2b54d38faf87100eaa Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Wed, 16 Sep 2009 13:10:51 +0530
Subject: [PATCH 20/74] [IMP]quality_integration_server: make link of
 extra-addons module in addons module automatic on install-module command

bzr revid: hmo@tinyerp.com-20090916074051-hyoq3atsctz8jdhd
---
 Makefile                                      |  3 +-
 .../base_quality_interrogation.py             | 37 +++++++++++++++++--
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 39ab146c13a..7b410d19dee 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 # -*- makefile -*-
 
 addons-path := bin/addons/ 
+extra-addons:= ''
 root-path := bin/  
 port := 8069
 net_port := 8070 
@@ -22,7 +23,7 @@ drop-db:
 	python $(interrogation_file) drop-db --database=$(database) --root-path=$(root-path) --addons-path=$(addons-path) --port=$(port)
 
 install-module:	
-	python $(interrogation_file) install-module --modules=$(module) --database=$(database) --root-path=$(root-path) --addons-path=$(addons-path) --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) --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)
diff --git a/bin/addons/quality_integration_server/base_quality_interrogation.py b/bin/addons/quality_integration_server/base_quality_interrogation.py
index 65bb7f5f849..b07c2baef40 100755
--- a/bin/addons/quality_integration_server/base_quality_interrogation.py
+++ b/bin/addons/quality_integration_server/base_quality_interrogation.py
@@ -180,7 +180,7 @@ def create_db(uri, dbname, user='admin', pwd='admin', lang='en_US'):
         elif res['type']=='state':
             state = res['state']
     res = execute(wiz_conn, 'execute', dbname, uid, pwd, wiz_id, datas, state, {})
-    install_module(uri, dbname, ['base_module_quality'],user,pwd)
+    install_module(uri, dbname, ['base_module_quality'],user=user,pwd=pwd)
     return True
 
 def drop_db(uri, dbname):
@@ -190,12 +190,37 @@ def drop_db(uri, dbname):
         execute(conn, 'drop', admin_passwd, dbname)    
     return True
 
-def install_module(uri, dbname, modules, user='admin', pwd='admin'):
+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    
+    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 addons and extra_addons:
+            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)])  
+        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)           
         wiz_id = execute(wizard_conn, 'create', dbname, uid, pwd, 'module.upgrade.simple')
         state = 'init'
@@ -255,6 +280,9 @@ 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",
+                     help="specify extra_addons and trunkCommunity modules path ")
+
 (opt, args) = parser.parse_args()
 if len(args) != 1:
     parser.error("incorrect number of arguments")
@@ -282,6 +310,7 @@ options = {
     'modules' : opt.modules or [],
     'login' : opt.login or 'admin',
     'pwd' : opt.pwd or '',
+    'extra-addons':opt.extra_addons or []
 }
 
 options['modules'] = opt.modules and map(lambda m: m.strip(), opt.modules.split(',')) or []
@@ -297,7 +326,7 @@ try:
     if command == 'drop-db': 
         drop_db(uri, options['database'])
     if command == 'install-module': 
-        install_module(uri, options['database'], options['modules'], options['login'], options['pwd'])
+        install_module(uri, options['database'], options['modules'],options['addons-path'],options['extra-addons'],options['login'], options['pwd'])
     if command == 'upgrade-module': 
         upgrade_module(uri, options['database'], options['modules'], options['login'], options['pwd'])
     if command == 'check-quality':

From c415a9d72f4e32c265058b94f256631e99f5f17d Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Wed, 16 Sep 2009 14:50:36 +0530
Subject: [PATCH 21/74] [FIX]base : ir_cron : take minimun next_call from
 database for job waiting. if database does not has any job, it will take 1
 day for job waiting

bzr revid: hmo@tinyerp.com-20090916092036-pevdiwq24d42zanl
---
 bin/addons/base/ir/ir_cron.py | 38 ++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/bin/addons/base/ir/ir_cron.py b/bin/addons/base/ir/ir_cron.py
index 7da956c36af..166a5781d44 100644
--- a/bin/addons/base/ir/ir_cron.py
+++ b/bin/addons/base/ir/ir_cron.py
@@ -27,8 +27,6 @@ import tools
 import pooler
 from osv import fields,osv
 
-next_wait = 60
-
 _intervalTypes = {
     'work_days': lambda interval: DateTime.RelativeDateTime(days=interval),
     'days': lambda interval: DateTime.RelativeDateTime(days=interval),
@@ -74,20 +72,18 @@ class ir_cron(osv.osv, netsvc.Agent):
             f = getattr(m, func)
             f(cr, uid, *args)
 
-    def _poolJobs(self, db_name, check=False):
+    def _poolJobs(self, db_name, check=False):        
         try:
             db, pool = pooler.get_db_and_pool(db_name)
         except:
-            return False
-
+            return False        
         if pool._init:
             # retry in a few minutes
-            next_call = 600 
+            next_call = 600
         else:
-            next_call = next_wait
-            cr = db.cursor()
             now = DateTime.now()
             try:
+                cr = db.cursor()
                 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')
@@ -115,8 +111,32 @@ class ir_cron(osv.osv, netsvc.Agent):
         # 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, int(time.time()) + next_call, db_name, db_name)
+            self.setAlarm(self._poolJobs, next_call, db_name, db_name)
+            
+    def create(self, cr, uid, vals, context=None):
+        res = super(ir_cron, self).create(cr, uid, vals, context=context)        
+        cr.commit()
+        self._poolJobs(cr.dbname)
+        return res
+    def write(self, cr, user, ids, vals, context=None):
+        res = super(ir_cron, self).write(cr, user, ids, vals, context=context)
+        cr.commit()
+        self._poolJobs(cr.dbname)
+        return res
+    def unlink(self, cr, uid, ids, context=None):
+        res = super(ir_cron, self).unlink(cr, uid, ids, context=context)
+        cr.commit()
+        self._poolJobs(cr.dbname)
+        return res
 ir_cron()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From c92e018556e66c9f2e1b4547d5522ca664566d97 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Wed, 16 Sep 2009 15:55:21 +0530
Subject: [PATCH 22/74] [REM]: remove the name search method, as this method
 was implemented for the email address field this was looking for the related
 fields too in the action object, but now that is not required as now email
 address can be located by object.object.object.....field so its better to
 make this method close

bzr revid: mga@tinyerp.com-20090916102521-m5xmlbmle8y2zc64
---
 bin/addons/base/ir/ir_actions.py | 82 ++++++++++++++++----------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 591a8ef2e73..1403923c040 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -284,57 +284,57 @@ class ir_model_fields(osv.osv):
         'complete_name': fields.char('Complete Name', size=64, select=1),
     }
 
-    def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=800):
-        def get_fields(cr, uid, field, rel):
-            result = []
-            mobj = self.pool.get('ir.model')
-            id = mobj.search(cr, uid, [('model','=',rel)])
+    def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=80):
+        return super(ir_model_fields, self).name_search(cr, uid, name, args, operator, context, limit)
+#        def get_fields(cr, uid, field, rel):
+#            result = []
+#            mobj = self.pool.get('ir.model')
+#            id = mobj.search(cr, uid, [('model','=',rel)])
 
-            obj = self.pool.get('ir.model.fields')
-            ids = obj.search(cr, uid, [('model_id','in',id)])
-            records = obj.read(cr, uid, ids)
-            for record in records:
-                id = record['id']
-                fld = field + '/' + record['name']
+#            obj = self.pool.get('ir.model.fields')
+#            ids = obj.search(cr, uid, [('model_id','in',id)])
+#            records = obj.read(cr, uid, ids)
+#            for record in records:
+#                id = record['id']
+#                fld = field + '/' + record['name']
 
-                result.append((id, fld))
-            return result
+#                result.append((id, fld))
+#            return result
 
-        if not args:
-            args=[]
-        if not context:
-            context={}
-            return super(ir_model_fields, self).name_search(cr, uid, name, args, operator, context, limit)
+#        if not args:
+#            args=[]
+#        if not context:
+#            context={}
+#            return super(ir_model_fields, self).name_search(cr, uid, name, args, operator, context, limit)
 
-        if context.get('key') != 'server_action':
-            return super(ir_model_fields, self).name_search(cr, uid, name, args, operator, context, limit)
+#        if context.get('key') != 'server_action':
+#            return super(ir_model_fields, self).name_search(cr, uid, name, args, operator, context, limit)
+#        result = []
+#        obj = self.pool.get('ir.model.fields')
+#        ids = obj.search(cr, uid, args)
+#        records = obj.read(cr, uid, ids)
+#        for record in records:
+#            id = record['id']
+#            field = record['name']
 
-        result = []
-        obj = self.pool.get('ir.model.fields')
-        ids = obj.search(cr, uid, args)
-        records = obj.read(cr, uid, ids)
-        for record in records:
-            id = record['id']
-            field = record['name']
+#            if record['ttype'] == 'many2one':
+#                rel = record['relation']
+#                res = get_fields(cr, uid, field, record['relation'])
+#                for rs in res:
+#                    result.append(rs)
 
-            if record['ttype'] == 'many2one':
-                rel = record['relation']
-                res = get_fields(cr, uid, field, record['relation'])
-                for rs in res:
-                    result.append(rs)
+#            result.append((id, field))
 
-            result.append((id, field))
+#        for rs in result:
+#            obj.write(cr, uid, [rs[0]], {'complete_name':rs[1]})
 
-        for rs in result:
-            obj.write(cr, uid, [rs[0]], {'complete_name':rs[1]})
+#        iids = []
+#        for rs in result:
+#            iids.append(rs[0])
 
-        iids = []
-        for rs in result:
-            iids.append(rs[0])
+#        result = super(ir_model_fields, self).name_search(cr, uid, name, [('complete_name','ilike',name), ('id','in',iids)], operator, context, limit)
 
-        result = super(ir_model_fields, self).name_search(cr, uid, name, [('complete_name','ilike',name), ('id','in',iids)], operator, context, limit)
-
-        return result
+#        return result
 
 ir_model_fields()
 

From b3a239601f9cdfde4242b560f564c530baa497b0 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Wed, 16 Sep 2009 16:37:22 +0530
Subject: [PATCH 23/74] [REM] document : remove code of get_translation and
 remove user context_lang from node context on getting new node because of we
 see some problem in this code for translation term of french

bzr revid: hmo@tinyerp.com-20090916110722-4kl5t5q71im6c76i
---
 addons/document/document.py | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/addons/document/document.py b/addons/document/document.py
index 21aa59661a7..082ea0144da 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -125,16 +125,7 @@ class node_class(object):
     
     def get_translation(self,value,lang):
         result = value
-        pool = pooler.get_pool(self.cr.dbname)        
-        translation_ids = pool.get('ir.translation').search(self.cr, self.uid, [('value','=',value),('lang','=',lang),('type','=','model')])
-        if len(translation_ids):
-            tran_id = translation_ids[0]
-            translation = pool.get('ir.translation').read(self.cr, self.uid, tran_id, ['res_id','name'])
-            res_model,field_name = tuple(translation['name'].split(','))  
-            res_id = translation['res_id']        
-            res = pool.get(res_model).read(self.cr, self.uid, res_id, [field_name])
-            if res:
-                result = res[field_name]
+        #TODO : to get translation term        
         return result 
     
     def directory_list_for_child(self,nodename,parent=False):
@@ -346,12 +337,8 @@ class document_directory(osv.osv):
             object: the object.directory or object.directory.content
             object2: the other object linked (if object.directory.content)
     """
-    def get_object(self, cr, uid, uri, context={}):
-        lang = context.get('lang',False)
-        if not lang:
-            user = self.pool.get('res.users').browse(cr, uid, uid)
-            lang = user.context_lang 
-        context['lang'] = lang
+    def get_object(self, cr, uid, uri, context={}):        
+        #TODO : set user's context_lang in context        
         if not uri:
             return node_class(cr, uid, '', False, context=context, type='database')
         turi = tuple(uri)

From 4f50981946228dc2ef5075fa6f865898eb6a42ea Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Wed, 16 Sep 2009 20:17:04 +0530
Subject: [PATCH 24/74] [FIX + IMP] Sale :consistency in order
 report(addresses,date)

lp bug: https://launchpad.net/bugs/430516 fixed
lp bug: https://launchpad.net/bugs/430522 fixed

bzr revid: jvo@tinyerp.com-20090916144704-1dyh5w84ng9m27td
---
 addons/sale/report/order.rml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/sale/report/order.rml b/addons/sale/report/order.rml
index fac75e4f4d9..fa03eb1624b 100644
--- a/addons/sale/report/order.rml
+++ b/addons/sale/report/order.rml
@@ -138,14 +138,16 @@
           <para style="terp_default_9">[[ o.partner_shipping_id.title or '' ]] [[ o.partner_shipping_id.name ]]</para>
           <para style="terp_default_9">[[ o.partner_shipping_id.street ]]</para>
           <para style="terp_default_9">[[ o.partner_shipping_id.street2 or '' ]]</para>
-          <para style="terp_default_9">[[ o.partner_shipping_id.city or '' ]] [[ o.partner_shipping_id.zip or '' ]]</para>
+          <para style="terp_default_9">[[ o.partner_shipping_id.zip or '' ]] [[ o.partner_shipping_id.city or '' ]]</para>
           <para style="terp_default_9">[[ o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name or '' ]] [[ o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name or '' ]]</para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
           <para style="terp_default_Bold_9">Invoice address :</para>
+          <para style="terp_default_9">[[ o.partner_invoice_id.title or '' ]] [[ o.partner_invoice_id.name or '' ]] </para>
           <para style="terp_default_9">[[ o.partner_invoice_id.street ]] [[ o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2 or '') ]]</para>
-          <para style="terp_default_9">[[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]] [[ o.partner_invoice_id.country_id and (', %s' % (o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '')) ]]</para>
+          <para style="terp_default_9">[[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]]</para>
+          <para style="terp_default_9">[[ o.partner_invoice_id.state_id and o.partner_invoice_id.state_id.name or '' ]] [[ o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '' ]]</para>
         </td>
         <td>
           <para style="terp_default_8">
@@ -185,7 +187,7 @@
           <para style="terp_tblheader_General_Centre">Your Reference </para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Date Ordered </para>
+          <para style="terp_tblheader_General_Centre">[[ o.state=='draft' and 'Quotation Date' or 'Date Ordered' ]]</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Our Salesman </para>

From 5f2ab89a72fbaf4a1bec960ec137523670d0352b Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Wed, 16 Sep 2009 20:26:33 +0530
Subject: [PATCH 25/74] [FIX] Sale : Order Lines switches view from tree,form
 and view

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

bzr revid: jvo@tinyerp.com-20090916145633-h0wic35v1p4bbe96
---
 addons/sale/sale_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index f0b8da9a017..168d8c39ee6 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -110,7 +110,7 @@
                             <field domain="[('type','=','sale')]" name="pricelist_id"/>
                             <field name="project_id" select="2" context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}"/>
                             <newline/>
-                            <field colspan="4" mode="tree,graph" name="order_line" nolabel="1" widget="one2many_list">
+                            <field colspan="4" mode="tree,form,graph" name="order_line" nolabel="1" widget="one2many_list">
                                 <form string="Sale Order Lines">
                                     <notebook>
                                         <page string="Order Line">

From 03a072b4b78aa348a92fdfdcfa16350aadff132b Mon Sep 17 00:00:00 2001
From: "GPA(OpenERP)" <>
Date: Wed, 16 Sep 2009 20:37:35 +0530
Subject: [PATCH 26/74] [FIX] Hr_holidays : Workflow actions validations
 corrected

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

bzr revid: jvo@tinyerp.com-20090916150735-2d3cb8a1ybqt164r
---
 addons/hr_holidays/hr.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/hr_holidays/hr.py b/addons/hr_holidays/hr.py
index 5e4b1ed7a05..dc0f7a82d66 100644
--- a/addons/hr_holidays/hr.py
+++ b/addons/hr_holidays/hr.py
@@ -187,8 +187,11 @@ class hr_holidays(osv.osv):
             'state':'validate',
         }
         ids2 = self.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
+        
         if ids2:
             vals['manager_id'] = ids2[0]
+        else:
+            raise osv.except_osv(_('Warning !'),_('Either there is no Employee defined, or no User attached with it.'))    
         self.write(cr, uid, ids, vals)
         self._create_holiday(cr, uid, ids)
         return True
@@ -207,6 +210,8 @@ class hr_holidays(osv.osv):
 
     def holidays_refuse(self, cr, uid, ids, *args):
         ids2 = self.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
+        if not ids2:
+            raise osv.except_osv(_('Warning !'),_('Either there is no Employee defined, or no User attached with it.'))
         self.write(cr, uid, ids, {
             'state':'refuse',
             'manager_id':ids2[0]

From acfd835091f38c29a91dec8de08265c8a9800759 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Thu, 17 Sep 2009 10:17:14 +0530
Subject: [PATCH 27/74] [FIX]quality_integration_server : quality log : reduce
 overwrite last test log in other test logs

bzr revid: hmo@tinyerp.com-20090917044714-onj9maung7o7gi97
---
 .../base_quality_interrogation.py             | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/bin/addons/quality_integration_server/base_quality_interrogation.py b/bin/addons/quality_integration_server/base_quality_interrogation.py
index b07c2baef40..9a453d85c38 100755
--- a/bin/addons/quality_integration_server/base_quality_interrogation.py
+++ b/bin/addons/quality_integration_server/base_quality_interrogation.py
@@ -49,14 +49,14 @@ def clean():
             ps.close()  
             if pid:    
                 os.kill(pid,9)
-                
+
 def execute(connector, method, *args):
-    global wait_count
+    global wait_count 
     res = False
     try:        
         res = getattr(connector,method)(*args)
     except socket.error,e:        
-        if e.args[0] == 111:                                    
+        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()
@@ -68,8 +68,7 @@ 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')
@@ -108,12 +107,12 @@ def check_quality(uri, user, pwd, dbname, modules):
     uid = login(uri, dbname, user, pwd)
     if uid:
         conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/object')
-        qualityresult = {}  
         final = {}   
-        test_detail = {}
-        for module in modules:            
+        for module in modules:   
+            qualityresult = {}
+            test_detail = {}              
             quality_result = execute(conn,'execute', dbname, uid, pwd,'module.quality.check','check_quality',module)
-            detail_html = ''            
+            detail_html = ''
             html = '''<html><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'])
@@ -124,7 +123,10 @@ def check_quality(uri, user, pwd, dbname, modules):
                 msg = detail.get('message','')
                 score = round(float(detail.get('score',0)),2)
                 html += "<li><a href=\"#%s\">%s</a></li>"%(test.replace(' ','-'),test)
-                detail_html +="<div id=\"%s\"><h3>%s (Score : %s)</h3>%s</div>"%(test.replace(' ','-'),test,score,detail.get('detail'))                
+                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',''))                
                 test_detail[test] = (score,msg,detail.get('detail',''))
             html += "</ul>%s</body></html></html></html></html></html>"%(detail_html)
             html += "</div>"
@@ -138,7 +140,7 @@ def check_quality(uri, user, pwd, dbname, modules):
     else:
         print 'Login Failed...'        
         clean()
-        sys.exit(1)
+        sys.exit(1)     
 
 
 
@@ -189,7 +191,7 @@ def drop_db(uri, dbname):
     if dbname in db_list:
         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  
@@ -207,7 +209,7 @@ def make_links(uri, uid, dbname, source, destination, module, user, pwd):
                         for dep_data in dep_datas:    
                             make_links(uri, uid, dbname, source, destination, dep_data['name'], user, pwd)
                     return True    
-    return False
+    return False    
 
 def install_module(uri, dbname, modules, addons='', extra_addons='',  user='admin', pwd='admin'):
     uid = login(uri, dbname, user, pwd)

From 38633249301299371a0cd823f941a958f24074c5 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Thu, 17 Sep 2009 12:51:25 +0530
Subject: [PATCH 28/74] [FIX]quality_integration_server: fixe problem on make
 link of extra-module in addons

bzr revid: hmo@tinyerp.com-20090917072125-y63krel1152ox742
---
 .../quality_integration_server/base_quality_interrogation.py  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/quality_integration_server/base_quality_interrogation.py b/bin/addons/quality_integration_server/base_quality_interrogation.py
index 9a453d85c38..a75477ed0f8 100755
--- a/bin/addons/quality_integration_server/base_quality_interrogation.py
+++ b/bin/addons/quality_integration_server/base_quality_interrogation.py
@@ -195,8 +195,8 @@ 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):    
+    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)

From 6d6bc82fca30c840cf1713dc6d5b683dc6e26475 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Thu, 17 Sep 2009 18:35:29 +0530
Subject: [PATCH 29/74] [FIX] Purchase_manual : certificate on terp displayed
 wrong value

bzr revid: jvo@tinyerp.com-20090917130529-vdzbrr2u2yx4gjeq
---
 addons/purchase_manual/__terp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase_manual/__terp__.py b/addons/purchase_manual/__terp__.py
index d9c3087c86c..885ac4d9d98 100644
--- a/addons/purchase_manual/__terp__.py
+++ b/addons/purchase_manual/__terp__.py
@@ -37,6 +37,6 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': False,
+#    'certificate': False,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From e6f996e75b9abcb5210685e855173597a418ea11 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Thu, 17 Sep 2009 18:39:17 +0530
Subject: [PATCH 30/74] [REF]quality_integration_server: now intsall-translate
 command accept input like
 i18n-import=purchase:ar_AR.po+sale:fr_FR.po,nl_BE.po

bzr revid: hmo@tinyerp.com-20090917130917-hj4nos9bcxpqsxzv
---
 .../base_quality_interrogation.py             | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/bin/addons/quality_integration_server/base_quality_interrogation.py b/bin/addons/quality_integration_server/base_quality_interrogation.py
index a75477ed0f8..f4e84f5194a 100755
--- a/bin/addons/quality_integration_server/base_quality_interrogation.py
+++ b/bin/addons/quality_integration_server/base_quality_interrogation.py
@@ -37,10 +37,8 @@ waittime = 10
 wait_count = 0
 wait_limit = 12
 
-def start_server(root_path, port, addons_path):
-    if root_path:
-        root_path += '/'
-    os.system('python2.5 '+root_path+'openerp-server.py  --pidfile=openerp.pid  --port=%s --no-netrpc --addons-path=%s' %(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') 
@@ -306,7 +304,7 @@ die(opt.translate_in and (not opt.db_name),
 options = {
     'addons-path' : opt.addons_path or 'addons',
     'root-path' : opt.root_path or '',
-    'translate-in': opt.translate_in,
+    'translate-in': [],
     'port' : opt.port or 8069,        
     'database': opt.db_name or 'terp',
     'modules' : opt.modules or [],
@@ -316,7 +314,14 @@ options = {
 }
 
 options['modules'] = opt.modules and map(lambda m: m.strip(), opt.modules.split(',')) or []
-options['translate_in'] = opt.translate_in and map(lambda m: m.strip(), opt.translate_in.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(','):                   
+            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'])
 
 server_thread = threading.Thread(target=start_server,
@@ -334,7 +339,7 @@ try:
     if command == 'check-quality':
         check_quality(uri, options['login'], options['pwd'], options['database'], options['modules'])
     if command == 'install-translation':        
-        import_translate(uri, options['login'], options['pwd'], options['database'], options['translate_in'])
+        import_translate(uri, options['login'], options['pwd'], options['database'], options['translate-in'])
     clean()
     sys.exit(0)
     

From fcf202751d872861e9a5319ec95b3d059a36dae4 Mon Sep 17 00:00:00 2001
From: Quentin De Paoli <qdp@cyan>
Date: Thu, 17 Sep 2009 15:16:16 +0200
Subject: [PATCH 31/74] [FIX] account: bugfixed the fiscalyear closing wizard: 
 * wizard wasn't working if there weren't entries to report: uneeded error was
 raised 	* wizard wasn't reconciling the reported entries of the new
 fiscalyear (but of the old fiscalyear)

bzr revid: qdp@cyan-20090917131616-hy6kdupx5j0em41q
---
 .../account/wizard/wizard_fiscalyear_close.py | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/addons/account/wizard/wizard_fiscalyear_close.py b/addons/account/wizard/wizard_fiscalyear_close.py
index 68e69941b5c..ac9518e006b 100644
--- a/addons/account/wizard/wizard_fiscalyear_close.py
+++ b/addons/account/wizard/wizard_fiscalyear_close.py
@@ -192,21 +192,24 @@ def _data_save(self, cr, uid, data, context):
                     })
                     pool.get('account.move.line').create(cr, uid, move)
                 offset += limit
-
     ids = pool.get('account.move.line').search(cr, uid, [('journal_id','=',new_journal.id),
-        ('period_id.fiscalyear_id','=',old_fyear.id)])
+        ('period_id.fiscalyear_id','=',new_fyear.id)])
     context['fy_closing'] = True
-    if not ids:
-        raise wizard.except_wizard(_('UserError'),
-                _('The old fiscal year does not have any entry to reconcile!'))
 
-    pool.get('account.move.line').reconcile(cr, uid, ids, context=context)
+    if ids:
+        pool.get('account.move.line').reconcile(cr, uid, ids, context=context)
     new_period = data['form']['period_id']
     ids = pool.get('account.journal.period').search(cr, uid, [('journal_id','=',new_journal.id),('period_id','=',new_period)])
-    if ids:
-        cr.execute('UPDATE account_fiscalyear ' \
+    if not ids:
+        ids = [pool.get('account.journal.period').create(cr, uid, {
+               'name': (new_journal.name or '')+':'+(period.code or ''),
+               'journal_id': new_journal.id,
+               'period_id': period.id
+           })]
+    cr.execute('UPDATE account_fiscalyear ' \
                 'SET end_journal_period_id = %s ' \
-                'WHERE id = %s', (ids[0], new_fyear.id))
+                'WHERE id = %s', (ids[0], old_fyear.id))
+
     return {}
 
 class wiz_journal_close(wizard.interface):

From cdb2371b83f20f6026f69d9228ee46d392cf9b3b Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Thu, 17 Sep 2009 15:21:26 +0200
Subject: [PATCH 32/74] [IMP] updated changelog file

bzr revid: olt@tinyerp.com-20090917132126-bghsqfgbvfod54ac
---
 doc/Changelog | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 133 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index 577dfc5a651..53607a2b975 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,136 @@
+
+2009-09-17: 5.0.5
+=================
+
+Bugfixes (server)
+-----------------
+
+ * Not linked to a bug report:
+   * quality_integration_server: fixe problem on make link of extra-module in addons
+   * quality_integration_server : quality log : reduce overwrite last test log in other test logs
+   * base : ir_cron : take minimun next_call from database for job waiting. if database does not has any job, it will take 1 day for job waiting
+   * quality_integration_server: get message from base_quality_module if module can not success to reach minimun score
+   * regression in fields.function computation
+   * better log error, new line
+   * Report: context was missing while printing any report with header in a non-English Language
+ * https://launchpad.net/bugs/425131
+   * Better translation exportation.
+ * https://launchpad.net/bugs/379645
+   * Print screen : Correction when text for report is already encoded
+ * https://launchpad.net/bugs/421162
+   * Send Mail : Unicode error handled
+   * Send mail : Non-English characters were throwing error.
+ * https://launchpad.net/bugs/421137
+   * Base : 'Supplier Partners' menu will open new record with supplier=1,customer=0
+ * https://launchpad.net/bugs/425430
+   * Export : Error solved while Exporting O2M records with None value of any field
+ * https://launchpad.net/bugs/399208
+   * Translation issue with cache: it needed to restart server,SOLVED
+ * https://launchpad.net/bugs/422563
+   * Security Loophole corrected
+
+
+Improvements (server)
+---------------------
+
+ * quality_integration_server: make link of extra-addons module in addons module automatic on install-module command
+ * quality_integration_server: get message from base_quality_module if module can not success to reach minimun score
+ * Rng : Accepting Groups under/after/replacing Buttons
+ * quality_integration_server : quality html log
+ * quality_integration_server: put max_limit in server connection
+ * Base : Rate for ARS Added
+ * cchange version number
+
+
+Bugfixes (addons)
+-----------------
+
+ * Not linked to a bug report:
+   * Purchase_manual : certificate on terp displayed wrong value
+   * fix the problem of message depending on the partner language
+   * fix a problem for the overdue payment message
+   * fix problem to get the detault message
+   * #416908 computation of invoice lines
+   * Project : Taks hours computed accurately.
+   * base_module_record: avoid duplications
+   * document: do not try to index binary documents
+   * +1 on the lengthmonth returns was too much, removed it
+   * Problem when using hr_holidays Summary Report when entering date 1 jan 2009 for example.
+   * multi currency reconciliations on bank statements weren't properly displayed
+   * multi currency payments weren't correctly computed on invoice's residual amount
+   * Project_gtd : Demo data defined for tasks(inboxes)
+   * Module:product Added report tag for product pricelist reportso that it can be modified using OODesigner
+   * Document : error on create if attachment not specified
+ * https://launchpad.net/bugs/422401
+   * project_gtd : timebox field re-arranged
+ * https://launchpad.net/bugs/421907
+   * Account : Aged Partner Balance report for Future analysis corrected
+ * https://launchpad.net/bugs/427388
+   * Project : task work behavior towards task hours corrected
+ * https://launchpad.net/bugs/422408
+   * Project_gtd : Hierarchical timeboxes allowed to open
+ * https://launchpad.net/bugs/403972
+   * Account : Reports from Chart of Accounts were not considering contextual value of MOVE(draft,posted)
+ * https://launchpad.net/bugs/430577
+   * Sale : Order Lines switches view from tree,form and view
+ * https://launchpad.net/bugs/425257
+   * Project_gtd : improved menuitems names to avoid user confusion,domain improved
+ * https://launchpad.net/bugs/422078
+   * Account_tax_include : floatdivision error corrected
+ * https://launchpad.net/bugs/423585
+ * https://launchpad.net/bugs/423581
+ * https://launchpad.net/bugs/416807
+   * report_document : Dashboard should not display partner with no files
+ * https://launchpad.net/bugs/430522
+ * https://launchpad.net/bugs/424214
+   * Account :Residual amount unclear when used with partial payments.
+ * https://launchpad.net/bugs/424177
+   * hr_timesheet_sheet : Rounding value problem in float_time widget
+ * https://launchpad.net/bugs/415056
+ * https://launchpad.net/bugs/421636
+   * added tooltip on tax and payment term
+ * https://launchpad.net/bugs/407290
+ * https://launchpad.net/bugs/407293
+   * Account : Making account.invoice.tax field language-depenant from account.tax
+ * https://launchpad.net/bugs/430043
+   * Hr_timesheet_invoice : Query calculation corrected
+ * https://launchpad.net/bugs/379645
+   * Base_report_creator : Print screen report is now available for custom reports
+ * https://launchpad.net/bugs/423260
+   * Account : Title of of Move Line widnows renamed
+ * https://launchpad.net/bugs/427982
+   * hr_timesheet_invoice : Invoicing analytic entries wizard corrected for product
+ * https://launchpad.net/bugs/426243
+   * Account : Context was missing in report
+ * https://launchpad.net/bugs/426831
+   * l10n_ch : default_value() of res.partner.bank corrected
+ * https://launchpad.net/bugs/430098
+   * Hr_holidays : Workflow actions validations corrected
+ * https://launchpad.net/bugs/430516
+ * https://launchpad.net/bugs/379191
+   * its better to aply the patch
+   * fix the problem for related fields, related fields act as a many2one fields
+ * https://launchpad.net/bugs/429203
+   * CRM : Mailgate script used default uid=3 instead of 1
+ * https://launchpad.net/bugs/399817
+   * Fixed Partial deliveries problem
+
+
+Improvements (addons)
+---------------------
+
+ * Invoice Supplier Control per line/manual
+ * add missing file for the followup date
+ * changed interval CRM calls to 4 hours instead of one -> efficient connection pooling with cron
+ * add inherited view for company
+ * add new filed to company object which will store the mesages
+ * add new data file which will add over due payment message to company
+ * Account : Analytic Account report following parental relationship approach(account with all its children
+ * hr_timesheet_invoice : Misleading string on invoice analytic entries' wizard
+ * base_module_quality: remove certificate tag from terp test
+ * report_dcoument : changed the misleading name of action
+
+
 2009-08-28: 5.0.4
 =================
 

From 0d7199a133edff51fdbd109b9337f67ba8699285 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Thu, 17 Sep 2009 15:23:35 +0200
Subject: [PATCH 33/74] [IMP] updated changelog file

bzr revid: olt@tinyerp.com-20090917132335-so2fugos4sutat90
---
 doc/Changelog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/Changelog b/doc/Changelog
index 53607a2b975..9ecc752e9ff 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -13,6 +13,7 @@ Bugfixes (server)
    * regression in fields.function computation
    * better log error, new line
    * Report: context was missing while printing any report with header in a non-English Language
+   * quality_integration_server: fixe problem on make link of extra-module in addons
  * https://launchpad.net/bugs/425131
    * Better translation exportation.
  * https://launchpad.net/bugs/379645

From a0c0cb3bca6c0a6d9d45cceda03a41fed1cdcbc1 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Thu, 17 Sep 2009 15:53:46 +0200
Subject: [PATCH 34/74] [IMP] updated release.py to 5.0.5

bzr revid: olt@tinyerp.com-20090917135346-9vylvoy89xoffkep
---
 bin/release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/release.py b/bin/release.py
index 158af8793e4..f26d235c5e1 100644
--- a/bin/release.py
+++ b/bin/release.py
@@ -22,7 +22,7 @@
 ##############################################################################
 
 name = 'openerp-server'
-version = '5.0.5-bzr'
+version = '5.0.5'
 major_version = '5.0'
 description = 'OpenERP Server'
 long_desc = '''\

From 35ca7bf8a746180743701efeaadf67e3c9d9d20c Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Fri, 18 Sep 2009 11:39:13 +0530
Subject: [PATCH 35/74] [FIX] Account_followup : Sending email while sending
 follow up corrected.

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

bzr revid: jvo@tinyerp.com-20090918060913-v05i5qp2468o3ufv
---
 .../account_followup/wizard/wizard_followup_print.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/account_followup/wizard/wizard_followup_print.py b/addons/account_followup/wizard/wizard_followup_print.py
index 70f90f2d6ae..7729d267365 100644
--- a/addons/account_followup/wizard/wizard_followup_print.py
+++ b/addons/account_followup/wizard/wizard_followup_print.py
@@ -179,7 +179,7 @@ class followup_all_print(wizard.interface):
                 l = '--------------------------------------------------------------------------------------------------------------------------'
                 head = l+ '\n' + 'Date'.rjust(10) + '\t' + 'Description'.rjust(10) + '\t' + 'Ref'.rjust(10) + '\t' + 'Maturity date'.rjust(10) + '\t' + 'Due'.rjust(10) + '\t' + 'Paid'.rjust(10) + '\t' + 'Maturity'.rjust(10) + '\t' + 'Litigation'.rjust(10) + '\n' + l
                 for i in data_lines:
-                    maturity = ''
+                    maturity = 0.00
                     if i.date_maturity < time.strftime('%Y-%m-%d') and (i.debit - i.credit):
                         maturity = i.debit - i.credit
                     subtotal_due = subtotal_due + i.debit
@@ -200,7 +200,7 @@ class followup_all_print(wizard.interface):
                     'date':time.strftime('%Y-%m-%d'),
                 }
                 body = body%val
-                sub = str(data['form']['email_subject'])
+                sub = tools.ustr(data['form']['email_subject'])
                 msg = ''
                 if dest:
                     tools.email_send(src,dest,sub,body)
@@ -209,15 +209,15 @@ class followup_all_print(wizard.interface):
                     msg += partner.name + '\n'
                     msg_unsent += msg
             if not msg_unsent:
-                summary = _("All emails have been successfully sent to Partners:.\n\n") + msg_sent
+                summary = _("All E-mails have been successfully sent to Partners:.\n\n") + msg_sent
             else:
-                msg_unsent = _("Mail not sent to following Partners, Email not available !\n\n") + msg_unsent
-                msg_sent = msg_sent and _("\n\nMail sent to following Partners successfully, !\n\n") + msg_sent
+                msg_unsent = _("E-Mail not sent to following Partners, Email not available !\n\n") + msg_unsent
+                msg_sent = msg_sent and _("\n\nE-Mail sent to following Partners successfully. !\n\n") + msg_sent
                 line = '=========================================================================='
                 summary = msg_unsent + line + msg_sent
             return {'summary' : summary}
         else:
-            return {'summary' : '\n\n\nMail not sent to any partner if you want to sent it please tick send email confirmation on wizard'}
+            return {'summary' : '\n\n\nE-Mail has not been sent to any partner. If you want to send it, please tick send email confirmation on wizard.'}
 
     def _get_partners(self, cr, uid, data, context):
         pool = pooler.get_pool(cr.dbname)

From 62749f58231d3dcb6ceef161f846fdb3b39782ba Mon Sep 17 00:00:00 2001
From: "GPA(Open ERP)" <>
Date: Fri, 18 Sep 2009 16:03:21 +0530
Subject: [PATCH 36/74] [FIX] Account : Move line creation was giving encoding
 error while automated entries were inserted,corrected

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

bzr revid: jvo@tinyerp.com-20090918103321-duidpcu12b358dlv
---
 addons/account/account_move_line.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 1ed28ff2588..d7c098de206 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -28,6 +28,8 @@ from tools.translate import _
 import mx.DateTime
 from mx.DateTime import RelativeDateTime, now, DateTime, localtime
 
+import tools
+
 class account_move_line(osv.osv):
     _name = "account.move.line"
     _description = "Entry lines"
@@ -908,7 +910,7 @@ class account_move_line(osv.osv):
                         'move_id': vals['move_id'],
                         'journal_id': vals['journal_id'],
                         'period_id': vals['period_id'],
-                        'name': vals['name']+' '+tax['name'],
+                        'name': tools.ustr(vals['name'] or '') + ' ' + tools.ustr(tax['name'] or ''),
                         'date': vals['date'],
                         'partner_id': vals.get('partner_id',False),
                         'ref': vals.get('ref',False),
@@ -927,7 +929,7 @@ class account_move_line(osv.osv):
                     'move_id': vals['move_id'],
                     'journal_id': vals['journal_id'],
                     'period_id': vals['period_id'],
-                    'name': vals['name']+' '+tax['name'],
+                    'name': tools.ustr(vals['name'] or '') + ' ' + tools.ustr(tax['name'] or ''),
                     'date': vals['date'],
                     'partner_id': vals.get('partner_id',False),
                     'ref': vals.get('ref',False),

From cc08f8e3d299736731f7b5ced33d6a89c8f2980e Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@tinyerp.com>
Date: Fri, 18 Sep 2009 14:28:07 +0200
Subject: [PATCH 37/74] [IMP] purchase: improve views to be directly usable in
 portals...

bzr revid: chs@tinyerp.com-20090918122807-s6iaqfw5htxs4poe
---
 addons/purchase/purchase_view.xml | 35 +++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index df971a84b04..972d91206f3 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -51,7 +51,18 @@
                             <field domain="[('type','=','purchase')]" name="pricelist_id"/>
                             <field name="partner_ref" select="2"/>
                             <newline/>
-                            <field colspan="4" name="order_line" nolabel="1"/>
+                            <field colspan="4" name="order_line" nolabel="1" mode="tree,form">
+                                <tree colors="red:date_planned&lt;=current_date" string="Purchase Order Lines">
+                                    <field name="date_planned"/>
+                                    <field name="name"/>
+                                    <field name="product_id"/>
+                                    <field name="product_qty"/>
+                                    <field name="product_uom"/>
+                                    <field name="price_unit"/>
+                                    <field name="price_subtotal"/>
+                                </tree>
+                                <!-- default form view -->
+                            </field>
                             <group col="7" colspan="4">
                                 <field name="amount_untaxed" sum="Untaxed amount"/>
                                 <field name="amount_tax"/>
@@ -71,7 +82,7 @@
                                 <button name="invoice_ok" states="except_invoice" string="Manually Corrected" icon="gtk-convert"/>
                             </group>
                         </page>
-                        <page string="Delivery &amp; Invoices">
+                        <page string="Delivery &amp; Invoices" groups="account.group_account_user">
                             <group colspan="2" col="2">
                                 <separator string="Delivery" colspan="2"/>
                                 <field name="dest_address_id" on_change="onchange_dest_address_id(dest_address_id)"/>
@@ -170,7 +181,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Purchase Order Line">
-                    <notebook>
+                    <notebook colspan="4">
                         <page string="Order Line">
                             <field colspan="4" context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order, parent.fiscal_position)"/>
                             <field context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" name="product_qty" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order, parent.fiscal_position)"/>
@@ -178,17 +189,21 @@
                             <field colspan="4" name="name"/>
                             <field name="date_planned"/>
                             <field name="price_unit"/>
-                            <field name="account_analytic_id"/>
+                            <label colspan="2"/>
                             <field name="price_subtotal" readonly="1"/>
-                            <field colspan="4" name="taxes_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','sale')]"/>
                         </page>
                         <page string="Notes">
                             <field colspan="4" name="notes" nolabel="1"/>
                         </page>
-                        <page string="History" groups="base.group_extended">
+                        <page string="History" groups="base.group_extended,stock.group_stock_user">
                                <separator colspan="4" string="Stock Moves"/>
                                <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
-                        </page>                        
+                        </page>
+                        <page string="Invoicing" groups="account.group_account_user">
+                            <field name="account_analytic_id" colspan="4"/>
+                            <separator colspan="4" string="Taxes"/>
+                            <field colspan="4" nolabel="1" name="taxes_id" domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
+                        </page>
                     </notebook>
                 </form>
             </field>
@@ -199,9 +214,11 @@
             <field name="model">purchase.order.line</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="red:date_planned&lt;=current_date" string="Purchase Order Line">
+                <tree colors="red:date_planned&lt;=current_date" string="Purchase Order Lines">
+                    <field name="order_id"/>
+                    <field name="date_order"/>
                     <field name="date_planned"/>
-                    <field name="name"/>
+                    <field name="partner_id"/>
                     <field name="product_id"/>
                     <field name="product_qty"/>
                     <field name="product_uom"/>

From 48b9c6e3336c520d349355f8e7e97d82176a5e9f Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@tinyerp.com>
Date: Fri, 18 Sep 2009 14:28:46 +0200
Subject: [PATCH 38/74] [IMP] purchase_manual: do not redefine view: add fields
 by inheritance...

bzr revid: chs@tinyerp.com-20090918122846-uplt55vy9egit6q5
---
 .../purchase_manual/purchase_manual_view.xml  | 76 ++++++++-----------
 1 file changed, 32 insertions(+), 44 deletions(-)

diff --git a/addons/purchase_manual/purchase_manual_view.xml b/addons/purchase_manual/purchase_manual_view.xml
index 5ef2d7ac3bb..de424bb17f6 100644
--- a/addons/purchase_manual/purchase_manual_view.xml
+++ b/addons/purchase_manual/purchase_manual_view.xml
@@ -5,43 +5,40 @@
         #
         # Define PO Line Views
         #
+        
+        <record id="purchase_order_form" model="ir.ui.view">
+            <field name="name">purchase.order.form</field>
+            <field name="model">purchase.order</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="purchase.purchase_order_form"/>
+            <field name="arch" type="xml">
+                    <xpath expr="/form/notebook/page[@string='Purchase Order']/field[@name='order_line']/tree/field[@name='price_subtotal']" position="after">
+                        <field name="invoiced"/>
+                        <field name="state"/>
+                    </xpath>
+            </field>
+        </record>
+
         <record id="purchase_order_line_form" model="ir.ui.view">
             <field name="name">purchase.order.line.form</field>
             <field name="model">purchase.order.line</field>
             <field name="type">form</field>
-            <field name="priority">20</field>
+            <field name="inherit_id" ref="purchase.purchase_order_line_form"/>
+            <field name="priority">17</field>
             <field name="arch" type="xml">
-                <form string="Purchase Order Line">
-                    <group colspan="4" col="6">
-                        <field name="order_id" select="1"/>
-                        <field name="partner_id" select="1"/>
-                        <field name="date_order" select="1"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Order Line">
-                            <field colspan="4" context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order, parent.fiscal_position)" select="1"/>
-                            <field context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" name="product_qty" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order, parent.fiscal_position)"/>
-                            <field name="product_uom" on_change="product_uom_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order)"/>
-                            <field colspan="4" name="name"/>
-                            <field name="date_planned" select="2"/>
-                            <field name="price_unit"/>
-                            <field name="account_analytic_id"/>
-                            <field name="price_subtotal" readonly="1"/>
-                            <field colspan="4" name="taxes_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','sale')]"/>
-                        </page>
-                        <page string="Notes">
-                            <field colspan="4" name="notes" nolabel="1"/>
-                        </page>
-                        <page string="History" groups="base.group_extended">
-                               <separator colspan="4" string="Stock Moves"/>
-                               <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
-                               <separator colspan="4" string="Manual Invoices"/>
-                               <field name="invoiced"/>
-                               <field name="state"/><newline/>
-                               <field colspan="4" name="invoice_lines" nolabel="1" widget="many2many"/>
-                        </page>
-                    </notebook>
-                </form>
+                <data>
+                    <xpath expr="/form/notebook/page[@string='Invoicing']" position="inside">
+                        <separator colspan="4" string="Manual Invoices"/>
+                        <field name="invoiced"/>
+                        <newline/>
+                        <field colspan="4" name="invoice_lines" nolabel="1" widget="many2many"/>
+                    </xpath>
+                    <xpath expr="/form/notebook" position="after">
+                        <group>
+                            <field name="state" />
+                        </group>
+                    </xpath>
+                </data>
             </field>
         </record>
 
@@ -49,20 +46,11 @@
             <field name="name">purchase.order.line.tree</field>
             <field name="model">purchase.order.line</field>
             <field name="type">tree</field>
-            <field name="priority">20</field>
+            <field name="inherit_id" ref="purchase.purchase_order_line_tree"/>
             <field name="arch" type="xml">
-                <tree colors="red:date_planned&lt;=current_date" string="Purchase Order Line">
-                    <field name="date_order"/>
-                    <field name="order_id"/>
-                    <field name="partner_id"/>
-                    <field name="product_id"/>
-                    <field name="product_qty"/>
-                    <field name="product_uom"/>
-                    <field name="price_unit"/>
-                    <field name="price_subtotal"/>
+                <field name="price_subtotal" position="after">
                     <field name="invoiced"/>
-                    <field name="date_planned"/>
-                </tree>
+                </field>
             </field>
         </record>
 

From 294d923ac23b31da7c96aac7f8d63ef9a3c867b3 Mon Sep 17 00:00:00 2001
From: "VRA(OpenERP)" <>
Date: Fri, 18 Sep 2009 19:07:46 +0530
Subject: [PATCH 39/74] [FIX] Sale_delivery_report : Delivery order report
 should take shipping address from picking itself

bzr revid: jvo@tinyerp.com-20090918133746-3oes2v0lb8je0rxs
---
 .../sale_delivery_report/report/shipping.py   | 54 +++++++++----------
 .../sale_delivery_report/report/shipping.rml  | 12 ++---
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/addons/sale_delivery_report/report/shipping.py b/addons/sale_delivery_report/report/shipping.py
index 9c7cc3a26f0..63aeba6c10c 100644
--- a/addons/sale_delivery_report/report/shipping.py
+++ b/addons/sale_delivery_report/report/shipping.py
@@ -30,35 +30,35 @@ class shipping(report_sxw.rml_parse):
         super(shipping, self).__init__(cr, uid, name, context)
         self.localcontext.update({
             'time': time,
-            'get_address': self._get_address,
-            'get_address_ship':self._get_address_ship
+#            'get_address': self._get_address,
+#            'get_address_ship':self._get_address_ship
         })
 
-    def _get_address(self,data):
-
-         self.cr.execute("select sp.id,sp.origin,sp.address_id,so.partner_id,rp.name as name2,so.partner_invoice_id,rpa.name,rpa.street as Street,rpa.city ,rpa.zip,rc.name as country " \
-                         "from sale_order as so, stock_picking as sp,res_partner rp,res_partner_address as rpa,res_country as rc " \
-                         "where sp.origin=so.name " \
-                         "and so.partner_id=rp.id " \
-                         "and so.partner_invoice_id=rpa.id  " \
-                         "and rpa.country_id=rc.id " \
-                         "and sp.id=%s", (data.id,))
-
-         add=self.cr.dictfetchall()
-         return add
-
-    def _get_address_ship(self,data):
-
-         self.cr.execute("select sp.id,sp.origin,sp.address_id,so.partner_id,rp.name as name2,so.partner_shipping_id,rpa.name,rpa.street as Street,rpa.city ,rpa.zip,rc.name as country " \
-                         "from sale_order as so, stock_picking as sp,res_partner rp,res_partner_address as rpa,res_country as rc " \
-                         "where sp.origin=so.name " \
-                         "and so.partner_id=rp.id " \
-                         "and so.partner_shipping_id=rpa.id  " \
-                         "and rpa.country_id=rc.id " \
-                         "and sp.id=%s", (data.id,))
-
-         ship=self.cr.dictfetchall()
-         return ship
+#    def _get_address(self,data):
+#
+#         self.cr.execute("select sp.id,sp.origin,sp.address_id,so.partner_id,rp.name as name2,so.partner_invoice_id,rpa.name,rpa.street as Street,rpa.city ,rpa.zip,rc.name as country " \
+#                         "from sale_order as so, stock_picking as sp,res_partner rp,res_partner_address as rpa,res_country as rc " \
+#                         "where sp.origin=so.name " \
+#                         "and so.partner_id=rp.id " \
+#                         "and so.partner_invoice_id=rpa.id  " \
+#                         "and rpa.country_id=rc.id " \
+#                         "and sp.id=%s", (data.id,))
+#
+#         add=self.cr.dictfetchall()
+#         return add
+#
+#    def _get_address_ship(self,data):
+#
+#         self.cr.execute("select sp.id,sp.origin,sp.address_id,so.partner_id,rp.name as name2,so.partner_shipping_id,rpa.name,rpa.street as Street,rpa.city ,rpa.zip,rc.name as country " \
+#                         "from sale_order as so, stock_picking as sp,res_partner rp,res_partner_address as rpa,res_country as rc " \
+#                         "where sp.origin=so.name " \
+#                         "and so.partner_id=rp.id " \
+#                         "and so.partner_shipping_id=rpa.id  " \
+#                         "and rpa.country_id=rc.id " \
+#                         "and sp.id=%s", (data.id,))
+#
+#         ship=self.cr.dictfetchall()
+#         return ship
 
 #    def _sum_total(self,data):
 #        print "======data=======",data
diff --git a/addons/sale_delivery_report/report/shipping.rml b/addons/sale_delivery_report/report/shipping.rml
index e9c26f0e6ae..c827cced55a 100644
--- a/addons/sale_delivery_report/report/shipping.rml
+++ b/addons/sale_delivery_report/report/shipping.rml
@@ -123,12 +123,12 @@
           <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.country_id and o.sale_id.partner_invoice_id.country_id.name or '']]</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_shipping_id and o.sale_id.partner_shipping_id.partner_id.name or '']]</para>
-          <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_shipping_id and o.sale_id.partner_shipping_id.name or '']]</para>
-          <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_shipping_id and o.sale_id.partner_shipping_id.street or '']]</para>
-          <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_shipping_id and o.sale_id.partner_shipping_id.zip or '']]</para>
-          <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_shipping_id and o.sale_id.partner_shipping_id.city or '']]</para>
-          <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_shipping_id and o.sale_id.partner_shipping_id.country_id and o.sale_id.partner_shipping_id.country_id.name or '']]</para>
+          <para style="terp_default_9">[[ o.address_id and o.address_id.partner_id and o.address_id.partner_id.name or '']]</para>
+          <para style="terp_default_9">[[ o.address_id and o.address_id.name or '']]</para>
+          <para style="terp_default_9">[[ o.address_id and o.address_id.street or '']]</para>
+          <para style="terp_default_9">[[ o.address_id and o.address_id.zip or '']]</para>
+          <para style="terp_default_9">[[ o.address_id and o.address_id.city or '']]</para>
+          <para style="terp_default_9">[[ o.address_id and o.address_id.country_id and o.address_id.country_id.name or '']]</para>
         </td>
       </tr>
     </blockTable>

From 20bc712f9c8658940f24126801b563431ca6e210 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Fri, 18 Sep 2009 19:25:56 +0530
Subject: [PATCH 40/74] [FIX] Price Accuracy : rounding made to be based on
 --price_accuracy option

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

bzr revid: jvo@tinyerp.com-20090918135556-lmun5j8d27437xkc
---
 bin/addons/base/res/res_currency.py | 3 ++-
 bin/osv/fields.py                   | 6 ++++++
 bin/osv/orm.py                      | 8 ++++++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/bin/addons/base/res/res_currency.py b/bin/addons/base/res/res_currency.py
index 7033abe7ec6..0ce4cbb3254 100644
--- a/bin/addons/base/res/res_currency.py
+++ b/bin/addons/base/res/res_currency.py
@@ -26,6 +26,7 @@ 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
@@ -67,7 +68,7 @@ class res_currency(osv.osv):
         if currency.rounding == 0:
             return 0.0
         else:
-            return round(amount / currency.rounding) * currency.rounding
+            return round(amount / currency.rounding, int(config['price_accuracy'])) * currency.rounding
 
     def is_zero(self, cr, uid, currency, amount):
         return abs(self.round(cr, uid, currency, amount)) < currency.rounding
diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index dbd37ec8a76..cde2a0e8ff4 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -607,6 +607,12 @@ class function(_column):
         self._multi = multi
         if 'relation' in args:
             self._obj = args['relation']
+            
+        if 'digits' in args:
+            self.digits = args['digits']
+        else:
+            self.digits = (16,2)    
+                
         self._fnct_inv_arg = fnct_inv_arg
         if not fnct_inv:
             self.readonly = 1
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index f5be539a6d6..26afced1669 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -299,7 +299,10 @@ def get_pg_type(f):
         t = eval('fields.'+(f._type))
         f_type = (type_dict[t], type_dict[t])
     elif isinstance(f, fields.function) and f._type == 'float':
-        f_type = ('float8', 'DOUBLE PRECISION')
+        if f.digits:
+            f_type = ('numeric', 'NUMERIC(%d,%d)' % (f.digits[0], f.digits[1]))
+        else:
+            f_type = ('float8', 'DOUBLE PRECISION')
     elif isinstance(f, fields.function) and f._type == 'selection':
         f_type = ('text', 'text')
     elif isinstance(f, fields.function) and f._type == 'char':
@@ -997,9 +1000,10 @@ class orm_template(object):
                     attrs = {'views': views}
                     if node.hasAttribute('widget') and node.getAttribute('widget')=='selection':
                         # We can not use the 'string' domain has it is defined according to the record !
-                        dom = None
+                        dom = []
                         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:
                             attrs['selection'].append((False,''))

From 758b7ed2854e5be2ca710cf0ddbdc25fb52e1455 Mon Sep 17 00:00:00 2001
From: "SME(Tiny/Axelor)" <>
Date: Fri, 18 Sep 2009 19:30:22 +0530
Subject: [PATCH 41/74] [FIX] Account : Rounding problem based on
 price_accuracy

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

bzr revid: jvo@tinyerp.com-20090918140022-demflhtd2gs6r19r
---
 addons/account/account.py | 31 ++++++++++++++++---------------
 addons/account/invoice.py | 24 ++++++++++++------------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index b6dd4bfb11b..85dc85fd2d8 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -30,6 +30,7 @@ import pooler
 import mx.DateTime
 from mx.DateTime import RelativeDateTime, now, DateTime, localtime
 
+from tools import config
 
 class account_payment_term(osv.osv):
     _name = "account.payment.term"
@@ -53,11 +54,11 @@ class account_payment_term(osv.osv):
         result = []
         for line in pt.line_ids:
             if line.value == 'fixed':
-                amt = round(line.value_amount, 2)
+                amt = round(line.value_amount, int(config['price_accuracy']))
             elif line.value == 'procent':
-                amt = round(value * line.value_amount, 2)
+                amt = round(value * line.value_amount, int(config['price_accuracy']))
             elif line.value == 'balance':
-                amt = round(amount, 2)
+                amt = round(amount, int(config['price_accuracy']))
             if amt:
                 next_date = mx.DateTime.strptime(date_ref, '%Y-%m-%d') + RelativeDateTime(days=line.days)
                 if line.days2 < 0:
@@ -267,9 +268,9 @@ class account_account(osv.osv):
         'child_parent_ids': fields.one2many('account.account','parent_id','Children'),
         'child_consol_ids': fields.many2many('account.account', 'account_account_consol_rel', 'child_id', 'parent_id', 'Consolidated Children'),
         'child_id': fields.function(_get_child_ids, method=True, type='many2many', relation="account.account", string="Child Accounts"),
-        'balance': fields.function(__compute, digits=(16, 2), method=True, string='Balance', multi='balance'),
-        'credit': fields.function(__compute, digits=(16, 2), method=True, string='Credit', multi='balance'),
-        'debit': fields.function(__compute, digits=(16, 2), method=True, string='Debit', multi='balance'),
+        'balance': fields.function(__compute, digits=(16, int(config['price_accuracy'])), method=True, string='Balance', multi='balance'),
+        'credit': fields.function(__compute, digits=(16, int(config['price_accuracy'])), method=True, string='Credit', multi='balance'),
+        'debit': fields.function(__compute, digits=(16, int(config['price_accuracy'])), method=True, string='Debit', multi='balance'),
         'reconcile': fields.boolean('Reconcile', help="Check this if the user is allowed to reconcile entries in this account."),
         'shortcut': fields.char('Shortcut', size=12),
         'tax_ids': fields.many2many('account.tax', 'account_account_tax_default_rel',
@@ -743,7 +744,7 @@ class account_move(osv.osv):
         'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}),
         'to_check': fields.boolean('To Be Verified'),
         'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner"),
-        'amount': fields.function(_amount_compute, method=True, string='Amount', digits=(16,2)),
+        'amount': fields.function(_amount_compute, method=True, string='Amount', digits=(16,int(config['price_accuracy']))),
         'date': fields.date('Date', required=True),
         'type': fields.selection([
             ('pay_voucher','Cash Payment'),
@@ -1109,7 +1110,7 @@ class account_tax_code(osv.osv):
                 for rec in record.child_ids:
                     amount += _rec_get(rec) * rec.sign
                 return amount
-            res[record.id] = round(_rec_get(record), 2)
+            res[record.id] = round(_rec_get(record), int(config['price_accuracy']))
         return res
 
     def _sum_year(self, cr, uid, ids, name, args, context):
@@ -1380,9 +1381,9 @@ class account_tax(osv.osv):
         total = 0.0
         for r in res:
             if r.get('balance',False):
-                r['amount'] = round(r['balance'] * quantity, 2) - total
+                r['amount'] = round(r['balance'] * quantity, int(config['price_accuracy'])) - total
             else:
-                r['amount'] = round(r['amount'] * quantity, 2)
+                r['amount'] = round(r['amount'] * quantity, int(config['price_accuracy']))
                 total += r['amount']
 
         return res
@@ -1477,9 +1478,9 @@ class account_tax(osv.osv):
         total = 0.0
         for r in res:
             if r.get('balance',False):
-                r['amount'] = round(r['balance'] * quantity, 2) - total
+                r['amount'] = round(r['balance'] * quantity, int(config['price_accuracy'])) - total
             else:
-                r['amount'] = round(r['amount'] * quantity, 2)
+                r['amount'] = round(r['amount'] * quantity, int(config['price_accuracy']))
                 total += r['amount']
         return res
 account_tax()
@@ -1545,9 +1546,9 @@ class account_model_line(osv.osv):
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the resources from lower sequences to higher ones"),
-        'quantity': fields.float('Quantity', digits=(16,2), help="The optional quantity on entries"),
-        'debit': fields.float('Debit', digits=(16,2)),
-        'credit': fields.float('Credit', digits=(16,2)),
+        'quantity': fields.float('Quantity', digits=(16, int(config['price_accuracy'])), help="The optional quantity on entries"),
+        'debit': fields.float('Debit', digits=(16, int(config['price_accuracy']))),
+        'credit': fields.float('Credit', digits=(16, int(config['price_accuracy']))),
 
         'account_id': fields.many2one('account.account', 'Account', required=True, ondelete="cascade"),
 
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 467bf02f661..559f0a88156 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -233,21 +233,21 @@ class account_invoice(osv.osv):
         'tax_line': fields.one2many('account.invoice.tax', 'invoice_id', 'Tax Lines', readonly=True, states={'draft':[('readonly',False)]}),
 
         'move_id': fields.many2one('account.move', 'Invoice Movement', readonly=True, help="Link to the automatically generated account moves."),
-        'amount_untaxed': fields.function(_amount_all, method=True, digits=(16,2),string='Untaxed',
+        'amount_untaxed': fields.function(_amount_all, method=True, digits=(16, int(config['price_accuracy'])),string='Untaxed',
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20),
                 'account.invoice.tax': (_get_invoice_tax, None, 20),
                 'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount'], 20),
             },
             multi='all'),
-        'amount_tax': fields.function(_amount_all, method=True, digits=(16,2), string='Tax',
+        'amount_tax': fields.function(_amount_all, method=True, digits=(16, int(config['price_accuracy'])), string='Tax',
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20),
                 'account.invoice.tax': (_get_invoice_tax, None, 20),
                 'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount'], 20),
             },
             multi='all'),
-        'amount_total': fields.function(_amount_all, method=True, digits=(16,2), string='Total',
+        'amount_total': fields.function(_amount_all, method=True, digits=(16, int(config['price_accuracy'])), string='Total',
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20),
                 'account.invoice.tax': (_get_invoice_tax, None, 20),
@@ -257,7 +257,7 @@ class account_invoice(osv.osv):
         'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True,readonly=True, states={'draft':[('readonly',False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=True),
-        'check_total': fields.float('Total', digits=(16,2), states={'open':[('readonly',True)],'close':[('readonly',True)]}),
+        'check_total': fields.float('Total', digits=(16, int(config['price_accuracy'])), states={'open':[('readonly',True)],'close':[('readonly',True)]}),
         'reconciled': fields.function(_reconciled, method=True, string='Paid/Reconciled', type='boolean',
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, None, 50), # Check if we can remove ?
@@ -267,7 +267,7 @@ class account_invoice(osv.osv):
         'partner_bank': fields.many2one('res.partner.bank', 'Bank Account',
             help='The bank account to pay to or to be paid from'),
         'move_lines':fields.function(_get_lines , method=True,type='many2many' , relation='account.move.line',string='Move Lines'),
-        'residual': fields.function(_amount_residual, method=True, digits=(16,2),string='Residual',
+        'residual': fields.function(_amount_residual, method=True, digits=(16, int(config['price_accuracy'])),string='Residual',
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 50),
                 'account.invoice.tax': (_get_invoice_tax, None, 50),
@@ -916,7 +916,7 @@ class account_invoice_line(osv.osv):
                 cur = line.invoice_id.currency_id
                 res[line.id] = cur_obj.round(cr, uid, cur, res[line.id])
             else:
-                res[line.id] = round(line.price_unit * line.quantity * (1-(line.discount or 0.0)/100.0),2)
+                res[line.id] = round(line.price_unit * line.quantity * (1-(line.discount or 0.0)/100.0),int(config['price_accuracy']))
         return res
 
 
@@ -948,9 +948,9 @@ class account_invoice_line(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', ondelete='set null'),
         'account_id': fields.many2one('account.account', 'Account', required=True, domain=[('type','<>','view'), ('type', '<>', 'closed')], help="The income or expense account related to the selected product."),
         'price_unit': fields.float('Unit Price', required=True, digits=(16, int(config['price_accuracy']))),
-        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal',store=True),
+        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal',store=True, type="float", digits=(16, int(config['price_accuracy']))),
         'quantity': fields.float('Quantity', required=True),
-        'discount': fields.float('Discount (%)', digits=(16,2)),
+        'discount': fields.float('Discount (%)', digits=(16, int(config['price_accuracy']))),
         'invoice_line_tax_id': fields.many2many('account.tax', 'account_invoice_line_tax', 'invoice_line_id', 'tax_id', 'Taxes', domain=[('parent_id','=',False)]),
         'note': fields.text('Notes'),
         'account_analytic_id':  fields.many2one('account.analytic.account', 'Analytic Account'),
@@ -1100,15 +1100,15 @@ class account_invoice_tax(osv.osv):
         'invoice_id': fields.many2one('account.invoice', 'Invoice Line', ondelete='cascade', select=True),
         'name': fields.char('Tax Description', size=64, required=True),
         'account_id': fields.many2one('account.account', 'Tax Account', required=True, domain=[('type','<>','view'),('type','<>','income'), ('type', '<>', 'closed')]),
-        'base': fields.float('Base', digits=(16,2)),
-        'amount': fields.float('Amount', digits=(16,2)),
+        'base': fields.float('Base', digits=(16,int(config['price_accuracy']))),
+        'amount': fields.float('Amount', digits=(16,int(config['price_accuracy']))),
         'manual': fields.boolean('Manual'),
         'sequence': fields.integer('Sequence'),
 
         'base_code_id': fields.many2one('account.tax.code', 'Base Code', help="The account basis of the tax declaration."),
-        'base_amount': fields.float('Base Code Amount', digits=(16,2)),
+        'base_amount': fields.float('Base Code Amount', digits=(16,int(config['price_accuracy']))),
         '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,2)),
+        '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')

From dbf72b286f784e1eb951e540a9f83f7e5740ceec Mon Sep 17 00:00:00 2001
From: "VRA(Open ERP)" <>
Date: Fri, 18 Sep 2009 20:11:54 +0530
Subject: [PATCH 42/74] [FIX] Sale : SO Boolean field picked behavior corrected

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

bzr revid: jvo@tinyerp.com-20090918144154-q61g8bwi6szzg42k
---
 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 6b50cd3cb48..c660120356c 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -520,7 +520,7 @@ class sale_order(osv.osv):
                         pending_deliveries = True
                 
                 if ((not line.procurement_id) or (line.procurement_id.state=='done')) and not pending_deliveries:
-                    finished = True
+#                    finished = True
                     if line.state != 'done':
                         write_done_ids.append(line.id)
                 else:

From 9dee415befbb6739b9d1cb60bc5f3e5614acc966 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Mon, 21 Sep 2009 10:59:34 +0200
Subject: [PATCH 44/74] [FIX] fixed an "unsupported operand type(s) for +:
 'bool' and 'str'" error.

bzr revid: olt@tinyerp.com-20090921085934-zgzbsgopwdbcbjhx
---
 addons/purchase/wizard/wizard_group.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/purchase/wizard/wizard_group.py b/addons/purchase/wizard/wizard_group.py
index 65c09f33593..6add3ad99f8 100644
--- a/addons/purchase/wizard/wizard_group.py
+++ b/addons/purchase/wizard/wizard_group.py
@@ -40,7 +40,7 @@ merge_form = """<?xml version="1.0"?>
       - lines will only be merged if:
         * they are exactly the same except for the quantity and unit</label>
 </form>
-""" 
+"""
 
 merge_fields = {
 }
@@ -98,9 +98,9 @@ def _merge_orders(self, cr, uid, data, context):
         else:
             #order_infos['name'] += ', %s' % porder.name
             if porder.notes:
-                order_infos['notes'] += ('\n%s' % (porder.notes,))
+                order_infos['notes'] = (order_infos['notes'] or '') + ('\n%s' % (porder.notes,))
             if porder.origin:
-                order_infos['origin'] = order_infos['origin'] + ' ' + porder.origin
+                order_infos['origin'] = (order_infos['origin'] or '') + ' ' + porder.origin
 
         for order_line in porder.order_line:
             line_key = make_key(order_line, ('name', 'date_planned', 'taxes_id', 'price_unit', 'notes', 'product_id', 'move_dest_id', 'account_analytic_id'))
@@ -156,7 +156,7 @@ class merge_orders(wizard.interface):
     states = {
         'init': {
             'actions': [],
-            'result': {'type': 'form', 'arch' : merge_form, 'fields' : merge_fields, 'state' : [('end', 'Cancel'), ('merge', 'Merge orders') ]}
+            'result': {'type': 'form', 'arch': merge_form, 'fields' : merge_fields, 'state' : [('end', 'Cancel'), ('merge', 'Merge orders') ]}
         },
         'merge': {
             'actions': [],

From 3180ca5f741dd1869acb13847ade7081568ec8a0 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Tue, 22 Sep 2009 10:34:49 +0530
Subject: [PATCH 45/74] [FIX][CRITICAL]document: crash list of directory after
 rev:hmo@tinyerp.com-20090916110722-4kl5t5q71im6c76i

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

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

diff --git a/addons/document/document.py b/addons/document/document.py
index 082ea0144da..1d7ca841576 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -338,7 +338,8 @@ class document_directory(osv.osv):
             object2: the other object linked (if object.directory.content)
     """
     def get_object(self, cr, uid, uri, context={}):        
-        #TODO : set user's context_lang in context        
+        #TODO : set user's context_lang in context  
+        context.update({'lang':False})      
         if not uri:
             return node_class(cr, uid, '', False, context=context, type='database')
         turi = tuple(uri)

From 60550c799db802f68c9fa0f55b5996885101695e Mon Sep 17 00:00:00 2001
From: "GPA(Open ERP)" <>
Date: Tue, 22 Sep 2009 10:49:11 +0530
Subject: [PATCH 46/74] [FIX] hr_timesheet_sheet : casting correction for a
 view

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

bzr revid: jvo@tinyerp.com-20090922051911-6ujs6cwfgegmqxfe
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 3fbf615ad18..bff8e6189bc 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -576,7 +576,7 @@ class hr_timesheet_sheet_sheet_day(osv.osv):
                 sheet_id,
                 total_timesheet,
                 total_attendance,
-                round(cast((total_attendance - total_timesheet) as Numeric),2) AS total_difference
+                cast(round(cast(total_attendance - total_timesheet as Numeric),2) as Double Precision) AS total_difference
             FROM
                 ((
                     SELECT

From 48a8d1f0a1f0089d35d6349db25eaf5369f4e120 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Tue, 22 Sep 2009 11:07:03 +0530
Subject: [PATCH 47/74] [FIX] Fields.function : Store value computation
 corrected

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

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

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 26afced1669..cf215adf12e 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -2706,6 +2706,8 @@ class orm(orm_template):
         for fnct in range(len(fncts)):
             if fncts[fnct][3]:
                 ok = False
+                if not fields:
+                    ok = True
                 for f in (fields or []):
                     if f in fncts[fnct][3]:
                         ok = True

From f4dd75aeae4d82cdb2648cc0f5cbb6dab5f64517 Mon Sep 17 00:00:00 2001
From: "Nicolas Bessi(C2C)" <>
Date: Tue, 22 Sep 2009 12:12:56 +0530
Subject: [PATCH 48/74] [FIX] Sale : Delivery Date delay computation made
 corrected when days are passed with fractions

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

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

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index c660120356c..b33736714ca 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -554,8 +554,8 @@ class sale_order(osv.osv):
             picking_id = False
             for line in order.order_line:
                 proc_id = False
-                date_planned = DateTime.now() + DateTime.RelativeDateTime(days=line.delay or 0.0)
-                date_planned = (date_planned - DateTime.RelativeDateTime(days=company.security_lead)).strftime('%Y-%m-%d %H:%M:%S')
+                date_planned = DateTime.now() + DateTime.DateTimeDeltaFromDays(line.delay or 0.0)
+                date_planned = (date_planned - DateTime.DateTimeDeltaFromDays(company.security_lead)).strftime('%Y-%m-%d %H:%M:%S')
                 if line.state == 'done':
                     continue
                 if line.product_id and line.product_id.product_tmpl_id.type in ('product', 'consu'):

From 8a86e56dbeb429521d6be8a17bc89872aa315d37 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@tinyerp.com>
Date: Tue, 22 Sep 2009 10:02:54 +0200
Subject: [PATCH 50/74] [FIX] account_analytic_plans: avoid encoding errors

bzr revid: chs@tinyerp.com-20090922080254-3bxtb47sf7fjv810
---
 addons/account_analytic_plans/account_analytic_plans.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index 393c681dc01..790e2c25cc0 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -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'])
+                doc = dom.minidom.parseString(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 10a0116ab3bbefb8d26c855bc1d29f62a555fbe5 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Tue, 22 Sep 2009 11:56:22 +0200
Subject: [PATCH 52/74] [REL] release.py: 5.0.6

bzr revid: olt@tinyerp.com-20090922095622-n618d3pjdlcqx2tm
---
 bin/release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/release.py b/bin/release.py
index f26d235c5e1..935d2136460 100644
--- a/bin/release.py
+++ b/bin/release.py
@@ -22,7 +22,7 @@
 ##############################################################################
 
 name = 'openerp-server'
-version = '5.0.5'
+version = '5.0.6'
 major_version = '5.0'
 description = 'OpenERP Server'
 long_desc = '''\

From 605e3786cee22317c325df74bd04b519aea06d86 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Tue, 22 Sep 2009 13:18:15 +0200
Subject: [PATCH 56/74] [IMP] updated changelog file for 5.0.6 release

bzr revid: olt@tinyerp.com-20090922111815-je0c161jzeoeeaqn
---
 doc/Changelog | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index 9ecc752e9ff..e8866ff37b1 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,4 +1,46 @@
 
+2009-09-22: 5.0.6
+=================
+
+Bugfixes (server)
+-----------------
+
+ * https://launchpad.net/bugs/421904
+   * Fields.function : Store value computation corrected
+ * https://launchpad.net/bugs/407332
+   * Price Accuracy : rounding made to be based on --price_accuracy option
+
+Bugfixes (addons)
+-----------------
+
+ * Not linked to a bug report:
+   * fixed an "unsupported operand type(s) for +: 'bool' and 'str'" error.
+   * Sale_delivery_report : Delivery order report should take shipping address from picking itself
+   * account: bugfixed the fiscalyear closing wizard:
+   * Purchase_manual : certificate on terp displayed wrong value
+ * https://launchpad.net/bugs/431864
+   * hr_timesheet_sheet : casting correction for a view
+ * https://launchpad.net/bugs/431871
+   * Account : Move line creation was giving encoding error while automated entries were inserted,corrected
+ * https://launchpad.net/bugs/433979
+   * [CRITICAL]document: crash list of directory after rev:hmo@tinyerp.com-20090916110722-4kl5t5q71im6c76i
+ * https://launchpad.net/bugs/407332
+   * Account : Rounding problem based on price_accuracy
+ * https://launchpad.net/bugs/419720
+   * Sale : Delivery Date delay computation made corrected when days are passed with fractions
+ * https://launchpad.net/bugs/423726
+   * Sale : SO Boolean field picked behavior corrected
+ * https://launchpad.net/bugs/431821
+   * Account_followup : Sending email while sending follow up corrected.
+
+
+Improvements (addons)
+---------------------
+
+ * purchase_manual: do not redefine view: add fields by inheritance...
+ * purchase: improve views to be directly usable in portals...
+
+
 2009-09-17: 5.0.5
 =================
 

From 03d8be3790f38c5aef3e48908ce94a00ec169a99 Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Tue, 22 Sep 2009 19:44:47 +0530
Subject: [PATCH 57/74] [FIX] base_module_quality: speed test if read method
 has exception

bzr revid: mra@tinyerp.com-20090922141447-e22fbytnhwtokuqs
---
 .../speed_test/speed_test.py                  | 53 +++++++++++--------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/addons/base_module_quality/speed_test/speed_test.py b/addons/base_module_quality/speed_test/speed_test.py
index 875b2de136a..29252cab8b1 100644
--- a/addons/base_module_quality/speed_test/speed_test.py
+++ b/addons/base_module_quality/speed_test/speed_test.py
@@ -64,6 +64,9 @@ This test checks the speed of the module. Note that at least 5 demo data is need
         result_dict2 = {}
         self.result_details += _("<html>O(1) means that the number of SQL requests to read the object does not depand on the number of objects we are reading. This feature is hardly wished.\n</html>")
         for obj, ids in obj_ids.items():
+            code_base_complexity = 0
+            code_half_complexity = 0
+            code_size_complexity = 0
             obj_counter += 1
             ids = ids[:100]
             size = len(ids)
@@ -71,34 +74,38 @@ This test checks the speed of the module. Note that at least 5 demo data is need
             if size:
                 speed_list = []
                 #we perform the operation twice, and count the number of queries in the second run. This allows to avoid the cache effect. (like translated terms that asks for more queries)
-                pool.get(obj).read(cr, uid, [ids[0]])
-                cnt = cr.count
-                pool.get(obj).read(cr, uid, [ids[0]])
-                code_base_complexity = cr.count - cnt
+                try:
+                    pool.get(obj).read(cr, uid, [ids[0]])
+                    cnt = cr.count
+                    pool.get(obj).read(cr, uid, [ids[0]])
+                    code_base_complexity = cr.count - cnt
 
-                pool.get(obj).read(cr, uid, ids[:size/2])
-                cnt = cr.count
-                pool.get(obj).read(cr, uid, ids[:size/2])
-                code_half_complexity = cr.count - cnt
+                    pool.get(obj).read(cr, uid, ids[:size/2])
+                    cnt = cr.count
+                    pool.get(obj).read(cr, uid, ids[:size/2])
+                    code_half_complexity = cr.count - cnt
 
-                pool.get(obj).read(cr, uid, ids)
-                cnt = cr.count
-                pool.get(obj).read(cr, uid, ids)
-                code_size_complexity = cr.count - cnt
-
-                if size < 5:
-                    speed_list = [obj, size, code_base_complexity, code_half_complexity, code_size_complexity, _("Warning! Not enough demo data")]
-                    list2 = [obj, _("No enough data")]
+                    pool.get(obj).read(cr, uid, ids)
+                    cnt = cr.count
+                    pool.get(obj).read(cr, uid, ids)
+                    code_size_complexity = cr.count - cnt
+                except Exception, e:
+                    list2 = [obj, _("Error in Read method")]
+                    speed_list = [obj, size, code_base_complexity, code_half_complexity, code_size_complexity, _("Error in Read method:" + str(e))]
                 else:
-                    if code_size_complexity <= (code_base_complexity + size):
-                        complexity = _("O(1)")
-                        score += 1
-                        list2 = [obj, _("Efficient")]
+                    if size < 5:
+                        speed_list = [obj, size, code_base_complexity, code_half_complexity, code_size_complexity, _("Warning! Not enough demo data")]
+                        list2 = [obj, _("No enough data")]
                     else:
-                        complexity = _("O(n) or worst")
-                        list2 = [obj, _("Not Efficient")]
+                        if code_size_complexity <= (code_base_complexity + size):
+                            complexity = _("O(1)")
+                            score += 1
+                            list2 = [obj, _("Efficient")]
+                        else:
+                            complexity = _("O(n) or worst")
+                            list2 = [obj, _("Not Efficient")]
 
-                    speed_list = [obj, size, code_base_complexity, code_half_complexity, code_size_complexity, complexity]
+                        speed_list = [obj, size, code_base_complexity, code_half_complexity, code_size_complexity, complexity]
             else:
                 speed_list = [obj, size, "", "", "", _("Warning! Object has no demo data")]
                 list2 = [obj, _("No data")]

From c9e3a815805ce0aed04022581a6cd67943c7d577 Mon Sep 17 00:00:00 2001
From: "Sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 23 Sep 2009 12:42:36 +0530
Subject: [PATCH 58/74] [FIX] set the access right

bzr revid: sbh@tinyerp.com-20090923071236-uq53il4x6tchh81w
---
 addons/base_report_designer/__terp__.py          |  4 ++--
 addons/base_report_designer/base_report_data.xml | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/addons/base_report_designer/__terp__.py b/addons/base_report_designer/__terp__.py
index c66be0ec379..9782fba2786 100644
--- a/addons/base_report_designer/__terp__.py
+++ b/addons/base_report_designer/__terp__.py
@@ -32,9 +32,9 @@ OpenOffice.
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': [],
+    'init_xml': ['base_report_data.xml'],
     'update_xml': ['base_report_designer_wizard.xml'],
-    'demo_xml': ['base_report_data.xml'],
+    'demo_xml': [],
     'installable': True,
     'active': False,
     'certificate': '0056379010493',
diff --git a/addons/base_report_designer/base_report_data.xml b/addons/base_report_designer/base_report_data.xml
index 865a1181a22..3ad137ab649 100644
--- a/addons/base_report_designer/base_report_data.xml
+++ b/addons/base_report_designer/base_report_data.xml
@@ -7,5 +7,15 @@
 			<field eval="[(6,0,[ref('base.user_root')])]" name="users"/>
 			<field eval="&quot;&quot;&quot;OpenOfficeReportDesigner&quot;&quot;&quot;" name="name"/>
 		</record>
+
+		<record id="ir_model_access_openofficereportdesigner0" model="ir.model.access">
+			<field name="model_id" ref="base.model_ir_actions_report_xml"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;OpenOfficeReportDesigner&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_openofficereportdesinger0"/>
+		</record>
 	</data>
 </openerp>

From 0d741b110be463a76215611bca0054cf4afaadf7 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Wed, 23 Sep 2009 18:22:31 +0530
Subject: [PATCH 59/74] [FIX][CRITICAL]subscription: crash subscription process

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

bzr revid: hmo@tinyerp.com-20090923125231-skjg2hkhw3tbvdsz
---
 addons/subscription/subscription.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/subscription/subscription.py b/addons/subscription/subscription.py
index a6242321ca8..7c4c80f03be 100644
--- a/addons/subscription/subscription.py
+++ b/addons/subscription/subscription.py
@@ -98,6 +98,8 @@ class subscription_subscription(osv.osv):
 
     def model_copy(self, cr, uid, ids, context={}):
         for row in self.read(cr, uid, ids):
+            if not row.get('cron_id',False):
+                continue
             cron_ids = [row['cron_id'][0]]
             remaining = self.pool.get('ir.cron').read(cr, uid, cron_ids, ['numbercall'])[0]['numbercall']
             try:

From f8383842135329c0c100bc654d7cba562b51c894 Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Thu, 24 Sep 2009 16:20:25 +0530
Subject: [PATCH 60/74] [IMP] base_module_quality: pylint test result display
 for buildpot, use class on tag instead of css file

bzr revid: mra@tinyerp.com-20090924105025-m65dbnc37zi0p1vd
---
 .../pylint_test/pylint_test.py                | 43 ++++++++++++++++---
 1 file changed, 36 insertions(+), 7 deletions(-)

diff --git a/addons/base_module_quality/pylint_test/pylint_test.py b/addons/base_module_quality/pylint_test/pylint_test.py
index c8ba4b77a3c..7873924de13 100644
--- a/addons/base_module_quality/pylint_test/pylint_test.py
+++ b/addons/base_module_quality/pylint_test/pylint_test.py
@@ -48,11 +48,29 @@ class quality_test(base_module_quality.abstract_quality_check):
         score = 0.0
         dict_py = {}
         flag = False
-        self.result_details += '''<html>
-        <head>
-            <link rel="stylesheet" type="text/css" href="/tg_widgets/openerp/css/wiki.css" media="all">
-        </head>
-        <body>'''
+        self.result_details += '''<html><body><head>
+        <style>
+            .bstyle
+            {
+            border-width:2px;
+            border-style:dashed;
+            border-color: gray;
+            }
+            .btstyle
+            {
+            border-width:2px;
+            border-style:solid;
+            border-color: gray;
+            }
+            .head
+            {
+            color: black;background: none;font-weight: normal;margin: 0;padding-top: .5em;
+            padding-bottom: .17em; border-bottom: 1px solid #aaa;
+            }
+            }
+      </style>
+
+        '''
         for file_py in list_files:
             if file_py.split('.')[-1] == 'py' and not file_py.endswith('__init__.py') and not file_py.endswith('__terp__.py'):
                 if not flag:
@@ -84,8 +102,19 @@ class quality_test(base_module_quality.abstract_quality_check):
                     score += 0
                     #self.result += file + ": "+_("Unable to parse the result. Check the details.")+"\n"
                     dict_py[file_py] = [file_py, _("Unable to parse the result. Check the details.")]
-                self.result_details += res.replace('''<div''', '''<div class="wikiwidget readonlyfield"''')
-
+                replace_string = ''
+                replace_string += res
+                replace_string = replace_string.replace('''<div''', '''<div style="border:1px solid #aaaaaa;background-color:#f9f9f9;padding:5px;"''')
+                replace_string = replace_string.replace('''<h1''', '''<h1 style="font-size:188%" class="head" ''')
+                replace_string = replace_string.replace('''<h2''', '''<h2 style="font-size:150%" class="head" ''')
+                replace_string = replace_string.replace('''<h3''', '''<h3 style="font-size:132%" class="head" ''')
+                replace_string = replace_string.replace('''<h4''', '''<h4 style="font-size:116%" class="head" ''')
+                replace_string = replace_string.replace('''<h5''', '''<h5 style="font-size:100%" class="head" ''')
+                replace_string = replace_string.replace('''<h6''', '''<h6 style="font-size:80%" class="head" ''')
+                replace_string = replace_string.replace('''<table''', '''<table class="bstyle" ''')
+                replace_string = replace_string.replace('''<th''', '''<th class="btstyle" ''')
+                replace_string = replace_string.replace('''<td''', '''<td class="btstyle" ''')
+                self.result_details += replace_string
         if not flag:
             self.error = True
             self.result = _("No python file found")

From 48cad3549282beb06747aaa63caa91a5ffa12260 Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Thu, 24 Sep 2009 17:54:48 +0530
Subject: [PATCH 61/74] [IMP] base_module_quality: modify all tests result
 display for buildpot, use class on tag instead of css file

bzr revid: mra@tinyerp.com-20090924122448-iw771j32awal2b2u
---
 .../object_test/object_test.py                | 42 ++++++++++++++++---
 .../pep8_test/pep8_test.py                    | 21 +++++++++-
 .../speed_test/speed_test.py                  | 20 ++++++++-
 .../structure_test/structure_test.py          | 20 ++++++++-
 .../terp_test/terp_test.py                    | 20 ++++++++-
 .../workflow_test/workflow_test.py            | 20 ++++++++-
 6 files changed, 128 insertions(+), 15 deletions(-)

diff --git a/addons/base_module_quality/object_test/object_test.py b/addons/base_module_quality/object_test/object_test.py
index d319d3f3a50..ada0b944cb4 100644
--- a/addons/base_module_quality/object_test/object_test.py
+++ b/addons/base_module_quality/object_test/object_test.py
@@ -184,9 +184,24 @@ Test checks for fields, views, security rules, dependancy level
     def get_result_details(self, dict_obj):
         res = ""
         if dict_obj != {}:
-            str_html = '''<html><strong> Fields Result</strong><head></head><body>'''
+            str_html = '''<html><strong> Fields Result</strong><head>
+            <style>
+                .bstyle
+                {
+                border-width:2px;
+                border-style:dashed;
+                border-color: gray;
+                }
+                .btstyle
+                {
+                border-width:2px;
+                border-style:solid;
+                border-color: gray;
+                }
+                }
+           </style></head><body>'''
             res += str_html
-            header = ('<tr><th width="200">%s</th><th width="200">%s</th><th width="300">%s</th></tr>', [_('Object Name'), _('Field name'), _('Suggestion')])
+            header = ('<tr><th class="btstyle">%s</th><th class="btstyle">%s</th><th class="btstyle">%s</th></tr>', [_('Object Name'), _('Field name'), _('Suggestion')])
             if not self.error:
                 for key in dict_obj.keys():
                     data_list = []
@@ -196,15 +211,32 @@ Test checks for fields, views, security rules, dependancy level
                     for i in data_list:
                         count = count + 1
                         final_dict[key + str(count)] = i
-                    res += '<table>' + self.format_html_table(header, data_list=final_dict) + '</table><br>'
+                    res_str = '<table class="bstyle">' + self.format_html_table(header, data_list=final_dict) + '</table><br>'
+                    res += res_str.replace('''<td''', '''<td class="btstyle" ''')
             return res + '</body></html>'
         return ""
 
     def get_result_general(self, dict_obj, name=''):
-        str_html = '''<html><strong> %s Result</strong><head></head><body><table>'''% (name)
-        header = ('<tr><th>%s</th><th>%s</th></tr>', [_('Object Name'), _('Suggestion')])
+        str_html = '''<html><strong> %s Result</strong><head>
+            <style>
+                .bstyle
+                {
+                border-width:2px;
+                border-style:dashed;
+                border-color: gray;
+                }
+                .btstyle
+                {
+                border-width:2px;
+                border-style:solid;
+                border-color: gray;
+                }
+                }
+           </style></head><body><table class="bstyle">'''% (name)
+        header = ('<tr><th class="btstyle">%s</th><th class="btstyle">%s</th></tr>', [_('Object Name'), _('Suggestion')])
         if not self.error:
             res = str_html + self.format_html_table(header, data_list=dict_obj) + '</table></body></html>'
+            res = res.replace('''<td''', '''<td class="btstyle" ''')
             return res
         return ""
 
diff --git a/addons/base_module_quality/pep8_test/pep8_test.py b/addons/base_module_quality/pep8_test/pep8_test.py
index f45b9516498..92e73c65881 100644
--- a/addons/base_module_quality/pep8_test/pep8_test.py
+++ b/addons/base_module_quality/pep8_test/pep8_test.py
@@ -271,10 +271,27 @@ PEP-8 Test , copyright of py files check, method can not call from loops
         return ""
 
     def get_result_general(self, dict_obj):
-        str_html = '''<html><strong>Result</strong><head></head><body><table>'''
-        header = ('<tr><th>%s</th><th>%s</th><th>%s</th></tr>', [_('Object Name'), _('Line number'), _('Suggestion')])
+        str_html = '''<html><strong>Result</strong><head>
+            <style>
+                .bstyle
+                {
+                border-width:2px;
+                border-style:dashed;
+                border-color: gray;
+                }
+                .btstyle
+                {
+                border-width:2px;
+                border-style:solid;
+                border-color: gray;
+                }
+                }
+          </style>
+          </head><body><table class="bstyle">'''
+        header = ('<tr><th class="btstyle">%s</th><th class="btstyle">%s</th><th class="btstyle">%s</th></tr>', [_('Object Name'), _('Line number'), _('Suggestion')])
         if not self.error:
             res = str_html + self.format_html_table(header, data_list=dict_obj) + '</table></body></html>'
+            res = res.replace('''<td''', '''<td class="btstyle" ''')
             return res
         return ""
 
diff --git a/addons/base_module_quality/speed_test/speed_test.py b/addons/base_module_quality/speed_test/speed_test.py
index 29252cab8b1..7db411b6310 100644
--- a/addons/base_module_quality/speed_test/speed_test.py
+++ b/addons/base_module_quality/speed_test/speed_test.py
@@ -125,10 +125,26 @@ This test checks the speed of the module. Note that at least 5 demo data is need
         return ""
 
     def get_result_details(self, dict_speed):
-        str_html = '''<html><head></head><body><table border="1">'''
-        header = ('<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th></tr>', [_('Object Name'), _('N (Number of Records)'), _('1'), _('N/2'), _('N'), _('Reading Complexity')])
+        str_html = '''<html><head>
+        <style>
+            .bstyle
+            {
+            border-width:2px;
+            border-style:dashed;
+            border-color: gray;
+            }
+            .btstyle
+            {
+            border-width:2px;
+            border-style:solid;
+            border-color: gray;
+            }
+            }
+       </style></head><body><table class="bstyle">'''
+        header = ('<tr><th class="btstyle" >%s</th><th class="btstyle">%s</th><th class="btstyle">%s</th><th class="btstyle">%s</th><th class="btstyle">%s</th><th class="btstyle">%s</th></tr>', [_('Object Name'), _('N (Number of Records)'), _('1'), _('N/2'), _('N'), _('Reading Complexity')])
         if not self.error:
             res = str_html + self.format_html_table(header, data_list=dict_speed) + '</table></body></html>'
+            res = res.replace('''<td''', '''<td class="btstyle" ''')
             return res
         return ""
 
diff --git a/addons/base_module_quality/structure_test/structure_test.py b/addons/base_module_quality/structure_test/structure_test.py
index e89c68cdefb..5c43d3a0e10 100644
--- a/addons/base_module_quality/structure_test/structure_test.py
+++ b/addons/base_module_quality/structure_test/structure_test.py
@@ -170,10 +170,26 @@ This test checks if the module satisfy tiny structure
         return score
 
     def get_result_details(self, dict_struct):
-        str_html = '''<html><head></head><body><table>'''
-        header = ('<tr><th>%s</th><th>%s</th></tr>', [_('File Name'), _('Feedback about structure of module')])
+        str_html = '''<html><head>
+        <style>
+            .bstyle
+            {
+            border-width:2px;
+            border-style:dashed;
+            border-color: gray;
+            }
+            .btstyle
+            {
+            border-width:2px;
+            border-style:solid;
+            border-color: gray;
+            }
+            }
+          </style></head><body><table class="bstyle">'''
+        header = ('<tr><th class="btstyle">%s</th><th class="btstyle">%s</th></tr>', [_('File Name'), _('Feedback about structure of module')])
         if not self.error:
             res = str_html + self.format_html_table(header, data_list=dict_struct) + '</table></body></html>'
+            res = res.replace('''<td''', '''<td class="btstyle" ''')
             return res
         return ""
 
diff --git a/addons/base_module_quality/terp_test/terp_test.py b/addons/base_module_quality/terp_test/terp_test.py
index 298c8626d92..fe6234eb903 100644
--- a/addons/base_module_quality/terp_test/terp_test.py
+++ b/addons/base_module_quality/terp_test/terp_test.py
@@ -137,10 +137,26 @@ class quality_test(base_module_quality.abstract_quality_check):
 
     def get_result_details(self, dict_terp):
         if dict_terp:
-            str_html = '''<html><head></head><body><table border="1">'''
-            header = ('<tr><th>%s</th><th>%s</th></tr>', [_('Tag Name'), _('Feed back About terp file of Module')])
+            str_html = '''<html><head>
+            <style>
+                .bstyle
+                {
+                border-width:2px;
+                border-style:dashed;
+                border-color: gray;
+                }
+                .btstyle
+                {
+                border-width:2px;
+                border-style:solid;
+                border-color: gray;
+                }
+                }
+          </style></head><body><table class="bstyle">'''
+            header = ('<tr><th class="btstyle">%s</th><th class="btstyle">%s</th></tr>', [_('Tag Name'), _('Feed back About terp file of Module')])
             if not self.error:
                 res = str_html + self.format_html_table(header, data_list=dict_terp) + '</table><newline/></body></html>'
+                res = res.replace('''<td''', '''<td class="btstyle" ''')
                 return res
         return ""
 
diff --git a/addons/base_module_quality/workflow_test/workflow_test.py b/addons/base_module_quality/workflow_test/workflow_test.py
index d31b13f1087..ae2ffb6cc69 100644
--- a/addons/base_module_quality/workflow_test/workflow_test.py
+++ b/addons/base_module_quality/workflow_test/workflow_test.py
@@ -134,10 +134,26 @@ class quality_test(base_module_quality.abstract_quality_check):
         return ""
 
     def get_result_details(self, dict_wf):
-        str_html = '''<html><head></head><body><table border="1">'''
-        header = ('<tr><th>%s</th><th>%s</th></tr>', [_('Object Name'), _('Feed back About Workflow of Module')])
+        str_html = '''<html><head>
+        <style>
+            .bstyle
+            {
+            border-width:2px;
+            border-style:dashed;
+            border-color: gray;
+            }
+            .btstyle
+            {
+            border-width:2px;
+            border-style:solid;
+            border-color: gray;
+            }
+            }
+           </style></head><body><table class="bstyle">'''
+        header = ('<tr><th class="btstyle">%s</th><th class="btstyle">%s</th></tr>', [_('Object Name'), _('Feed back About Workflow of Module')])
         if not self.error:
             res = str_html + self.format_html_table(header, data_list=dict_wf) + '</table><newline/></body></html>'
+            res = res.replace('''<td''', '''<td class="btstyle" ''')
             return res
         return ""
 

From 45c8d1d93d75133ab067318d6e2bf54af94d5ae5 Mon Sep 17 00:00:00 2001
From: "VRA(OpenERP)" <>
Date: Thu, 24 Sep 2009 18:11:04 +0530
Subject: [PATCH 62/74] [FIX] Account : Partner Balance report gets printed
 with respect to the company selected

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

bzr revid: jvo@tinyerp.com-20090924124104-1jujc0yjssk1dlbb
---
 addons/account/report/partner_balance.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account/report/partner_balance.py b/addons/account/report/partner_balance.py
index 4551aca1ed4..ddd6ad1ecb4 100755
--- a/addons/account/report/partner_balance.py
+++ b/addons/account/report/partner_balance.py
@@ -217,6 +217,7 @@ class partner_balance(report_sxw.rml_parse):
                 "JOIN account_account ac ON (l.account_id = ac.id)" \
                 "WHERE ac.type IN " + self.ACCOUNT_TYPE + " " \
                     "AND l.date IN (" + self.date_lst_string + ") " \
+                    "AND ac.company_id = "+ str(data['form']['company_id']) +" " \
                 "GROUP BY p.id, p.ref, p.name,l.account_id,ac.name,ac.code " \
                 "ORDER BY l.account_id,p.name")
             res = self.cr.dictfetchall()

From 667d3f782d4dc042abb317d1cce7cf3f82b22134 Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Fri, 25 Sep 2009 14:53:07 +0200
Subject: [PATCH 63/74] Set right account when generating invoice

bzr revid: nel@tinyerp.com-20090925125307-1knaa2pc8r3hmxys
---
 addons/mrp_repair/mrp_repair.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index c5cefd61267..0c4ae3a6f48 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -300,7 +300,7 @@ class mrp_repair(osv.osv):
                             'invoice_id': inv_id,
                             'name': name,
                             'origin':repair.name,
-                            'account_id': a,
+                            'account_id': operation.product_id and operation.product_id.property_account_income and operation.produc        t_id.property_account_income.id,
                             'quantity' : operation.product_uom_qty,
                             'invoice_line_tax_id': [(6,0,[x.id for x in operation.tax_id])],
                             'uos_id' : operation.product_uom.id,

From 872b75d4f3c7e6708dc8b419dfca6ad56c832b99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Borja=20L=C3=B3pez=20Soil=C3=A1n=20=28Pexego=29?= <>
Date: Fri, 25 Sep 2009 18:58:13 +0530
Subject: [PATCH 64/74] [FIX] Sale: Passing Contact address for invoices from
 SO

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

bzr revid: jvo@tinyerp.com-20090925132813-jrhul80rsxdo6aay
---
 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 b33736714ca..52e25c603dd 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -374,7 +374,7 @@ class sale_order(osv.osv):
             'account_id': a,
             'partner_id': order.partner_id.id,
             'address_invoice_id': order.partner_invoice_id.id,
-            'address_contact_id': order.partner_invoice_id.id,
+            'address_contact_id': order.partner_order_id.id,
             'invoice_line': [(6, 0, lines)],
             'currency_id': order.pricelist_id.currency_id.id,
             'comment': order.note,

From 0d897873892fb74090bfd193ce26a82f669b4783 Mon Sep 17 00:00:00 2001
From: "YSA(OpenERP)" <>
Date: Fri, 25 Sep 2009 19:19:42 +0530
Subject: [PATCH 65/74] [FIX] Document: attachment linked with Files

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

bzr revid: jvo@tinyerp.com-20090925134942-y663miys2ocgwi56
---
 addons/document/document.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/document/document.py b/addons/document/document.py
index 1d7ca841576..4b1a5c715e3 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -651,10 +651,11 @@ class document_file(osv.osv):
     def create(self, cr, uid, vals, context={}):
         vals['title']=vals['name']
         vals['parent_id'] = context.get('parent_id',False) or vals.get('parent_id',False)
-        if not vals.get('res_id', False) and context.get('default_res_id',False):
-            vals['res_id']=context.get('default_res_id',False)
-        if not vals.get('res_model', False) and context.get('default_res_model',False):
-            vals['res_model']=context.get('default_res_model',False)
+#        if not vals.get('res_id', False) and context.get('default_res_id',False):
+#            vals['res_id']=context.get('default_res_id',False)
+#        if not vals.get('res_model', False) and context.get('default_res_model',False):
+#            vals['res_model']=context.get('default_res_model',False)
+        vals['res_model'] = "report.document.user"
         if vals.get('res_id', False) and vals.get('res_model',False):
             obj_model=self.pool.get(vals['res_model'])
             result = obj_model.read(cr, uid, [vals['res_id']], context=context)
@@ -693,7 +694,8 @@ class document_file(osv.osv):
         try:
             res = content_index(base64.decodestring(datas), vals['datas_fname'], vals.get('content_type', None))
             super(document_file,self).write(cr, uid, [result], {
-                'index_content': res,
+                'index_content' : res,
+                'res_id' : result
             })
             cr.commit()
         except:

From c4120d295abcc5c7fee85306a691aed75574bc2e Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Fri, 25 Sep 2009 15:51:48 +0200
Subject: [PATCH 66/74] [REM] spaces

bzr revid: nel@tinyerp.com-20090925135148-15p33532ds8abxa4
---
 addons/mrp_repair/mrp_repair.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 0c4ae3a6f48..a34f6c844b6 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -300,7 +300,7 @@ class mrp_repair(osv.osv):
                             'invoice_id': inv_id,
                             'name': name,
                             'origin':repair.name,
-                            'account_id': operation.product_id and operation.product_id.property_account_income and operation.produc        t_id.property_account_income.id,
+                            'account_id': operation.product_id and operation.product_id.property_account_income and operation.product_id.property_account_income.id,
                             'quantity' : operation.product_uom_qty,
                             'invoice_line_tax_id': [(6,0,[x.id for x in operation.tax_id])],
                             'uos_id' : operation.product_uom.id,

From b51701a4f22a9cf5b21e14f802207d4cf24a3893 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Fri, 25 Sep 2009 20:51:24 +0530
Subject: [PATCH 67/74] [FIX] Account: Supplier invoices was not taking product
 price on onchange of product

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

bzr revid: jvo@tinyerp.com-20090925152124-kmh3iiikco7e8asg
---
 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 6d14f25427c..8822568ef00 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -52,7 +52,7 @@
                 <form string="Invoice Line">
                     <notebook>
                         <page string="Line">
-                            <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position)" select="1"/>
+                            <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit)" select="1"/>
                             <field name="uos_id"/>
                             <field name="quantity" select="1"/>
                             <field name="price_unit" select="1"/>

From 059077b108328d694836a8d23b0f01b840bdbef7 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Fri, 25 Sep 2009 21:02:35 +0530
Subject: [PATCH 68/74] [FIX] mrp : workcentre load report had a query
 malformed

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

bzr revid: jvo@tinyerp.com-20090925153235-4mihi5g1gesfx5us
---
 addons/mrp/report/workcenter_load.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp/report/workcenter_load.py b/addons/mrp/report/workcenter_load.py
index 2bb1572d170..48a94bbff02 100644
--- a/addons/mrp/report/workcenter_load.py
+++ b/addons/mrp/report/workcenter_load.py
@@ -101,7 +101,7 @@ class report_custom(report_int):
         colors = choice_colors(len(ids))
         ids_str = ','.join(map(str, ids))
         cr.execute(
-            "SELECT MAX(date_planned) AS stop "\
+            "SELECT MAX(mrp_production.date_planned) AS stop "\
             "FROM mrp_workcenter, mrp_production, mrp_production_workcenter_line "\
             "WHERE mrp_production_workcenter_line.production_id=mrp_production.id "\
             "AND mrp_production_workcenter_line.workcenter_id=mrp_workcenter.id "\

From 570e8dbc4b762d97e7e00762a67e03737d4091bf Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 28 Sep 2009 16:24:06 +0200
Subject: [PATCH 69/74] [FIX] workcenter load graph

bzr revid: fp@tinyerp.com-20090928142406-bzvef0e2afweq4u9
---
 addons/mrp/report/workcenter_load.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/mrp/report/workcenter_load.py b/addons/mrp/report/workcenter_load.py
index 2bb1572d170..46d0d34628a 100644
--- a/addons/mrp/report/workcenter_load.py
+++ b/addons/mrp/report/workcenter_load.py
@@ -35,7 +35,7 @@ theme.use_color = 1
 random.seed(0)
 
 #
-# Pinky: Bad code, seems buggy, TO CHECK !
+# TODO: Bad code, seems buggy, TO CHECK !
 #
 
 class external_pdf(render):
@@ -101,7 +101,7 @@ class report_custom(report_int):
         colors = choice_colors(len(ids))
         ids_str = ','.join(map(str, ids))
         cr.execute(
-            "SELECT MAX(date_planned) AS stop "\
+            "SELECT MAX(mrp_production.date_planned) AS stop,MIN(mrp_production.date_planned) AS start "\
             "FROM mrp_workcenter, mrp_production, mrp_production_workcenter_line "\
             "WHERE mrp_production_workcenter_line.production_id=mrp_production.id "\
             "AND mrp_production_workcenter_line.workcenter_id=mrp_workcenter.id "\
@@ -109,8 +109,10 @@ class report_custom(report_int):
             "AND mrp_workcenter.id IN (%s)" % ids_str)
         res = cr.dictfetchone()
         if not res['stop']:
-            res['stop'] = time.strftime('%Y-%m-%d')
-        dates = self._compute_dates(datas['form']['time_unit'], time.strftime('%Y-%m-%d'), res['stop'][:10])
+            res['stop'] = time.strftime('%Y-%m-%d %H:%M:%S')
+        if not res['start']:
+            res['start'] = time.strftime('%Y-%m-%d %H:%M:%S')
+        dates = self._compute_dates(datas['form']['time_unit'], res['start'][:10], res['stop'][:10])
         dates_list = dates.keys()
         dates_list.sort()
         x_index = []
@@ -174,8 +176,8 @@ class report_custom(report_int):
             workcenter_num += 1
 
         #plot = bar_plot.T(label=workcenter['name'], data=data, hcol=1, fill_style=fill_style.white, cluster=(color_index,len(ids)))
-        if (len(data[0]) <= 1):
-            ar = self._empty_graph(data[0][0])
+        if (not data) or (len(data[0]) <= 1):
+            ar = self._empty_graph(time.strftime('%Y-%m-%d'))
         ar.draw(can)
         # close canvas so that the file is written to "disk"
         can.close()

From 6898b2230a2eb1a837dc0c349d0cc4f332344e49 Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Tue, 29 Sep 2009 13:58:04 +0200
Subject: [PATCH 70/74] set product id on move lines

bzr revid: nel@tinyerp.com-20090929115804-9we1ivhac1ayzbuk
---
 addons/stock/stock.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 039dfdd99fd..1d7b69c6b3a 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1266,6 +1266,7 @@ class stock_move(osv.osv):
                             (0, 0, {
                                 'name': move.name,
                                 'quantity': move.product_qty,
+                                'product_id': move.product_id and move.product_id.id or False,
                                 'credit': amount,
                                 'account_id': acc_src,
                                 'ref': ref,
@@ -1273,6 +1274,7 @@ class stock_move(osv.osv):
                                 'partner_id': partner_id}),
                             (0, 0, {
                                 'name': move.name,
+                                'product_id': move.product_id and move.product_id.id or False,
                                 'quantity': move.product_qty,
                                 'debit': amount,
                                 'account_id': acc_dest,

From 34645503b72e0e7196f98f0ebca0902009afddba Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Tue, 29 Sep 2009 17:50:27 +0530
Subject: [PATCH 71/74] [IMP] base_module_quality: styles on different tests

bzr revid: mra@tinyerp.com-20090929122027-8e01uw61dwax00h3
---
 .../base_module_quality.py                    | 32 +++++++++++++
 .../object_test/object_test.py                | 48 ++++---------------
 .../pep8_test/pep8_test.py                    | 22 ++-------
 .../pylint_test/pylint_test.py                | 36 +++-----------
 .../speed_test/speed_test.py                  | 21 ++------
 .../structure_test/structure_test.py          | 26 ++--------
 .../terp_test/terp_test.py                    | 23 ++-------
 addons/base_module_quality/wizard/__init__.py |  2 -
 .../workflow_test/workflow_test.py            | 21 ++------
 9 files changed, 65 insertions(+), 166 deletions(-)

diff --git a/addons/base_module_quality/base_module_quality.py b/addons/base_module_quality/base_module_quality.py
index d584177a993..70568090439 100644
--- a/addons/base_module_quality/base_module_quality.py
+++ b/addons/base_module_quality/base_module_quality.py
@@ -161,6 +161,38 @@ class abstract_quality_check(object):
     def add_quatation(self, x_no, y_no):
         return x_no/y_no
 
+    def get_style(self):
+        # This function return style tag with specified styles for html pages
+        style = '''
+            <style>
+                .divstyle {
+                border:1px solid #aaaaaa;
+                background-color:#f9f9f9;
+                padding:5px;
+                }
+                .tablestyle
+                {
+                border:1px dashed gray;
+                }
+                .tdatastyle
+                {
+                border:0.5px solid gray;
+                }
+                .head
+                {
+                color: black;
+                background: none;
+                font-weight: normal;
+                margin: 0;
+                padding-top: .5em;
+                padding-bottom: .17em;
+                border-bottom: 1px solid #aaa;
+                }
+                }
+          </style> '''
+        return style
+
+
 class module_quality_check(osv.osv):
     _name = 'module.quality.check'
     _columns = {
diff --git a/addons/base_module_quality/object_test/object_test.py b/addons/base_module_quality/object_test/object_test.py
index ada0b944cb4..87329b480c7 100644
--- a/addons/base_module_quality/object_test/object_test.py
+++ b/addons/base_module_quality/object_test/object_test.py
@@ -40,7 +40,6 @@ Test checks for fields, views, security rules, dependancy level
         return None
 
     def run_test(self, cr, uid, module_path):
-
         pool = pooler.get_pool(cr.dbname)
         module_name = module_path.split('/')[-1]
         obj_list = self.get_objects(cr, uid, module_name)
@@ -184,24 +183,9 @@ Test checks for fields, views, security rules, dependancy level
     def get_result_details(self, dict_obj):
         res = ""
         if dict_obj != {}:
-            str_html = '''<html><strong> Fields Result</strong><head>
-            <style>
-                .bstyle
-                {
-                border-width:2px;
-                border-style:dashed;
-                border-color: gray;
-                }
-                .btstyle
-                {
-                border-width:2px;
-                border-style:solid;
-                border-color: gray;
-                }
-                }
-           </style></head><body>'''
+            str_html = '''<html><strong> Fields Result</strong><head>%s</head><body>'''%(self.get_style())
             res += str_html
-            header = ('<tr><th class="btstyle">%s</th><th class="btstyle">%s</th><th class="btstyle">%s</th></tr>', [_('Object Name'), _('Field name'), _('Suggestion')])
+            header = ('<tr><th class="tdatastyle">%s</th><th class="tdatastyle">%s</th><th class="tdatastyle">%s</th></tr>', [_('Object Name'), _('Field name'), _('Suggestion')])
             if not self.error:
                 for key in dict_obj.keys():
                     data_list = []
@@ -211,34 +195,18 @@ Test checks for fields, views, security rules, dependancy level
                     for i in data_list:
                         count = count + 1
                         final_dict[key + str(count)] = i
-                    res_str = '<table class="bstyle">' + self.format_html_table(header, data_list=final_dict) + '</table><br>'
-                    res += res_str.replace('''<td''', '''<td class="btstyle" ''')
+                    res_str = '<table class="tablestyle">' + self.format_html_table(header, data_list=final_dict) + '</table><br>'
+                    res += res_str.replace('''<td''', '''<td class="tdatastyle" ''')
             return res + '</body></html>'
         return ""
 
     def get_result_general(self, dict_obj, name=''):
-        str_html = '''<html><strong> %s Result</strong><head>
-            <style>
-                .bstyle
-                {
-                border-width:2px;
-                border-style:dashed;
-                border-color: gray;
-                }
-                .btstyle
-                {
-                border-width:2px;
-                border-style:solid;
-                border-color: gray;
-                }
-                }
-           </style></head><body><table class="bstyle">'''% (name)
-        header = ('<tr><th class="btstyle">%s</th><th class="btstyle">%s</th></tr>', [_('Object Name'), _('Suggestion')])
+        str_html = '''<html><strong> %s Result</strong><head>%s</head><body><table class="tablestyle">'''% (name, self.get_style())
+        header = ('<tr><th class="tdatastyle">%s</th><th class="tdatastyle">%s</th></tr>', [_('Object Name'), _('Suggestion')])
         if not self.error:
             res = str_html + self.format_html_table(header, data_list=dict_obj) + '</table></body></html>'
-            res = res.replace('''<td''', '''<td class="btstyle" ''')
+            res = res.replace('''<td''', '''<td class="tdatastyle" ''')
             return res
         return ""
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/base_module_quality/pep8_test/pep8_test.py b/addons/base_module_quality/pep8_test/pep8_test.py
index 92e73c65881..25358db0a64 100644
--- a/addons/base_module_quality/pep8_test/pep8_test.py
+++ b/addons/base_module_quality/pep8_test/pep8_test.py
@@ -271,27 +271,11 @@ PEP-8 Test , copyright of py files check, method can not call from loops
         return ""
 
     def get_result_general(self, dict_obj):
-        str_html = '''<html><strong>Result</strong><head>
-            <style>
-                .bstyle
-                {
-                border-width:2px;
-                border-style:dashed;
-                border-color: gray;
-                }
-                .btstyle
-                {
-                border-width:2px;
-                border-style:solid;
-                border-color: gray;
-                }
-                }
-          </style>
-          </head><body><table class="bstyle">'''
-        header = ('<tr><th class="btstyle">%s</th><th class="btstyle">%s</th><th class="btstyle">%s</th></tr>', [_('Object Name'), _('Line number'), _('Suggestion')])
+        str_html = '''<html><strong>Result</strong><head>%s</head><body><table class="tablestyle">'''%(self.get_style())
+        header = ('<tr><th class="tdatastyle">%s</th><th class="tdatastyle">%s</th><th class="tdatastyle">%s</th></tr>', [_('Object Name'), _('Line number'), _('Suggestion')])
         if not self.error:
             res = str_html + self.format_html_table(header, data_list=dict_obj) + '</table></body></html>'
-            res = res.replace('''<td''', '''<td class="btstyle" ''')
+            res = res.replace('''<td''', '''<td class="tdatastyle" ''')
             return res
         return ""
 
diff --git a/addons/base_module_quality/pylint_test/pylint_test.py b/addons/base_module_quality/pylint_test/pylint_test.py
index 7873924de13..6a9d15dfdd3 100644
--- a/addons/base_module_quality/pylint_test/pylint_test.py
+++ b/addons/base_module_quality/pylint_test/pylint_test.py
@@ -48,29 +48,7 @@ class quality_test(base_module_quality.abstract_quality_check):
         score = 0.0
         dict_py = {}
         flag = False
-        self.result_details += '''<html><body><head>
-        <style>
-            .bstyle
-            {
-            border-width:2px;
-            border-style:dashed;
-            border-color: gray;
-            }
-            .btstyle
-            {
-            border-width:2px;
-            border-style:solid;
-            border-color: gray;
-            }
-            .head
-            {
-            color: black;background: none;font-weight: normal;margin: 0;padding-top: .5em;
-            padding-bottom: .17em; border-bottom: 1px solid #aaa;
-            }
-            }
-      </style>
-
-        '''
+        self.result_details += '''<html><body><head>%s</head>'''%(self.get_style())
         for file_py in list_files:
             if file_py.split('.')[-1] == 'py' and not file_py.endswith('__init__.py') and not file_py.endswith('__terp__.py'):
                 if not flag:
@@ -104,17 +82,18 @@ class quality_test(base_module_quality.abstract_quality_check):
                     dict_py[file_py] = [file_py, _("Unable to parse the result. Check the details.")]
                 replace_string = ''
                 replace_string += res
-                replace_string = replace_string.replace('''<div''', '''<div style="border:1px solid #aaaaaa;background-color:#f9f9f9;padding:5px;"''')
+                replace_string = replace_string.replace('''<div''', '''<div class="divstyle" ''')
                 replace_string = replace_string.replace('''<h1''', '''<h1 style="font-size:188%" class="head" ''')
                 replace_string = replace_string.replace('''<h2''', '''<h2 style="font-size:150%" class="head" ''')
                 replace_string = replace_string.replace('''<h3''', '''<h3 style="font-size:132%" class="head" ''')
                 replace_string = replace_string.replace('''<h4''', '''<h4 style="font-size:116%" class="head" ''')
                 replace_string = replace_string.replace('''<h5''', '''<h5 style="font-size:100%" class="head" ''')
                 replace_string = replace_string.replace('''<h6''', '''<h6 style="font-size:80%" class="head" ''')
-                replace_string = replace_string.replace('''<table''', '''<table class="bstyle" ''')
-                replace_string = replace_string.replace('''<th''', '''<th class="btstyle" ''')
-                replace_string = replace_string.replace('''<td''', '''<td class="btstyle" ''')
+                replace_string = replace_string.replace('''<table''', '''<table class="tablestyle" ''')
+                replace_string = replace_string.replace('''<th''', '''<th class="tdatastyle" ''')
+                replace_string = replace_string.replace('''<td''', '''<td class="tdatastyle" ''')
                 self.result_details += replace_string
+
         if not flag:
             self.error = True
             self.result = _("No python file found")
@@ -133,5 +112,4 @@ class quality_test(base_module_quality.abstract_quality_check):
             return self.format_table(header, data_list=dict_py)
         return ""
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/base_module_quality/speed_test/speed_test.py b/addons/base_module_quality/speed_test/speed_test.py
index 7db411b6310..afbcb6a0b12 100644
--- a/addons/base_module_quality/speed_test/speed_test.py
+++ b/addons/base_module_quality/speed_test/speed_test.py
@@ -125,26 +125,11 @@ This test checks the speed of the module. Note that at least 5 demo data is need
         return ""
 
     def get_result_details(self, dict_speed):
-        str_html = '''<html><head>
-        <style>
-            .bstyle
-            {
-            border-width:2px;
-            border-style:dashed;
-            border-color: gray;
-            }
-            .btstyle
-            {
-            border-width:2px;
-            border-style:solid;
-            border-color: gray;
-            }
-            }
-       </style></head><body><table class="bstyle">'''
-        header = ('<tr><th class="btstyle" >%s</th><th class="btstyle">%s</th><th class="btstyle">%s</th><th class="btstyle">%s</th><th class="btstyle">%s</th><th class="btstyle">%s</th></tr>', [_('Object Name'), _('N (Number of Records)'), _('1'), _('N/2'), _('N'), _('Reading Complexity')])
+        str_html = '''<html><head>%s</head><body><table class="tablestyle">'''%(self.get_style())
+        header = ('<tr><th class="tdatastyle" >%s</th><th class="tdatastyle">%s</th><th class="tdatastyle">%s</th><th class="tdatastyle">%s</th><th class="tdatastyle">%s</th><th class="tdatastyle">%s</th></tr>', [_('Object Name'), _('N (Number of Records)'), _('1'), _('N/2'), _('N'), _('Reading Complexity')])
         if not self.error:
             res = str_html + self.format_html_table(header, data_list=dict_speed) + '</table></body></html>'
-            res = res.replace('''<td''', '''<td class="btstyle" ''')
+            res = res.replace('''<td''', '''<td class="tdatastyle" ''')
             return res
         return ""
 
diff --git a/addons/base_module_quality/structure_test/structure_test.py b/addons/base_module_quality/structure_test/structure_test.py
index 5c43d3a0e10..00489ed9a40 100644
--- a/addons/base_module_quality/structure_test/structure_test.py
+++ b/addons/base_module_quality/structure_test/structure_test.py
@@ -23,6 +23,7 @@ import os
 
 from tools.translate import _
 from base_module_quality import base_module_quality
+import pooler
 
 class quality_test(base_module_quality.abstract_quality_check):
 
@@ -135,7 +136,6 @@ This test checks if the module satisfy tiny structure
         self.module_score +=  final_score
         self.score = self.module_score / (self.count)
         self.result = self.get_result({ module_name: [module_name, int(self.score*100)]})
-#        self.result_details += self.get_result_details(self.result_dict)
         return None
 
     def run_test(self, cr, uid, module_path):
@@ -170,28 +170,12 @@ This test checks if the module satisfy tiny structure
         return score
 
     def get_result_details(self, dict_struct):
-        str_html = '''<html><head>
-        <style>
-            .bstyle
-            {
-            border-width:2px;
-            border-style:dashed;
-            border-color: gray;
-            }
-            .btstyle
-            {
-            border-width:2px;
-            border-style:solid;
-            border-color: gray;
-            }
-            }
-          </style></head><body><table class="bstyle">'''
-        header = ('<tr><th class="btstyle">%s</th><th class="btstyle">%s</th></tr>', [_('File Name'), _('Feedback about structure of module')])
+        str_html = '''<html><head>%s</head><body><table class="tablestyle">'''%(self.get_style())
+        header = ('<tr><th class="tdatastyle">%s</th><th class="tdatastyle">%s</th></tr>', [_('File Name'), _('Feedback about structure of module')])
         if not self.error:
             res = str_html + self.format_html_table(header, data_list=dict_struct) + '</table></body></html>'
-            res = res.replace('''<td''', '''<td class="btstyle" ''')
+            res = res.replace('''<td''', '''<td class="tdatastyle" ''')
             return res
         return ""
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/base_module_quality/terp_test/terp_test.py b/addons/base_module_quality/terp_test/terp_test.py
index fe6234eb903..ba8227756d7 100644
--- a/addons/base_module_quality/terp_test/terp_test.py
+++ b/addons/base_module_quality/terp_test/terp_test.py
@@ -26,7 +26,6 @@ import re
 import tools
 from tools.translate import _
 from base_module_quality import base_module_quality
-import pooler
 
 class quality_test(base_module_quality.abstract_quality_check):
 
@@ -116,6 +115,7 @@ class quality_test(base_module_quality.abstract_quality_check):
 
         if result_dict1 or result_dict1:
             score = round((feel_good_factor) / float(feel_good_factor + feel_bad_factor), 2)
+
         self.result_details += self.get_result_details(result_dict)
         self.result_details += self.get_result_details(result_dict1)
         return [_('__terp__.py file'), score]
@@ -137,26 +137,11 @@ class quality_test(base_module_quality.abstract_quality_check):
 
     def get_result_details(self, dict_terp):
         if dict_terp:
-            str_html = '''<html><head>
-            <style>
-                .bstyle
-                {
-                border-width:2px;
-                border-style:dashed;
-                border-color: gray;
-                }
-                .btstyle
-                {
-                border-width:2px;
-                border-style:solid;
-                border-color: gray;
-                }
-                }
-          </style></head><body><table class="bstyle">'''
-            header = ('<tr><th class="btstyle">%s</th><th class="btstyle">%s</th></tr>', [_('Tag Name'), _('Feed back About terp file of Module')])
+            str_html = '''<html><head>%s</head><body><table class="tablestyle">'''%(self.get_style())
+            header = ('<tr><th class="tdatastyle">%s</th><th class="tdatastyle">%s</th></tr>', [_('Tag Name'), _('Feed back About terp file of Module')])
             if not self.error:
                 res = str_html + self.format_html_table(header, data_list=dict_terp) + '</table><newline/></body></html>'
-                res = res.replace('''<td''', '''<td class="btstyle" ''')
+                res = res.replace('''<td''', '''<td class="tdatastyle" ''')
                 return res
         return ""
 
diff --git a/addons/base_module_quality/wizard/__init__.py b/addons/base_module_quality/wizard/__init__.py
index 440ab8c63d9..355357d4428 100644
--- a/addons/base_module_quality/wizard/__init__.py
+++ b/addons/base_module_quality/wizard/__init__.py
@@ -23,6 +23,4 @@
 import module_quality_check
 import quality_save_report
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/base_module_quality/workflow_test/workflow_test.py b/addons/base_module_quality/workflow_test/workflow_test.py
index ae2ffb6cc69..c2af184341b 100644
--- a/addons/base_module_quality/workflow_test/workflow_test.py
+++ b/addons/base_module_quality/workflow_test/workflow_test.py
@@ -134,26 +134,11 @@ class quality_test(base_module_quality.abstract_quality_check):
         return ""
 
     def get_result_details(self, dict_wf):
-        str_html = '''<html><head>
-        <style>
-            .bstyle
-            {
-            border-width:2px;
-            border-style:dashed;
-            border-color: gray;
-            }
-            .btstyle
-            {
-            border-width:2px;
-            border-style:solid;
-            border-color: gray;
-            }
-            }
-           </style></head><body><table class="bstyle">'''
-        header = ('<tr><th class="btstyle">%s</th><th class="btstyle">%s</th></tr>', [_('Object Name'), _('Feed back About Workflow of Module')])
+        str_html = '''<html><head>%s</head><body><table class="tablestyle">'''%(self.get_style())
+        header = ('<tr><th class="tdatastyle">%s</th><th class="tdatastyle">%s</th></tr>', [_('Object Name'), _('Feed back About Workflow of Module')])
         if not self.error:
             res = str_html + self.format_html_table(header, data_list=dict_wf) + '</table><newline/></body></html>'
-            res = res.replace('''<td''', '''<td class="btstyle" ''')
+            res = res.replace('''<td''', '''<td class="tdatastyle" ''')
             return res
         return ""
 

From f47eae52203d4d43bc0e45ff3b2a094943f01118 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Tue, 29 Sep 2009 19:26:59 +0530
Subject: [PATCH 72/74] [REVERT] Document : BAD Fix
 jvo@tinyerp.com-20090925134942-y663miys2ocgwi56

bzr revid: jvo@tinyerp.com-20090929135659-3zf9j2m8a8py2qvx
---
 addons/document/document.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/addons/document/document.py b/addons/document/document.py
index 4b1a5c715e3..460c52a9698 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -651,11 +651,11 @@ class document_file(osv.osv):
     def create(self, cr, uid, vals, context={}):
         vals['title']=vals['name']
         vals['parent_id'] = context.get('parent_id',False) or vals.get('parent_id',False)
-#        if not vals.get('res_id', False) and context.get('default_res_id',False):
-#            vals['res_id']=context.get('default_res_id',False)
-#        if not vals.get('res_model', False) and context.get('default_res_model',False):
-#            vals['res_model']=context.get('default_res_model',False)
-        vals['res_model'] = "report.document.user"
+        if not vals.get('res_id', False) and context.get('default_res_id',False):
+            vals['res_id']=context.get('default_res_id',False)
+        if not vals.get('res_model', False) and context.get('default_res_model',False):
+            vals['res_model']=context.get('default_res_model',False)
+
         if vals.get('res_id', False) and vals.get('res_model',False):
             obj_model=self.pool.get(vals['res_model'])
             result = obj_model.read(cr, uid, [vals['res_id']], context=context)
@@ -695,7 +695,6 @@ class document_file(osv.osv):
             res = content_index(base64.decodestring(datas), vals['datas_fname'], vals.get('content_type', None))
             super(document_file,self).write(cr, uid, [result], {
                 'index_content' : res,
-                'res_id' : result
             })
             cr.commit()
         except:

From 4cedadb41522d5db5a1db27dd8c20e43161e44c6 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Tue, 29 Sep 2009 20:22:09 +0530
Subject: [PATCH 73/74] [FIX] Stock : Stock move lines on Production Order
 well-structured

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

bzr revid: jvo@tinyerp.com-20090929145209-yfkyl3z7ot5rpyus
---
 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 17a0de03be6..4dd89b614aa 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1245,6 +1245,7 @@
                     <field name="address_id" select="2" context="{'contact_display':'partner'}"/>
                     <newline/>
                     <field name="picking_id" select="2"/>
+                    <newline/>
                     <field name="prodlot_id" select="2"
                         context="{'location_id':location_id, 'product_id':product_id}"
                         domain="[('product_id','=',product_id)]"

From 53c2bb98ca1f0d7096908ee5adf9b4d763135e39 Mon Sep 17 00:00:00 2001
From: Albert Cervera i Areny <>
Date: Wed, 30 Sep 2009 12:57:07 +0530
Subject: [PATCH 74/74] [FIX] Report_project :wrong average of closing days
 counting

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

bzr revid: jvo@tinyerp.com-20090930072707-japt0gv7zj8v6s5b
---
 addons/report_project/report_project.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/report_project/report_project.py b/addons/report_project/report_project.py
index b87961e9ee7..933af3e5a46 100644
--- a/addons/report_project/report_project.py
+++ b/addons/report_project/report_project.py
@@ -47,7 +47,7 @@ class report_project_task_user(osv.osv):
                     t.user_id,
                     t.project_id,
                     sum(planned_hours) as hours_planned,
-                    to_char(avg(date_close::abstime-t.create_date::timestamp), 'DD"d" HH12:MI:SS') as closing_days,
+                    to_char(avg(date_close::abstime-t.create_date::timestamp), 'DD"d" HH24:MI:SS') as closing_days,
                     sum(w.hours) as hours_effective,
                     ((sum(planned_hours)-sum(w.hours))/count(distinct t.id))::decimal(16,2) as hours_delay
                 from project_task t