From a98cbcf770951d498c174607026a2dc662056675 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@tinyerp.com>
Date: Tue, 2 Dec 2008 17:13:25 +0530
Subject: [PATCH 01/82] modify report mrp_repair

bzr revid: mra@tinyerp.com-20081202114325-lxs2td6pxqf1ehd2
---
 addons/mrp_repair/report/order.rml | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml
index b9a786a0bc0..6244ff702c4 100644
--- a/addons/mrp_repair/report/order.rml
+++ b/addons/mrp_repair/report/order.rml
@@ -184,7 +184,9 @@
     <blockTable colWidths="265.0,51.0,225.0" style="AddressTable">
       <tr>
         <td>
-          <para style="P10">Shipping address :[[ o.address_id.title or '' ]] [[ o.address_id.name ]]</para>
+          <para style="P10">Shipping address :</para>
+          <para style="P1">[[ o.partner_id.name ]]</para>
+          <para style="P1">[[ o.address_id.title or '' ]] [[ o.address_id.name ]]</para>
           <para style="P1">[[ o.address_id.street ]]</para>
           <para style="P1">[[ o.address_id.street2 or '' ]]</para>
           <para style="P1">[[ o.address_id.city or '' ]] [[ o.address_id.zip or '' ]]</para>
@@ -202,7 +204,6 @@
           </para>
         </td>
         <td>
-          <para style="P19">[[ o.partner_id.name ]]</para>
           <para style="P18">[[ o.partner_id and adr_get(o.partner_id, 'default')['name'] ]]</para>
           <para style="P18">[[ o.partner_id and adr_get(o.partner_id, 'default')['street'] ]]</para>
           <para style="P18">[[ o.partner_id and adr_get(o.partner_id, 'default')['zip'] ]] [[ o.partner_id and adr_get(o.partner_id, 'default')['city'] ]]</para>
@@ -216,7 +217,7 @@
     <para style="P7">
       <font color="white"> </font>
     </para>
-    <para style="P6">[[ o.state&lt;&gt;'draft' and removeParentNode('para') ]]Repair Quotation</para>
+    <para style="P6">[[ o.state&lt;&gt;'draft' and removeParentNode('para') ]]Repair Quotation N° : [[ o.name ]]</para>
     <para style="P26">[[ o.state=='draft' and removeParentNode('para') ]]Repair Order N° : [[ o.name ]]</para>
     <para style="P8">
       <font color="white"> </font>
@@ -262,11 +263,9 @@
     <para style="P9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="100.0,100,80.0,100.0,60.0,64.0" repeatRows="1" style="HeadingTable">
+    <blockTable colWidths="120.0,140.0,100.0,80.0,80.0" repeatRows="1" style="HeadingTable">
       <tr>
-        <td>
-          <para style="P11">Product</para>
-        </td>
+
         <td>
           <para style="P11">Description</para>
         </td>
@@ -293,13 +292,9 @@
         <tr>
           <td>
             <para style="P4">[[ repeatIn(o.operations,'line') ]]</para>
-            <blockTable colWidths="100.0,120,80.0,100.0,60.0,64.0" style="Table7">
+            <blockTable colWidths="120.0,140.0,100.0,80.0,80.0" style="Table7">
               <tr>
-                <td>
-                  <para style="P3">Add [[ ((line.type == 'add') or removeParentNode('para')) and '' ]] </para>
-                  <para style="P3">Remove [[ ((line.type == 'remove') or removeParentNode('para')) and '' ]]</para>
-                  <para style="P1">[[ line.product_id.name ]]</para>
-                </td>
+
                 <td>
                   <para style="P1">[[ line.name ]]</para>
                 </td>
@@ -332,11 +327,9 @@
       <tr>
         <td>
           <para style="P23">[[ repeatIn(o.fees_lines,'fees') ]]</para>
-          <blockTable colWidths="100.0,120,80.0,100.0,60.0,64.0" style="Table9">
+          <blockTable colWidths="120.0,140.0,100.0,80.0,80.0" style="Table9">
             <tr>
-              <td>
-                <para style="P1">[[ fees.product_id.name ]]</para>
-              </td>
+
               <td>
                 <para style="P1">[[ fees.name ]]</para>
               </td>

From 57aaf177b9539883112ad990904856a9b23c984f Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@tinyerp.com>
Date: Tue, 2 Dec 2008 13:51:23 +0100
Subject: [PATCH 02/82] [IMP] Move maintenance_maintenance#test_maintenance to
 maintenance_contract_wizard#validate_cb

bzr revid: stephane@tinyerp.com-20081202125123-9hl9bmoqz4z7gfn5
---
 bin/addons/base/maintenance/maintenance.py | 58 ++++++++++++----------
 1 file changed, 31 insertions(+), 27 deletions(-)

diff --git a/bin/addons/base/maintenance/maintenance.py b/bin/addons/base/maintenance/maintenance.py
index 3db2d40196f..158b6144629 100644
--- a/bin/addons/base/maintenance/maintenance.py
+++ b/bin/addons/base/maintenance/maintenance.py
@@ -49,27 +49,44 @@ class maintenance_contract(osv.osv):
     _defaults = {
         'password' : lambda obj,cr,uid,context={} : '',
     }
-    def _test_maintenance(self, cr, uid, ids, context):
+
+maintenance_contract()
+
+
+class maintenance_contract_wizard(osv.osv_memory):
+    _name = 'maintenance.contract.wizard'
+
+    _columns = {
+        'name' : fields.char('Contract ID', size=256, required=True ),
+        'password' : fields.char('Password', size=64, required=True),
+    }
+
+    def validate_cb(self, cr, uid, ids, context):
+        login = 'admin'
+        password = 'admin'
         remote_db='trunk'
         remote_server='localhost'
         port=8069
+
         module_obj=self.pool.get('ir.module.module')
         contract_obj=self.pool.get('maintenance.contract')
         module_ids=module_obj.search(cr, uid, [('state','=','installed')])
         modules=module_obj.read(cr, uid, module_ids, ['name','installed_version'])
         contract_obj=contract_obj.read(cr, uid, ids[0])
-        local_url = 'http://%s:%d/xmlrpc/common'%(remote_server,port)
-        rpc = xmlrpclib.ServerProxy(local_url)
-        ruid = rpc.login(remote_db, 'admin', 'admin')
-        local_url = 'http://%s:%d/xmlrpc/object'%(remote_server,port)
-        rrpc = xmlrpclib.ServerProxy(local_url)
+        rpc = xmlrpclib.ServerProxy('http://%s:%d/xmlrpc/common' % (remote_server, port))
+        ruid = rpc.login(remote_db, login, password)
+        rpc = xmlrpclib.ServerProxy('http://%s:%d/xmlrpc/object' % (remove_server, port))
         try:
-            result=rrpc.execute(remote_db, ruid, 'admin', 'maintenance.maintenance', 'check_contract' , modules,contract_obj)
+            result=rpc.execute(remote_db, ruid, 'admin', 'maintenance.maintenance', 'check_contract' , modules, contract_obj)
         except:
-            raise osv.except_osv(_('Maintenance Error !'),('''Module Maintenance_Editor is not installed at server : %s Database : %s'''%(remote_server,remote_db)))
+            raise osv.except_osv(
+                _('Maintenance Error !'),
+                _('''Module Maintenance_Editor is not installed at server : %s Database : %s''')%(remote_server,remote_db))
         if context.get('active_id',False):
-            if result['status']=='ko':
-                raise osv.except_osv(_('Maintenance Error !'),('''Maintenance Contract
+            if result['status']=='none':
+                raise osv.except_osv(
+                    _('Maintenance Error !'),
+                    _('''Maintenance Contract
 -----------------------------------------------------------
 You have no valid maintenance contract! If you are using
 Open ERP, it is highly suggested to take maintenance contract.
@@ -81,7 +98,9 @@ The maintenance program offers you:
 * Access to the customer portal.
 * Check the maintenance contract (www.openerp.com)'''))
             elif result['status']=='partial':
-                raise osv.except_osv(_('Maintenance Error !'),('''Maintenance Contract
+                raise osv.except_osv(
+                    _('Maintenance Error !'),
+                    _('''Maintenance Contract
 -----------------------------------------------------------
 You have a maintenance contract, But you installed modules those
 are not covered by your maintenance contract:
@@ -102,24 +121,9 @@ your installed modules.
 * Extend your maintenance to the modules you used.
 * Check your maintenance contract''') % ','.join(result['modules']))
             else:
-                raise osv.except_osv(_('Valid Maintenance Contract !'),('''Your Maintenance Contract is up to date'''))
+                raise osv.except_osv(_('Valid Maintenance Contract !'),_('''Your Maintenance Contract is up to date'''))
         return result
 
-maintenance_contract()
-
-
-class maintenance_contract_wizard(osv.osv_memory):
-    _name = 'maintenance.contract.wizard'
-
-    _columns = {
-        'name' : fields.char('Contract ID', size=256, required=True ),
-        'password' : fields.char('Password', size=64, required=True),
-    }
-
-    def validate_cb(self, cr, uid, ids, context):
-        print "Validate_cb"
-        return False
-
 maintenance_contract_wizard()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 6dd72363aed824c372cde3b3c62f8cd0a22d8847 Mon Sep 17 00:00:00 2001
From: qdp <qdp@tinyerp.com>
Date: Tue, 2 Dec 2008 14:26:28 +0100
Subject: [PATCH 03/82] 2 bugfixes on mrp_repair module: 	* There's a
 problem with the packing created from the finished repair: I have packing in
 Available state, and also packing line in Available state. Then I have
 buttons for validating my packing. When I do it, the packing line change in
 DONE state, that's ok, but the packing stay in Available state, with same
 button (Packing done and Cancel). The packing state should also change state
 into DONE and no button should be available (like a normal packing) 	* On
 the repair form, when I fill in the Lot number field, it should return the
 LAST move in DONE state. Currently, it simply returns the Last move...

bzr revid: qdp@tinyerp.com-20081202132628-ghtcvgu79si7khm7
---
 addons/mrp_repair/mrp_repair.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 66353a7e168..0525627ffa9 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -204,14 +204,14 @@ class mrp_repair(osv.osv):
             }
 
         def get_last_move(lst_move):
-            while lst_move.move_dest_id and lst_move.state == 'done':
+            while lst_move.move_dest_id and lst_move.move_dest_id and lst_move.move_dest_id.picking_id.state == 'done':
                 lst_move = lst_move.move_dest_id
             return lst_move
 
         move_id = move_ids[0]
         move = get_last_move(self.pool.get('stock.move').browse(cr, uid, move_id))            
         product = self.pool.get('product.product').browse(cr, uid, product_id)
-        date = move.date_planned
+        date = move.picking_id.date_done
         limit = mx.DateTime.strptime(date, '%Y-%m-%d %H:%M:%S') + RelativeDateTime(months=product.warranty)            
         return {'value': {
                     'location_id': move.location_dest_id.id, 
@@ -381,13 +381,15 @@ class mrp_repair(osv.osv):
             
             picking = self.pool.get('stock.picking').create(cr, uid, {
                 'origin': repair.name,
-                'state': 'assigned',
+                'state': 'draft',
                 'move_type': 'one',
                 'address_id': repair.address_id and repair.address_id.id or False,
                 'note': repair.internal_notes,
                 'invoice_state': 'none',
                 'type': 'out',  # FIXME delivery ?
             })
+            wf_service = netsvc.LocalService("workflow")
+            wf_service.trg_validate(uid, 'stock.picking', picking, 'button_confirm', cr)
 
             move_id = self.pool.get('stock.move').create(cr, uid, {
                 'name': repair.name,

From 2340370caf0c32a1ab8c0688d6c135bd37ef8d89 Mon Sep 17 00:00:00 2001
From: qdp <qdp@tinyerp.com>
Date: Tue, 2 Dec 2008 15:00:15 +0100
Subject: [PATCH 04/82] *removed ready to repair state (not needed)

bzr revid: qdp@tinyerp.com-20081202140015-e82y7e1r2e968qmp
---
 addons/mrp_repair/mrp_repair.py           | 13 ++---
 addons/mrp_repair/mrp_repair_view.xml     |  5 +-
 addons/mrp_repair/mrp_repair_workflow.xml | 59 +++++------------------
 3 files changed, 18 insertions(+), 59 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 0525627ffa9..7ebdbfeb98b 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -77,7 +77,6 @@ class mrp_repair(osv.osv):
         'state': fields.selection([
             ('draft','Quotation'),
             ('confirmed','Confirmed'),
-            ('ready','Ready to Repair'),
             ('under_repair','Under Repair'),
             ('2binvoiced','To be Invoiced'),            
             ('invoice_except','Invoice Exception'),
@@ -259,8 +258,8 @@ class mrp_repair(osv.osv):
         invoices_group = {}
         for repair in self.browse(cr, uid, ids, context=context):
             res[repair.id]=False
-            if repair.state in ('draft','cancel') or repair.invoice_id:                                
-                continue           
+            if repair.state in ('draft','cancel') or repair.invoice_id:
+                continue
             if not (repair.partner_id.id and repair.partner_invoice_id.id):
                 raise osv.except_osv('No partner !','You have to select a partner in the repair form ! ')
             comment=repair.quotation_notes
@@ -337,10 +336,6 @@ class mrp_repair(osv.osv):
         self.write(cr, uid, ids, {'state':'invoice_except'})
         return True
 
-    def action_repair_ready(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'state':'ready'})
-        return True
-
     def action_repair_start(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'under_repair'})
         return True
@@ -349,7 +344,7 @@ class mrp_repair(osv.osv):
         for order in self.browse(cr, uid, ids):
             val = {}             
             if (order.invoice_method=='b4repair'):
-                val['state'] = 'ready'
+                val['state'] = 'under_repair'
             else:                
                 #val['state'] = 'done'                 
                 pass
@@ -363,7 +358,7 @@ class mrp_repair(osv.osv):
             if (not order.invoiced and order.invoice_method=='after_repair'):
                 val['state'] = '2binvoiced'  
             elif (not order.invoiced and order.invoice_method=='b4repair'):
-                val['state'] = 'ready'
+                val['state'] = 'confirmed'
             else:                
                 #val['state'] = 'done'                 
                 pass
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 360c905331b..d53a3ec5754 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -83,8 +83,7 @@
                             <group col="13" colspan="4">                              
                                 <field name="state" select="2"/>
                                 <button name="repair_confirm" states="draft" string="Confirm Repair"/>  
-                                <button name="repair_ready" states="confirmed" string="Ready to Repair"/>   
-                                <button name="action_repair_start" states="ready" string="Start Repair"/> 
+                                <button name="action_repair_start" states="confirmed" string="Start Repair"/> 
                                 <button name="action_repair_end" states="under_repair" string="End Repair"/>                           
                                 <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice"/>
                                 <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected"/>                                
@@ -92,7 +91,7 @@
 								<button name="%(action_cancel_repair)d" states="invoice_except" string="Cancel Repair" type="action"/>
                                 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
                                 <button name="cancel" states="draft" string="Cancel Repair"/>                                
-                                <button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,ready,under_repair" string="Cancel Repair" type="action"/>
+                                <button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,under_repair" string="Cancel Repair" type="action"/>
                             </group>
                         </page>
                         <page string="Invoicing">
diff --git a/addons/mrp_repair/mrp_repair_workflow.xml b/addons/mrp_repair/mrp_repair_workflow.xml
index ae4a38a7310..fd57a61d345 100644
--- a/addons/mrp_repair/mrp_repair_workflow.xml
+++ b/addons/mrp_repair/mrp_repair_workflow.xml
@@ -51,15 +51,6 @@
             <field name="kind">function</field>            
             <field name="action">action_repair_start()</field>
         </record>  
-        <record id="act_repair_ready" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_repair"/>
-            <field name="name">Ready Repair</field>
-            <field name="kind">function</field>            
-            <field name="action">action_repair_ready()</field>
-        </record>   
-        
-        
-        
         <record id="act_invoice_end" model="workflow.activity">
             <field name="wkf_id" ref="wkf_repair"/>
             <field name="name">invoice_end</field>
@@ -87,8 +78,6 @@
             <field name="action">action_invoice_cancel()</field>
         </record>       -->    
         
-       
-
         <record id="act_cancel" model="workflow.activity">
             <field name="wkf_id" ref="wkf_repair"/>
             <field name="name">cancel</field>
@@ -103,14 +92,8 @@
             <field name="kind">stopall</field>
             <field name="action">action_cancel()</field>
         </record>
-        <record id="act_cancel3" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_repair"/>
-            <field name="name">cancel3</field>
-            <field name="flow_stop">True</field>
-            <field name="kind">stopall</field>
-            <field name="action">action_cancel()</field>
-        </record>
-        
+
+
         <!-- Transistion -->        
         
         
@@ -148,12 +131,13 @@
             <field name="act_from" ref="act_wait_invoice"/>
             <field name="act_to" ref="act_invoice_end"/>
             <field name="signal">action_invoice_create</field>
-        </record>        
+        </record> 
+
         <record id="trans_invoice_start_repair" model="workflow.transition">
             <field name="act_from" ref="act_invoice_end"/>
-            <field name="act_to" ref="act_repair_ready"/>
+            <field name="act_to" ref="act_repair_start"/>
             <field name="condition">invoice_method=='b4repair'</field>            
-        </record>        
+        </record>
 
         <record id="trans_wait_invoice_cancel2" model="workflow.transition">
             <field name="act_from" ref="act_wait_invoice"/>
@@ -161,55 +145,36 @@
             <field name="signal">cancel</field>
         </record>
 
-           
-
         <record id="trans_invoice_end_done" model="workflow.transition">
             <field name="act_from" ref="act_invoice_end"/>
             <field name="act_to" ref="act_done"/>
             <field name="condition">invoice_method=='after_repair'</field>
         </record>
-        
-        
-        
+
         <record id="trans_wait_repair_ready" model="workflow.transition">
             <field name="act_from" ref="act_wait_repair"/>
-            <field name="act_to" ref="act_repair_ready"/>
+            <field name="act_to" ref="act_repair_start"/>
             <field name="signal">repair_ready</field>            
         </record>
-        <record id="trans_ready_repair_start" model="workflow.transition">
-            <field name="act_from" ref="act_repair_ready"/>
-            <field name="act_to" ref="act_repair_start"/>
-            <field name="signal">action_repair_start</field>            
-        </record>
+
        <record id="trans_repair_repair_end" model="workflow.transition">
             <field name="act_from" ref="act_repair_start"/>
             <field name="act_to" ref="act_repair_end"/>  
             <field name="signal">action_repair_end</field>           
         </record>
+
         <record id="trans_reapir_end_done" model="workflow.transition">
             <field name="act_from" ref="act_repair_end"/>
             <field name="act_to" ref="act_done"/>
             <field name="condition">invoice_method=='none' or invoice_method=='b4repair'</field>
         </record>
+
         <record id="trans_reapir_end_invoice" model="workflow.transition">
             <field name="act_from" ref="act_repair_end"/>
             <field name="act_to" ref="act_wait_invoice"/>                  
             <field name="condition">invoice_method=='after_repair'</field>                 
         </record>
-        
-        <record id="trans_wait_repair_cancel3" model="workflow.transition">
-            <field name="act_from" ref="act_wait_repair"/>
-            <field name="act_to" ref="act_cancel3"/>
-            <field name="signal">cancel</field>
-        </record>      
-        
-        
-        
-        
-        
-        
-        
-        
+           
         
     </data>
 </openerp>

From cd342a9bae37c5563d21320bf1b3c7a267ae56f2 Mon Sep 17 00:00:00 2001
From: qdp <qdp@tinyerp.com>
Date: Tue, 2 Dec 2008 15:51:56 +0100
Subject: [PATCH 05/82] *removed dummy test on write of account_move_line (Both
 Credit and Debit cannot be zero!: Wrong Accounting Entry!)

bzr revid: qdp@tinyerp.com-20081202145156-q83ophwr2cwcweei
---
 addons/account/account_move_line.py | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 21f5b96848b..453ec9e9067 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -692,17 +692,7 @@ class account_move_line(osv.osv):
     def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
         if not context:
             context={}
-        raise_ex=False
 
-        if ('debit' in vals and 'credit' in vals)  and not vals['debit'] and not vals['credit']:
-            raise_ex=True
-        if ('debit' in vals and 'credit' not in vals) and  not vals['debit']:
-            raise_ex=True
-        if ('credit' in vals and 'debit' not in vals) and  not vals['credit']:
-            raise_ex=True
-
-        if raise_ex:
-            raise osv.except_osv(_('Wrong Accounting Entry!'), _('Both Credit and Debit cannot be zero!'))
         account_obj = self.pool.get('account.account')
         if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']:
             raise osv.except_osv(_('Bad account!'), _('You can not use an inactive account!'))

From bc8847a1f2d926d8267e78587c3468168f278991 Mon Sep 17 00:00:00 2001
From: qdp <qdp@tinyerp.com>
Date: Tue, 2 Dec 2008 17:49:40 +0100
Subject: [PATCH 06/82] *removed dummy test on write of account_move_line (Both
 debit and credit cannot be equal to 0)

bzr revid: qdp@tinyerp.com-20081202164940-99t5bibjv6exn92s
---
 addons/account/account_move_line.py | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 21f5b96848b..453ec9e9067 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -692,17 +692,7 @@ class account_move_line(osv.osv):
     def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
         if not context:
             context={}
-        raise_ex=False
 
-        if ('debit' in vals and 'credit' in vals)  and not vals['debit'] and not vals['credit']:
-            raise_ex=True
-        if ('debit' in vals and 'credit' not in vals) and  not vals['debit']:
-            raise_ex=True
-        if ('credit' in vals and 'debit' not in vals) and  not vals['credit']:
-            raise_ex=True
-
-        if raise_ex:
-            raise osv.except_osv(_('Wrong Accounting Entry!'), _('Both Credit and Debit cannot be zero!'))
         account_obj = self.pool.get('account.account')
         if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']:
             raise osv.except_osv(_('Bad account!'), _('You can not use an inactive account!'))

From 122c20af252e8fe705756c31a068757af372b42f Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@tinyerp.com>
Date: Tue, 2 Dec 2008 17:57:35 +0100
Subject: [PATCH 07/82] [IMP] Redraw the screen

bzr revid: stephane@tinyerp.com-20081202165735-gzz08zyhprsp7dxj
---
 .../base/maintenance/maintenance_view.xml     | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/bin/addons/base/maintenance/maintenance_view.xml b/bin/addons/base/maintenance/maintenance_view.xml
index 1354c98addb..9ef3793074e 100644
--- a/bin/addons/base/maintenance/maintenance_view.xml
+++ b/bin/addons/base/maintenance/maintenance_view.xml
@@ -54,14 +54,20 @@
             <field name="model">maintenance.contract.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Add Maintenance Contract">
-                    <separator string="Add Maintenance Contract" colspan="2"/>
+                <form string="Add Maintenance Contract" col="4">
+                    <image name="gtk-dialog-info" />
+                    <group>
+                        <separator string="Add Maintenance Contract" colspan="2"/>
+                        <newline />
+                        <field name="name" />
+                        <newline />
+                        <field name="password" password="True" />
+                    </group>
                     <newline />
-                    <field name="name" />
-                    <newline />
-                    <field name="password" password="True" />
-                    <newline />
-                    <label string="" /><button name="validate_cb" type="object" string="Validate" />
+                    <group colspan="2">
+                        <button type="object" string="Cancel" special="cancel" icon="gtk-cancel" /> 
+                        <button name="action_validate" type="object" string="Validate" icon="gtk-apply" />
+                    </group>
                 </form>
             </field>
         </record>

From bcedd8ec8834e0cfabc356028f5b6d4bb1c03582 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@tinyerp.com>
Date: Tue, 2 Dec 2008 17:58:17 +0100
Subject: [PATCH 08/82] [IMP] Check if there is a contract in the
 maintainer_editor module

bzr revid: stephane@tinyerp.com-20081202165817-5l36pies53jxk319
---
 bin/addons/base/maintenance/maintenance.py | 82 +++++++---------------
 1 file changed, 24 insertions(+), 58 deletions(-)

diff --git a/bin/addons/base/maintenance/maintenance.py b/bin/addons/base/maintenance/maintenance.py
index 158b6144629..8cd2d9f5ada 100644
--- a/bin/addons/base/maintenance/maintenance.py
+++ b/bin/addons/base/maintenance/maintenance.py
@@ -32,6 +32,7 @@ from osv import osv, fields
 import pooler
 import time
 import math
+from pprint import pprint as pp
 
 from tools import config
 import xmlrpclib
@@ -61,68 +62,33 @@ class maintenance_contract_wizard(osv.osv_memory):
         'password' : fields.char('Password', size=64, required=True),
     }
 
-    def validate_cb(self, cr, uid, ids, context):
-        login = 'admin'
-        password = 'admin'
-        remote_db='trunk'
-        remote_server='localhost'
-        port=8069
+    def action_validate(self, cr, uid, ids, context):
+        if not ids:
+            return False
+        contract = self.read(cr, uid, ids, ['name', 'password'])[0]
+        if contract['name'] == 'toto':
+            self.write(cr, uid, ids, { 'name' : 'trouduc' })
+            return False
+
+        login, password, remote_db, remote_server, port = 'admin', 'admin', 'trunk', 'localhost', 8069
 
-        module_obj=self.pool.get('ir.module.module')
-        contract_obj=self.pool.get('maintenance.contract')
-        module_ids=module_obj.search(cr, uid, [('state','=','installed')])
-        modules=module_obj.read(cr, uid, module_ids, ['name','installed_version'])
-        contract_obj=contract_obj.read(cr, uid, ids[0])
         rpc = xmlrpclib.ServerProxy('http://%s:%d/xmlrpc/common' % (remote_server, port))
         ruid = rpc.login(remote_db, login, password)
-        rpc = xmlrpclib.ServerProxy('http://%s:%d/xmlrpc/object' % (remove_server, port))
-        try:
-            result=rpc.execute(remote_db, ruid, 'admin', 'maintenance.maintenance', 'check_contract' , modules, contract_obj)
-        except:
-            raise osv.except_osv(
-                _('Maintenance Error !'),
-                _('''Module Maintenance_Editor is not installed at server : %s Database : %s''')%(remote_server,remote_db))
-        if context.get('active_id',False):
-            if result['status']=='none':
-                raise osv.except_osv(
-                    _('Maintenance Error !'),
-                    _('''Maintenance Contract
------------------------------------------------------------
-You have no valid maintenance contract! If you are using
-Open ERP, it is highly suggested to take maintenance contract.
-The maintenance program offers you:
-* Migrations on new versions,
-* Bugfix guarantee,
-* Monthly announces of bugs,
-* Security alerts,
-* Access to the customer portal.
-* Check the maintenance contract (www.openerp.com)'''))
-            elif result['status']=='partial':
-                raise osv.except_osv(
-                    _('Maintenance Error !'),
-                    _('''Maintenance Contract
------------------------------------------------------------
-You have a maintenance contract, But you installed modules those
-are not covered by your maintenance contract:
-%s
-It means we can not offer you the garantee of maintenance on
-your whole installation.
-The maintenance program includes:
-* Migrations on new versions,
-* Bugfix guarantee,
-* Monthly announces of bugs,
-* Security alerts,
-* Access to the customer portal.
+        rpc = xmlrpclib.ServerProxy('http://%s:%d/xmlrpc/object' % (remote_server, port))
+        res = rpc.execute(remote_db, ruid, password, 
+                          'maintenance.maintenance', 'get_module_for_contract', contract['name'], contract['password'])
+        if res:
+            self.pool.get('maintenance.contract').create(
+                cr, 
+                uid, {
+                    'name' : contract['name'],
+                    'password' : contract['password'],
+                    'date_start' : res['date_from'],
+                    'date_stop' : res['date_to'],
+                }
+            )
 
-To include these modules in your maintenance contract, you should
-extend your contract with the editor. We will review and validate
-your installed modules.
-
-* Extend your maintenance to the modules you used.
-* Check your maintenance contract''') % ','.join(result['modules']))
-            else:
-                raise osv.except_osv(_('Valid Maintenance Contract !'),_('''Your Maintenance Contract is up to date'''))
-        return result
+        return res
 
 maintenance_contract_wizard()
 

From 4528e7eb2125a20a2aa3651ab83a73c37fbf28c8 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 2 Dec 2008 19:08:12 +0100
Subject: [PATCH 09/82] bugfix

bzr revid: fp@tinyerp.com-20081202180812-c19o24b1n4bl0777
---
 addons/account_analytic_plans/account_analytic_plans.py     | 2 +-
 addons/account_voucher/voucher.py                           | 6 +++---
 .../analytic_journal_billing_rate.py                        | 4 ++--
 addons/hr_timesheet_invoice/hr_timesheet_invoice.py         | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index 7df623aa3a5..dc63e082a19 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -317,7 +317,7 @@ class account_invoice(osv.osv):
         res['analytics_id']=x.get('analytics_id',False)
         return res
 
-    def _get_analityc_lines(self, cr, uid, id):
+    def _get_analytic_lines(self, cr, uid, id):
         inv = self.browse(cr, uid, [id])[0]
         cur_obj = self.pool.get('res.currency')
 
diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index 9903f13ffa9..873d6c19668 100755
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -127,7 +127,7 @@ class account_voucher(osv.osv):
 
     }
     
-    def _get_analityc_lines(self, cr, uid, id):
+    def _get_analytic_lines(self, cr, uid, id):
         inv = self.browse(cr, uid, [id])[0]
         cur_obj = self.pool.get('res.currency')
         
@@ -193,7 +193,7 @@ class account_voucher(osv.osv):
         return True
     
 
-    def _get_analityc_lines(self, cr, uid, id):
+    def _get_analytic_lines(self, cr, uid, id):
         inv = self.browse(cr, uid, [id])[0]
         cur_obj = self.pool.get('res.currency')
 
@@ -238,7 +238,7 @@ class account_voucher(osv.osv):
             line_ids = self.read(cr, uid, [inv.id], ['payment_ids'])[0]['payment_ids']
             ils = self.pool.get('account.voucher.line').read(cr, uid, line_ids)
             # one move line per invoice line
-            iml = self._get_analityc_lines(cr, uid, inv.id)
+            iml = self._get_analytic_lines(cr, uid, inv.id)
             # check if taxes are all computed
             diff_currency_p = inv.currency_id.id <> company_currency
             # create one move line for the total and possibly adjust the other lines amount
diff --git a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate.py b/addons/analytic_journal_billing_rate/analytic_journal_billing_rate.py
index 366287ad3df..58e9d9a7fb8 100644
--- a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate.py
+++ b/addons/analytic_journal_billing_rate/analytic_journal_billing_rate.py
@@ -101,8 +101,8 @@ hr_analytic_timesheet()
 class account_invoice(osv.osv):
     _inherit = "account.invoice"
 
-    def _get_analityc_lines(self, cr, uid, id):
-        iml = super(account_invoice, self)._get_analityc_lines(cr, uid, id)
+    def _get_analytic_lines(self, cr, uid, id):
+        iml = super(account_invoice, self)._get_analytic_lines(cr, uid, id)
         inv = self.browse(cr, uid, [id])[0]
         for il in iml:
             if il['account_analytic_id']:
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index fcc3dc8c6c2..10ae4d924f1 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -137,8 +137,8 @@ hr_analytic_timesheet()
 class account_invoice(osv.osv):
     _inherit = "account.invoice"
 
-    def _get_analityc_lines(self, cr, uid, id):
-        iml = super(account_invoice, self)._get_analityc_lines(cr, uid, id)
+    def _get_analytic_lines(self, cr, uid, id):
+        iml = super(account_invoice, self)._get_analytic_lines(cr, uid, id)
 
         inv = self.browse(cr, uid, [id])[0]
         if inv.type == 'in_invoice':

From 862a0230dbec461c56746ff9630742dfaf57e1eb Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@tinyerp.com>
Date: Tue, 2 Dec 2008 19:52:21 +0100
Subject: [PATCH 10/82] [REF] Indent the xml file

bzr revid: stephane@tinyerp.com-20081202185221-ogdc7hg8qyb9ebub
---
 bin/addons/base/module/module_wizard.xml | 46 ++++++++++++------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/bin/addons/base/module/module_wizard.xml b/bin/addons/base/module/module_wizard.xml
index 3b340ca0191..2b993f13dd4 100644
--- a/bin/addons/base/module/module_wizard.xml
+++ b/bin/addons/base/module/module_wizard.xml
@@ -28,30 +28,30 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form col="3" string="Export language">
-				    <notebook>
-                    <page string="Export Data">
-                    <group col="2" fill="0" states="choose">
-                        <separator colspan="2" string="Export translation file"/>
-                        <field name="lang" required="1" width="300"/>
-                        <field name="format" required="1"/>
-                        <field height="200" name="modules" width="500"/>
-                        <field invisible="1" name="state"/>
-                    </group>
-                    <group col="1" fill="0" states="get">
-                        <separator string="Export done"/>
-                        <field name="name" invisible="1"/>
-                        <field name="data" nolabel="1" readonly="1" fieldname="name"/>
-                        <field height="80" name="advice" nolabel="1"/>
-                    </group>
-                    </page>
-                    <page string="Help">
-                        <label align="0.0" colspan="4" string="The official translations pack of all OpenERP/OpenObjects module are managed through launchpad. We use their online interface to synchronize all translations efforts."/>
-                        <label align="0.0" colspan="4" string="To improve some terms of the official translations of OpenERP, you should modify the terms directly on the launchpad interface. If you made lots of translations for your own module, you can also publish all your translation at once."/>
-                        <label align="0.0" colspan="4" string="To browse official translations, you can visit this link: "/>
-                        <label align="0.0" colspan="4" string="https://translations.launchpad.net/openobject"/>
-                    </page>
+                    <notebook>
+                        <page string="Export Data">
+                            <group col="2" fill="0" states="choose">
+                                <separator colspan="2" string="Export translation file"/>
+                                <field name="lang" required="1" width="300"/>
+                                <field name="format" required="1"/>
+                                <field height="200" name="modules" width="500"/>
+                                <field invisible="1" name="state"/>
+                            </group>
+                            <group col="1" fill="0" states="get">
+                                <separator string="Export done"/>
+                                <field name="name" invisible="1"/>
+                                <field name="data" nolabel="1" readonly="1" fieldname="name"/>
+                                <field height="80" name="advice" nolabel="1"/>
+                            </group>
+                        </page>
+                        <page string="Help">
+                            <label align="0.0" colspan="4" string="The official translations pack of all OpenERP/OpenObjects module are managed through launchpad. We use their online interface to synchronize all translations efforts."/>
+                            <label align="0.0" colspan="4" string="To improve some terms of the official translations of OpenERP, you should modify the terms directly on the launchpad interface. If you made lots of translations for your own module, you can also publish all your translation at once."/>
+                            <label align="0.0" colspan="4" string="To browse official translations, you can visit this link: "/>
+                            <label align="0.0" colspan="4" string="https://translations.launchpad.net/openobject"/>
+                        </page>
                     </notebook>
-                    
+
                     <group col="2" colspan="3" fill="0">
                         <button icon="gtk-cancel" name="act_cancel" special="cancel" states="choose" string="Cancel" type="object"/>
                         <button icon="gtk-ok" name="act_getfile" states="choose" string="Get file" type="object"/>

From 7af013fd483de92b682a28c34a86cc5a7e7a0fb8 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@tinyerp.com>
Date: Tue, 2 Dec 2008 19:52:32 +0100
Subject: [PATCH 11/82] [IMP] Add the state field [IMP] Return the value of
 self.write in action_validate [IMP] Draw the screen for the Add Maintenance
 Contract wizard

bzr revid: stephane@tinyerp.com-20081202185232-9hszwznnz6vwz9md
---
 bin/addons/base/maintenance/maintenance.py    | 11 ++++---
 .../base/maintenance/maintenance_view.xml     | 30 ++++++++++++-------
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/bin/addons/base/maintenance/maintenance.py b/bin/addons/base/maintenance/maintenance.py
index 8cd2d9f5ada..8550fd02d02 100644
--- a/bin/addons/base/maintenance/maintenance.py
+++ b/bin/addons/base/maintenance/maintenance.py
@@ -60,15 +60,18 @@ class maintenance_contract_wizard(osv.osv_memory):
     _columns = {
         'name' : fields.char('Contract ID', size=256, required=True ),
         'password' : fields.char('Password', size=64, required=True),
+        'state' : fields.selection([('draft', 'Draft'),('validated', 'Validated'),('unvalidated', 'Unvalidated')], 'States'),
+    }
+
+    _defaults = {
+        'state' : lambda *a: 'draft',
     }
 
     def action_validate(self, cr, uid, ids, context):
         if not ids:
             return False
+
         contract = self.read(cr, uid, ids, ['name', 'password'])[0]
-        if contract['name'] == 'toto':
-            self.write(cr, uid, ids, { 'name' : 'trouduc' })
-            return False
 
         login, password, remote_db, remote_server, port = 'admin', 'admin', 'trunk', 'localhost', 8069
 
@@ -88,7 +91,7 @@ class maintenance_contract_wizard(osv.osv_memory):
                 }
             )
 
-        return res
+        return self.write(cr, uid, ids, {'state' : ('unvalidated', 'validated')[bool(res)] }, context=context)
 
 maintenance_contract_wizard()
 
diff --git a/bin/addons/base/maintenance/maintenance_view.xml b/bin/addons/base/maintenance/maintenance_view.xml
index 9ef3793074e..31936ea54c4 100644
--- a/bin/addons/base/maintenance/maintenance_view.xml
+++ b/bin/addons/base/maintenance/maintenance_view.xml
@@ -54,19 +54,27 @@
             <field name="model">maintenance.contract.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Add Maintenance Contract" col="4">
+                <form string="Add Maintenance Contract" col="2">
                     <image name="gtk-dialog-info" />
-                    <group>
-                        <separator string="Add Maintenance Contract" colspan="2"/>
-                        <newline />
-                        <field name="name" />
-                        <newline />
-                        <field name="password" password="True" />
+                    <group col="1">
+                        <separator string="Add Maintenance Contract" />
+                        <group states="draft">
+                            <field name="name" width="250" />
+                            <newline />
+                            <field name="password" password="True" />
+                            <field name="state" invisible="1" />
+                        </group>
+                        <group states="validated">
+                            <label string="Maintenance contract added !"/>
+                        </group>
+                        <group states="unvalidated">
+                            <label string="Could you check your contract information ?" />
+                        </group>
                     </group>
-                    <newline />
-                    <group colspan="2">
-                        <button type="object" string="Cancel" special="cancel" icon="gtk-cancel" /> 
-                        <button name="action_validate" type="object" string="Validate" icon="gtk-apply" />
+                    <group colspan="4">
+                        <button type="object" string="_Cancel" icon="gtk-cancel" special="cancel" states="draft"/> 
+                        <button type="object" string="_Validate" icon="gtk-apply" name="action_validate" states="draft"/>
+                        <button type="object" string="_Close" icon="gtk-close" special="cancel" states="validated,unvalidated"/>
                     </group>
                 </form>
             </field>

From 0d64f90e16f99acc1bb850f61f4b47dc89bbf26b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 3 Dec 2008 00:07:16 +0100
Subject: [PATCH 12/82] improve_sale_bom

bzr revid: fp@tinyerp.com-20081202230716-8peaubp6l84lcf7z
---
 addons/mrp/mrp.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 189ba957834..836df8a8cd9 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -1180,6 +1180,7 @@ class StockMove(osv.osv):
                         'product_uos_qty': line['product_uos_qty'],
                         'move_dest_id': move.id,
                         'state': state,
+                        'name': line['name'],
                         'location_dest_id': dest,
                         'move_history_ids': [(6,0,[move.id])],
                         'move_history_ids2': [(6,0,[])],

From e8b1fbcda9da5cfd700fb33a422251c4339ebf12 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 3 Dec 2008 00:16:49 +0100
Subject: [PATCH 13/82] bugfix

bzr revid: fp@tinyerp.com-20081202231649-abeq7qz71k907u0i
---
 addons/mrp/mrp.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 836df8a8cd9..aedd0543805 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -144,6 +144,8 @@ class mrp_bom(osv.osv):
         result = {}
         for bom in self.browse(cr, uid, ids, context=context):
             result[bom.id] = map(lambda x: x.id, bom.bom_lines)
+            if bom.bom_lines:
+                continue
             ok = ((name=='child_complete_ids') and (bom.product_id.supply_method=='produce'))
             if bom.type=='phantom' or ok:
                 sids = self.pool.get('mrp.bom').search(cr, uid, [('bom_id','=',False),('product_id','=',bom.product_id.id)])

From b4b0fe4e7c6eedc6cf9c8758e9d35bebf85753d5 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@tinyerp.com>
Date: Wed, 3 Dec 2008 14:44:20 +0530
Subject: [PATCH 14/82] base_module_quality module added

bzr revid: mra@tinyerp.com-20081203091420-jbq0j2wj94hj5q7h
---
 addons/.project                               | 17 +++++++++
 addons/base_module_quality/__init__.py        | 27 ++++++++++++++
 addons/base_module_quality/__terp__.py        | 35 +++++++++++++++++++
 .../base_module_quality.py                    |  0
 .../base_module_quality_view.xml              |  0
 5 files changed, 79 insertions(+)
 create mode 100644 addons/.project
 create mode 100644 addons/base_module_quality/__init__.py
 create mode 100644 addons/base_module_quality/__terp__.py
 create mode 100644 addons/base_module_quality/base_module_quality.py
 create mode 100644 addons/base_module_quality/base_module_quality_view.xml

diff --git a/addons/.project b/addons/.project
new file mode 100644
index 00000000000..6b6fa8f2cfc
--- /dev/null
+++ b/addons/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>openobject-addons</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.python.pydev.PyDevBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.python.pydev.pythonNature</nature>
+	</natures>
+</projectDescription>
diff --git a/addons/base_module_quality/__init__.py b/addons/base_module_quality/__init__.py
new file mode 100644
index 00000000000..18f7cbc52c4
--- /dev/null
+++ b/addons/base_module_quality/__init__.py
@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2008 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 base_module_quality
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_module_quality/__terp__.py b/addons/base_module_quality/__terp__.py
new file mode 100644
index 00000000000..ced15f682bd
--- /dev/null
+++ b/addons/base_module_quality/__terp__.py
@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2008 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" : "Base module quality",
+    "author" : "Tiny",
+    "version" : "1.0",
+    "depends" : ["base", "product"],
+    "description": "Sample module to check the quality",
+    "init_xml" : [],
+    "update_xml" : ["base_module_quality_view.xml"],
+    "category" : "Tiny Specific Modules/Base module quality",
+    "active": False,
+    "installable": False
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_module_quality/base_module_quality.py b/addons/base_module_quality/base_module_quality.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/base_module_quality/base_module_quality_view.xml b/addons/base_module_quality/base_module_quality_view.xml
new file mode 100644
index 00000000000..e69de29bb2d

From 98943ec1277b4de90ffab45c56c853a61cc5ad8a Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@tinyerp.com>
Date: Wed, 3 Dec 2008 15:08:30 +0530
Subject: [PATCH 15/82] small changes on report mrp_repair

bzr revid: mra@tinyerp.com-20081203093830-na6yg4gm4uc6c4dh
---
 addons/mrp_repair/report/order.rml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml
index 6244ff702c4..6805496a5e8 100644
--- a/addons/mrp_repair/report/order.rml
+++ b/addons/mrp_repair/report/order.rml
@@ -204,6 +204,7 @@
           </para>
         </td>
         <td>
+          <para style="P1">[[ o.partner_id.name ]]</para>
           <para style="P18">[[ o.partner_id and adr_get(o.partner_id, 'default')['name'] ]]</para>
           <para style="P18">[[ o.partner_id and adr_get(o.partner_id, 'default')['street'] ]]</para>
           <para style="P18">[[ o.partner_id and adr_get(o.partner_id, 'default')['zip'] ]] [[ o.partner_id and adr_get(o.partner_id, 'default')['city'] ]]</para>
@@ -435,11 +436,8 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="43.0,492.0" style="Table1">
+    <blockTable colWidths="492.0" style="Table1">
       <tr>
-        <td>
-          <para style="P2">Notes : </para>
-        </td>
         <td>
           <para style="P1">[[ format(o.quotation_notes or '') ]]</para>
         </td>

From 20d046ad665dd0608aafebc1603b0433081feb81 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Wed, 3 Dec 2008 15:33:54 +0530
Subject: [PATCH 16/82] add sorting algorithm

bzr revid: mga@tinyerp.com-20081203100354-rylbn3xsaupeykpy
---
 addons/wiki/wizard/sort_algo.py | 133 ++++++++++++++++++++++++++++++++
 1 file changed, 133 insertions(+)
 create mode 100644 addons/wiki/wizard/sort_algo.py

diff --git a/addons/wiki/wizard/sort_algo.py b/addons/wiki/wizard/sort_algo.py
new file mode 100644
index 00000000000..9579b8ff6b7
--- /dev/null
+++ b/addons/wiki/wizard/sort_algo.py
@@ -0,0 +1,133 @@
+def sort(data, index):
+    for i in range(len(data)):
+        j = i + 1
+        for j in range(len(data)-1):
+            d1 = data[i].split('.')
+            d2 = data[j].split('.')
+            
+            l1 = len(d1)
+            l2 = len(d2)
+            max = 0
+            if l1 < l2:
+                max = l1
+            elif l2 < l1:
+                max = l2
+            else:
+                max = l1
+            
+            if max == 1:
+                if int(d1[0]) == int(d2[0]):
+                    if len(d1) < len(d2):
+                        tmp = data[i]
+                        data[i] = data[j]
+                        data[j] = tmp
+                        continue
+
+            for p in range(0, max):
+                val1 = val2 = 0
+                try:
+                    val1 = int(d1[p])
+                except:
+                    val1 = 0
+                    
+                try:
+                    val2 = int(d2[p])
+                except:
+                    val2 = 0
+                    
+                if val1 < val2:
+                    tmp = data[i]
+                    data[i] = data[j]
+                    data[j] = tmp
+            if data[i].startswith(data[j]):
+                tmp = data[i]
+                tmp = tmp.replace(data[j],'')
+
+def group(data):
+    gp = {}
+    for i in range(len(data)):
+        d1 = data[i].split('.')[0]
+        if gp.has_key(d1):
+            gp[d1].append(data[i])
+        else:
+            gp[d1] = [data[i]]
+    return gp
+
+def max(data):
+    max = 0
+    for i in range(len(data)):
+        d = str(data[i]).split('.')
+        if len(d) > max:
+            max = len(d)
+            
+    return max
+
+def toint(data):
+    for i in range(len(data)):
+        data[i] = int(data[i])
+        
+def rearrange(key, groups):
+    i = 1
+    new = {}
+    for ky in key:
+        new[i] = groups[str(ky)]
+        i += 1
+    return new
+
+def reindex(key, groups):
+    if groups[0] != key:
+        groups[0] = key
+    
+    lvl_group = {}
+    level = max(groups)
+    for i in range(len(groups)):
+        dg = str(groups[i]).split('.')
+        index = len(dg)
+        if lvl_group.has_key(str(index)):
+            lvl_group[str(index)].append(groups[i])
+        else:
+            lvl_group[str(index)] = [groups[i]]
+    
+    for i in range(2, level+1):
+        ixd = 1
+        gps = lvl_group[str(i)]
+        for j in range(len(gps)):
+            dt = gps[j].split('.')
+            new =""
+            for k in range(i-1):
+                new += str(dt[k])
+                new += '.'
+                
+            new += str(ixd)
+            ixd += 1
+            gps[j] = new
+            
+    print lvl_group
+    
+if __name__ == '__main__':
+    
+    data = ['1', '10.1', '10.3', '1.1', '1.2.3', '1.7', '3.1.8', '1.2.2', '1.2.10', '1.3', '1.4', '2', '20.2', '2.1', '2.2', '3', '3.1', '1.2.1', '2.1.2']
+    
+    sort(data, 0)
+    
+    grp = group(data)
+    
+    for gp in grp:
+        loop = max(grp[gp])
+        for lp in range(1, loop):
+            sort(grp[gp],lp)
+    
+    key = grp.keys()
+    toint(key)
+    key.sort()
+    
+    groups = rearrange(key, grp)
+    
+    new_data = []
+    for key in groups:
+        new_data.extend(groups[key])
+        #print groups[key]
+    
+    print 'XXXXXXXXXXXXXXXXX : ', new_data
+#    print groups
+#    

From d06bd52c367e44b889831c3b705d27b190790e6c Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@tinyerp.com>
Date: Wed, 3 Dec 2008 11:44:19 +0100
Subject: [PATCH 17/82] [IMP] Add maintenance.contract.module to store the
 modules in the maintenance contract [IMP] Use a fields.many2many instead of a
 fields.text for the module list in the maintenance.contract

bzr revid: stephane@tinyerp.com-20081203104419-64mrmq6qmjhv553k
---
 bin/addons/base/maintenance/maintenance.py    | 34 +++++++++++++++----
 .../base/maintenance/maintenance_view.xml     |  7 +++-
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/bin/addons/base/maintenance/maintenance.py b/bin/addons/base/maintenance/maintenance.py
index 8550fd02d02..71369190c8e 100644
--- a/bin/addons/base/maintenance/maintenance.py
+++ b/bin/addons/base/maintenance/maintenance.py
@@ -37,6 +37,16 @@ from pprint import pprint as pp
 from tools import config
 import xmlrpclib
 
+class maintenance_contract_module(osv.osv):
+    _name ="maintenance.contract.module"
+    _description = "maintenance contract modules"
+    _columns = {
+        'name' : fields.char('Name', size=128, required=True),
+        'version': fields.char('Version', size=64,),
+    }
+
+maintenance_contract_module()
+
 class maintenance_contract(osv.osv):
     _name = "maintenance.contract"
     _description = "Maintenance Contract"
@@ -45,7 +55,7 @@ class maintenance_contract(osv.osv):
         'password' : fields.char('Password', size=64, invisible=True, required=True, readonly=True),
         'date_start' : fields.date('Starting Date', readonly=True),
         'date_stop' : fields.date('Ending Date', readonly=True),
-        'modules': fields.text('Covered Modules')
+        'module_ids' : fields.many2many('maintenance.contract.module', 'maintenance_contract_module_rel', 'contract_id', 'module_id', 'Covered Modules', readonly=True),
     }
     _defaults = {
         'password' : lambda obj,cr,uid,context={} : '',
@@ -78,20 +88,32 @@ class maintenance_contract_wizard(osv.osv_memory):
         rpc = xmlrpclib.ServerProxy('http://%s:%d/xmlrpc/common' % (remote_server, port))
         ruid = rpc.login(remote_db, login, password)
         rpc = xmlrpclib.ServerProxy('http://%s:%d/xmlrpc/object' % (remote_server, port))
-        res = rpc.execute(remote_db, ruid, password, 
+        contract_info = rpc.execute(remote_db, ruid, password, 
                           'maintenance.maintenance', 'get_module_for_contract', contract['name'], contract['password'])
-        if res:
+        if contract_info:
+            if contract_info['modules']:
+                module_ids = []
+                for name, version in contract_info['modules']:
+                    contract_module = self.pool.get('maintenance.contract.module')
+                    res = contract_module.search(cr, uid, [('name', '=', name),('version', '=', version)])
+                    if not res:
+                        id = contract_module.create(cr, uid, { 'name' : name, 'version' : version } )
+                    else:
+                        id = res[0]
+                    module_ids.append(id)
+
             self.pool.get('maintenance.contract').create(
                 cr, 
                 uid, {
                     'name' : contract['name'],
                     'password' : contract['password'],
-                    'date_start' : res['date_from'],
-                    'date_stop' : res['date_to'],
+                    'date_start' : contract_info['date_from'],
+                    'date_stop' : contract_info['date_to'],
+                    'module_ids' : [(6,0,module_ids)],
                 }
             )
 
-        return self.write(cr, uid, ids, {'state' : ('unvalidated', 'validated')[bool(res)] }, context=context)
+        return self.write(cr, uid, ids, {'state' : ('unvalidated', 'validated')[bool(contract_info)] }, context=context)
 
 maintenance_contract_wizard()
 
diff --git a/bin/addons/base/maintenance/maintenance_view.xml b/bin/addons/base/maintenance/maintenance_view.xml
index 31936ea54c4..fcef2e17911 100644
--- a/bin/addons/base/maintenance/maintenance_view.xml
+++ b/bin/addons/base/maintenance/maintenance_view.xml
@@ -26,7 +26,12 @@
                     <field name="date_start" select="1"/>
                     <field name="date_stop" select="1"/>
                     <separator string="Covered Modules" colspan="4"/>
-                    <field name="modules" nolabel="1" colspan="4"/>
+                    <field name="module_ids" nolabel="1" colspan="4">
+                        <tree string="Covered Modules">
+                            <field name="name" />
+                            <field name="version" />
+                        </tree>
+                    </field>
                 </form>
             </field>
         </record>

From 5bd81b51da455c6051a691c24d039574a945728a Mon Sep 17 00:00:00 2001
From: Jay Vora <jvo@tinyerp.com>
Date: Wed, 3 Dec 2008 16:20:58 +0530
Subject: [PATCH 18/82] Avoided Label's set markup error on GTK by replacing
 &gt; by >.

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

diff --git a/addons/account_report/account_view.xml b/addons/account_report/account_view.xml
index bfbc61a7d28..671df56d3e3 100644
--- a/addons/account_report/account_view.xml
+++ b/addons/account_report/account_view.xml
@@ -55,7 +55,7 @@
                                 <label align="1.0" string="= Goodness Indicator Limit:"/>
                                 <label align="0.0" string="Good"/>
                                 <newline/>
-                                <label align="1.0" string="&gt; Goodness Indicator Limit:"/>
+                                <label align="1.0" string="> Goodness Indicator Limit:"/>
                                 <label align="0.0" string="Very Good"/>
                                 <newline/>
                             </group>

From b5de92db2ca8cf83049566986576219aaf5924cf Mon Sep 17 00:00:00 2001
From: qdp <qdp@tinyerp.com>
Date: Wed, 3 Dec 2008 12:29:25 +0100
Subject: [PATCH 19/82] *improvement of mrp_repair module (lots of things)

bzr revid: qdp@tinyerp.com-20081203112925-flb88fatksd18l51
---
 addons/mrp_repair/mrp_repair.py           | 152 +++++++++++-----------
 addons/mrp_repair/mrp_repair_view.xml     |  57 ++++----
 addons/mrp_repair/mrp_repair_workflow.xml |  40 ++++--
 3 files changed, 134 insertions(+), 115 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 7ebdbfeb98b..01b568b3da1 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -77,6 +77,7 @@ class mrp_repair(osv.osv):
         'state': fields.selection([
             ('draft','Quotation'),
             ('confirmed','Confirmed'),
+            ('ready','Ready to Repair'),
             ('under_repair','Under Repair'),
             ('2binvoiced','To be Invoiced'),            
             ('invoice_except','Invoice Exception'),
@@ -84,7 +85,7 @@ class mrp_repair(osv.osv):
             ('cancel','Cancel')
             ], 'Repair State', readonly=True, help="Gives the state of the Repair Order"),
         'location_id': fields.many2one('stock.location', 'Current Location', required=True, select=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'location_dest_id': fields.many2one('stock.location', 'Delivery Location', required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'location_dest_id': fields.many2one('stock.location', 'Delivery Location', readonly=True, states={'draft':[('readonly',False)]}),
         'move_id': fields.many2one('stock.move', 'Move',required=True, domain="[('product_id','=',product_id)]", readonly=True, states={'draft':[('readonly',False)]}),#,('location_dest_id','=',location_id),('prodlot_id','=',prodlot_id)
         'guarantee_limit': fields.date('Guarantee limit'),
         'operations' : fields.one2many('mrp.repair.line', 'repair_id', 'Operation Lines', readonly=True, states={'draft':[('readonly',False)]}),        
@@ -95,12 +96,13 @@ class mrp_repair(osv.osv):
             ("b4repair","Before Repair"),
             ("after_repair","After Repair")
            ], "Invoice Method", 
-            select=True, states={'draft':[('readonly',False)]}, readonly=True),
+            select=True, required=True, states={'draft':[('readonly',False)]}, readonly=True),
         'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True),
         'picking_id': fields.many2one('stock.picking', 'Packing',readonly=True),
         'fees_lines' : fields.one2many('mrp.repair.fee', 'repair_id', 'Fees Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'internal_notes' : fields.text('Internal Notes'),
         'quotation_notes' : fields.text('Quotation Notes'),
+        'deliver_bool': fields.boolean('Deliver'),
         'invoiced': fields.boolean('Invoiced', readonly=True),
         'repaired' : fields.boolean('Repaired', readonly=True),
         'amount_untaxed': fields.function(_amount_untaxed, method=True, string='Untaxed Amount'),
@@ -110,6 +112,7 @@ class mrp_repair(osv.osv):
     
     _defaults = {
         'state': lambda *a: 'draft',
+        'deliver_bool': lambda *a: True,
         'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'mrp.repair'),
         'invoice_method': lambda *a: 'none',
         'pricelist_id': lambda self, cr, uid,context : self.pool.get('product.pricelist').search(cr,uid,[('type','=','sale')])[0]
@@ -140,29 +143,28 @@ class mrp_repair(osv.osv):
         }
     
     def onchange_move_id(self, cr, uid, ids, prod_id=False, move_id=False):
+        data = {}
+        data['value'] = {}
         if not prod_id:
-            return {'value': {
-                        'prodlot_id': False, 
-                        'move_id': False, 
-                        'guarantee_limit' :False, 
-                        'location_id':  False, 
-                        'location_dest_id': False
-                    }
-            }
+            return data
         if move_id:
             move =  self.pool.get('stock.move').browse(cr, uid, move_id)
             product = self.pool.get('product.product').browse(cr, uid, prod_id)
-            date = move.date_planned
+            date = move.picking_id.date_done
             limit = mx.DateTime.strptime(date, '%Y-%m-%d %H:%M:%S') + RelativeDateTime(months=product.warranty)
-            return {'value': {
-                        'guarantee_limit': limit.strftime('%Y-%m-%d'),
-                    }
-            }
+            data['value']['guarantee_limit'] = limit.strftime('%Y-%m-%d')
+            data['value']['location_id'] = move.location_dest_id.id
+            data['value']['location_dest_id'] = move.location_dest_id.id
+            data['value']['partner_id'] = move.address_id and move.address_id.partner_id and move.address_id.partner_id.id
+            data['value']['address_id'] = move.address_id and move.address_id.id
+            d = self.onchange_partner_id(cr, uid, ids, data['value']['partner_id'], data['value']['address_id'])
+            data['value'].update(d['value'])
+        return data
     
     def button_dummy(self, cr, uid, ids, context=None):
         return True
 
-    def onchange_partner_id(self, cr, uid, ids, part):
+    def onchange_partner_id(self, cr, uid, ids, part, address_id):
         if not part:
             return {'value': {
                         'address_id': False,
@@ -174,33 +176,28 @@ class mrp_repair(osv.osv):
         partner = self.pool.get('res.partner').browse(cr, uid, part)
         pricelist = partner.property_product_pricelist and partner.property_product_pricelist.id or False
         return {'value': {
-                    'address_id': addr['delivery'], 
+                    'address_id': address_id or addr['delivery'], 
                     'partner_invoice_id': addr['invoice'],
                     'pricelist_id': pricelist
                 }
         }
 
-    
     def onchange_lot_id(self, cr, uid, ids, lot, product_id):
+        data = {}
+        data['value'] = {
+            'location_id': False,
+            'location_dest_id': False,
+            'move_id': False,
+            'guarantee_limit': False
+        }
+
         if not lot:
-            return {'value': {
-                        'location_id': False,
-                        'location_dest_id': False,
-                        'move_id': False,
-                        'guarantee_limit': False
-                    }
-            }
+            return data
         lot_info = self.pool.get('stock.production.lot').browse(cr, uid, lot)
         move_ids = self.pool.get('stock.move').search(cr, uid, [('prodlot_id', '=', lot)])
         
         if not len(move_ids):
-            return {'value': {
-                        'location_id': False,
-                        'location_dest_id': False,
-                        'move_id':  False, 
-                        'guarantee_limit':False
-                    }
-            }
+            return data
 
         def get_last_move(lst_move):
             while lst_move.move_dest_id and lst_move.move_dest_id and lst_move.move_dest_id.picking_id.state == 'done':
@@ -208,17 +205,11 @@ class mrp_repair(osv.osv):
             return lst_move
 
         move_id = move_ids[0]
-        move = get_last_move(self.pool.get('stock.move').browse(cr, uid, move_id))            
-        product = self.pool.get('product.product').browse(cr, uid, product_id)
-        date = move.picking_id.date_done
-        limit = mx.DateTime.strptime(date, '%Y-%m-%d %H:%M:%S') + RelativeDateTime(months=product.warranty)            
-        return {'value': {
-                    'location_id': move.location_dest_id.id, 
-                    'location_dest_id': move.location_dest_id.id,
-                    'move_id': move.id,
-                    'guarantee_limit': limit.strftime('%Y-%m-%d')
-                }
-            }
+        move = get_last_move(self.pool.get('stock.move').browse(cr, uid, move_id))
+        data['value']['move_id'] = move.id
+        d = self.onchange_move_id(cr, uid, ids, product_id, move.id)
+        data['value'].update(d['value'])
+        return data
         
     def action_cancel_draft(self, cr, uid, ids, *args):
         if not len(ids):
@@ -332,6 +323,10 @@ class mrp_repair(osv.osv):
         #self.action_invoice_end(cr, uid, ids)
         return res
 
+    def action_repair_ready(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'state':'ready'})
+        return True
+
     def action_invoice_cancel(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'invoice_except'})
         return True
@@ -344,7 +339,7 @@ class mrp_repair(osv.osv):
         for order in self.browse(cr, uid, ids):
             val = {}             
             if (order.invoice_method=='b4repair'):
-                val['state'] = 'under_repair'
+                val['state'] = 'ready'
             else:                
                 #val['state'] = 'done'                 
                 pass
@@ -358,7 +353,7 @@ class mrp_repair(osv.osv):
             if (not order.invoiced and order.invoice_method=='after_repair'):
                 val['state'] = '2binvoiced'  
             elif (not order.invoiced and order.invoice_method=='b4repair'):
-                val['state'] = 'confirmed'
+                val['state'] = 'ready'
             else:                
                 #val['state'] = 'done'                 
                 pass
@@ -373,37 +368,38 @@ class mrp_repair(osv.osv):
         res = {}    
         company = self.pool.get('res.users').browse(cr, uid, uid).company_id
         for repair in self.browse(cr, uid, ids, context=context): 
-            
-            picking = self.pool.get('stock.picking').create(cr, uid, {
-                'origin': repair.name,
-                'state': 'draft',
-                'move_type': 'one',
-                'address_id': repair.address_id and repair.address_id.id or False,
-                'note': repair.internal_notes,
-                'invoice_state': 'none',
-                'type': 'out',  # FIXME delivery ?
-            })
-            wf_service = netsvc.LocalService("workflow")
-            wf_service.trg_validate(uid, 'stock.picking', picking, 'button_confirm', cr)
+            if repair.deliver_bool:
+                picking = self.pool.get('stock.picking').create(cr, uid, {
+                    'origin': repair.name,
+                    'state': 'draft',
+                    'move_type': 'one',
+                    'address_id': repair.address_id and repair.address_id.id or False,
+                    'note': repair.internal_notes,
+                    'invoice_state': 'none',
+                    'type': 'out',  # FIXME delivery ?
+                })
+                wf_service = netsvc.LocalService("workflow")
+                wf_service.trg_validate(uid, 'stock.picking', picking, 'button_confirm', cr)
 
-            move_id = self.pool.get('stock.move').create(cr, uid, {
-                'name': repair.name,
-                'picking_id': picking,
-                'product_id': repair.product_id.id,
-                'product_qty': 1.0,
-                'product_uom': repair.product_id.uom_id.id,
-                #'product_uos_qty': line.product_uom_qty,
-                #'product_uos': line.product_uom.id,
-                'prodlot_id': repair.prodlot_id and repair.prodlot_id.id or False,
-                'address_id': repair.address_id and repair.address_id.id or False,
-                'location_id': repair.location_id.id,
-                'location_dest_id': repair.location_dest_id.id,
-                'tracking_id': False,
-                'state': 'assigned',    # FIXME done ?
-            })
-            
-            self.write(cr, uid, [repair.id], {'state':'done', 'picking_id':picking})
-            res[repair.id] = picking
+                move_id = self.pool.get('stock.move').create(cr, uid, {
+                    'name': repair.name,
+                    'picking_id': picking,
+                    'product_id': repair.product_id.id,
+                    'product_qty': 1.0,
+                    'product_uom': repair.product_id.uom_id.id,
+                    #'product_uos_qty': line.product_uom_qty,
+                    #'product_uos': line.product_uom.id,
+                    'prodlot_id': repair.prodlot_id and repair.prodlot_id.id or False,
+                    'address_id': repair.address_id and repair.address_id.id or False,
+                    'location_id': repair.location_id.id,
+                    'location_dest_id': repair.location_dest_id.id,
+                    'tracking_id': False,
+                    'state': 'assigned',    # FIXME done ?
+                })
+                self.write(cr, uid, [repair.id], {'state':'done', 'picking_id':picking})
+                res[repair.id] = picking
+            else:
+                self.write(cr, uid, [repair.id], {'state':'done'})
         return res   
         
            
@@ -449,7 +445,7 @@ class ProductChangeMixin(object):
 
 class mrp_repair_line(osv.osv, ProductChangeMixin):
     _name = 'mrp.repair.line'
-    _description = 'Repair Operations Lines'    
+    _description = 'Repair Operations Lines'
     
     def copy(self, cr, uid, id, default=None, context=None):
         if not default: default = {}
@@ -466,7 +462,7 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
         return res
 
     _columns = {
-        'name' : fields.char('Name',size=64,required=True),
+        'name' : fields.char('Description',size=64,required=True),
         'repair_id': fields.many2one('mrp.repair', 'Repair Order Ref',ondelete='cascade', select=True),
         'type': fields.selection([('add','Add'),('remove','Remove')],'Type'),
         'to_invoice': fields.boolean('To Invoice'),                
@@ -509,7 +505,7 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
             }
         if type == 'remove':
             return {'value': {
-                        'to_invoice': to_invoice,
+                        'to_invoice': False,
                         'location_id': produc_id,
                         'location_dest_id':False
                     }
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index d53a3ec5754..5cb2a633c65 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -10,22 +10,23 @@
                 <form string="Repairs order">
                     <group col="6" colspan="4">
                     	<field name="name"/>
-                    	<newline/>
                         <field name="product_id" select="1"  on_change="onchange_product_id(product_id)"/>
+                        <field name="deliver_bool"/>
+                    	<newline/>
                         <field name="prodlot_id" select="2" on_change="onchange_lot_id(prodlot_id,product_id)"/>
+                        <field name="move_id" on_change="onchange_move_id(product_id, move_id)"/>
                         <field name="repaired"/>
-                        <field name="partner_id" select="2" on_change="onchange_partner_id(partner_id)" />
-                        <field name="address_id"/>
+                    	<newline/>
+                        <field name="partner_id" select="2" on_change="onchange_partner_id(partner_id,address_id)" attrs="{'readonly':[('deliver_bool','=', False)]}"/>
+                        <field name="address_id" attrs="{'readonly':[('deliver_bool','=', False)]}"/>
                     	<field name="invoiced"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Products">
                             <field name="location_id"/>
-                            <field name="move_id"   on_change="onchange_move_id(product_id, move_id)"/>
-                            <field name="location_dest_id"/>
+                            <field name="location_dest_id" attrs="{'readonly':[('deliver_bool','=', False)], 'required':[('deliver_bool','=', True)]}"/>
                             <field name="guarantee_limit" />
                             <newline/>
-                            <separator colspan="4" string="Operations"/>
                             <field colspan="4" mode="tree,form" name="operations" nolabel="1" widget="one2many_list">
                                 <form string="Operations"> 
                                     <notebook>
@@ -59,17 +60,17 @@
 		                                         
                                      </notebook>
                                 </form>
-                                <tree string="Operations lines" editable="bottom">
-                                    <field name="type" on_change="onchange_operation_type(type,parent.guarantee_limit)"/>                                    
-                                    <field name='name'/> 
-                                    <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id)"/>                                    
+                                <tree string="Operations" editable="bottom">
+                                    <field name="type" on_change="onchange_operation_type(type,parent.guarantee_limit)"/>
+                                    <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id)"/>
+                                    <field name='name'/>
                                     <field name="location_id"/>
-                                    <field name="location_dest_id"/> 
+                                    <field name="location_dest_id"/>
                                     <field name="product_uom_qty" string="Qty" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id)"/>
-                                    <field name="product_uom" string="UoM"/>                                    
-                                    <field name="price_unit"/>   
-                                    <field name="price_subtotal"/>                                
+                                    <field name="product_uom" string="UoM"/>
+                                    <field name="price_unit"/>
                                     <field name="to_invoice"/>
+                                    <field name="price_subtotal"/>
                                 </tree>
                             </field>
                             <newline/>
@@ -82,26 +83,26 @@
                             <newline/>
                             <group col="13" colspan="4">                              
                                 <field name="state" select="2"/>
-                                <button name="repair_confirm" states="draft" string="Confirm Repair"/>  
-                                <button name="action_repair_start" states="confirmed" string="Start Repair"/> 
-                                <button name="action_repair_end" states="under_repair" string="End Repair"/>                           
+                                <button name="repair_confirm" states="draft" string="Confirm Repair"/>
+                                <button name="repair_ready" states="confirmed" string="Start Repair"/>
+                                <button name="action_repair_start" states="ready" string="Start Repair"/>
+                                <button name="action_repair_end" states="under_repair" string="End Repair"/>
                                 <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice"/>
-                                <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected"/>                                
+                                <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected"/>
                                 <button name="action_invoice_create" states="2binvoiced" string="Make Invoice"/>
 								<button name="%(action_cancel_repair)d" states="invoice_except" string="Cancel Repair" type="action"/>
                                 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
                                 <button name="cancel" states="draft" string="Cancel Repair"/>                                
-                                <button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,under_repair" string="Cancel Repair" type="action"/>
+                                <button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,ready,under_repair" string="Cancel Repair" type="action"/>
                             </group>
                         </page>
                         <page string="Invoicing">
                             <field name="pricelist_id" context="product_id=product_id"/>
                             <field name="partner_invoice_id"/>
-                            <field name="invoice_method"/>
+                            <field name="invoice_method" attrs="{'readonly':[('deliver_bool','=', False)]}"/>
                             <field name="invoice_id"/>
-                            <separator colspan="4" string="Fees"/>
                             <field colspan="4" mode="tree,form" name="fees_lines" nolabel="1" widget="one2many_list">
-                            <form string="Fees Line">
+                                <form string="Fees">
                                     <notebook>
                                         <page string="Fees Line"> 
                                             <field name='name'/>  
@@ -123,16 +124,16 @@
                                         </page>     
                                       </notebook>                     
                                 </form>
-                                <tree string="Fees lines" editable="bottom">
-                                    <field name='name'/> 
+                                <tree string="Fees" editable="bottom">
                                     <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id,parent.guarantee_limit)"/>
+                                    <field name='name'/>
                                     <field name="product_uom_qty" string="Qty" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id,parent.guarantee_limit)"/>
                                     <field name="product_uom" string="UoM"/>
-                                    <field name="price_unit"/>  
-                                    <field name="price_subtotal"/>  
-                                    <field name="to_invoice"/>                                
+                                    <field name="price_unit"/>
+                                    <field name="to_invoice"/>
+                                    <field name="price_subtotal"/>
                                 </tree>
-                                </field>
+                            </field>
                         </page>
                         <page string="Quality">
                             <separator colspan="4" string="Internal Notes"/>
diff --git a/addons/mrp_repair/mrp_repair_workflow.xml b/addons/mrp_repair/mrp_repair_workflow.xml
index fd57a61d345..f4f9baf191a 100644
--- a/addons/mrp_repair/mrp_repair_workflow.xml
+++ b/addons/mrp_repair/mrp_repair_workflow.xml
@@ -29,7 +29,19 @@
             <field name="wkf_id" ref="wkf_repair"/>
             <field name="name">wait_repair</field>
         </record>
-        
+        <record id="act_repair_ready" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_repair"/>
+            <field name="name">Ready Repair</field>
+            <field name="kind">function</field>            
+            <field name="action">action_repair_ready()</field>
+        </record>
+        <record id="act_cancel3" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_repair"/>
+            <field name="name">cancel3</field>
+            <field name="flow_stop">True</field>
+            <field name="kind">stopall</field>
+            <field name="action">action_cancel()</field>
+        </record>
         <record id="act_done" model="workflow.activity">
             <field name="wkf_id" ref="wkf_repair"/>
             <field name="name">done</field>
@@ -135,8 +147,8 @@
 
         <record id="trans_invoice_start_repair" model="workflow.transition">
             <field name="act_from" ref="act_invoice_end"/>
-            <field name="act_to" ref="act_repair_start"/>
-            <field name="condition">invoice_method=='b4repair'</field>            
+            <field name="act_to" ref="act_repair_ready"/>
+            <field name="condition">invoice_method=='b4repair'</field>
         </record>
 
         <record id="trans_wait_invoice_cancel2" model="workflow.transition">
@@ -151,10 +163,16 @@
             <field name="condition">invoice_method=='after_repair'</field>
         </record>
 
-        <record id="trans_wait_repair_ready" model="workflow.transition">
+        <record id="trans_wait_repair_start" model="workflow.transition">
             <field name="act_from" ref="act_wait_repair"/>
             <field name="act_to" ref="act_repair_start"/>
-            <field name="signal">repair_ready</field>            
+            <field name="signal">repair_ready</field>
+        </record>
+
+        <record id="trans_ready_repair_start" model="workflow.transition">
+            <field name="act_from" ref="act_repair_ready"/>
+            <field name="act_to" ref="act_repair_start"/>
+            <field name="signal">action_repair_start</field>
         </record>
 
        <record id="trans_repair_repair_end" model="workflow.transition">
@@ -171,10 +189,14 @@
 
         <record id="trans_reapir_end_invoice" model="workflow.transition">
             <field name="act_from" ref="act_repair_end"/>
-            <field name="act_to" ref="act_wait_invoice"/>                  
-            <field name="condition">invoice_method=='after_repair'</field>                 
+            <field name="act_to" ref="act_wait_invoice"/>
+            <field name="condition">invoice_method=='after_repair'</field>
         </record>
-           
-        
+        <record id="trans_wait_repair_cancel3" model="workflow.transition">
+            <field name="act_from" ref="act_wait_repair"/>
+            <field name="act_to" ref="act_cancel3"/>
+            <field name="signal">cancel</field>
+        </record>
+
     </data>
 </openerp>

From 452c12f8ed8997e687999c2149ed8c33cf99e8ef Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Wed, 3 Dec 2008 17:27:53 +0530
Subject: [PATCH 20/82] write code for the reindexing : by fabien

bzr revid: mga@tinyerp.com-20081203115753-32atuyr9t53exq2p
---
 addons/wiki/wizard/make_index.py | 49 ++++++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 5 deletions(-)

diff --git a/addons/wiki/wizard/make_index.py b/addons/wiki/wizard/make_index.py
index 34a333911dd..1f2745448e4 100644
--- a/addons/wiki/wizard/make_index.py
+++ b/addons/wiki/wizard/make_index.py
@@ -39,11 +39,50 @@ def wiki_do_index(self, cr, uid, data, context):
     iid = ','.join([str(x) for x in ids])
     sSQL = "Select id, section from wiki_wiki where id in (%s) order by section " % (iid)
     cr.execute(sSQL)
-    wiki = cr.fetchall()
-    i = 1
-    for wk in wiki:
-        wiki_pool.write(cr, uid, [wk[0]], {'section':i})
-        i+=1
+    lst0 = cr.fetchall()
+    lst = []
+    ids = {}
+    for l in lst0:
+        ids[l[1]] = l[0]
+        lst.append(l[1])
+
+    lst.sort()
+    val = None
+    def toint(x):
+        try:
+            return int(x)
+        except:
+            return 1
+    
+    lst = map(lambda x: map(toint, x.split('.')), lst)
+    
+    result = []
+    current = ['0']
+    current2 = []
+
+    for l in lst:
+        for pos in range(len(l)):
+            if pos >= len(current):
+                current.append('1')
+                continue
+            if (pos == len(l) - 1) or (pos >= len(current2)) or (toint(l[pos]) > toint(current2[pos])):
+                 current[pos] = str(toint(current[pos]) + 1)
+                 current = current[:pos + 1]
+            if pos == len(l) - 1:
+                 break
+             
+        key = ('.'.join([str(x) for x in l]))
+        id = ids[key]
+        val = ('.'.join([str(x) for x in current[:]]), id)
+
+        if val:
+            result.append(val)
+        current2 = l
+    
+    print 'OLD', lst
+    print 'NEW', result
+    for rs in result:
+        wiki_pool.write(cr, uid, [rs[1]], {'section':rs[0]})
         
     return {}
 

From 775ab9010cda074fdcef8a0a9c22d3a096d53498 Mon Sep 17 00:00:00 2001
From: Husen Daudi <hda@tinyerp.com>
Date: Wed, 3 Dec 2008 19:08:20 +0530
Subject: [PATCH 21/82] bugfix for task work and remaining hours

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

bzr revid: hda@tinyerp.com-20081203133820-fp0ca4k3qwk61jj2
---
 addons/.project                 | 17 -----------------
 addons/project/project.py       | 24 +++++++++---------------
 addons/project/project_demo.xml |  2 +-
 addons/project/project_view.xml |  5 +++--
 4 files changed, 13 insertions(+), 35 deletions(-)
 delete mode 100644 addons/.project

diff --git a/addons/.project b/addons/.project
deleted file mode 100644
index 6b6fa8f2cfc..00000000000
--- a/addons/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>openobject-addons</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.python.pydev.PyDevBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.python.pydev.pythonNature</nature>
-	</natures>
-</projectDescription>
diff --git a/addons/project/project.py b/addons/project/project.py
index b7ff8044707..c2337da7053 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -246,6 +246,15 @@ class task(osv.osv):
     #_sql_constraints = [
     #    ('remaining_hours', 'CHECK (remaining_hours>=0)', 'Please increase and review remaining hours ! It can not be smaller than 0.'),
     #]
+    
+    def _button_dummy(self, cr, uid, ids, context={}):
+        tot_work=0
+        for obj in self.browse(cr,uid,ids):
+            for work in obj.work_ids:
+                tot_work+=work.hours
+            final_val = obj.planned_hours - tot_work
+            self.write(cr,uid,ids[0],{'remaining_hours':final_val})
+        return True
 
     def copy(self, cr, uid, id, default={},context={}):
         default = default or {}
@@ -408,23 +417,8 @@ class project_work(osv.osv):
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S')
     }
     _order = "date desc"
-    def create(self, cr, uid, vals, *args, **kwargs):
-        if 'task_id' in vals:
-            cr.execute('update project_task set remaining_hours=remaining_hours+%.2f where id=%d', (-vals.get('hours',0.0), vals['task_id']))
-        return super(project_work,self).create(cr, uid, vals, *args, **kwargs)
 
-    def write(self, cr, uid, ids,vals,context={}):
-        for work in self.browse(cr, uid, ids, context):
-            cr.execute('update project_task set remaining_hours=remaining_hours+%.2f+(%.2f) where id=%d', (-vals.get('hours',0.0), work.hours, work.task_id.id))
-        return super(project_work,self).write(cr, uid, ids, vals, context)
-
-    def unlink(self, cr, uid, ids, *args, **kwargs):
-        for work in self.browse(cr, uid, ids):
-            cr.execute('update project_task set remaining_hours=remaining_hours+%.2f where id=%d', (work.hours, work.task_id.id))
-        return super(project_work,self).unlink(cr, uid, ids,*args, **kwargs)
 project_work()
 
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 9a25d722689..ea6803bf302 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -89,7 +89,7 @@
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_21"/>
             <field name="name">Internal testing + Software Install</field>
-            <field name="date_deadline">2007-06-06</field>
+            <field name="date_deadline">2008-06-06</field>
         </record>
         <record id="project_task_188" model="project.task">
             <field name="sequence">17</field>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 9b92f22c2cb..b2d31694d57 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -220,7 +220,8 @@
                                 widget="float_time"
                                 on_change="onchange_planned(planned_hours,effective_hours)"/>
                             <field name="delay_hours" widget="float_time"/>
-                            <field name="remaining_hours" select="2" widget="float_time"/>
+                            <field name="remaining_hours" select="2" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" colspan="1"/>
+                            <button name="_button_dummy" string="Compute" type="object" colspan="1"/>
                             <field name="effective_hours" widget="float_time"/>
 
                             <field colspan="4" name="description" nolabel="1" select="2"/>
@@ -507,6 +508,6 @@
         <act_window domain="[('user_id', '=', active_id),('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned tasks" res_model="project.task" src_model="res.users" view_mode="tree,form" view_type="form"/>
 
         <act_window domain="[('user_id', '=', active_id),('date', '&gt;=', time.strftime('%Y-%m-01'))]" id="act_res_users_2_project_task_work_month" name="Month works" res_model="project.task.work" src_model="res.users" view_mode="tree,form" view_type="form"/>
-
+        
     </data>
 </openerp>

From 1bc9def53687958a472733f28616d37171f2c47a Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@tinyerp.com>
Date: Wed, 3 Dec 2008 19:33:21 +0530
Subject: [PATCH 22/82] modify report

bzr revid: mra@tinyerp.com-20081203140321-8qt25xrhja1iwlpu
---
 addons/mrp_repair/report/order.rml | 401 +++++++++++++----------------
 1 file changed, 175 insertions(+), 226 deletions(-)

diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml
index 6805496a5e8..223bcd38fbe 100644
--- a/addons/mrp_repair/report/order.rml
+++ b/addons/mrp_repair/report/order.rml
@@ -10,7 +10,7 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="AddressTable">
+    <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
@@ -48,19 +48,28 @@
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="HeadingTable">
+    <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,-1"/>
-
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table7">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
@@ -68,81 +77,58 @@
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table8">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
     <blockTableStyle id="Table9">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table4">
+    <blockTableStyle id="Table10">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,2" stop="3,2"/>
     </blockTableStyle>
-    <blockTableStyle id="Table1">
+    <blockTableStyle id="Table11">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table8">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P3" fontName="Helvetica-Oblique" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P4" fontName="Helvetica-Oblique" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="5.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P17" fontName="Helvetica"/>
-    <paraStyle name="P18" fontName="Helvetica" fontSize="9.0" leading="11"/>
-    <paraStyle name="P19" fontName="Helvetica-Bold" fontSize="9.0" leading="11"/>
-    <paraStyle name="P20" fontName="Helvetica-Oblique" fontSize="2.0" leading="3"/>
-    <paraStyle name="P21" fontName="Helvetica-Oblique" fontSize="2.0" leading="3"/>
-    <paraStyle name="P22" fontName="Helvetica-Bold" fontSize="9.0" leading="11"/>
-    <paraStyle name="P23" fontName="Helvetica-Oblique" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P24" fontName="Helvetica" fontSize="2.0" leading="3"/>
-    <paraStyle name="P25" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT"/>
-    <paraStyle name="P26" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="P27" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P28" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P29" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P30" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P31" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" fontName="Helvetica-Oblique" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="5.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P15" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P18" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P19" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P20" fontName="Helvetica-Oblique" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P21" fontName="Helvetica"/>
+    <paraStyle name="P22" fontName="Times-Roman"/>
+    <paraStyle name="P23" fontName="Times-Roman"/>
+    <paraStyle name="P24" fontName="Helvetica-Oblique" fontSize="2.0" leading="3"/>
+    <paraStyle name="P25" fontName="Helvetica-Oblique" fontSize="2.0" leading="3" alignment="RIGHT"/>
+    <paraStyle name="P26" fontName="Helvetica-Bold" fontSize="9.0" leading="11"/>
+    <paraStyle name="P27" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P28" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="P29" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="P30" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="P31" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P32" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P33" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P34" fontName="Helvetica" fontSize="5.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P35" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P36" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P37" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P38" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P39" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P40" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P41" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P33" fontName="Helvetica" fontSize="5.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Times-Roman"/>
     <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -180,271 +166,234 @@
   </stylesheet>
   <images/>
   <story>
-    <para style="P9">[[ repeatIn(objects,'o') ]]</para>
-    <blockTable colWidths="265.0,51.0,225.0" style="AddressTable">
+    <para style="P11">[[ repeatIn(objects,'o') ]]</para>
+    <blockTable colWidths="265.0,51.0,225.0" style="Table1">
       <tr>
         <td>
-          <para style="P10">Shipping address :</para>
-          <para style="P1">[[ o.partner_id.name ]]</para>
-          <para style="P1">[[ o.address_id.title or '' ]] [[ o.address_id.name ]]</para>
-          <para style="P1">[[ o.address_id.street ]]</para>
-          <para style="P1">[[ o.address_id.street2 or '' ]]</para>
-          <para style="P1">[[ o.address_id.city or '' ]] [[ o.address_id.zip or '' ]]</para>
-          <para style="P1">[[ o.address_id.state_id and o.address_id.state_id.name or '' ]] [[ o.address_id.country_id and o.address_id.country_id.name or '' ]]</para>
-          <para style="P1">
+          <para style="P5">Shipping address :</para>
+          <para style="P3">[[ o.partner_id.name ]]</para>
+          <para style="P3">[[ o.address_id.title or '' ]] [[ o.address_id.name ]]</para>
+          <para style="P3">[[ o.address_id.street ]]</para>
+          <para style="P3">[[ o.address_id.street2 or '' ]]</para>
+          <para style="P3">[[ o.address_id.city or '' ]] [[ o.address_id.zip or '' ]]</para>
+          <para style="P3">[[ o.address_id.state_id and o.address_id.state_id.name or '' ]] [[ o.address_id.country_id and o.address_id.country_id.name or '' ]]</para>
+          <para style="P3">
             <font color="white"> </font>
           </para>
-          <para style="P10">Invoice address :[[ o.partner_id and o.partner_id.property_payment_term.name and removeParentNode('para')]]</para>
-          <para style="P1">[[ o.partner_invoice_id.street ]] [[ o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2 or '') ]]</para>
-          <para style="P1">[[ 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="P12">Invoice address :[[ o.partner_id and o.partner_id.property_payment_term.name ]]</para>
+          <para style="P3">[[ o.partner_invoice_id.street ]] [[ o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2 or '') ]]</para>
+          <para style="P3">[[ 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>
         </td>
         <td>
-          <para style="P9">
+          <para style="P11">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P1">[[ o.partner_id.name ]]</para>
-          <para style="P18">[[ o.partner_id and adr_get(o.partner_id, 'default')['name'] ]]</para>
-          <para style="P18">[[ o.partner_id and adr_get(o.partner_id, 'default')['street'] ]]</para>
-          <para style="P18">[[ o.partner_id and adr_get(o.partner_id, 'default')['zip'] ]] [[ o.partner_id and adr_get(o.partner_id, 'default')['city'] ]]</para>
-          <para style="P18">[[ o.partner_id and adr_get(o.partner_id, 'default')['country_id'] and adr_get(o.partner_id, 'default')['country_id'][1] ]]</para>
+          <para style="P3">[[ o.partner_id.name ]]</para>
+          <para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default')['name'] ]]</para>
+          <para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default')['street'] ]]</para>
+          <para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default')['zip'] ]][[ o.partner_id and adr_get(o.partner_id, 'default')['city'] ]]</para>
+          <para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default')['country_id'] and adr_get(o.partner_id, 'default')['country_id'][1] ]]</para>
+          <para style="P3">
+            <font color="white"> </font>
+          </para>
+          <para style="P3">
+            <font color="white"> </font>
+          </para>
+          <para style="P3">
+            <font color="white"> </font>
+          </para>
+          <para style="P3">
+            <font color="white"> </font>
+          </para>
         </td>
       </tr>
     </blockTable>
+    <para style="P11">
+      <font color="white"> </font>
+    </para>
     <para style="P9">
       <font color="white"> </font>
     </para>
-    <para style="P7">
+    <para style="P7">[[ o.state&lt;&gt;'draft' and removeParentNode('para') ]]Repair Quotation <font face="Helvetica">N° : [[ o.name ]]</font></para>
+    <para style="P8">[[ o.state=='draft' and removeParentNode('para') ]]Repair Order N° : [[ o.name ]]</para>
+    <para style="P10">
       <font color="white"> </font>
     </para>
-    <para style="P6">[[ o.state&lt;&gt;'draft' and removeParentNode('para') ]]Repair Quotation N° : [[ o.name ]]</para>
-    <para style="P26">[[ o.state=='draft' and removeParentNode('para') ]]Repair Order N° : [[ o.name ]]</para>
-    <para style="P8">
-      <font color="white"> </font>
-    </para>
-    <para style="P5">
+    <para style="P6">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="130.0,136.0,136.0,136.0" style="Table2">
       <tr>
         <td>
-          <para style="P12">Product to Repair </para>
+          <para style="P14">Product to Repair </para>
         </td>
         <td>
-          <para style="P12">Lot Number</para>
+          <para style="P14">Lot Number</para>
         </td>
         <td>
-          <para style="P12">Guarantee Limit </para>
+          <para style="P14">Guarantee Limit </para>
         </td>
         <td>
-          <para style="P12">Printing Date</para>
+          <para style="P14">Printing Date</para>
         </td>
       </tr>
     </blockTable>
     <blockTable colWidths="130.0,136.0,136.0,136.0" style="Table3">
       <tr>
         <td>
-          <para style="P13">[[ o.product_id.name or '' ]]</para>
+          <para style="P15">[[ o.product_id.name or '' ]]</para>
         </td>
         <td>
-          <para style="P13">[[ o.prodlot_id.name or '' ]]</para>
+          <para style="P15">[[ o.prodlot_id.name or ' ' ]]</para>
         </td>
         <td>
-          <para style="P13">[[ time.strftime('%d/%m/%Y', time.strptime(o.guarantee_limit, '%Y-%m-%d')) ]]</para>
+          <para style="P15">[[ time.strftime('%d/%m/%Y', time.strptime(o.guarantee_limit, '%Y-%m-%d')) ]]</para>
         </td>
         <td>
-          <para style="P13">[[ time.strftime('%d/%m/%Y') ]]</para>
+          <para style="P15">[[ time.strftime('%d/%m/%Y')]] </para>
         </td>
       </tr>
     </blockTable>
-    <para style="P9">
+    <para style="P11">
       <font color="white"> </font>
     </para>
-    <para style="P9">
+    <para style="P11">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="120.0,140.0,100.0,80.0,80.0" repeatRows="1" style="HeadingTable">
+    <blockTable colWidths="165.0,165.0,71.0,70.0,64.0" repeatRows="1" style="Table4">
       <tr>
-
         <td>
-          <para style="P11">Description</para>
+          <para style="P13">Description</para>
         </td>
         <td>
-          <para style="P11">VAT</para>
+          <para style="P13">VAT</para>
         </td>
         <td>
-          <para style="P14">Quantity</para>
+          <para style="P16">Quantity</para>
         </td>
         <td>
-          <para style="P15">Unit Price</para>
+          <para style="P17">Unit Price</para>
         </td>
         <td>
-          <para style="P16">Price</para>
+          <para style="P18">Price</para>
         </td>
       </tr>
     </blockTable>
     <section>
-      <para style="P32">
-        <font color="white"> </font>
-      </para>
-      <para style="P33">Operation Line(s)</para>
-      <blockTable colWidths="537.0" style="Table6">
+      <para style="P32"/>
+      <para style="P31">Operation Line(s)</para>
+      <blockTable colWidths="26.0,142.0,153.0,95.0,52.0,69.0" style="Table5">
         <tr>
           <td>
-            <para style="P4">[[ repeatIn(o.operations,'line') ]]</para>
-            <blockTable colWidths="120.0,140.0,100.0,80.0,80.0" style="Table7">
-              <tr>
-
-                <td>
-                  <para style="P1">[[ line.name ]]</para>
-                </td>
-                <td>
-		     		<para style="P31">[[ ', '.join(map(lambda x: x.name, line.tax_id)) or '0.00' ]]</para>
-                </td>
-                <td>
-                  <para style="P31">[[ line.product_uom_qty or '0.00' ]] [[ line.product_uom.name ]]</para>
-                </td>
-                <td>
-                  <para style="P28">[[ line.price_unit ]]</para>
-                </td>
-                <td>
-                 	<para style="P29">[[ line.price_subtotal ]]</para>
-                </td>
-              </tr>
-            </blockTable>
-            <para style="P25">
-              <font color="white"> </font>
-            </para>
+            <para style="P4">[[ repeatIn(o.operations,'line') ]] </para> <para style="P4">Add [[ ((line.type == 'add') or removeParentNode('para')) and '' ]] </para>
+            <para style="P4">Remove [[ ((line.type == 'remove') or removeParentNode('para')) and '' ]]</para>
+          </td>
+          <td>
+            <para style="P3">[[ line.name ]]</para>
+          </td>
+          <td>
+            <para style="P27">[[ ','.join(map( lambda x: x.name, line.tax_id)) or '0.00' ]]</para>
+          </td>
+          <td>
+            <para style="P19">[[ line.product_uom_qty or '0.00' ]] [[ line.product_uom.name ]] </para>
+          </td>
+          <td>
+            <para style="P1">[[ line.price_unit ]]</para>
+          </td>
+          <td>
+            <para style="P2">[[ line.price_subtotal ]]</para>
           </td>
         </tr>
       </blockTable>
-      <para style="P34">
-        <font color="white"> </font>
-      </para>
     </section>
-    <para style="P22">Fees Line(s)</para>
-    <blockTable colWidths="539.0" style="Table8">
-      <tr>
-        <td>
-          <para style="P23">[[ repeatIn(o.fees_lines,'fees') ]]</para>
-          <blockTable colWidths="120.0,140.0,100.0,80.0,80.0" style="Table9">
-            <tr>
-
-              <td>
-                <para style="P1">[[ fees.name ]]</para>
-              </td>
-              <td>
-                <para style="P31">[[ ', '.join(map(lambda x: x.name, fees.tax_id)) or '0.00' ]]</para>
-              </td>
-              <td>
-                <para style="P31">[[ fees.product_uom_qty or '0.00' ]] [[ fees.product_uom.name ]] </para>
-              </td>
-              <td>
-                <para style="P28">[[ fees.price_unit ]]</para>
-              </td>
-              <td>
-                <para style="P29">[[ fees.price_subtotal ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-          <para style="P24">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="P21">
-      <font color="white"> </font>
-    </para>
+    <para style="P26">Fees Line(s)</para>
     <para style="P20">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="410.0,59.0,50.0,22.0" style="Table4">
-          <tr>
-        <td>
-          <para style="p1">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="P35">Net Total :</para>
-        </td>
-        <td>
-          <para style="P27">[[ o.amount_untaxed or '0.00' ]]</para>
-        </td>
-        <td>
-          <para style="P30">[[ o.pricelist_id.currency_id.name ]]</para>
-        </td>
-      </tr>
+    <blockTable colWidths="28.0,145.0,150.0,96.0,51.0,69.0" style="Table6">
       <tr>
         <td>
-          <para style="p1">
-            <font color="white"> </font>
-          </para>
+          <para style="P20">[[ repeatIn(o.fees_lines,'fees') ]]</para>
         </td>
         <td>
-          <para style="P35">Taxes :</para>
+          <para style="P3">[[ fees.name ]]</para>
         </td>
         <td>
-          <para style="P27">[[ o.amount_tax or '0.00' ]]</para>
+          <para style="P27">[[ ','.join(map( lambda x: x.name, fees.tax_id)) or '0.00' ]]</para>
         </td>
         <td>
-          <para style="P30">[[ o.pricelist_id.currency_id.name ]]</para>
+          <para style="P19">[[ fees.product_uom_qty or '0.00' ]] [[ fees.product_uom.name ]] </para>
+        </td>
+        <td>
+          <para style="P1">[[ fees.price_unit ]]</para>
+        </td>
+        <td>
+          <para style="P2">[[ fees.price_subtotal ]]</para>
         </td>
       </tr>
-
+    </blockTable>
+    <para style="P24">
+      <font color="white"> </font>
+    </para>
+    <para style="P24">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="444.0,61.0,34.0" style="Table9">
       <tr>
         <td>
-          <para style="P1">
-            <font color="white"> </font>
-          </para>
+          <para style="P28">Net Total :</para>
         </td>
         <td>
-          <para style="P35">Total :</para>
+          <para style="P29">[[ o.amount_untaxed or '0.00' ]]</para>
         </td>
         <td>
-          <para style="P27">[[ total(o) ]] </para>
-        </td>
-        <td>
-          <para style="P30">[[ o.pricelist_id.currency_id.name ]]</para>
+          <para style="P29">[[ o.pricelist_id.currency_id.name ]]</para>
         </td>
       </tr>
+    </blockTable>
+    <blockTable colWidths="444.0,61.0,34.0" style="Table10">
       <tr>
         <td>
-          <para style="P1">
-            <font color="white"> </font>
-          </para>
+          <para style="P28">Taxes:</para>
         </td>
         <td>
-          <para style="P35">
-            <font color="white"> </font>
-          </para>
+          <para style="P29">[[ o.amount_tax or '0.00']]</para>
         </td>
         <td>
-          <para style="P27">
-            <font color="white"> </font>
-          </para>
+          <para style="P29">[[ o.pricelist_id.currency_id.name ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="444.0,61.0,34.0" style="Table11">
+      <tr>
+        <td>
+          <para style="P28">Total :</para>
         </td>
         <td>
-          <para style="P30">
-            <font color="white"> </font>
-          </para>
+          <para style="P30">[[ total(o) ]]</para>
+        </td>
+        <td>
+          <para style="P29">[[ o.pricelist_id.currency_id.name ]]</para>
         </td>
       </tr>
     </blockTable>
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="492.0" style="Table1">
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="534.0" style="Table8">
       <tr>
         <td>
-          <para style="P1">[[ format(o.quotation_notes or '') ]]</para>
+          <para style="P3">[[ format(o.quotation_notes or '') ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P17">
+    <para style="P21">
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file

From 48e1893e78fa7bf65e0c29cf774547ba11a113d7 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 3 Dec 2008 15:22:02 +0100
Subject: [PATCH 23/82] imrpoved

bzr revid: fp@tinyerp.com-20081203142202-4xqrwrd29futw8ns
---
 addons/delivery/delivery_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 0c008c5db55..400d7967b67 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -125,8 +125,7 @@
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
                 <separator string="Notes" position="before">
-                    <field name="id" invisible="True"/>
-                    <field name="carrier_id" context="{'order_id':id}"/>
+                    <field name="carrier_id"/>
                 </separator>
             </field>
         </record>

From 6b1d204031fb0a18d7d7667c89ed1b806e0ed145 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Wed, 3 Dec 2008 19:55:05 +0530
Subject: [PATCH 24/82] improvement in showing diff for 2 histiey pages

bzr revid: mga@tinyerp.com-20081203142505-p91cklqh2gc047em
---
 addons/wiki/wizard/show_diff.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/wiki/wizard/show_diff.py b/addons/wiki/wizard/show_diff.py
index 468931a72e9..80b73bfcba1 100644
--- a/addons/wiki/wizard/show_diff.py
+++ b/addons/wiki/wizard/show_diff.py
@@ -39,8 +39,7 @@ class showdiff(osv.osv_memory):
             old = history.browse(cr, uid, ids[0])
             nids = history.search(cr, uid, [('wiki_id','=',old.wiki_id.id)])
             nids.sort()
-            if ids[0] != nids[-1]:
-                diff = history.getDiff(cr, uid, ids[0], nids[-1])
+            diff = history.getDiff(cr, uid, ids[0], nids[-1])
         else:
             raise osv.except_osv('Warning', "You need to select minimum 1 or maximum 2 history revision!")
         return diff

From 589c7a84430ee90b987d189ae8a5765804117a37 Mon Sep 17 00:00:00 2001
From: qdp <qdp@tinyerp.com>
Date: Wed, 3 Dec 2008 16:06:41 +0100
Subject: [PATCH 25/82] *module mrp_repair improvements

bzr revid: qdp@tinyerp.com-20081203150641-6zajb1q3vt4ub760
---
 addons/mrp_repair/__terp__.py           |  10 +-
 addons/mrp_repair/mrp_repair.py         | 123 +++++++++++-------------
 addons/mrp_repair/mrp_repair_report.xml |   2 +-
 addons/mrp_repair/mrp_repair_view.xml   |  33 +++----
 4 files changed, 83 insertions(+), 85 deletions(-)

diff --git a/addons/mrp_repair/__terp__.py b/addons/mrp_repair/__terp__.py
index 285e0bd0c5a..3dbb7b99b58 100644
--- a/addons/mrp_repair/__terp__.py
+++ b/addons/mrp_repair/__terp__.py
@@ -36,7 +36,15 @@
     "category":"Custom",
     "depends":["base","sale","account"],
     "demo_xml":[],
-    "update_xml":["mrp_repair_sequence.xml","mrp_repair_wizard.xml", "mrp_repair_view.xml", "mrp_repair_workflow.xml", "mrp_repair_report.xml"],
+    "update_xml":[
+        #"security/mrp_repair_security.xml",
+        #"security/ir.model.access.csv",
+        "mrp_repair_sequence.xml",
+        "mrp_repair_wizard.xml", 
+        "mrp_repair_view.xml", 
+        "mrp_repair_workflow.xml", 
+        "mrp_repair_report.xml",
+    ],
     "active": False,
     "installable": True,
 }
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 01b568b3da1..d5ce7e84253 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -69,7 +69,7 @@ class mrp_repair(osv.osv):
             res[id] = cur_obj.round(cr, uid, cur, untax.get(id, 0.0) + tax.get(id, 0.0))
         return res
     _columns = {
-        'name' : fields.char('Name',size=24, required=True),
+        'name' : fields.char('Repair Ref',size=24, required=True),
         'product_id': fields.many2one('product.product', string='Product to Repair', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'partner_id' : fields.many2one('res.partner', 'Partner', select=True),
         'address_id': fields.many2one('res.partner.address', 'Delivery Address', domain="[('partner_id','=',partner_id)]"),
@@ -79,16 +79,16 @@ class mrp_repair(osv.osv):
             ('confirmed','Confirmed'),
             ('ready','Ready to Repair'),
             ('under_repair','Under Repair'),
-            ('2binvoiced','To be Invoiced'),            
+            ('2binvoiced','To be Invoiced'),
             ('invoice_except','Invoice Exception'),
             ('done','Done'),
             ('cancel','Cancel')
             ], 'Repair State', readonly=True, help="Gives the state of the Repair Order"),
         'location_id': fields.many2one('stock.location', 'Current Location', required=True, select=True, readonly=True, states={'draft':[('readonly',False)]}),
         'location_dest_id': fields.many2one('stock.location', 'Delivery Location', readonly=True, states={'draft':[('readonly',False)]}),
-        'move_id': fields.many2one('stock.move', 'Move',required=True, domain="[('product_id','=',product_id)]", readonly=True, states={'draft':[('readonly',False)]}),#,('location_dest_id','=',location_id),('prodlot_id','=',prodlot_id)
+        'move_id': fields.many2one('stock.move', 'Move',required=True, domain="[('product_id','=',product_id)]", readonly=True, states={'draft':[('readonly',False)]}),
         'guarantee_limit': fields.date('Guarantee limit'),
-        'operations' : fields.one2many('mrp.repair.line', 'repair_id', 'Operation Lines', readonly=True, states={'draft':[('readonly',False)]}),        
+        'operations' : fields.one2many('mrp.repair.line', 'repair_id', 'Operation Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist'),
         'partner_invoice_id':fields.many2one('res.partner.address', 'Invoice to',  domain="[('partner_id','=',partner_id)]"),
         'invoice_method':fields.selection([
@@ -150,7 +150,7 @@ class mrp_repair(osv.osv):
         if move_id:
             move =  self.pool.get('stock.move').browse(cr, uid, move_id)
             product = self.pool.get('product.product').browse(cr, uid, prod_id)
-            date = move.picking_id.date_done
+            date = move.date_planned
             limit = mx.DateTime.strptime(date, '%Y-%m-%d %H:%M:%S') + RelativeDateTime(months=product.warranty)
             data['value']['guarantee_limit'] = limit.strftime('%Y-%m-%d')
             data['value']['location_id'] = move.location_dest_id.id
@@ -200,7 +200,7 @@ class mrp_repair(osv.osv):
             return data
 
         def get_last_move(lst_move):
-            while lst_move.move_dest_id and lst_move.move_dest_id and lst_move.move_dest_id.picking_id.state == 'done':
+            while lst_move.move_dest_id and lst_move.move_dest_id.state == 'done':
                 lst_move = lst_move.move_dest_id
             return lst_move
 
@@ -223,10 +223,10 @@ class mrp_repair(osv.osv):
             wf_service.trg_create(uid, 'mrp.repair', id, cr)
         return True
 
-    def action_confirm(self, cr, uid, ids, *args):        
+    def action_confirm(self, cr, uid, ids, *args):
         mrp_line_obj = self.pool.get('mrp.repair.line')
         for o in self.browse(cr, uid, ids):
-            if (o.invoice_method == 'b4repair'):                
+            if (o.invoice_method == 'b4repair'):
                 self.write(cr, uid, [o.id], {'state': '2binvoiced'})
             else:
                 self.write(cr, uid, [o.id], {'state': 'confirmed'})   
@@ -262,14 +262,14 @@ class mrp_repair(osv.osv):
                         'name': invoice.name +', '+repair.name,
                         'origin': invoice.origin+', '+repair.name,    
                         'comment':(comment and (invoice.comment and invoice.comment+"\n"+comment or comment)) or (invoice.comment and invoice.comment or ''),
-                    }                 
+                    }
                     invoice_obj.write(cr, uid, [inv_id],invoice_vals,context=context)
                 else:
                     a = repair.partner_id.property_account_receivable.id
                     inv = {
                         'name': repair.name,
                         'origin':repair.name,
-                        'type': 'out_invoice',                    
+                        'type': 'out_invoice',
                         'account_id': a,
                         'partner_id': repair.partner_id.id,
                         'address_invoice_id': repair.address_id.id,
@@ -282,7 +282,7 @@ class mrp_repair(osv.osv):
                 self.write(cr, uid, repair.id , {'invoiced':True,'invoice_id' : inv_id}) 
                                 
                 for operation in repair.operations:
-                    if operation.to_invoice == True:                                        
+                    if operation.to_invoice == True:
                         if group:
                             name = repair.name + '-' + operation.name
                         else:
@@ -298,7 +298,7 @@ class mrp_repair(osv.osv):
                             'price_unit' : operation.price_unit,
                             'price_subtotal' : operation.product_uom_qty*operation.price_unit,
                             'product_id' : operation.product_id and operation.product_id.id or False
-                            })                   
+                            })
                         self.pool.get('mrp.repair.line').write(cr, uid, [operation.id], {'invoiced':True,'invoice_line_id':invoice_line_id})
                 for fee in repair.fees_lines:
                     if fee.to_invoice == True:
@@ -335,13 +335,13 @@ class mrp_repair(osv.osv):
         self.write(cr, uid, ids, {'state':'under_repair'})
         return True
     
-    def action_invoice_end(self, cr, uid, ids, context=None):        
+    def action_invoice_end(self, cr, uid, ids, context=None):
         for order in self.browse(cr, uid, ids):
             val = {}             
             if (order.invoice_method=='b4repair'):
                 val['state'] = 'ready'
-            else:                
-                #val['state'] = 'done'                 
+            else:
+                #val['state'] = 'done'
                 pass
             self.write(cr, uid, [order.id], val)
         return True     
@@ -351,11 +351,11 @@ class mrp_repair(osv.osv):
             val = {}
             val['repaired']=True
             if (not order.invoiced and order.invoice_method=='after_repair'):
-                val['state'] = '2binvoiced'  
+                val['state'] = '2binvoiced'
             elif (not order.invoiced and order.invoice_method=='b4repair'):
                 val['state'] = 'ready'
-            else:                
-                #val['state'] = 'done'                 
+            else:
+                #val['state'] = 'done'
                 pass
             self.write(cr, uid, [order.id], val)
         return True     
@@ -364,10 +364,25 @@ class mrp_repair(osv.osv):
         res=self.action_repair_done(cr,uid,ids)
         return True
         
-    def action_repair_done(self, cr, uid, ids, context=None):    
+    def action_repair_done(self, cr, uid, ids, context=None):
         res = {}    
         company = self.pool.get('res.users').browse(cr, uid, uid).company_id
         for repair in self.browse(cr, uid, ids, context=context): 
+            #TODO: create the moves add/remove
+            for move in repair.operations:
+                move_id = self.pool.get('stock.move').create(cr, uid, {
+                    'name': move.name,
+                    'product_id': move.product_id.id,
+                    'product_qty': move.product_uom_qty,
+                    'product_uom': move.product_uom.id,
+                    'address_id': repair.address_id and repair.address_id.id or False,
+                    'location_id': move.location_id.id,
+                    'location_dest_id': move.location_dest_id.id,
+                    'tracking_id': False,
+                    'state': 'assigned',
+                })
+                self.pool.get('mrp.repair.line').write(cr, uid, [move.id], {'move_id': move_id})
+
             if repair.deliver_bool:
                 picking = self.pool.get('stock.picking').create(cr, uid, {
                     'origin': repair.name,
@@ -400,7 +415,7 @@ class mrp_repair(osv.osv):
                 res[repair.id] = picking
             else:
                 self.write(cr, uid, [repair.id], {'state':'done'})
-        return res   
+        return res
         
            
 mrp_repair()
@@ -449,7 +464,7 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
     
     def copy(self, cr, uid, id, default=None, context=None):
         if not default: default = {}
-        default.update( {'invoice_line_id':False,'move_ids':[],'invoiced':False,'state':'draft'})
+        default.update( {'invoice_line_id':False,'move_id':False,'invoiced':False,'state':'draft'})
         return super(mrp_repair_line, self).copy(cr, uid, id, default, context)
     
     def _amount_line(self, cr, uid, ids, field_name, arg, context):
@@ -464,53 +479,52 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
     _columns = {
         'name' : fields.char('Description',size=64,required=True),
         'repair_id': fields.many2one('mrp.repair', 'Repair Order Ref',ondelete='cascade', select=True),
-        'type': fields.selection([('add','Add'),('remove','Remove')],'Type'),
-        'to_invoice': fields.boolean('To Invoice'),                
-        'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok','=',True)]),
-        'invoiced': fields.boolean('Invoiced',readonly=True),                
-        'price_unit': fields.float('Unit Price', required=True, digits=(16, int(config['price_accuracy']))),                
+        'type': fields.selection([('add','Add'),('remove','Remove')],'Type', required=True),
+        'to_invoice': fields.boolean('To Invoice'),
+        'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok','=',True)], required=True),
+        'invoiced': fields.boolean('Invoiced',readonly=True),
+        'price_unit': fields.float('Unit Price', required=True, digits=(16, int(config['price_accuracy']))),
         'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal',digits=(16, int(config['price_accuracy']))),  
-        'tax_id': fields.many2many('account.tax', 'repair_operation_line_tax', 'repair_operation_line_id', 'tax_id', 'Taxes'),              
+        'tax_id': fields.many2many('account.tax', 'repair_operation_line_tax', 'repair_operation_line_id', 'tax_id', 'Taxes'),
         'product_uom_qty': fields.float('Quantity (UoM)', digits=(16,2), required=True),
-        'product_uom': fields.many2one('product.uom', 'Product UoM', required=True),          
-        'invoice_line_id': fields.many2one('account.invoice.line', 'Invoice Line', readonly=True),   
+        'product_uom': fields.many2one('product.uom', 'Product UoM', required=True),
+        'invoice_line_id': fields.many2one('account.invoice.line', 'Invoice Line', readonly=True),
         'location_id': fields.many2one('stock.location', 'Source Location', required=True, select=True),
         'location_dest_id': fields.many2one('stock.location', 'Dest. Location', required=True, select=True),      
-        'move_ids': fields.one2many('stock.move', 'repair_line_id', 'Inventory Moves', readonly=True),   
+        'move_id': fields.many2one('stock.move', 'Inventory Move', readonly=True),
         'state': fields.selection([('draft','Draft'),('confirmed','Confirmed'),('done','Done'),('cancel','Canceled')], 'Status', required=True, readonly=True),
     }
-    _defaults = {                 
+    _defaults = {
      'state': lambda *a: 'draft',
-     'product_uom_qty':lambda *a:1,                 
+     'product_uom_qty':lambda *a:1,
     }
      
-    def onchange_operation_type(self, cr, uid, ids, type,guarantee_limit):
+    def onchange_operation_type(self, cr, uid, ids, type, guarantee_limit):
         if not type:
             return {'value': {
                         'location_id': False,
                         'location_dest_id': False
                     }
             }
-        stock_id = self.pool.get('stock.location').search(cr, uid, [('name','=','Stock')])[0]
         produc_id = self.pool.get('stock.location').search(cr, uid, [('name','=','Production')])[0]
-        to_invoice=False
-        if guarantee_limit and today() > mx.DateTime.strptime(guarantee_limit, '%Y-%m-%d'):
-            to_invoice=True
         if type == 'add':
+            stock_id = self.pool.get('stock.location').search(cr, uid, [('name','=','Stock')])[0]
+            to_invoice=False
+            if guarantee_limit and today() > mx.DateTime.strptime(guarantee_limit, '%Y-%m-%d'):
+                to_invoice=True
             return {'value': {
                         'to_invoice': to_invoice,
                         'location_id': stock_id,
                         'location_dest_id' : produc_id
                     }
             }
-        if type == 'remove':
-            return {'value': {
-                        'to_invoice': False,
-                        'location_id': produc_id,
-                        'location_dest_id':False
-                    }
+        return {'value': {
+                'to_invoice': False,
+                'location_id': produc_id,
+                'location_dest_id':False
             }
-    
+        }
+
 mrp_repair_line()
 
 class mrp_repair_fee(osv.osv, ProductChangeMixin):
@@ -547,25 +561,4 @@ class mrp_repair_fee(osv.osv, ProductChangeMixin):
     }
     
 mrp_repair_fee()
-
-
-class stock_move(osv.osv):
-    _inherit = 'stock.move'
-    _columns = {
-        'repair_line_id': fields.many2one('mrp.repair.line', 'Repair Operation Line', ondelete='set null', select=True, readonly=True),
-    }
-    _defaults = {
-        'repair_line_id': lambda *a:False
-    }
-stock_move()
-
-class stock_picking(osv.osv):
-    _inherit = 'stock.picking'
-    _columns = {
-        'repair_id': fields.many2one('mrp.repair', 'Repair Order', ondelete='set null', select=True, readonly=True),
-    }
-    _defaults = {
-        'repair_id': lambda *a: False
-    }
-stock_picking()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_repair/mrp_repair_report.xml b/addons/mrp_repair/mrp_repair_report.xml
index a9d41f8514c..f9b5d25baa2 100644
--- a/addons/mrp_repair/mrp_repair_report.xml
+++ b/addons/mrp_repair/mrp_repair_report.xml
@@ -3,7 +3,7 @@
     <data>
 	<report
 		id="report_mrp_repair"
-		string="Repair Order"
+		string="Quotation / Order"
 		model="mrp.repair"
 		name="repair.order"
 		rml="mrp_repair/report/order.rml"
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 5cb2a633c65..b200d838445 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -17,14 +17,12 @@
                         <field name="move_id" on_change="onchange_move_id(product_id, move_id)"/>
                         <field name="repaired"/>
                     	<newline/>
-                        <field name="partner_id" select="2" on_change="onchange_partner_id(partner_id,address_id)" attrs="{'readonly':[('deliver_bool','=', False)]}"/>
-                        <field name="address_id" attrs="{'readonly':[('deliver_bool','=', False)]}"/>
+                        <field name="partner_id" select="2" on_change="onchange_partner_id(partner_id,address_id)"/>
+                        <field name="address_id"/>
                     	<field name="invoiced"/>
                     </group>
                     <notebook colspan="4">
-                        <page string="Products">
-                            <field name="location_id"/>
-                            <field name="location_dest_id" attrs="{'readonly':[('deliver_bool','=', False)], 'required':[('deliver_bool','=', True)]}"/>
+                        <page string="Operationss">
                             <field name="guarantee_limit" />
                             <newline/>
                             <field colspan="4" mode="tree,form" name="operations" nolabel="1" widget="one2many_list">
@@ -41,7 +39,7 @@
 		                                    <field name="location_dest_id"/>
                                             <newline/>
                                             <field name="type"  on_change="onchange_operation_type(type,parent.guarantee_limit)"/>
-                                            <group colspan="2">                                                
+                                            <group colspan="2">
                                                 <field name="to_invoice"/>
     		                                    <field name="invoiced"/>  
                                             </group>
@@ -51,11 +49,8 @@
                                             <field name="state"/>
 										</page>
                                         <page string="History" groups="base.group_extended">
-                                            <separator colspan="4" string="Invoice Lines"/>
-                                            <field colspan="4" name="invoice_line_id" nolabel="1"/>                                      
-                                            
-                                            <separator colspan="4" string="Stock Moves"/>
-                                            <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
+                                            <field colspan="4" name="move_id" />
+                                            <field colspan="4" name="invoice_line_id"/>
                                         </page>
 		                                         
                                      </notebook>
@@ -81,7 +76,7 @@
                                 <button name="button_dummy" states="draft" string="Compute" type="object"/>
                             </group>
                             <newline/>
-                            <group col="13" colspan="4">                              
+                            <group col="13" colspan="4">
                                 <field name="state" select="2"/>
                                 <button name="repair_confirm" states="draft" string="Confirm Repair"/>
                                 <button name="repair_ready" states="confirmed" string="Start Repair"/>
@@ -97,10 +92,10 @@
                             </group>
                         </page>
                         <page string="Invoicing">
-                            <field name="pricelist_id" context="product_id=product_id"/>
-                            <field name="partner_invoice_id"/>
-                            <field name="invoice_method" attrs="{'readonly':[('deliver_bool','=', False)]}"/>
-                            <field name="invoice_id"/>
+                            <field name="invoice_method" colspan="4" />
+                            <field name="pricelist_id" context="product_id=product_id" attrs="{'readonly':[('invoice_method','=', 'none')]}"/>
+                            <field name="partner_invoice_id" attrs="{'readonly':[('invoice_method','=', 'none')]}"/>
+                            <!--<field name="invoice_id"/>-->
                             <field colspan="4" mode="tree,form" name="fees_lines" nolabel="1" widget="one2many_list">
                                 <form string="Fees">
                                     <notebook>
@@ -141,9 +136,11 @@
                             <separator colspan="4" string="Quotation Notes"/>
                             <field colspan="4" name="quotation_notes" nolabel="1"/>
                         </page>
-                        <page string="History" groups="base.group_extended">                            
-                            <!-- <field name="invoice_id"/> -->
+                        <page string="Extra Info" groups="base.group_extended">                            
+                            <field name="invoice_id"/>
                             <field name="picking_id"/>
+                            <field name="location_id"/>
+                            <field name="location_dest_id" attrs="{'readonly':[('deliver_bool','=', False)], 'required':[('deliver_bool','=', True)]}"/>
                         </page>
                     </notebook>
                 </form>

From 45fa6e9d289edb8dead584d1c2f03cd8979fcb78 Mon Sep 17 00:00:00 2001
From: qdp <qdp@tinyerp.com>
Date: Wed, 3 Dec 2008 16:43:48 +0100
Subject: [PATCH 26/82] *added help tooltips on mrp_repair module

bzr revid: qdp@tinyerp.com-20081203154348-3ogufw0hj2b1khet
---
 addons/mrp_repair/mrp_repair.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index d5ce7e84253..c54ad673e28 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -71,7 +71,7 @@ class mrp_repair(osv.osv):
     _columns = {
         'name' : fields.char('Repair Ref',size=24, required=True),
         'product_id': fields.many2one('product.product', string='Product to Repair', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'partner_id' : fields.many2one('res.partner', 'Partner', select=True),
+        'partner_id' : fields.many2one('res.partner', 'Partner', select=True, help='This field allow you to choose the parner that will be invoiced and delivered'),
         'address_id': fields.many2one('res.partner.address', 'Delivery Address', domain="[('partner_id','=',partner_id)]"),
         'prodlot_id': fields.many2one('stock.production.lot', 'Lot Number', select=True, domain="[('product_id','=',product_id)]"),
         'state': fields.selection([
@@ -87,22 +87,22 @@ class mrp_repair(osv.osv):
         'location_id': fields.many2one('stock.location', 'Current Location', required=True, select=True, readonly=True, states={'draft':[('readonly',False)]}),
         'location_dest_id': fields.many2one('stock.location', 'Delivery Location', readonly=True, states={'draft':[('readonly',False)]}),
         'move_id': fields.many2one('stock.move', 'Move',required=True, domain="[('product_id','=',product_id)]", readonly=True, states={'draft':[('readonly',False)]}),
-        'guarantee_limit': fields.date('Guarantee limit'),
+        'guarantee_limit': fields.date('Guarantee limit', help="The garantee limit is computed as: last move date + warranty defined on selected product. If the current date is below the garantee limit, each operation and fee you will add will be set as 'not to invoiced' by default. Note that you can change manually afterwards."),
         'operations' : fields.one2many('mrp.repair.line', 'repair_id', 'Operation Lines', readonly=True, states={'draft':[('readonly',False)]}),
-        'pricelist_id': fields.many2one('product.pricelist', 'Pricelist'),
+        'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', help='The pricelist comes from the selected partner, by default.'),
         'partner_invoice_id':fields.many2one('res.partner.address', 'Invoice to',  domain="[('partner_id','=',partner_id)]"),
         'invoice_method':fields.selection([
             ("none","No Invoice"),
             ("b4repair","Before Repair"),
             ("after_repair","After Repair")
            ], "Invoice Method", 
-            select=True, required=True, states={'draft':[('readonly',False)]}, readonly=True),
+            select=True, required=True, states={'draft':[('readonly',False)]}, readonly=True, help='This field allow you to change the workflow of the repair order. If value selected is different from \'No Invoice\', it also allow you to select the pricelist and invoicing address.'),
         'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True),
         'picking_id': fields.many2one('stock.picking', 'Packing',readonly=True),
         'fees_lines' : fields.one2many('mrp.repair.fee', 'repair_id', 'Fees Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'internal_notes' : fields.text('Internal Notes'),
         'quotation_notes' : fields.text('Quotation Notes'),
-        'deliver_bool': fields.boolean('Deliver'),
+        'deliver_bool': fields.boolean('Deliver', help="Check this box if you want to manage the delivery once the product is repaired. If cheked, it will create a packing with selected product. Note that you can select the locations in the Info tab, if you have the extended view."),
         'invoiced': fields.boolean('Invoiced', readonly=True),
         'repaired' : fields.boolean('Repaired', readonly=True),
         'amount_untaxed': fields.function(_amount_untaxed, method=True, string='Untaxed Amount'),

From c547e413cffc0b9bef17d918ce69299e59b7bb38 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 3 Dec 2008 18:23:17 +0100
Subject: [PATCH 27/82] improve

bzr revid: fp@tinyerp.com-20081203172317-ce02tde92v7p50gl
---
 addons/base_contact/base_contact.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index fa3dc37b311..d24b9bde649 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -118,8 +118,8 @@ class res_partner_job(osv.osv):
         'address_id':fields.many2one('res.partner.address','Address'),
         'contact_id':fields.many2one('res.partner.contact','Contact', required=True, ondelete='cascade'),
         'function_id': fields.many2one('res.partner.function','Job Title'),
-        'sequence_contact':fields.integer('Sequence (Contact)',help='order of importance of this address in the list of addresses of the linked contact'),
-        'sequence_partner':fields.integer('Sequence (Partner)',help='order of importance of this job title in the list of job title of the linked partner'),
+        'sequence_contact':fields.integer('Sequence',help='Order of importance of this address in the list of addresses of the linked contact'),
+        'sequence_partner':fields.integer('Sequence',help='Order of importance of this job title in the list of job title of the linked partner'),
         'email': fields.char('E-Mail', size=240),
         'phone': fields.char('Phone', size=64),
         'date_start' : fields.date('Date Start'),

From 449d189626bf8b1b197a18615105c9a94dc3c41c Mon Sep 17 00:00:00 2001
From: Jay Vora <jvo@tinyerp.com>
Date: Thu, 4 Dec 2008 12:15:32 +0530
Subject: [PATCH 28/82] CRM:Commented ID,create_date columns from object
 definition.

bzr revid: jvo@tinyerp.com-20081204064532-ca0gtweaarhsxonb
---
 addons/crm/crm.py       | 7 ++++---
 addons/crm/crm_view.xml | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index d284da54904..47016285e9f 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -320,11 +320,12 @@ class crm_case(osv.osv):
         return res
     def copy(self, cr, uid, id, default=None, context={}):
         if not default: default = {}
-        default.update( {'state':'draft', 'id':False, 'history_line':[],'log_ids':[]})
+#        default.update( {'state':'draft', 'id':False, 'history_line':[],'log_ids':[]})
+        default.update( {'state':'draft', 'history_line':[],'log_ids':[]})
         return super(crm_case, self).copy(cr, uid, id, default, context)
 
     _columns = {
-        'id': fields.integer('ID', readonly=True),
+#        'id': fields.integer('ID', readonly=True),
         'name': fields.char('Description',size=64, required=True),
         'priority': fields.selection(AVAILABLE_PRIORITIES, 'Priority'),
         'active': fields.boolean('Active'),
@@ -342,7 +343,7 @@ class crm_case(osv.osv):
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', domain="[('partner_id','=',partner_id)]"),
         'som': fields.many2one('res.partner.som', 'State of Mind'),
         'date': fields.datetime('Date'),
-        'create_date': fields.datetime('Created' ,readonly=True),
+#        'create_date': fields.datetime('Created' ,readonly=True),
         'date_deadline': fields.datetime('Deadline'),
         'date_closed': fields.datetime('Closed', readonly=True),
         'canal_id': fields.many2one('res.partner.canal', 'Channel'),
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 71e5ba41296..a1b60e449d2 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -254,7 +254,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="red:date_deadline&lt;current_date and state=='open'" string="Cases">
-                    <field name="id"/>
+<!--                    <field name="id"/>-->
                     <field name="date"/>
                     <field name="date_deadline"/>
                     <field name="name"/>
@@ -326,13 +326,13 @@
                             </group>
                         </page>
                         <page string="Extra Info">
-                            <field name="id" select="1"/>
+<!--                            <field name="id" select="1"/>-->
                             <field name="active" select="2"/>
                             <field colspan="4" name="email_cc"/>
                             <field name="categ_id" on_change="onchange_categ_id(categ_id)" select="2"/>
                             <field name="som" select="2"/>
                             <separator colspan="4" string="Dates"/>
-                            <field name="create_date"/>
+<!--                            <field name="create_date"/>-->
                             <field name="date_closed"/>
                             <field name="date_action_last"/>
                             <field name="date_action_next"/>

From eaa543f198201f31b03615c9ea958658b39bb6b0 Mon Sep 17 00:00:00 2001
From: Husen Daudi <hda@tinyerp.com>
Date: Thu, 4 Dec 2008 12:17:26 +0530
Subject: [PATCH 29/82] bug fixed for task remaining hours

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

bzr revid: hda@tinyerp.com-20081204064726-qlw3l0x291jtnql2
---
 addons/project/project.py       | 46 ++++++++++++++++++++++++++-------
 addons/project/project_view.xml | 34 ++++++++++++++++++++++--
 2 files changed, 69 insertions(+), 11 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index c2337da7053..4d9261f2ea0 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -247,15 +247,6 @@ class task(osv.osv):
     #    ('remaining_hours', 'CHECK (remaining_hours>=0)', 'Please increase and review remaining hours ! It can not be smaller than 0.'),
     #]
     
-    def _button_dummy(self, cr, uid, ids, context={}):
-        tot_work=0
-        for obj in self.browse(cr,uid,ids):
-            for work in obj.work_ids:
-                tot_work+=work.hours
-            final_val = obj.planned_hours - tot_work
-            self.write(cr,uid,ids[0],{'remaining_hours':final_val})
-        return True
-
     def copy(self, cr, uid, id, default={},context={}):
         default = default or {}
         default['work_ids'] = []
@@ -417,8 +408,45 @@ class project_work(osv.osv):
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S')
     }
     _order = "date desc"
+    def create(self, cr, uid, vals, *args, **kwargs):
+        if 'task_id' in vals:
+            cr.execute('update project_task set remaining_hours=remaining_hours+%.2f where id=%d', (-vals.get('hours',0.0), vals['task_id']))
+        return super(project_work,self).create(cr, uid, vals, *args, **kwargs)
 
+    def write(self, cr, uid, ids,vals,context={}):
+        for work in self.browse(cr, uid, ids, context):
+            cr.execute('update project_task set remaining_hours=remaining_hours+%.2f+(%.2f) where id=%d', (-vals.get('hours',0.0), work.hours, work.task_id.id))
+        return super(project_work,self).write(cr, uid, ids, vals, context)
+
+    def unlink(self, cr, uid, ids, *args, **kwargs):
+        for work in self.browse(cr, uid, ids):
+            cr.execute('update project_task set remaining_hours=remaining_hours+%.2f where id=%d', (work.hours, work.task_id.id))
+        return super(project_work,self).unlink(cr, uid, ids,*args, **kwargs)
 project_work()
 
+class config_compute_remaining(osv.osv_memory):
+    _name='config.compute.remaining'
+    def _get_remaining(self,cr, uid, ctx):
+        if 'active_id' in ctx:
+            return self.pool.get('project.task').browse(cr,uid,ctx['active_id']).remaining_hours
+        return False
+
+    _columns = {
+        'remaining_hours' : fields.float('Remaining Hours', digits=(16,2), help="Total remaining time, can be re-estimated periodically by the assignee of the task."),
+            }
+
+    _defaults = {
+        'remaining_hours': _get_remaining
+        }
+    
+    def compute_hours(self, cr, uid, ids, context=None):
+        if 'active_id' in context:
+            remaining_hrs=self.browse(cr,uid,ids)[0].remaining_hours
+            self.pool.get('project.task').write(cr,uid,context['active_id'],{'remaining_hours':remaining_hrs})
+        return {
+                'type': 'ir.actions.act_window_close',
+         }
+config_compute_remaining()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index b2d31694d57..b7ec8362408 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -197,6 +197,34 @@
             id="menu_open_view_my_project_open"
             parent="project.menu_all_project"/>
 
+	<!-- Wizard for compute remaining hours -->
+
+        <record id="view_config_compute_remaining" model="ir.ui.view">
+            <field name="name">Compute Remaining Hours </field>
+            <field name="model">config.compute.remaining</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Remaining Hours">
+                    <separator colspan="4" string="Change Remaining Hours"/>
+                    <newline/>
+                    <field name="remaining_hours" widget="float_time"/>
+                    <group col="4" colspan="4">
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-ok" name="compute_hours" string="Compute" type="object"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+		<record id="action_config_compute_remaining" model="ir.actions.act_window">
+            <field name="name">Compute Remaining Hours</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">config.compute.remaining</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
         <!-- Task -->
         <record id="view_task_form2" model="ir.ui.view">
             <field name="name">project.task.form</field>
@@ -220,8 +248,10 @@
                                 widget="float_time"
                                 on_change="onchange_planned(planned_hours,effective_hours)"/>
                             <field name="delay_hours" widget="float_time"/>
-                            <field name="remaining_hours" select="2" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" colspan="1"/>
-                            <button name="_button_dummy" string="Compute" type="object" colspan="1"/>
+                            <group col="3" colspan="2">
+	                            <field name="remaining_hours" select="2" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" colspan="2"/>
+	                            <button name="%(action_config_compute_remaining)d" string="Compute" type="action" colspan="1" target="new"/>
+                            </group>
                             <field name="effective_hours" widget="float_time"/>
 
                             <field colspan="4" name="description" nolabel="1" select="2"/>

From 6ddfabaf17d258c0c54749e663f88072e874802f Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@tinyerp.com>
Date: Thu, 4 Dec 2008 12:23:34 +0530
Subject: [PATCH 30/82] mrp_repair

bzr revid: mra@tinyerp.com-20081204065334-zjp08syur6t8z8e9
---
 addons/mrp_repair/report/order.rml | 265 ++++++++++++++++-------------
 1 file changed, 148 insertions(+), 117 deletions(-)

diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml
index 223bcd38fbe..34c6902308f 100644
--- a/addons/mrp_repair/report/order.rml
+++ b/addons/mrp_repair/report/order.rml
@@ -70,24 +70,17 @@
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table9">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table10">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table11">
+    <blockTableStyle id="Table7">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,1" stop="-1,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table8">
       <blockAlignment value="LEFT"/>
@@ -101,34 +94,39 @@
     <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P4" fontName="Helvetica-Oblique" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="5.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P15" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="5.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P16" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P18" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P19" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P20" fontName="Helvetica-Oblique" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P21" fontName="Helvetica"/>
-    <paraStyle name="P22" fontName="Times-Roman"/>
-    <paraStyle name="P23" fontName="Times-Roman"/>
-    <paraStyle name="P24" fontName="Helvetica-Oblique" fontSize="2.0" leading="3"/>
-    <paraStyle name="P25" fontName="Helvetica-Oblique" fontSize="2.0" leading="3" alignment="RIGHT"/>
-    <paraStyle name="P26" fontName="Helvetica-Bold" fontSize="9.0" leading="11"/>
-    <paraStyle name="P27" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P28" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
-    <paraStyle name="P29" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
-    <paraStyle name="P30" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
-    <paraStyle name="P31" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P32" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P33" fontName="Helvetica" fontSize="5.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P18" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P19" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P20" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P21" fontName="Helvetica-Oblique" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P22" fontName="Helvetica-Bold" fontSize="9.0" leading="11"/>
+    <paraStyle name="P23" fontName="Helvetica"/>
+    <paraStyle name="P24" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="P25" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="P26" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="P27" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P28" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P29" fontName="Times-Roman"/>
+    <paraStyle name="P30" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="P31" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="P32" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="P33" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P34" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P35" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P36" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P37" fontName="Helvetica-Oblique" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P38" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Times-Roman"/>
     <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -166,7 +164,7 @@
   </stylesheet>
   <images/>
   <story>
-    <para style="P11">[[ repeatIn(objects,'o') ]]</para>
+    <para style="P12">[[ repeatIn(objects,'o') ]]</para>
     <blockTable colWidths="265.0,51.0,225.0" style="Table1">
       <tr>
         <td>
@@ -180,12 +178,12 @@
           <para style="P3">
             <font color="white"> </font>
           </para>
-          <para style="P12">Invoice address :[[ o.partner_id and o.partner_id.property_payment_term.name ]]</para>
+          <para style="P13">Invoice address :[[ o.partner_id and o.partner_id.property_payment_term.name ]]</para>
           <para style="P3">[[ o.partner_invoice_id.street ]] [[ o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2 or '') ]]</para>
           <para style="P3">[[ 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>
         </td>
         <td>
-          <para style="P11">
+          <para style="P12">
             <font color="white"> </font>
           </para>
         </td>
@@ -210,94 +208,94 @@
         </td>
       </tr>
     </blockTable>
-    <para style="P11">
+    <para style="P12">
       <font color="white"> </font>
     </para>
-    <para style="P9">
-      <font color="white"> </font>
-    </para>
-    <para style="P7">[[ o.state&lt;&gt;'draft' and removeParentNode('para') ]]Repair Quotation <font face="Helvetica">N° : [[ o.name ]]</font></para>
-    <para style="P8">[[ o.state=='draft' and removeParentNode('para') ]]Repair Order N° : [[ o.name ]]</para>
     <para style="P10">
       <font color="white"> </font>
     </para>
-    <para style="P6">
+    <para style="P8">[[ o.state&lt;&gt;'draft' and removeParentNode('para') ]]Repair Quotation <font face="Helvetica">N° : [[ o.name ]]</font></para>
+    <para style="P9">[[ o.state=='draft' and removeParentNode('para') ]]Repair Order N° : [[ o.name ]]</para>
+    <para style="P11">
+      <font color="white"> </font>
+    </para>
+    <para style="P7">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="130.0,136.0,136.0,136.0" style="Table2">
       <tr>
         <td>
-          <para style="P14">Product to Repair </para>
+          <para style="P15">Product to Repair </para>
         </td>
         <td>
-          <para style="P14">Lot Number</para>
+          <para style="P15">Lot Number</para>
         </td>
         <td>
-          <para style="P14">Guarantee Limit </para>
+          <para style="P15">Guarantee Limit </para>
         </td>
         <td>
-          <para style="P14">Printing Date</para>
+          <para style="P15">Printing Date</para>
         </td>
       </tr>
     </blockTable>
     <blockTable colWidths="130.0,136.0,136.0,136.0" style="Table3">
       <tr>
         <td>
-          <para style="P15">[[ o.product_id.name or '' ]]</para>
+          <para style="P16">[[ o.product_id.name or '' ]]</para>
         </td>
         <td>
-          <para style="P15">[[ o.prodlot_id.name or ' ' ]]</para>
+          <para style="P16">[[ o.prodlot_id.name or ' ' ]]</para>
         </td>
         <td>
-          <para style="P15">[[ time.strftime('%d/%m/%Y', time.strptime(o.guarantee_limit, '%Y-%m-%d')) ]]</para>
+          <para style="P16">[[ time.strftime('%d/%m/%Y', time.strptime(o.guarantee_limit, '%Y-%m-%d')) ]]</para>
         </td>
         <td>
-          <para style="P15">[[ time.strftime('%d/%m/%Y')]] </para>
+          <para style="P16">[[ time.strftime('%d/%m/%Y')]] </para>
         </td>
       </tr>
     </blockTable>
-    <para style="P11">
+    <para style="P12">
       <font color="white"> </font>
     </para>
-    <para style="P11">
+    <para style="P12">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="165.0,165.0,71.0,70.0,64.0" repeatRows="1" style="Table4">
       <tr>
         <td>
-          <para style="P13">Description</para>
+          <para style="P14">Description</para>
         </td>
         <td>
-          <para style="P13">VAT</para>
+          <para style="P14">VAT</para>
         </td>
         <td>
-          <para style="P16">Quantity</para>
+          <para style="P17">Quantity</para>
         </td>
         <td>
-          <para style="P17">Unit Price</para>
+          <para style="P18">Unit Price</para>
         </td>
         <td>
-          <para style="P18">Price</para>
+          <para style="P19">Price</para>
         </td>
       </tr>
     </blockTable>
     <section>
-      <para style="P32"/>
-      <para style="P31">Operation Line(s)</para>
+      <para style="P28"/>
+      <para style="P27">Operation Line(s)</para>
       <blockTable colWidths="26.0,142.0,153.0,95.0,52.0,69.0" style="Table5">
         <tr>
           <td>
-            <para style="P4">[[ repeatIn(o.operations,'line') ]] </para> <para style="P4">Add [[ ((line.type == 'add') or removeParentNode('para')) and '' ]] </para>
+            <para style="P4"><font face="Times-Roman" size="2.0">[[ repeatIn(o.operations,'line') ]]</font>Add [[ ((line.type == 'add') or removeParentNode('para')) and '' ]] </para>
             <para style="P4">Remove [[ ((line.type == 'remove') or removeParentNode('para')) and '' ]]</para>
           </td>
           <td>
             <para style="P3">[[ line.name ]]</para>
           </td>
           <td>
-            <para style="P27">[[ ','.join(map( lambda x: x.name, line.tax_id)) or '0.00' ]]</para>
+            <para style="P6">[[ ','.join(map( lambda x: x.name, line.tax_id)) or '0.00' ]]</para>
           </td>
           <td>
-            <para style="P19">[[ line.product_uom_qty or '0.00' ]] [[ line.product_uom.name ]] </para>
+            <para style="P20">[[ line.product_uom_qty or '0.00' ]] [[ line.product_uom.name ]] </para>
           </td>
           <td>
             <para style="P1">[[ line.price_unit ]]</para>
@@ -308,23 +306,23 @@
         </tr>
       </blockTable>
     </section>
-    <para style="P26">Fees Line(s)</para>
-    <para style="P20">
+    <para style="P22">Fees Line(s)</para>
+    <para style="P21">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="28.0,145.0,150.0,96.0,51.0,69.0" style="Table6">
       <tr>
         <td>
-          <para style="P20">[[ repeatIn(o.fees_lines,'fees') ]]</para>
+          <para style="P21">[[ repeatIn(o.fees_lines,'fees') ]]</para>
         </td>
         <td>
           <para style="P3">[[ fees.name ]]</para>
         </td>
         <td>
-          <para style="P27">[[ ','.join(map( lambda x: x.name, fees.tax_id)) or '0.00' ]]</para>
+          <para style="P6">[[ ','.join(map( lambda x: x.name, fees.tax_id)) or '0.00' ]]</para>
         </td>
         <td>
-          <para style="P19">[[ fees.product_uom_qty or '0.00' ]] [[ fees.product_uom.name ]] </para>
+          <para style="P20">[[ fees.product_uom_qty or '0.00' ]] [[ fees.product_uom.name ]] </para>
         </td>
         <td>
           <para style="P1">[[ fees.price_unit ]]</para>
@@ -334,55 +332,90 @@
         </td>
       </tr>
     </blockTable>
-    <para style="P24">
-      <font color="white"> </font>
-    </para>
-    <para style="P24">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="444.0,61.0,34.0" style="Table9">
+    <blockTable colWidths="90.0,90.0,221.0,57.0,54.0,28.0" style="Table7">
       <tr>
         <td>
-          <para style="P28">Net Total :</para>
+          <para style="Table Contents">
+            <font color="white"> </font>
+          </para>
         </td>
         <td>
-          <para style="P29">[[ o.amount_untaxed or '0.00' ]]</para>
+          <para style="Table Contents">
+            <font color="white"> </font>
+          </para>
         </td>
         <td>
-          <para style="P29">[[ o.pricelist_id.currency_id.name ]]</para>
+          <para style="Table Contents">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P24">Net Total :</para>
+        </td>
+        <td>
+          <para style="P25">[[ o.amount_untaxed or '0.00' ]]</para>
+        </td>
+        <td>
+          <para style="P25">[[ o.pricelist_id.currency_id.name ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="Table Contents">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="Table Contents">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="Table Contents">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P24">Taxes:</para>
+        </td>
+        <td>
+          <para style="P25">[[ o.amount_tax or '0.00']]</para>
+        </td>
+        <td>
+          <para style="P25">[[ o.pricelist_id.currency_id.name ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="Table Contents">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="Table Contents">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="Table Contents">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P24">Total :</para>
+        </td>
+        <td>
+          <para style="P26">[[ total(o) ]]</para>
+        </td>
+        <td>
+          <para style="P25">[[ o.pricelist_id.currency_id.name ]]</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="444.0,61.0,34.0" style="Table10">
-      <tr>
-        <td>
-          <para style="P28">Taxes:</para>
-        </td>
-        <td>
-          <para style="P29">[[ o.amount_tax or '0.00']]</para>
-        </td>
-        <td>
-          <para style="P29">[[ o.pricelist_id.currency_id.name ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="444.0,61.0,34.0" style="Table11">
-      <tr>
-        <td>
-          <para style="P28">Total :</para>
-        </td>
-        <td>
-          <para style="P30">[[ total(o) ]]</para>
-        </td>
-        <td>
-          <para style="P29">[[ o.pricelist_id.currency_id.name ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="Standard">
+    <para style="P29">
       <font color="white"> </font>
     </para>
-    <para style="Standard">
+    <para style="P29">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="534.0" style="Table8">
@@ -392,8 +425,6 @@
         </td>
       </tr>
     </blockTable>
-    <para style="P21">
-      <font color="white"> </font>
-    </para>
+    <para style="P23"/>
   </story>
 </document>
\ No newline at end of file

From 1fa19942460167c65c60c57279be27ee86a286b0 Mon Sep 17 00:00:00 2001
From: Jay Vora <jvo@tinyerp.com>
Date: Thu, 4 Dec 2008 13:08:03 +0530
Subject: [PATCH 31/82] Reverted Rev 1972.

bzr revid: jvo@tinyerp.com-20081204073803-0djf5ut18zy4466d
---
 addons/crm/crm.py       | 7 +++----
 addons/crm/crm_view.xml | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 47016285e9f..d284da54904 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -320,12 +320,11 @@ class crm_case(osv.osv):
         return res
     def copy(self, cr, uid, id, default=None, context={}):
         if not default: default = {}
-#        default.update( {'state':'draft', 'id':False, 'history_line':[],'log_ids':[]})
-        default.update( {'state':'draft', 'history_line':[],'log_ids':[]})
+        default.update( {'state':'draft', 'id':False, 'history_line':[],'log_ids':[]})
         return super(crm_case, self).copy(cr, uid, id, default, context)
 
     _columns = {
-#        'id': fields.integer('ID', readonly=True),
+        'id': fields.integer('ID', readonly=True),
         'name': fields.char('Description',size=64, required=True),
         'priority': fields.selection(AVAILABLE_PRIORITIES, 'Priority'),
         'active': fields.boolean('Active'),
@@ -343,7 +342,7 @@ class crm_case(osv.osv):
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', domain="[('partner_id','=',partner_id)]"),
         'som': fields.many2one('res.partner.som', 'State of Mind'),
         'date': fields.datetime('Date'),
-#        'create_date': fields.datetime('Created' ,readonly=True),
+        'create_date': fields.datetime('Created' ,readonly=True),
         'date_deadline': fields.datetime('Deadline'),
         'date_closed': fields.datetime('Closed', readonly=True),
         'canal_id': fields.many2one('res.partner.canal', 'Channel'),
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index a1b60e449d2..71e5ba41296 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -254,7 +254,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="red:date_deadline&lt;current_date and state=='open'" string="Cases">
-<!--                    <field name="id"/>-->
+                    <field name="id"/>
                     <field name="date"/>
                     <field name="date_deadline"/>
                     <field name="name"/>
@@ -326,13 +326,13 @@
                             </group>
                         </page>
                         <page string="Extra Info">
-<!--                            <field name="id" select="1"/>-->
+                            <field name="id" select="1"/>
                             <field name="active" select="2"/>
                             <field colspan="4" name="email_cc"/>
                             <field name="categ_id" on_change="onchange_categ_id(categ_id)" select="2"/>
                             <field name="som" select="2"/>
                             <separator colspan="4" string="Dates"/>
-<!--                            <field name="create_date"/>-->
+                            <field name="create_date"/>
                             <field name="date_closed"/>
                             <field name="date_action_last"/>
                             <field name="date_action_next"/>

From fafd61127d381b29a322c6337f4c51aa015e1fc0 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 4 Dec 2008 09:05:03 +0100
Subject: [PATCH 32/82] bugfix

bzr revid: fp@tinyerp.com-20081204080503-vubo0n5xgk7t2usr
---
 addons/delivery/delivery_view.xml | 5 +++--
 addons/delivery/sale.py           | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 400d7967b67..a0bdd2ef4c2 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -125,7 +125,8 @@
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
                 <separator string="Notes" position="before">
-                    <field name="carrier_id"/>
+                    <field name="id" invisible="True"/>
+                    <field name="carrier_id" context="{'order_id':id}"/>
                 </separator>
             </field>
         </record>
@@ -136,7 +137,7 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_out_form"/>
             <field name="arch" type="xml">
-                <field name="address_id" position="after">                   
+                <field name="address_id" position="after">
                     <field name="carrier_id"/>
                     <field name="weight"/>
                 </field>
diff --git a/addons/delivery/sale.py b/addons/delivery/sale.py
index c1bff9f8aa7..ff110ca03c7 100644
--- a/addons/delivery/sale.py
+++ b/addons/delivery/sale.py
@@ -28,6 +28,7 @@ class sale_order(osv.osv):
     _inherit = 'sale.order' 
     _columns = {
         'carrier_id':fields.many2one("delivery.carrier","Delivery method", help="Complete this field if you plan to invoice the shipping based on packings made."),
+        'id': fields.integer('ID', readonly=True,invisible=True),
     }
 
     def onchange_partner_id(self, cr, uid, ids, part):

From f53e6122080dadb18419611707caf814725bade9 Mon Sep 17 00:00:00 2001
From: qdp <qdp-launchpad@tinyerp.com>
Date: Thu, 4 Dec 2008 10:20:40 +0100
Subject: [PATCH 33/82] *improvement and bugfixes

bzr revid: qdp-launchpad@tinyerp.com-20081204092040-9fwcd1z6s5p5op55
---
 addons/mrp_repair/mrp_repair.py | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index c54ad673e28..dd1b4b2fdc9 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -50,11 +50,13 @@ class mrp_repair(osv.osv):
             val = 0.0
             cur=repair.pricelist_id.currency_id
             for line in repair.operations:
-                for c in self.pool.get('account.tax').compute(cr, uid, line.tax_id, line.price_unit, line.product_uom_qty, repair.partner_invoice_id.id, line.product_id, repair.partner_id):
-                    val+= c['amount']
+                if line.to_invoice:
+                    for c in self.pool.get('account.tax').compute(cr, uid, line.tax_id, line.price_unit, line.product_uom_qty, repair.partner_invoice_id.id, line.product_id, repair.partner_id):
+                        val+= c['amount']
             for line in repair.fees_lines:
-                for c in self.pool.get('account.tax').compute(cr, uid, line.tax_id, line.price_unit, line.product_uom_qty, repair.partner_invoice_id.id, line.product_id, repair.partner_id):
-                    val+= c['amount']
+                if line.to_invoice:
+                    for c in self.pool.get('account.tax').compute(cr, uid, line.tax_id, line.price_unit, line.product_uom_qty, repair.partner_invoice_id.id, line.product_id, repair.partner_id):
+                        val+= c['amount']
             res[repair.id]=cur_obj.round(cr, uid, cur, val)
         return res
 
@@ -68,6 +70,7 @@ class mrp_repair(osv.osv):
             cur=repair.pricelist_id.currency_id
             res[id] = cur_obj.round(cr, uid, cur, untax.get(id, 0.0) + tax.get(id, 0.0))
         return res
+
     _columns = {
         'name' : fields.char('Repair Ref',size=24, required=True),
         'product_id': fields.many2one('product.product', string='Product to Repair', required=True, readonly=True, states={'draft':[('readonly',False)]}),
@@ -155,7 +158,10 @@ class mrp_repair(osv.osv):
             data['value']['guarantee_limit'] = limit.strftime('%Y-%m-%d')
             data['value']['location_id'] = move.location_dest_id.id
             data['value']['location_dest_id'] = move.location_dest_id.id
-            data['value']['partner_id'] = move.address_id and move.address_id.partner_id and move.address_id.partner_id.id
+            if move.address_id:
+                data['value']['partner_id'] = move.address_id.partner_id and move.address_id.partner_id.id
+            else:
+                data['value']['partner_id'] = False
             data['value']['address_id'] = move.address_id and move.address_id.id
             d = self.onchange_partner_id(cr, uid, ids, data['value']['partner_id'], data['value']['address_id'])
             data['value'].update(d['value'])
@@ -425,13 +431,17 @@ class ProductChangeMixin(object):
     def product_id_change(self, cr, uid, ids, pricelist, product, uom=False, product_uom_qty=0, partner_id=False, guarantee_limit=False):
         result = {}
         warning = {}       
-        
+        print "here we are"
         if not product_uom_qty:
             product_uom_qty = 1
         result['product_uom_qty'] = product_uom_qty 
 
         if product:
             product_obj =  self.pool.get('product.product').browse(cr, uid, product)
+            if partner_id:
+                partner = self.pool.get('res.partner').browse(cr, uid, partner_id)
+                result['tax_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, partner, product_obj.taxes_id)
+
             result['name'] = product_obj.partner_ref
             result['product_uom'] = product_obj.uom_id and product_obj.uom_id.id or False
             if not pricelist:

From 546a890248a55231c87758936fc681fecc4041b7 Mon Sep 17 00:00:00 2001
From: Jay Vora <jvo@tinyerp.com>
Date: Thu, 4 Dec 2008 17:05:13 +0530
Subject: [PATCH 34/82] Mrp_Repair : Corrections on Report

bzr revid: jvo@tinyerp.com-20081204113513-cm2fon8mwgipxmep
---
 addons/mrp_repair/mrp_repair_view.xml |   2 +-
 addons/mrp_repair/report/order.rml    | 186 +++++++++++++-------------
 2 files changed, 97 insertions(+), 91 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index b200d838445..f469690141e 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -22,7 +22,7 @@
                     	<field name="invoiced"/>
                     </group>
                     <notebook colspan="4">
-                        <page string="Operationss">
+                        <page string="Operations">
                             <field name="guarantee_limit" />
                             <newline/>
                             <field colspan="4" mode="tree,form" name="operations" nolabel="1" widget="one2many_list">
diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml
index 223bcd38fbe..526f150caa6 100644
--- a/addons/mrp_repair/report/order.rml
+++ b/addons/mrp_repair/report/order.rml
@@ -80,14 +80,12 @@
     <blockTableStyle id="Table9">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table10">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table11">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,2" stop="1,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,2" stop="2,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,2" stop="3,2"/>
     </blockTableStyle>
     <blockTableStyle id="Table8">
       <blockAlignment value="LEFT"/>
@@ -101,34 +99,31 @@
     <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P4" fontName="Helvetica-Oblique" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="5.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P15" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="5.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P16" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P18" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P19" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P20" fontName="Helvetica-Oblique" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P21" fontName="Helvetica"/>
-    <paraStyle name="P22" fontName="Times-Roman"/>
-    <paraStyle name="P23" fontName="Times-Roman"/>
-    <paraStyle name="P24" fontName="Helvetica-Oblique" fontSize="2.0" leading="3"/>
-    <paraStyle name="P25" fontName="Helvetica-Oblique" fontSize="2.0" leading="3" alignment="RIGHT"/>
-    <paraStyle name="P26" fontName="Helvetica-Bold" fontSize="9.0" leading="11"/>
-    <paraStyle name="P27" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P18" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P19" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P20" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P21" fontName="Helvetica-Oblique" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P22" fontName="Helvetica-Oblique" fontSize="2.0" leading="3"/>
+    <paraStyle name="P23" fontName="Helvetica-Bold" fontSize="9.0" leading="11"/>
+    <paraStyle name="P24" fontName="Helvetica"/>
+    <paraStyle name="P25" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="P26" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="P27" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
     <paraStyle name="P28" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
-    <paraStyle name="P29" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
-    <paraStyle name="P30" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
-    <paraStyle name="P31" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P32" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P33" fontName="Helvetica" fontSize="5.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P29" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P30" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Times-Roman"/>
     <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -166,7 +161,7 @@
   </stylesheet>
   <images/>
   <story>
-    <para style="P11">[[ repeatIn(objects,'o') ]]</para>
+    <para style="P12">[[ repeatIn(objects,'o') ]]</para>
     <blockTable colWidths="265.0,51.0,225.0" style="Table1">
       <tr>
         <td>
@@ -180,12 +175,12 @@
           <para style="P3">
             <font color="white"> </font>
           </para>
-          <para style="P12">Invoice address :[[ o.partner_id and o.partner_id.property_payment_term.name ]]</para>
+          <para style="P13">Invoice address :[[ o.partner_id and o.partner_id.property_payment_term.name ]]</para>
           <para style="P3">[[ o.partner_invoice_id.street ]] [[ o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2 or '') ]]</para>
           <para style="P3">[[ 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>
         </td>
         <td>
-          <para style="P11">
+          <para style="P12">
             <font color="white"> </font>
           </para>
         </td>
@@ -210,94 +205,96 @@
         </td>
       </tr>
     </blockTable>
-    <para style="P11">
+    <para style="P12">
       <font color="white"> </font>
     </para>
-    <para style="P9">
-      <font color="white"> </font>
-    </para>
-    <para style="P7">[[ o.state&lt;&gt;'draft' and removeParentNode('para') ]]Repair Quotation <font face="Helvetica">N° : [[ o.name ]]</font></para>
-    <para style="P8">[[ o.state=='draft' and removeParentNode('para') ]]Repair Order N° : [[ o.name ]]</para>
     <para style="P10">
       <font color="white"> </font>
     </para>
-    <para style="P6">
+    <para style="P8">[[ o.state&lt;&gt;'draft' and removeParentNode('para') ]]Repair Quotation <font face="Helvetica">N° : [[ o.name ]]</font></para>
+    <para style="P9">[[ o.state=='draft' and removeParentNode('para') ]]Repair Order N° : [[ o.name ]]</para>
+    <para style="P11">
+      <font color="white"> </font>
+    </para>
+    <para style="P7">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="130.0,136.0,136.0,136.0" style="Table2">
       <tr>
         <td>
-          <para style="P14">Product to Repair </para>
+          <para style="P15">Product to Repair </para>
         </td>
         <td>
-          <para style="P14">Lot Number</para>
+          <para style="P15">Lot Number</para>
         </td>
         <td>
-          <para style="P14">Guarantee Limit </para>
+          <para style="P15">Guarantee Limit </para>
         </td>
         <td>
-          <para style="P14">Printing Date</para>
+          <para style="P15">Printing Date</para>
         </td>
       </tr>
     </blockTable>
     <blockTable colWidths="130.0,136.0,136.0,136.0" style="Table3">
       <tr>
         <td>
-          <para style="P15">[[ o.product_id.name or '' ]]</para>
+          <para style="P16">[[ o.product_id.name or '' ]]</para>
         </td>
         <td>
-          <para style="P15">[[ o.prodlot_id.name or ' ' ]]</para>
+          <para style="P16">[[ o.prodlot_id.name or ' ' ]]</para>
         </td>
         <td>
-          <para style="P15">[[ time.strftime('%d/%m/%Y', time.strptime(o.guarantee_limit, '%Y-%m-%d')) ]]</para>
+          <para style="P16">[[ time.strftime('%d/%m/%Y', time.strptime(o.guarantee_limit, '%Y-%m-%d')) ]]</para>
         </td>
         <td>
-          <para style="P15">[[ time.strftime('%d/%m/%Y')]] </para>
+          <para style="P16">[[ time.strftime('%d/%m/%Y')]] </para>
         </td>
       </tr>
     </blockTable>
-    <para style="P11">
+    <para style="P12">
       <font color="white"> </font>
     </para>
-    <para style="P11">
+    <para style="P12">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="165.0,165.0,71.0,70.0,64.0" repeatRows="1" style="Table4">
       <tr>
         <td>
-          <para style="P13">Description</para>
+          <para style="P14">Description</para>
         </td>
         <td>
-          <para style="P13">VAT</para>
+          <para style="P14">VAT</para>
         </td>
         <td>
-          <para style="P16">Quantity</para>
+          <para style="P17">Quantity</para>
         </td>
         <td>
-          <para style="P17">Unit Price</para>
+          <para style="P18">Unit Price</para>
         </td>
         <td>
-          <para style="P18">Price</para>
+          <para style="P19">Price</para>
         </td>
       </tr>
     </blockTable>
     <section>
-      <para style="P32"/>
-      <para style="P31">Operation Line(s)</para>
-      <blockTable colWidths="26.0,142.0,153.0,95.0,52.0,69.0" style="Table5">
+      <para style="P30">
+        <font color="white"> </font>
+      </para>
+      <para style="P29">Operation Line(s)</para>
+      <blockTable colWidths="28.0,145.0,150.0,96.0,51.0,69.0" style="Table5">
         <tr>
           <td>
-            <para style="P4">[[ repeatIn(o.operations,'line') ]] </para> <para style="P4">Add [[ ((line.type == 'add') or removeParentNode('para')) and '' ]] </para>
+            <para style="P4"><font face="Times-Roman" size="2.0">[[ repeatIn(o.operations,'line') ]]</font>Add [[ ((line.type == 'add') or removeParentNode('para')) and '' ]] </para>
             <para style="P4">Remove [[ ((line.type == 'remove') or removeParentNode('para')) and '' ]]</para>
           </td>
           <td>
-            <para style="P3">[[ line.name ]]</para>
+            <para style="P3">[[ line.name ]][[ (line.to_invoice==True) or removeParentNode('tr') ]]</para>
           </td>
           <td>
-            <para style="P27">[[ ','.join(map( lambda x: x.name, line.tax_id)) or '0.00' ]]</para>
+            <para style="P6">[[ ','.join(map( lambda x: x.name, line.tax_id)) or '0.00' ]]</para>
           </td>
           <td>
-            <para style="P19">[[ line.product_uom_qty or '0.00' ]] [[ line.product_uom.name ]] </para>
+            <para style="P20">[[ line.product_uom_qty or '0.00' ]] [[ line.product_uom.name ]]</para>
           </td>
           <td>
             <para style="P1">[[ line.price_unit ]]</para>
@@ -308,23 +305,21 @@
         </tr>
       </blockTable>
     </section>
-    <para style="P26">Fees Line(s)</para>
-    <para style="P20">
-      <font color="white"> </font>
-    </para>
+    <para style="P23">Fees Line(s)</para>
+    <para style="P21"/>
     <blockTable colWidths="28.0,145.0,150.0,96.0,51.0,69.0" style="Table6">
       <tr>
         <td>
-          <para style="P20">[[ repeatIn(o.fees_lines,'fees') ]]</para>
+          <para style="P21">[[ repeatIn(o.fees_lines,'fees') ]]</para>
         </td>
         <td>
-          <para style="P3">[[ fees.name ]]</para>
+          <para style="P3">[[ fees.name ]][[ (fees.to_invoice==True) or removeParentNode('tr') ]]</para>
         </td>
         <td>
-          <para style="P27">[[ ','.join(map( lambda x: x.name, fees.tax_id)) or '0.00' ]]</para>
+          <para style="P6">[[ ','.join(map( lambda x: x.name, fees.tax_id)) or '0.00' ]]</para>
         </td>
         <td>
-          <para style="P19">[[ fees.product_uom_qty or '0.00' ]] [[ fees.product_uom.name ]] </para>
+          <para style="P20">[[ fees.product_uom_qty or '0.00' ]] [[ fees.product_uom.name ]] </para>
         </td>
         <td>
           <para style="P1">[[ fees.price_unit ]]</para>
@@ -334,48 +329,59 @@
         </td>
       </tr>
     </blockTable>
-    <para style="P24">
+    <para style="P22">
       <font color="white"> </font>
     </para>
-    <para style="P24">
+    <para style="P22">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="444.0,61.0,34.0" style="Table9">
+    <blockTable colWidths="384.0,67.0,64.0,24.0" style="Table9">
       <tr>
         <td>
-          <para style="P28">Net Total :</para>
+          <para style="P28">
+            <font color="white"> </font>
+          </para>
         </td>
         <td>
-          <para style="P29">[[ o.amount_untaxed or '0.00' ]]</para>
+          <para style="P25">Net Total :</para>
         </td>
         <td>
-          <para style="P29">[[ o.pricelist_id.currency_id.name ]]</para>
+          <para style="P26">[[ o.amount_untaxed or '0.00' ]]</para>
+        </td>
+        <td>
+          <para style="P26">[[ o.pricelist_id.currency_id.name ]]</para>
         </td>
       </tr>
-    </blockTable>
-    <blockTable colWidths="444.0,61.0,34.0" style="Table10">
       <tr>
         <td>
-          <para style="P28">Taxes:</para>
+          <para style="P28">
+            <font color="white"> </font>
+          </para>
         </td>
         <td>
-          <para style="P29">[[ o.amount_tax or '0.00']]</para>
+          <para style="P25">Taxes:</para>
         </td>
         <td>
-          <para style="P29">[[ o.pricelist_id.currency_id.name ]]</para>
+          <para style="P26">[[ o.amount_tax or '0.00']]</para>
+        </td>
+        <td>
+          <para style="P26">[[ o.pricelist_id.currency_id.name ]]</para>
         </td>
       </tr>
-    </blockTable>
-    <blockTable colWidths="444.0,61.0,34.0" style="Table11">
       <tr>
         <td>
-          <para style="P28">Total :</para>
+          <para style="P28">
+            <font color="white"> </font>
+          </para>
         </td>
         <td>
-          <para style="P30">[[ total(o) ]]</para>
+          <para style="P25">Total :</para>
         </td>
         <td>
-          <para style="P29">[[ o.pricelist_id.currency_id.name ]]</para>
+          <para style="P27">[[ total(o) ]]</para>
+        </td>
+        <td>
+          <para style="P26">[[ o.pricelist_id.currency_id.name ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -392,7 +398,7 @@
         </td>
       </tr>
     </blockTable>
-    <para style="P21">
+    <para style="P24">
       <font color="white"> </font>
     </para>
   </story>

From 100063d17465b6ce978eeb4b516c5fce5fbb5ba4 Mon Sep 17 00:00:00 2001
From: Jay Vora <jvo@tinyerp.com>
Date: Thu, 4 Dec 2008 17:43:42 +0530
Subject: [PATCH 35/82] Mrp_Repair : Added Security Rules

bzr revid: jvo@tinyerp.com-20081204121342-2cj1412jnvj1auv0
---
 addons/mrp_repair/__terp__.py                  | 2 +-
 addons/mrp_repair/mrp_repair.py                | 2 +-
 addons/mrp_repair/security/ir.model.access.csv | 7 +++++++
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 addons/mrp_repair/security/ir.model.access.csv

diff --git a/addons/mrp_repair/__terp__.py b/addons/mrp_repair/__terp__.py
index 3dbb7b99b58..4a8a5d556fd 100644
--- a/addons/mrp_repair/__terp__.py
+++ b/addons/mrp_repair/__terp__.py
@@ -38,7 +38,7 @@
     "demo_xml":[],
     "update_xml":[
         #"security/mrp_repair_security.xml",
-        #"security/ir.model.access.csv",
+        "security/ir.model.access.csv",
         "mrp_repair_sequence.xml",
         "mrp_repair_wizard.xml", 
         "mrp_repair_view.xml", 
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index dd1b4b2fdc9..bf8a9f8a640 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -431,7 +431,7 @@ class ProductChangeMixin(object):
     def product_id_change(self, cr, uid, ids, pricelist, product, uom=False, product_uom_qty=0, partner_id=False, guarantee_limit=False):
         result = {}
         warning = {}       
-        print "here we are"
+
         if not product_uom_qty:
             product_uom_qty = 1
         result['product_uom_qty'] = product_uom_qty 
diff --git a/addons/mrp_repair/security/ir.model.access.csv b/addons/mrp_repair/security/ir.model.access.csv
new file mode 100644
index 00000000000..0f12f66a815
--- /dev/null
+++ b/addons/mrp_repair/security/ir.model.access.csv
@@ -0,0 +1,7 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_mrp_repair_user","MRP Repair user","model_mrp_repair","stock.group_stock_user",1,0,0,0
+"access_mrp_repair_manager","MRP Repair manager","model_mrp_repair","stock.group_stock_manager",1,1,1,1
+"access_mrp_repair_line_user","MRP Repair Line user","model_mrp_repair_line","stock.group_stock_user",1,0,0,0
+"access_mrp_repair_line_manager","MRP Repair Line manager","model_mrp_repair_line","stock.group_stock_manager",1,1,1,1
+"access_mrp_repair_fee_user","MRP Repair Fee user","model_mrp_repair_fee","stock.group_stock_user",1,0,0,0
+"access_mrp_repair_fee_manager","MRP Repair Fee manager","model_mrp_repair_fee","stock.group_stock_manager",1,1,1,1

From 5a6bf86b3a5439197f83a65560beb70aa705f591 Mon Sep 17 00:00:00 2001
From: qdp <qdp-launchpad@tinyerp.com>
Date: Thu, 4 Dec 2008 14:09:01 +0100
Subject: [PATCH 36/82] attrs on delivery address

bzr revid: qdp-launchpad@tinyerp.com-20081204130901-6p57c1ezhon2rauq
---
 addons/mrp_repair/mrp_repair_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index f469690141e..a8041d9b0c6 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -18,7 +18,7 @@
                         <field name="repaired"/>
                     	<newline/>
                         <field name="partner_id" select="2" on_change="onchange_partner_id(partner_id,address_id)"/>
-                        <field name="address_id"/>
+                        <field name="address_id"  attrs="{'readonly':[('deliver_bool','=', False)]}"/>
                     	<field name="invoiced"/>
                     </group>
                     <notebook colspan="4">

From e7e862e6b0a81a7e28a49619662a2adc298f3980 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@tinyerp.com>
Date: Thu, 4 Dec 2008 14:37:58 +0100
Subject: [PATCH 37/82] [ADD] Unique Constraint on the name of the maintenance
 contract

bzr revid: stephane@tinyerp.com-20081204133758-zwnogrtc2ew9en1k
---
 bin/addons/base/maintenance/maintenance.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bin/addons/base/maintenance/maintenance.py b/bin/addons/base/maintenance/maintenance.py
index 71369190c8e..fa4ae85af6e 100644
--- a/bin/addons/base/maintenance/maintenance.py
+++ b/bin/addons/base/maintenance/maintenance.py
@@ -60,6 +60,9 @@ class maintenance_contract(osv.osv):
     _defaults = {
         'password' : lambda obj,cr,uid,context={} : '',
     }
+    _sql_constraints = [
+        ('uniq_name', 'unique(name)', "Your maintenance contract is already subscribed in the system !")
+    ]
 
 maintenance_contract()
 

From 2ab4ed4eeec7b068b118a46bef99a551c87f53b0 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@tinyerp.com>
Date: Thu, 4 Dec 2008 15:34:12 +0100
Subject: [PATCH 38/82] [IMP] Add the state field

bzr revid: stephane@tinyerp.com-20081204143412-r4yy9kz4950d9rep
---
 bin/addons/base/maintenance/maintenance.py       | 8 ++++++++
 bin/addons/base/maintenance/maintenance_view.xml | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/maintenance/maintenance.py b/bin/addons/base/maintenance/maintenance.py
index fa4ae85af6e..b7150a4891e 100644
--- a/bin/addons/base/maintenance/maintenance.py
+++ b/bin/addons/base/maintenance/maintenance.py
@@ -50,12 +50,20 @@ maintenance_contract_module()
 class maintenance_contract(osv.osv):
     _name = "maintenance.contract"
     _description = "Maintenance Contract"
+
+    def _valid_get(self, cr, uid, ids, field_name, arg, context=None):
+        res = {}
+        for contract in self.browse(cr, uid, ids, context=context):
+            res[contract.id] = ("unvalid", "valid")[contract.date_stop >= time.strftime('%Y-%m-%d')]
+        return res
+
     _columns = {
         'name' : fields.char('Contract ID', size=256, required=True, readonly=True),
         'password' : fields.char('Password', size=64, invisible=True, required=True, readonly=True),
         'date_start' : fields.date('Starting Date', readonly=True),
         'date_stop' : fields.date('Ending Date', readonly=True),
         'module_ids' : fields.many2many('maintenance.contract.module', 'maintenance_contract_module_rel', 'contract_id', 'module_id', 'Covered Modules', readonly=True),
+        'state' : fields.function(_valid_get, method=True, string="State", type="selection", selection=[('valid', 'Valid'),('unvalid', 'Unvalid')], readonly=True)
     }
     _defaults = {
         'password' : lambda obj,cr,uid,context={} : '',
diff --git a/bin/addons/base/maintenance/maintenance_view.xml b/bin/addons/base/maintenance/maintenance_view.xml
index fcef2e17911..9d3100c528e 100644
--- a/bin/addons/base/maintenance/maintenance_view.xml
+++ b/bin/addons/base/maintenance/maintenance_view.xml
@@ -11,6 +11,7 @@
                     <field name="name"/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
+                    <field name="state" />
                 </tree>
             </field>
         </record>
@@ -22,7 +23,8 @@
             <field name="arch" type="xml">
                 <form string="Maintenance Contract">
                     <separator string="Information" colspan="4"/>
-                    <field name="name" select="1" colspan="4"/>
+                    <field name="name" select="1" />
+                    <field name="state" />
                     <field name="date_start" select="1"/>
                     <field name="date_stop" select="1"/>
                     <separator string="Covered Modules" colspan="4"/>

From 11ffe5247bad0b34468a234bf3bd7740633a98f9 Mon Sep 17 00:00:00 2001
From: qdp <qdp-launchpad@tinyerp.com>
Date: Thu, 4 Dec 2008 16:06:28 +0100
Subject: [PATCH 39/82] *bugfix

bzr revid: qdp-launchpad@tinyerp.com-20081204150628-gie3vi7w3thavsh6
---
 addons/mrp_repair/mrp_repair_view.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index a8041d9b0c6..ae13bc09f64 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -31,7 +31,7 @@
                                         <page string="Repair Line">                                                                      
 		                                    <field name="name" colspan="4"/>		                                     
 		                                    <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id)" colspan="4"/>                                            
-		                                    <field name="product_uom_qty" string="Qty" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id)"/>
+		                                    <field name="product_uom_qty" string="Qty" />
 		                                    <field name="product_uom" string="UoM"/>
 		                                    <field name="price_unit"/>     
 		                                    <field name="price_subtotal"/> 		                                    
@@ -61,9 +61,10 @@
                                     <field name='name'/>
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
-                                    <field name="product_uom_qty" string="Qty" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id)"/>
+                                    <field name="product_uom_qty" string="Qty"/>
                                     <field name="product_uom" string="UoM"/>
                                     <field name="price_unit"/>
+                                    <field name="tax_id"/>
                                     <field name="to_invoice"/>
                                     <field name="price_subtotal"/>
                                 </tree>
@@ -102,7 +103,7 @@
                                         <page string="Fees Line"> 
                                             <field name='name'/>  
 		                                    <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id,parent.guarantee_limit)" colspan="4"/>
-		                                    <field name="product_uom_qty" string="Qty" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id,parent.guarantee_limit)"/>
+		                                    <field name="product_uom_qty" string="Qty"/>
 		                                    <field name="product_uom" string="UoM" /> 
 		                                    <field name="price_unit"/>  
 		                                    <field name="price_subtotal"/>  
@@ -122,7 +123,7 @@
                                 <tree string="Fees" editable="bottom">
                                     <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id,parent.guarantee_limit)"/>
                                     <field name='name'/>
-                                    <field name="product_uom_qty" string="Qty" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id,parent.guarantee_limit)"/>
+                                    <field name="product_uom_qty" string="Qty"/>
                                     <field name="product_uom" string="UoM"/>
                                     <field name="price_unit"/>
                                     <field name="to_invoice"/>

From 3b18d96c9003c2309f8dda841d1e15701142f9a8 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 4 Dec 2008 18:59:31 +0100
Subject: [PATCH 40/82] improve

bzr revid: fp@tinyerp.com-20081204175931-mr0wd54kvqk925zz
---
 addons/mrp/mrp.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index aedd0543805..e0b326f7fca 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -891,7 +891,7 @@ class mrp_procurement(osv.osv):
         res = True
         user = self.pool.get('res.users').browse(cr, uid, uid)
         for procurement in self.browse(cr, uid, ids):
-            if procurement.product_id.product_tmpl_id.supply_method=='buy':
+            if procurement.product_id.product_tmpl_id.supply_method<>'produce':
                 if procurement.product_id.seller_ids:
                     partner = procurement.product_id.seller_ids[0].name
                     if user.company_id and user.company_id.partner_id:
@@ -909,7 +909,7 @@ class mrp_procurement(osv.osv):
     def check_buy(self, cr, uid, ids):
         user = self.pool.get('res.users').browse(cr, uid, uid)
         for procurement in self.browse(cr, uid, ids):
-            if procurement.product_id.product_tmpl_id.supply_method=='produce':
+            if procurement.product_id.product_tmpl_id.supply_method<>'buy':
                 return False
             if not procurement.product_id.seller_ids:
                 cr.execute('update mrp_procurement set message=%s where id=%d', ('No supplier defined for this product !', procurement.id))

From e3a1fbcfe1d71ae5cec34b8f975e1a61fdc686a9 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 4 Dec 2008 19:08:01 +0100
Subject: [PATCH 41/82] improved_text

bzr revid: fp@tinyerp.com-20081204180801-5jfnq05peu4j55m1
---
 addons/sale/sale.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 1eeaeca10d3..598f22151d3 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -209,15 +209,15 @@ class sale_order(osv.osv):
         'picking_policy': fields.selection([('direct','Partial Delivery'),('one','Complete Delivery')],
             'Packing Policy', required=True, help="""If you don't have enough stock available to deliver all at once, do you accept partial shippings or not."""),
         'order_policy': fields.selection([
-            ('prepaid','Payment before delivery'),
+            ('prepaid','Payment Before Delivery'),
             ('manual','Shipping & Manual Invoice'),
-            ('postpaid','Automatic Invoice after delivery'),
+            ('postpaid','Invoice on Order After Delivery'),
             ('picking','Invoice from the packings'),
         ], 'Shipping Policy', required=True, readonly=True, states={'draft':[('readonly',False)]},
                     help="""The Shipping Policy is used to synchronise invoice and delivery operations.
   - The 'Pay before delivery' choice will first generate the invoice and then generate the packing order after the payment of this invoice.
   - The 'Shipping & Manual Invoice' will create the packing order directly and wait for the user to manually click on the 'Invoice' button to generate the draft invoice.
-  - The 'Invoice after delivery' choice will generate the draft invoice after the packing list have been finished.
+  - The 'Invoice on Order Ater Delivery' choice will generate the draft invoice based on sale order after all packing lists have been finished.
   - The 'Invoice from the packings' choice is used to create an invoice during the packing process."""),
         'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'project_id':fields.many2one('account.analytic.account', 'Analytic Account', readonly=True, states={'draft':[('readonly', False)]}),

From ef6e2f01c062e833107f09e56f142fb9a93525e1 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 4 Dec 2008 19:10:00 +0100
Subject: [PATCH 42/82] improved_view

bzr revid: fp@tinyerp.com-20081204181000-8dlcgoymh0kz19kv
---
 addons/stock/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 52490b5d8fb..ad16df6d958 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -27,7 +27,7 @@
             <field name="arch" type="xml">
                 <form string="Stock Inventory Lines">
                     <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>
-                    <field context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" select="1"/>
+                    <field context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" select="1" domain="[('type','&lt;&gt;','service')]"/>
                     <field name="product_qty"/>
                     <field name="product_uom"/>
                 </form>

From b8a81ff835f61ed5a07be2cc5147c51cbf75dad1 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 4 Dec 2008 21:27:32 +0100
Subject: [PATCH 43/82] improve

bzr revid: fp@tinyerp.com-20081204202732-qleb81jglci775iu
---
 addons/product/security/ir.model.access.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/product/security/ir.model.access.csv b/addons/product/security/ir.model.access.csv
index 62d5079afce..841746f96ed 100644
--- a/addons/product/security/ir.model.access.csv
+++ b/addons/product/security/ir.model.access.csv
@@ -29,3 +29,4 @@
 "access_product_pricelist_item_user","product.pricelist.item.user","model_product_pricelist_item","base.group_user",1,0,0,0
 "access_product_pricelist_type_partner_manager","product.pricelist.type partner manager","model_product_pricelist_type","base.group_partner_manager",1,0,0,0
 "access_product_pricelist_partner_manager","product.pricelist partner manager","model_product_pricelist","base.group_partner_manager",1,0,0,0
+"access_ir_property_group_product_manager","ir_property group_product_manager","model_ir_property",product.group_product_manager,1,1,1,1

From 7182d99f983f5c6de9b05465e56e88ee7e51819f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 4 Dec 2008 21:33:34 +0100
Subject: [PATCH 44/82] bugfix

bzr revid: fp@tinyerp.com-20081204203334-giuv4fv6vvs3px7f
---
 addons/product/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product/security/ir.model.access.csv b/addons/product/security/ir.model.access.csv
index 841746f96ed..062db9e34e8 100644
--- a/addons/product/security/ir.model.access.csv
+++ b/addons/product/security/ir.model.access.csv
@@ -29,4 +29,4 @@
 "access_product_pricelist_item_user","product.pricelist.item.user","model_product_pricelist_item","base.group_user",1,0,0,0
 "access_product_pricelist_type_partner_manager","product.pricelist.type partner manager","model_product_pricelist_type","base.group_partner_manager",1,0,0,0
 "access_product_pricelist_partner_manager","product.pricelist partner manager","model_product_pricelist","base.group_partner_manager",1,0,0,0
-"access_ir_property_group_product_manager","ir_property group_product_manager","model_ir_property",product.group_product_manager,1,1,1,1
+"access_ir_property_group_product_manager","ir_property group_product_manager","base.model_ir_property",product.group_product_manager,1,1,1,1

From 713b3de5b9885c96e1b1563d2e72bcea9ddf8a35 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 5 Dec 2008 01:18:08 +0100
Subject: [PATCH 45/82] modifs

bzr revid: fp@tinyerp.com-20081205001808-rpu4csh3zvl3qb3x
---
 addons/account/account.py                                    | 2 +-
 addons/event_project/event.py                                | 2 +-
 .../wizard/hr_timesheet_invoice_create.py                    | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 8f1329cc30e..1b618d24cc4 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1369,7 +1369,7 @@ class account_tax(osv.osv):
             r['amount'] *= quantity
         return res
 
-    def _unit_compute_inv(self, cr, uid, taxes, price_unit, address_id=None, product=None, partner=None):
+    def _unit_compute_inv(self, cr, uid, taxes, price_unit, address_id=None, product=None, partner=None,tax_parent_tot=0.0):
         taxes = self._applicable(cr, uid, taxes, price_unit, address_id, product, partner)
 
         res = []
diff --git a/addons/event_project/event.py b/addons/event_project/event.py
index 477f05f61ea..2a4733db73f 100644
--- a/addons/event_project/event.py
+++ b/addons/event_project/event.py
@@ -51,7 +51,7 @@ class event(osv.osv):
     def write(self, cr, uid, ids,vals, *args, **kwargs):
         if 'date_begin' in vals and vals['date_begin']:
             for eve in self.browse(cr, uid, ids):
-                    self.pool.get('project.project').write(cr, uid, [eve.project_id.id], {'date_end':eve.date_begin})
+                    self.pool.get('project.project').write(cr, uid, [eve.project_id.id], {'date_end':eve.date_begin[:10]})
 
         return super(event,self).write(cr, uid, ids,vals, *args, **kwargs)
 
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 98a441e3d61..8125ce3f2fe 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -134,7 +134,10 @@ class invoice_create(wizard.interface):
                     if data['form']['date']:
                         details.append(line['date'])
                     if data['form']['time']:
-                        details.append("%s %s" % (line['unit_amount'], pool.get('product.uom').browse(cr, uid, [line['product_uom_id']])[0].name))
+                        if line['product_uom_id']:
+                            details.append("%s %s" % (line['unit_amount'], pool.get('product.uom').browse(cr, uid, [line['product_uom_id']])[0].name))
+                        else:
+                            details.append("%s" % (line['unit_amount'], ))
                     if data['form']['name']:
                         details.append(line['name'])
                     #if data['form']['price']:

From 3e62d37eed637144bfca49f6765ba57ae5403b44 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 5 Dec 2008 01:20:09 +0100
Subject: [PATCH 46/82] bugfix

bzr revid: fp@tinyerp.com-20081205002009-gjuwb1qygakvsmr2
---
 addons/event_project/event.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/event_project/event.py b/addons/event_project/event.py
index 2a4733db73f..6f5a5ee6a9c 100644
--- a/addons/event_project/event.py
+++ b/addons/event_project/event.py
@@ -51,6 +51,7 @@ class event(osv.osv):
     def write(self, cr, uid, ids,vals, *args, **kwargs):
         if 'date_begin' in vals and vals['date_begin']:
             for eve in self.browse(cr, uid, ids):
+                if eve.project_id:
                     self.pool.get('project.project').write(cr, uid, [eve.project_id.id], {'date_end':eve.date_begin[:10]})
 
         return super(event,self).write(cr, uid, ids,vals, *args, **kwargs)

From ca3887a6e07fd946a4f83d4eb7ed8358dff59000 Mon Sep 17 00:00:00 2001
From: Husen Daudi <hda@tinyerp.com>
Date: Fri, 5 Dec 2008 10:56:39 +0530
Subject: [PATCH 47/82] Improve task view

bzr revid: hda@tinyerp.com-20081205052639-1uf4wm5kmp5hvpyc
---
 addons/project/project_view.xml             | 4 ++--
 addons/project/security/ir.model.access.csv | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index b7ec8362408..32c7ed49c27 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -210,7 +210,7 @@
                     <field name="remaining_hours" widget="float_time"/>
                     <group col="4" colspan="4">
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-ok" name="compute_hours" string="Compute" type="object"/>
+                        <button icon="gtk-ok" name="compute_hours" string="Update" type="object"/>
                     </group>
                 </form>
             </field>
@@ -250,7 +250,7 @@
                             <field name="delay_hours" widget="float_time"/>
                             <group col="3" colspan="2">
 	                            <field name="remaining_hours" select="2" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" colspan="2"/>
-	                            <button name="%(action_config_compute_remaining)d" string="Compute" type="action" colspan="1" target="new"/>
+	                            <button name="%(action_config_compute_remaining)d" string="Review" type="action" colspan="1" target="new" attrs="{'invisible':[('state','=','draft')]}"/>
                             </group>
                             <field name="effective_hours" widget="float_time"/>
 
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index 40f5cfdb94b..1fe6bb56123 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -6,3 +6,4 @@
 "access_project_task_manager","project.task manager","model_project_task","project.group_project_manager",1,1,1,1
 "access_project_task","project.task","model_project_task","project.group_project_user",1,1,1,1
 "access_project_task_work","project.task.work","model_project_task_work","project.group_project_user",1,1,1,1
+"access_config_compute_remaining","project.config.compute.remaining","model_config_compute_remaining","project.group_project_manager",1,1,1,1

From 4c505f51aa77b7c86fa41dc4a79af17988b4e4ca Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@tinyerp.com>
Date: Fri, 5 Dec 2008 14:57:33 +0530
Subject: [PATCH 48/82] base module quality

bzr revid: mra@tinyerp.com-20081205092733-60b9iki2gxtgiolp
---
 addons/base_module_merge/__init__.py          |  24 ++
 addons/base_module_merge/__terp__.py          |  44 +++
 .../base_module_merge_wizard.xml              |  20 ++
 addons/base_module_merge/wizard/__init__.py   |  25 ++
 .../wizard/base_module_merge.py               | 302 ++++++++++++++++++
 addons/base_module_quality/__init__.py        |   1 +
 addons/base_module_quality/__terp__.py        |   6 +-
 .../base_module_quality.py                    |  27 ++
 .../base_module_quality_view.xml              |   0
 .../base_module_quality_wizard.xml            |   6 +
 addons/base_module_quality/wizard/__init__.py |  27 ++
 .../wizard/module_quality_check.py            |  85 +++++
 .../wizard/pylint_test/__init__.py            |  25 ++
 .../wizard/pylint_test/pylint_test.py         | 162 ++++++++++
 14 files changed, 751 insertions(+), 3 deletions(-)
 create mode 100644 addons/base_module_merge/__init__.py
 create mode 100644 addons/base_module_merge/__terp__.py
 create mode 100644 addons/base_module_merge/base_module_merge_wizard.xml
 create mode 100644 addons/base_module_merge/wizard/__init__.py
 create mode 100644 addons/base_module_merge/wizard/base_module_merge.py
 delete mode 100644 addons/base_module_quality/base_module_quality_view.xml
 create mode 100644 addons/base_module_quality/base_module_quality_wizard.xml
 create mode 100644 addons/base_module_quality/wizard/__init__.py
 create mode 100644 addons/base_module_quality/wizard/module_quality_check.py
 create mode 100644 addons/base_module_quality/wizard/pylint_test/__init__.py
 create mode 100644 addons/base_module_quality/wizard/pylint_test/pylint_test.py

diff --git a/addons/base_module_merge/__init__.py b/addons/base_module_merge/__init__.py
new file mode 100644
index 00000000000..8b433928f46
--- /dev/null
+++ b/addons/base_module_merge/__init__.py
@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2008 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
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_module_merge/__terp__.py b/addons/base_module_merge/__terp__.py
new file mode 100644
index 00000000000..aa912d04f99
--- /dev/null
+++ b/addons/base_module_merge/__terp__.py
@@ -0,0 +1,44 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2008 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" : "Module Merger",
+    "version" : "1.0",
+    "author" : "Tiny",
+    "website" : "http://tinyerp.com",
+    "category" : "Generic Modules/Base",
+    "description": """
+    * The wizard asks a many2many of modules
+    * And then generate a module which is the merge of all selected modules
+    * The new module is provided as a .zip file
+
+    The merge will works in all situations:
+    * Merging all .py files with the same name in the new module
+    * merging all .xml files and take care of id's.
+    """,
+    "depends" : ["base"],
+    "init_xml" : [ ],
+    "demo_xml" : [ ],
+    "update_xml" : [ "base_module_merge_wizard.xml" ],
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_module_merge/base_module_merge_wizard.xml b/addons/base_module_merge/base_module_merge_wizard.xml
new file mode 100644
index 00000000000..d9bf8755acb
--- /dev/null
+++ b/addons/base_module_merge/base_module_merge_wizard.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<openerp>
+	<data>
+		<wizard
+			id="wizard_base_module_merger"
+			string="Merge module"
+			model="ir.module.module"
+			multi="True"
+			name="base_module_merge.module_merge"/>
+
+		
+		<menuitem
+			parent="base.menu_management"
+			type="wizard"
+			action="wizard_base_module_merger"
+			id="menu_wizard_base_module_merger"/>
+
+
+	</data>
+</openerp>
diff --git a/addons/base_module_merge/wizard/__init__.py b/addons/base_module_merge/wizard/__init__.py
new file mode 100644
index 00000000000..6b33adb9c66
--- /dev/null
+++ b/addons/base_module_merge/wizard/__init__.py
@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2008 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 base_module_merge
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_module_merge/wizard/base_module_merge.py b/addons/base_module_merge/wizard/base_module_merge.py
new file mode 100644
index 00000000000..5e474b94fae
--- /dev/null
+++ b/addons/base_module_merge/wizard/base_module_merge.py
@@ -0,0 +1,302 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2008 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 osv
+import pooler
+import tools
+import os
+from xml.dom import minidom
+
+info_start_form = '''<?xml version="1.0"?>
+<form string="Module Merging">
+    <field name="modules_list" colspan="4"/>
+</form>'''
+
+info_start_fields = {
+    'modules_list': {'string':'Modules', 'type':'many2many','relation':'ir.module.module','help':'Select Modules which you want to merge in single module'},
+}
+
+
+intro_start_form = '''<?xml version="1.0"?>
+<form string="Module Recording">
+    <separator string="Module Information" colspan="4"/>
+    <field name="name"/>
+    <field name="directory_name"/>
+    <field name="version"/>
+    <field name="author"/>
+    <field name="website" colspan="4"/>
+    <field name="category" colspan="4"/>
+    <field name="data_kind"/>
+    <newline/>
+    <field name="description" colspan="4"/>
+</form>'''
+
+intro_start_fields = {
+    'name': {'string':'Module Name', 'type':'char', 'size':64, 'required':True},
+    'directory_name': {'string':'Directory Name', 'type':'char', 'size':32, 'required':True},
+    'version': {'string':'Version', 'type':'char', 'size':16, 'required':True},
+    'author': {'string':'Author', 'type':'char', 'size':64, 'default': lambda *args: 'Tiny', 'required':True},
+    'category': {'string':'Category', 'type':'char', 'size':64, 'default': lambda *args: 'Vertical Modules/Parametrization', 'required':True},
+    'website': {'string':'Documentation URL', 'type':'char', 'size':64, 'default': lambda *args: 'http://tinyerp.com', 'required':True},
+    'description': {'string':'Full Description', 'type':'text', 'required':True},
+    'data_kind': {'string':'Type of Data', 'type':'selection', 'selection':[('demo','Demo Data'),('update','Normal Data')], 'required':True, 'default': lambda *args:'update'},
+}
+
+intro_save_form = '''<?xml version="1.0"?>
+<form string="Module Recording">
+    <separator string="Module successfully created !" colspan="4"/>
+    <field name="module_filename"/>
+    <newline/>
+    <field name="module_file"/>
+    <separator string="Information" colspan="4"/>
+    <label string="If you think your module could interrest others people, we'd like you to publish it on TinyERP.com, in the 'Modules' section. You can do it through the website or using features of the 'base_module_publish' module." colspan="4" align="0.0"/>
+    <label string="Thanks in advance for your contribution." colspan="4" align="0.0"/>
+</form>'''
+
+intro_save_fields = {
+    'module_file': {'string': 'Module .zip File', 'type':'binary', 'readonly':True},
+    'module_filename': {'string': 'Filename', 'type':'char', 'size': 64, 'readonly':True},
+}
+import zipfile
+from zipfile import PyZipFile, ZIP_DEFLATED
+import StringIO
+import base64
+
+class base_module_merge(wizard.interface):
+
+    def _zip_writestr(self,file_name,data):
+        info = zipfile.ZipInfo(file_name)
+        info.compress_type = zipfile.ZIP_DEFLATED
+        info.external_attr = 2175008768
+        self.archive.writestr(info,data)
+        return True
+
+    def _remove_prefix_ref(self,fromurl,path):
+        infile=tools.file_open(os.path.join(fromurl,path))
+        xml=infile.read()
+        mydom = minidom.parseString(xml)
+        for child in mydom.getElementsByTagName("field"):
+            for attr in child.attributes.keys():
+                if attr=='ref':
+                    old=child.getAttribute(attr)
+                    if len(old.split('.')) > 1:
+                        if old.split('.')[0] in self.dependencies:
+                            child.setAttribute(attr,old.split('.')[1])
+        return mydom.toxml()
+
+    def _parse_init(self,path,filename):
+        res=[]
+        path=os.path.join(path,filename)
+        infile=open(path,'r')
+        for i in infile:
+            i=i.strip()
+            if len(i)>0:
+                if i[0]!="#":
+                    res.append( i.strip().split('\n')[0])
+        infile.close()
+        return res
+
+    def _zippy(self,archive, fromurl, path, src=True):
+        if path!='':
+            url = os.path.join(fromurl, path)
+        else:
+            url=fromurl
+        if os.path.isdir(url):
+            if path.split('/')[-1].startswith('.'):
+                return False
+            for fname in os.listdir(url):
+                self._zippy(self.archive, fromurl, path and os.path.join(path, fname) or fname, src=src)
+        else:
+            if src:
+                exclude = ['pyo', 'pyc']
+            else:
+                exclude = ['py','pyo','pyc']
+            if (path.split('.')[-1] not in exclude):
+                if os.path.basename(path)=='__init__.py':
+                    datas=self._parse_init(fromurl,path)
+                    if path in self.dict_init:
+                        self.dict_init[path]+=datas
+                    else:
+                        self.dict_init[path]=datas
+                    return True
+                if os.path.basename(path)=='__terp__.py':
+                    terp_file=os.path.join(fromurl,path)
+                    terp_info=eval(tools.file_open(terp_file).read())
+                    self.init_xml+=terp_info['init_xml']
+                    self.demo_xml+=terp_info['demo_xml']
+                    self.update_xml+=terp_info['update_xml']
+                    return True
+                try:
+                    info = self.archive.getinfo(path)
+                except KeyError:
+                    if path.split('.')[-1] == 'xml':
+                        xml_doc=self._remove_prefix_ref(fromurl,path)
+                        xml_doc = xml_doc.encode("utf-8")
+                        self._zip_writestr(path, xml_doc)
+                    else:
+                        file_data=tools.file_open(os.path.join(fromurl, path)).read()
+                        self._zip_writestr(path, file_data)
+                else:
+                    path2=os.path.split(fromurl)[-1]
+                    new_path=path2+'_'+os.path.split(path)[-1]
+                    if len(os.path.split(path))>1:
+                        new_path=os.path.join(os.path.split(path)[0],new_path)
+                    if path.split('.')[-1] == 'xml':
+                        xml_doc=self._remove_prefix_ref(fromurl,path)
+                        xml_doc = xml_doc.encode("utf-8")
+                        self._zip_writestr(new_path, xml_doc)
+                        if len(os.path.split(path))>1:
+                            terp_file=os.path.join(fromurl,'__terp__.py')
+                            terp_info=eval(tools.file_open(terp_file).read())
+                            if os.path.basename(path) in terp_info['init_xml']:
+                                print "in init_xml",new_path
+                                self.init_xml+=[os.path.basename(new_path)]
+                            elif os.path.basename(path) in terp_info['demo_xml']:
+                                print "in demo_xml",new_path
+                                self.demo_xml+=[os.path.basename(new_path)]
+                            elif os.path.basename(path) in terp_info['update_xml']:
+                                print "in update_xml",new_path
+                                self.update_xml+=[os.path.basename(new_path)]
+                    else:
+                        file_data=tools.file_open(os.path.join(fromurl, path)).read()
+                        self._zip_writestr(new_path, file_data)
+                    if new_path.split('.')[-1] == 'py':
+                        new_import='import '+os.path.basename(new_path).split('.')[0]
+                        if os.path.dirname(path)=='':
+                            dict_key='__init__.py'
+                        else:
+                            dict_key=os.path.join(os.path.dirname(path),'__init__.py')
+                        if dict_key in self.dict_init:
+                            self.dict_init[dict_key]+=[new_import]
+                        else:
+                            self.dict_init[dict_key]=[new_import]
+        return True
+
+    def rec_depend(self,cr, uid, ids, data, context=None, level=50):
+        pool = pooler.get_pool(cr.dbname)
+        dep_obj=pool.get('ir.module.module.dependency')
+        if level<1:
+            raise Exception, 'Recursion error in modules dependencies !'
+        for module in pool.get('ir.module.module').browse(cr, uid, ids):
+            dep_ids = dep_obj.search(cr, uid, [('module_id', '=', module.id)])
+            if dep_ids:
+                ids2 = []
+                for dep in dep_obj.browse(cr, uid, dep_ids):
+                    dep_name=pool.get('ir.module.module').search(cr, uid, [('name','=',dep.name)])
+                    ids2.append(dep_name[0])
+                self.rec_depend(cr, uid, ids2, data, context, level-1)
+            if module.name not in data['form']['dependencies']:
+                data['form']['dependencies'].append(module.name)
+        return True
+
+    def _compute_dependencies(self, cr, uid, data, context):
+        data['form']['dependencies']=[]
+        self.rec_depend(cr,uid,data['form']['modules_list'][0][2],data,context)
+        self.dependencies=data['form']['dependencies']
+        pool = pooler.get_pool(cr.dbname)
+        return {}
+
+    def _create_module(self, cr, uid, data, context):
+        self.dict_init={}
+        self.init_xml=[]
+        self.demo_xml=[]
+        self.update_xml=[]
+        self.archname = StringIO.StringIO('wb')
+        self.archive = zipfile.ZipFile(self.archname, "w", ZIP_DEFLATED)
+        for module in self.dependencies:
+            ad = tools.config['addons_path']
+            url = os.path.join(ad, module)
+            if not os.path.isdir(url):
+                url=url+'.zip'
+            self._zippy(self.archive, url, '', src=True)
+        dname = data['form']['directory_name']
+        data['form']['depen']=[]
+
+        data['form']['init_xml']=reduce(lambda l, x: x not in l and l.append(x) or l, self.init_xml, [])
+        data['form']['demo_xml']=reduce(lambda l, x: x not in l and l.append(x) or l, self.demo_xml, [])
+        data['form']['update_xml']=reduce(lambda l, x: x not in l and l.append(x) or l, self.update_xml, [])
+        _terp = """{
+            "name" : "%(name)s",
+            "version" : "%(version)s",
+            "author" : "%(author)s",
+            "website" : "%(website)s",
+            "category" : "%(category)s",
+            "description":\"\"\"%(description)s\"\"\",
+            "depends" : %(depen)s,
+            "init_xml" : %(init_xml)s,
+            "demo_xml" : %(demo_xml)s,
+            "update_xml" : %(update_xml)s,
+            "active": True,
+            "installable": True
+    } """ % data['form']
+        for name,datastr in self.dict_init.items():
+            self.dict_init[name]=reduce(lambda l, x: x not in l and l.append(x) or l, self.dict_init[name], [])
+            init_data='\n'.join(self.dict_init[name])
+            self._zip_writestr(name, init_data)
+        self._zip_writestr('__terp__.py', _terp)
+        self.archive.close()
+        return {
+            'module_file': base64.encodestring(self.archname.getvalue()),
+            'module_filename': data['form']['directory_name']+'-'+data['form']['version']+'.zip'
+        }
+
+    states = {
+        'init': {
+            'actions': [],
+            'result': {
+                'type':'form',
+                'arch':info_start_form,
+                'fields': info_start_fields,
+                'state':[
+                    ('end', 'Cancel', 'gtk-cancel'),
+                    ('info', 'Continue', 'gtk-ok'),
+                ]
+            }
+        },
+        'info': {
+            'actions': [_compute_dependencies],
+            'result': {
+                'type':'form',
+                'arch':intro_start_form,
+                'fields': intro_start_fields,
+                'state':[
+                    ('end', 'Cancel', 'gtk-cancel'),
+                    ('save', 'Continue', 'gtk-ok'),
+                ]
+            }
+        },
+        'save': {
+            'actions': [_create_module],
+            'result': {
+                'type':'form',
+                'arch':intro_save_form,
+                'fields': intro_save_fields,
+                'state':[
+                    ('end', 'Close', 'gtk-ok'),
+                ]
+            }
+        }
+    }
+base_module_merge('base_module_merge.module_merge')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_module_quality/__init__.py b/addons/base_module_quality/__init__.py
index 18f7cbc52c4..b5ad29991f8 100644
--- a/addons/base_module_quality/__init__.py
+++ b/addons/base_module_quality/__init__.py
@@ -21,6 +21,7 @@
 ##############################################################################
 
 import base_module_quality
+import wizard
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_module_quality/__terp__.py b/addons/base_module_quality/__terp__.py
index ced15f682bd..f80077e2b94 100644
--- a/addons/base_module_quality/__terp__.py
+++ b/addons/base_module_quality/__terp__.py
@@ -23,13 +23,13 @@
     "name" : "Base module quality",
     "author" : "Tiny",
     "version" : "1.0",
-    "depends" : ["base", "product"],
+    "depends" : ["base",],
     "description": "Sample module to check the quality",
     "init_xml" : [],
-    "update_xml" : ["base_module_quality_view.xml"],
+    "update_xml" : ["base_module_quality_wizard.xml"],
     "category" : "Tiny Specific Modules/Base module quality",
     "active": False,
-    "installable": False
+    "installable": True
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/base_module_quality/base_module_quality.py b/addons/base_module_quality/base_module_quality.py
index e69de29bb2d..ab46c3b44be 100644
--- a/addons/base_module_quality/base_module_quality.py
+++ b/addons/base_module_quality/base_module_quality.py
@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import netsvc
+from osv import fields, osv
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_module_quality/base_module_quality_view.xml b/addons/base_module_quality/base_module_quality_view.xml
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/addons/base_module_quality/base_module_quality_wizard.xml b/addons/base_module_quality/base_module_quality_wizard.xml
new file mode 100644
index 00000000000..be0048feb80
--- /dev/null
+++ b/addons/base_module_quality/base_module_quality_wizard.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+		<wizard id="base_module_quality" model="ir.module.module" name="base.module.quality" string="Check the Quality of module"/>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/base_module_quality/wizard/__init__.py b/addons/base_module_quality/wizard/__init__.py
new file mode 100644
index 00000000000..a8454f95f3f
--- /dev/null
+++ b/addons/base_module_quality/wizard/__init__.py
@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2008 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 module_quality_check
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_module_quality/wizard/module_quality_check.py b/addons/base_module_quality/wizard/module_quality_check.py
new file mode 100644
index 00000000000..648b24366f6
--- /dev/null
+++ b/addons/base_module_quality/wizard/module_quality_check.py
@@ -0,0 +1,85 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2008 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 pooler
+import osv
+import netsvc
+
+import sys
+import tools
+import os
+import pylint
+
+form_check = '''<?xml version="1.0"?>
+<form string="Quality check">
+    <field name="test" />
+</form>'''
+
+fields_check = {
+    'test': {
+        'string':'Tests', 'type':'selection', 'size':64, 'required':True,
+        'selection': [('pylint', 'Pylint'), ('othertest','other')],
+        'default': lambda *args: 'pylint'
+    },
+    }
+view_form = """<?xml version="1.0"?>
+<form string="Check quality">
+    <group colspan="2" col="4">
+        <field name="module_info" nolabel="1" colspan="4"/>
+    </group>
+</form>"""
+
+view_field = {
+    "module_info": {'type': 'text', 'string': 'check quality',
+        'readonly': True,},
+}
+
+class wiz_quality_check(wizard.interface):
+
+    def _check(self, cr, uid, data, context):
+        if data['form']['test'] == 'pylint':
+            pool=pooler.get_pool(cr.dbname)
+            module_data = pool.get('ir.module.module').browse(cr, uid, data['ids'])
+            from pylint_test import pylint_test
+            ad = tools.config['addons_path']
+            url = os.path.join(ad, module_data[0].name)
+            result = pylint_test._test_pylint(self, url)
+            string_ret = ''
+            for i in result:
+                string_ret = string_ret + i + ':\n' + result[i]
+
+        return {'module_info':string_ret}
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type':'form', 'arch':form_check, 'fields':fields_check, 'state':[('end','Cancel'),('do','Do Test')]}
+        },
+        'do': {
+            'actions': [_check],
+            'result': {'type':'form', 'arch':view_form, 'fields':view_field, 'state':[('end','Ok')]},
+        },
+
+    }
+wiz_quality_check('base.module.quality')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_module_quality/wizard/pylint_test/__init__.py b/addons/base_module_quality/wizard/pylint_test/__init__.py
new file mode 100644
index 00000000000..79bc02a75a6
--- /dev/null
+++ b/addons/base_module_quality/wizard/pylint_test/__init__.py
@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2008 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 pylint_test
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_module_quality/wizard/pylint_test/pylint_test.py b/addons/base_module_quality/wizard/pylint_test/pylint_test.py
new file mode 100644
index 00000000000..73e72307d29
--- /dev/null
+++ b/addons/base_module_quality/wizard/pylint_test/pylint_test.py
@@ -0,0 +1,162 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import netsvc
+from osv import fields, osv
+import os
+
+def _test_pylint(self, url):
+    list_files = os.listdir(url)
+    dict_files = {}
+    for file in list_files:
+        if file.split('.')[-1] == 'py':
+            save_file = file.split('.')[0]+".txt"
+            file_path = os.path.join(url, file)
+            a1 = os.system('pylint '+file_path+'>> '+save_file+' ')
+            a2 = os.system('cat '+save_file+' | tail -4 >> temp.txt')
+            fp = open('temp.txt','r')
+            result = fp.read()
+            fp.close()
+            str_result = ''
+            try:
+                for line in result:
+                    str_result = str_result + line
+            finally:
+                fp = open('temp.txt','w')
+                fp.write('')
+                fp.close()
+            if str_result.startswith('Global'):
+                dict_files[file] = str_result
+    return dict_files
+#
+#class res_partner_contact(osv.osv):
+#    _name = "res.partner.contact"
+#    _description = "res.partner.contact"
+#
+#    def _title_get(self,cr, user, context={}):
+#        obj = self.pool.get('res.partner.title')
+#        ids = obj.search(cr, user, [])
+#        res = obj.read(cr, user, ids, ['shortcut', 'name','domain'], context)
+#        res = [(r['shortcut'], r['name']) for r in res if r['domain']=='contact']
+#        return res
+#
+#    _columns = {
+#        'name': fields.char('Last Name', size=30,required=True),
+#        'first_name': fields.char('First Name', size=30),
+#        'mobile':fields.char('Mobile',size=30),
+#        'title': fields.selection(_title_get, 'Title'),
+#        'website':fields.char('Website',size=120),
+#        'lang_id':fields.many2one('res.lang','Language'),
+#        'job_ids':fields.one2many('res.partner.job','contact_id','Functions and Addresses'),
+#        'country_id':fields.many2one('res.country','Nationality'),
+#        'birthdate':fields.date('Birth Date'),
+#        'active' : fields.boolean('Active'),
+#        'partner_id':fields.related('job_ids','address_id','partner_id',type='many2one', relation='res.partner', string='Main Employer'),
+#        'function_id':fields.related('job_ids','function_id',type='many2one', relation='res.partner.function', string='Main Job'),
+#    }
+#    _defaults = {
+#        'active' : lambda *a: True,
+#    }
+#    def name_get(self, cr, user, ids, context={}):
+#        #will return name and first_name.......
+#        if not len(ids):
+#            return []
+#        res = []
+#        for r in self.read(cr, user, ids, ['name','first_name','title']):
+#            addr = r['title'] and str(r['title'])+" " or ''
+#            addr +=str(r['name'] or '')
+#            if r['name'] and r['first_name']:
+#                addr += ' '
+#            addr += str(r['first_name'] or '')
+#            res.append((r['id'], addr))
+#        return res
+#res_partner_contact()
+#
+#class res_partner_address(osv.osv):
+#
+#    #overriding of the name_get defined in base in order to remove the old contact name
+#    def name_get(self, cr, user, ids, context={}):
+#        if not len(ids):
+#            return []
+#        res = []
+#        for r in self.read(cr, user, ids, ['zip','city','partner_id', 'street']):
+#            if context.get('contact_display', 'contact')=='partner':
+#                res.append((r['id'], r['partner_id'][1]))
+#            else:
+#                addr = str('')
+#                addr += str(r['street'] or '') + ' ' + str(r['zip'] or '') + ' ' + str(r['city'] or '')
+#                res.append((r['id'], addr.strip() or '/'))
+#        return res
+#
+#    _name = 'res.partner.address'
+#    _inherit='res.partner.address'
+#    _description ='Partner Address'
+#    _columns = {
+#        'job_ids':fields.one2many('res.partner.job', 'address_id', 'Contacts'),
+#    }
+#res_partner_address()
+#
+#class res_partner_job(osv.osv):
+#
+#    def name_get(self, cr, uid, ids, context={}):
+#        if not len(ids):
+#            return []
+#        res = []
+#        for r in self.browse(cr, uid, ids):
+#            res.append((r.id, self.pool.get('res.partner.contact').name_get(cr, uid, [r.contact_id.id])[0][1] +", "+ r.function_id.name))
+#        return res
+#
+#    def search(self, cr, user, args, offset=0, limit=None, order=None,
+#            context=None, count=False):
+#        for arg in args:
+#            if arg[0]=='address_id':
+#                self._order = 'sequence_partner'
+#            if arg[0]=='contact_id':
+#                self._order = 'sequence_contact'
+#        return super(res_partner_job,self).search(cr, user, args, offset, limit, order, context, count)
+#
+#    _name = 'res.partner.job'
+#    _description ='Contact Job Title'
+#    _order = 'sequence_contact'
+#    _columns = {
+#        'name': fields.related('address_id','partner_id', type='many2one', relation='res.partner', string='Partner'),
+#        'address_id':fields.many2one('res.partner.address','Address'),
+#        'contact_id':fields.many2one('res.partner.contact','Contact', required=True, ondelete='cascade'),
+#        'function_id': fields.many2one('res.partner.function','Job Title'),
+#        'sequence_contact':fields.integer('Sequence',help='Order of importance of this address in the list of addresses of the linked contact'),
+#        'sequence_partner':fields.integer('Sequence',help='Order of importance of this job title in the list of job title of the linked partner'),
+#        'email': fields.char('E-Mail', size=240),
+#        'phone': fields.char('Phone', size=64),
+#        'date_start' : fields.date('Date Start'),
+#        'date_stop' : fields.date('Date Stop'),
+#        'state' : fields.selection([('past', 'Past'),('current', 'Current')], 'State', required=True),
+#    }
+#
+#    _defaults = {
+#        'sequence_contact' : lambda *a: 0,
+#        'state' : lambda *a: 'current',
+#    }
+#res_partner_job()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

From a50a5b7d9e75aa2a50cfec954d5d6f9d3ce7db8f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 5 Dec 2008 11:47:16 +0100
Subject: [PATCH 49/82] improved_ref

bzr revid: fp@tinyerp.com-20081205104716-p5rjhm9y0oq13d69
---
 addons/purchase/purchase.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 942c3f960d9..d13901574e5 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -466,7 +466,9 @@ class purchase_order_line(osv.osv):
                     'date': date_order,
                     })[pricelist]
         dt = (DateTime.now() + DateTime.RelativeDateTime(days=prod['seller_delay'] or 0.0)).strftime('%Y-%m-%d %H:%M:%S')
-        prod_name = self.pool.get('product.product').name_get(cr, uid, [product], context=context)[0][1]
+        context['partner_id'] = partner_id
+        prod_name = self.pool.get('product.product').browse(cr, uid,product, context=context).partner_ref
+
 
         res = {'value': {'price_unit': price, 'name':prod_name, 'taxes_id':prod['supplier_taxes_id'], 'date_planned': dt,'notes':prod['description_purchase'], 'product_uom': uom}}
         domain = {}

From 638ee7ffea55fdf6b0d762f63dfeccdf681b964d Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@tinyerp.com>
Date: Fri, 5 Dec 2008 16:28:19 +0530
Subject: [PATCH 50/82] base_module_qualtiy modifs

bzr revid: mra@tinyerp.com-20081205105819-2bsfctoovewgvuxa
---
 .../wizard/pylint_test/pylint_test.py         | 125 +++---------------
 1 file changed, 15 insertions(+), 110 deletions(-)

diff --git a/addons/base_module_quality/wizard/pylint_test/pylint_test.py b/addons/base_module_quality/wizard/pylint_test/pylint_test.py
index 73e72307d29..7a990992257 100644
--- a/addons/base_module_quality/wizard/pylint_test/pylint_test.py
+++ b/addons/base_module_quality/wizard/pylint_test/pylint_test.py
@@ -24,8 +24,16 @@ import netsvc
 from osv import fields, osv
 import os
 
-def _test_pylint(self, url):
+def _test_pylint(self, url, add_folder=None):
     list_files = os.listdir(url)
+    new_list = []
+    subfolder = {}
+    for i in list_files:
+        if os.path.isdir(i):
+            path = os.path.join(url, i)
+            new_list.append(os.listdir(path))
+            res = _test_pylint(self, path, add_folder=i)
+            subfolder.update(res)
     dict_files = {}
     for file in list_files:
         if file.split('.')[-1] == 'py':
@@ -45,117 +53,14 @@ def _test_pylint(self, url):
                 fp.write('')
                 fp.close()
             if str_result.startswith('Global'):
-                dict_files[file] = str_result
+                if add_folder:
+                    dict_files[add_folder + '/' + file] = str_result
+                else:
+                    dict_files[file] = str_result
+    dict_files.update(subfolder)
     return dict_files
+
 #
-#class res_partner_contact(osv.osv):
-#    _name = "res.partner.contact"
-#    _description = "res.partner.contact"
-#
-#    def _title_get(self,cr, user, context={}):
-#        obj = self.pool.get('res.partner.title')
-#        ids = obj.search(cr, user, [])
-#        res = obj.read(cr, user, ids, ['shortcut', 'name','domain'], context)
-#        res = [(r['shortcut'], r['name']) for r in res if r['domain']=='contact']
-#        return res
-#
-#    _columns = {
-#        'name': fields.char('Last Name', size=30,required=True),
-#        'first_name': fields.char('First Name', size=30),
-#        'mobile':fields.char('Mobile',size=30),
-#        'title': fields.selection(_title_get, 'Title'),
-#        'website':fields.char('Website',size=120),
-#        'lang_id':fields.many2one('res.lang','Language'),
-#        'job_ids':fields.one2many('res.partner.job','contact_id','Functions and Addresses'),
-#        'country_id':fields.many2one('res.country','Nationality'),
-#        'birthdate':fields.date('Birth Date'),
-#        'active' : fields.boolean('Active'),
-#        'partner_id':fields.related('job_ids','address_id','partner_id',type='many2one', relation='res.partner', string='Main Employer'),
-#        'function_id':fields.related('job_ids','function_id',type='many2one', relation='res.partner.function', string='Main Job'),
-#    }
-#    _defaults = {
-#        'active' : lambda *a: True,
-#    }
-#    def name_get(self, cr, user, ids, context={}):
-#        #will return name and first_name.......
-#        if not len(ids):
-#            return []
-#        res = []
-#        for r in self.read(cr, user, ids, ['name','first_name','title']):
-#            addr = r['title'] and str(r['title'])+" " or ''
-#            addr +=str(r['name'] or '')
-#            if r['name'] and r['first_name']:
-#                addr += ' '
-#            addr += str(r['first_name'] or '')
-#            res.append((r['id'], addr))
-#        return res
-#res_partner_contact()
-#
-#class res_partner_address(osv.osv):
-#
-#    #overriding of the name_get defined in base in order to remove the old contact name
-#    def name_get(self, cr, user, ids, context={}):
-#        if not len(ids):
-#            return []
-#        res = []
-#        for r in self.read(cr, user, ids, ['zip','city','partner_id', 'street']):
-#            if context.get('contact_display', 'contact')=='partner':
-#                res.append((r['id'], r['partner_id'][1]))
-#            else:
-#                addr = str('')
-#                addr += str(r['street'] or '') + ' ' + str(r['zip'] or '') + ' ' + str(r['city'] or '')
-#                res.append((r['id'], addr.strip() or '/'))
-#        return res
-#
-#    _name = 'res.partner.address'
-#    _inherit='res.partner.address'
-#    _description ='Partner Address'
-#    _columns = {
-#        'job_ids':fields.one2many('res.partner.job', 'address_id', 'Contacts'),
-#    }
-#res_partner_address()
-#
-#class res_partner_job(osv.osv):
-#
-#    def name_get(self, cr, uid, ids, context={}):
-#        if not len(ids):
-#            return []
-#        res = []
-#        for r in self.browse(cr, uid, ids):
-#            res.append((r.id, self.pool.get('res.partner.contact').name_get(cr, uid, [r.contact_id.id])[0][1] +", "+ r.function_id.name))
-#        return res
-#
-#    def search(self, cr, user, args, offset=0, limit=None, order=None,
-#            context=None, count=False):
-#        for arg in args:
-#            if arg[0]=='address_id':
-#                self._order = 'sequence_partner'
-#            if arg[0]=='contact_id':
-#                self._order = 'sequence_contact'
-#        return super(res_partner_job,self).search(cr, user, args, offset, limit, order, context, count)
-#
-#    _name = 'res.partner.job'
-#    _description ='Contact Job Title'
-#    _order = 'sequence_contact'
-#    _columns = {
-#        'name': fields.related('address_id','partner_id', type='many2one', relation='res.partner', string='Partner'),
-#        'address_id':fields.many2one('res.partner.address','Address'),
-#        'contact_id':fields.many2one('res.partner.contact','Contact', required=True, ondelete='cascade'),
-#        'function_id': fields.many2one('res.partner.function','Job Title'),
-#        'sequence_contact':fields.integer('Sequence',help='Order of importance of this address in the list of addresses of the linked contact'),
-#        'sequence_partner':fields.integer('Sequence',help='Order of importance of this job title in the list of job title of the linked partner'),
-#        'email': fields.char('E-Mail', size=240),
-#        'phone': fields.char('Phone', size=64),
-#        'date_start' : fields.date('Date Start'),
-#        'date_stop' : fields.date('Date Stop'),
-#        'state' : fields.selection([('past', 'Past'),('current', 'Current')], 'State', required=True),
-#    }
-#
-#    _defaults = {
-#        'sequence_contact' : lambda *a: 0,
-#        'state' : lambda *a: 'current',
-#    }
-#res_partner_job()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From a312c37c8652cb967171e55a395b4dcdc424ef95 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@tinyerp.com>
Date: Fri, 5 Dec 2008 16:33:11 +0530
Subject: [PATCH 51/82] base_module_quality

bzr revid: mra@tinyerp.com-20081205110311-tioofhfhdd6slwrz
---
 addons/base_module_quality/wizard/module_quality_check.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_module_quality/wizard/module_quality_check.py b/addons/base_module_quality/wizard/module_quality_check.py
index 648b24366f6..d4f0a19d4d2 100644
--- a/addons/base_module_quality/wizard/module_quality_check.py
+++ b/addons/base_module_quality/wizard/module_quality_check.py
@@ -50,7 +50,7 @@ view_form = """<?xml version="1.0"?>
 
 view_field = {
     "module_info": {'type': 'text', 'string': 'check quality',
-        'readonly': True,},
+        'readonly': True},
 }
 
 class wiz_quality_check(wizard.interface):

From bf4d49d238c58a68999d23b475968c93c4005373 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Fri, 5 Dec 2008 16:36:48 +0530
Subject: [PATCH 52/82] change implementation for the opening page / group list
 * change in create menu * add new wizard that open the page in form view

bzr revid: mga@tinyerp.com-20081205110648-rxgy2sfxl3tp5lkm
---
 addons/wiki/wiki.py                |   2 +
 addons/wiki/wiki_view.xml          |   1 +
 addons/wiki/wizard/__init__.py     |   1 +
 addons/wiki/wizard/create_menu.py  |  26 +++---
 addons/wiki/wizard/open_page.py    |  68 +++++++++++++++
 addons/wiki/wizard/sort_algo.py    | 133 -----------------------------
 addons/wiki/wizard/wizard_view.xml |   6 ++
 7 files changed, 92 insertions(+), 145 deletions(-)
 create mode 100644 addons/wiki/wizard/open_page.py
 delete mode 100644 addons/wiki/wizard/sort_algo.py

diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index ba2e432ca63..77092a92fd0 100644
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -44,6 +44,8 @@ class WikiGroup(osv.osv):
        'create_date':fields.datetime("Created Date", select=True),
        'template': fields.text('Wiki Template'),
        'section': fields.boolean("Make Section ?"),
+       'home':fields.many2one('wiki.wiki', 'Pages'),
+       'action_id': fields.many2one('ir.ui.menu', 'Menu')
     }
 WikiGroup()
 
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 0d6e69ca6c2..0483007cb65 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -8,6 +8,7 @@
         <wizard
             id="wizard_group_menu_create"
             string="Create Menu"
+            menu="True"
             name="wiki.create.menu"/>
             
         <record model="ir.ui.view" id="wiki_group_tree">
diff --git a/addons/wiki/wizard/__init__.py b/addons/wiki/wizard/__init__.py
index e6d1c52fa11..3f27f8dc92e 100644
--- a/addons/wiki/wizard/__init__.py
+++ b/addons/wiki/wizard/__init__.py
@@ -1,3 +1,4 @@
+import open_page
 import create_menu
 import show_diff
 import make_index
\ No newline at end of file
diff --git a/addons/wiki/wizard/create_menu.py b/addons/wiki/wizard/create_menu.py
index f97430312bd..611a05a3c6d 100644
--- a/addons/wiki/wizard/create_menu.py
+++ b/addons/wiki/wizard/create_menu.py
@@ -20,7 +20,6 @@
 #
 ##############################################################################
 
-
 import time
 import wizard
 import osv
@@ -31,31 +30,34 @@ section_form = '''<?xml version="1.0"?>
     <separator string="Menu Information" colspan="4"/>
     <field name="menu_name"/>
     <field name="menu_parent_id"/>
+    <field name="page" colspan="4" domain="[('group_id','=', active_id)]"/>
 </form>'''
 
 section_fields = {
     'menu_name': {'string':'Menu Name', 'type':'char', 'required':True, 'size':64},
     'menu_parent_id': {'string':'Parent Menu', 'type':'many2one', 'relation':'ir.ui.menu', 'required':True},
+    'page': {'string':'Group Home Page', 'type':'many2one', 'relation':'wiki.wiki'},
 }
 
 def wiki_menu_create(self, cr, uid, data, context):
     pool = pooler.get_pool(cr.dbname)
     group = pool.get('wiki.groups').browse(cr, uid, data['id'])
+    action_id = pool.get('ir.actions.wizard').search(cr, uid, [('wiz_name','=','wiki.wiki.page.open')])
 
-    action_id = pool.get('ir.actions.act_window').create(cr, uid, {
-        'name': group.name,
-        'view_type':'form',
-        'view_mode':"tree,form",
-        'context': "{'group_id':%d, 'section':%d}" % (group.id, group.section),
-        'domain': "[('group_id','child_of',[%d])]" % (group.id,),
-        'res_model': 'wiki.wiki'
-    })
-    pool.get('ir.ui.menu').create(cr, uid, {
+    menu_id = pool.get('ir.ui.menu').create(cr, uid, {
         'name': data['form']['menu_name'],
         'parent_id': data['form']['menu_parent_id'],
-        'icon': 'STOCK_JUSTIFY_FILL',
-        'action': 'ir.actions.act_window,'+str(action_id)
+        'icon': 'STOCK_DIALOG_QUESTION',
+        'action': 'ir.actions.wizard,'+str(action_id[0])
     }, context)
+    
+    home = data['form']['page']
+    res = {
+        'home':home,
+        'action_id':menu_id
+    }
+    pool.get('wiki.groups').write(cr, uid, [data['id']], res)
+    
     return {}
 
 class wizard_create_menu(wizard.interface):
diff --git a/addons/wiki/wizard/open_page.py b/addons/wiki/wizard/open_page.py
new file mode 100644
index 00000000000..e4135df2bb9
--- /dev/null
+++ b/addons/wiki/wizard/open_page.py
@@ -0,0 +1,68 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution    
+#    Copyright (C) 2004-2008 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 time
+import pooler
+from osv import osv
+from tools.translate import _
+
+class wiz_timesheet_open(wizard.interface):
+    
+    def _open_wiki_page(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        menu_id = data['id']
+        group_ids = pool.get('wiki.groups').search(cr, uid, [('action_id','=',menu_id)])
+
+        group = pool.get('wiki.groups').browse(cr, uid, group_ids[0])
+        
+        value = {
+            'context': "{'group_id':%d}" % (group.id),
+            'domain': "[('group_id','child_of',[%s])]" % (group.id),
+            'name': 'Wiki Page',
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': 'wiki.wiki',
+            'view_id': False,
+            'type': 'ir.actions.act_window',
+        }
+        if group.home :
+            value['res_id'] = group.home.id
+        else:
+            value['view_type'] = 'form'
+            value['view_mode'] = 'tree,form'
+            
+        return value
+
+    states = {
+        'init' : {
+            'actions' : [],
+            'result' : {'type':'action', 'action':_open_wiki_page, 'state':'end'}
+        }
+    }
+wiz_timesheet_open('wiki.wiki.page.open')
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/wiki/wizard/sort_algo.py b/addons/wiki/wizard/sort_algo.py
deleted file mode 100644
index 9579b8ff6b7..00000000000
--- a/addons/wiki/wizard/sort_algo.py
+++ /dev/null
@@ -1,133 +0,0 @@
-def sort(data, index):
-    for i in range(len(data)):
-        j = i + 1
-        for j in range(len(data)-1):
-            d1 = data[i].split('.')
-            d2 = data[j].split('.')
-            
-            l1 = len(d1)
-            l2 = len(d2)
-            max = 0
-            if l1 < l2:
-                max = l1
-            elif l2 < l1:
-                max = l2
-            else:
-                max = l1
-            
-            if max == 1:
-                if int(d1[0]) == int(d2[0]):
-                    if len(d1) < len(d2):
-                        tmp = data[i]
-                        data[i] = data[j]
-                        data[j] = tmp
-                        continue
-
-            for p in range(0, max):
-                val1 = val2 = 0
-                try:
-                    val1 = int(d1[p])
-                except:
-                    val1 = 0
-                    
-                try:
-                    val2 = int(d2[p])
-                except:
-                    val2 = 0
-                    
-                if val1 < val2:
-                    tmp = data[i]
-                    data[i] = data[j]
-                    data[j] = tmp
-            if data[i].startswith(data[j]):
-                tmp = data[i]
-                tmp = tmp.replace(data[j],'')
-
-def group(data):
-    gp = {}
-    for i in range(len(data)):
-        d1 = data[i].split('.')[0]
-        if gp.has_key(d1):
-            gp[d1].append(data[i])
-        else:
-            gp[d1] = [data[i]]
-    return gp
-
-def max(data):
-    max = 0
-    for i in range(len(data)):
-        d = str(data[i]).split('.')
-        if len(d) > max:
-            max = len(d)
-            
-    return max
-
-def toint(data):
-    for i in range(len(data)):
-        data[i] = int(data[i])
-        
-def rearrange(key, groups):
-    i = 1
-    new = {}
-    for ky in key:
-        new[i] = groups[str(ky)]
-        i += 1
-    return new
-
-def reindex(key, groups):
-    if groups[0] != key:
-        groups[0] = key
-    
-    lvl_group = {}
-    level = max(groups)
-    for i in range(len(groups)):
-        dg = str(groups[i]).split('.')
-        index = len(dg)
-        if lvl_group.has_key(str(index)):
-            lvl_group[str(index)].append(groups[i])
-        else:
-            lvl_group[str(index)] = [groups[i]]
-    
-    for i in range(2, level+1):
-        ixd = 1
-        gps = lvl_group[str(i)]
-        for j in range(len(gps)):
-            dt = gps[j].split('.')
-            new =""
-            for k in range(i-1):
-                new += str(dt[k])
-                new += '.'
-                
-            new += str(ixd)
-            ixd += 1
-            gps[j] = new
-            
-    print lvl_group
-    
-if __name__ == '__main__':
-    
-    data = ['1', '10.1', '10.3', '1.1', '1.2.3', '1.7', '3.1.8', '1.2.2', '1.2.10', '1.3', '1.4', '2', '20.2', '2.1', '2.2', '3', '3.1', '1.2.1', '2.1.2']
-    
-    sort(data, 0)
-    
-    grp = group(data)
-    
-    for gp in grp:
-        loop = max(grp[gp])
-        for lp in range(1, loop):
-            sort(grp[gp],lp)
-    
-    key = grp.keys()
-    toint(key)
-    key.sort()
-    
-    groups = rearrange(key, grp)
-    
-    new_data = []
-    for key in groups:
-        new_data.extend(groups[key])
-        #print groups[key]
-    
-    print 'XXXXXXXXXXXXXXXXX : ', new_data
-#    print groups
-#    
diff --git a/addons/wiki/wizard/wizard_view.xml b/addons/wiki/wizard/wizard_view.xml
index b1e73e689f4..bc10f5a2ae7 100644
--- a/addons/wiki/wizard/wizard_view.xml
+++ b/addons/wiki/wizard/wizard_view.xml
@@ -25,5 +25,11 @@
             string="Create Index"
             name="wiki.make.index"
             model="wiki.wiki"/>
+
+		<wizard
+		    id="wizard_open_page"
+		    string="Open Page"
+		    name="wiki.wiki.page.open"
+		    model="wiki.wiki"/>
     </data>
 </openerp>

From d9dfa863b06f14c8ae93ceed62b3306589597976 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@tinyerp.com>
Date: Fri, 5 Dec 2008 16:55:25 +0530
Subject: [PATCH 53/82] set height and width of display window on
 base_module_qualtiy

bzr revid: mra@tinyerp.com-20081205112525-t4zw0jpcxgi48ect
---
 .../base_module_quality/wizard/module_quality_check.py   | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/addons/base_module_quality/wizard/module_quality_check.py b/addons/base_module_quality/wizard/module_quality_check.py
index d4f0a19d4d2..de3f333338a 100644
--- a/addons/base_module_quality/wizard/module_quality_check.py
+++ b/addons/base_module_quality/wizard/module_quality_check.py
@@ -36,21 +36,18 @@ form_check = '''<?xml version="1.0"?>
 
 fields_check = {
     'test': {
-        'string':'Tests', 'type':'selection', 'size':64, 'required':True,
+        'string':'Tests', 'type':'selection',  'required':True,
         'selection': [('pylint', 'Pylint'), ('othertest','other')],
         'default': lambda *args: 'pylint'
     },
     }
 view_form = """<?xml version="1.0"?>
 <form string="Check quality">
-    <group colspan="2" col="4">
-        <field name="module_info" nolabel="1" colspan="4"/>
-    </group>
+        <field name="module_info" nolabel="1" colspan="4" height="150" width="400"/>
 </form>"""
 
 view_field = {
-    "module_info": {'type': 'text', 'string': 'check quality',
-        'readonly': True},
+    "module_info": {'type': 'text', 'string': 'check quality',  'readonly':True},
 }
 
 class wiz_quality_check(wizard.interface):

From 4196327f6820f35e968ec80c4ac71f1b28bc0956 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@tinyerp.com>
Date: Fri, 5 Dec 2008 17:36:58 +0530
Subject: [PATCH 54/82] modifs on base_module_quality

bzr revid: mra@tinyerp.com-20081205120658-ujsxa4ym2zq45jpc
---
 addons/base_module_quality/wizard/pylint_test/pylint_test.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/base_module_quality/wizard/pylint_test/pylint_test.py b/addons/base_module_quality/wizard/pylint_test/pylint_test.py
index 7a990992257..df4491a8f85 100644
--- a/addons/base_module_quality/wizard/pylint_test/pylint_test.py
+++ b/addons/base_module_quality/wizard/pylint_test/pylint_test.py
@@ -39,8 +39,9 @@ def _test_pylint(self, url, add_folder=None):
         if file.split('.')[-1] == 'py':
             save_file = file.split('.')[0]+".txt"
             file_path = os.path.join(url, file)
-            a1 = os.system('pylint '+file_path+'>> '+save_file+' ')
+            os.system('pylint '+file_path+'>> '+save_file+' ')
             a2 = os.system('cat '+save_file+' | tail -4 >> temp.txt')
+            os.system('rm '+save_file+' ')
             fp = open('temp.txt','r')
             result = fp.read()
             fp.close()
@@ -57,6 +58,7 @@ def _test_pylint(self, url, add_folder=None):
                     dict_files[add_folder + '/' + file] = str_result
                 else:
                     dict_files[file] = str_result
+    os.system(' rm temp.txt ')
     dict_files.update(subfolder)
     return dict_files
 

From d65b408046c59d7ab403dfddb82dae857ba795b8 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@tinyerp.com>
Date: Fri, 5 Dec 2008 14:49:05 +0100
Subject: [PATCH 55/82] [IMP] Use the check_contract method

bzr revid: stephane@tinyerp.com-20081205134905-h4l1vd8izy7ljus0
---
 bin/addons/base/maintenance/maintenance.py | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/bin/addons/base/maintenance/maintenance.py b/bin/addons/base/maintenance/maintenance.py
index b7150a4891e..0eae4277f1c 100644
--- a/bin/addons/base/maintenance/maintenance.py
+++ b/bin/addons/base/maintenance/maintenance.py
@@ -63,7 +63,8 @@ class maintenance_contract(osv.osv):
         'date_start' : fields.date('Starting Date', readonly=True),
         'date_stop' : fields.date('Ending Date', readonly=True),
         'module_ids' : fields.many2many('maintenance.contract.module', 'maintenance_contract_module_rel', 'contract_id', 'module_id', 'Covered Modules', readonly=True),
-        'state' : fields.function(_valid_get, method=True, string="State", type="selection", selection=[('valid', 'Valid'),('unvalid', 'Unvalid')], readonly=True)
+        'state' : fields.function(_valid_get, method=True, string="State", type="selection", selection=[('valid', 'Valid'),('unvalid', 'Unvalid')], readonly=True),
+        'kind' : fields.selection([('full', 'Full'),('partial', 'Partial')], 'Kind', required=True, readonly=True),
     }
     _defaults = {
         'password' : lambda obj,cr,uid,context={} : '',
@@ -92,6 +93,10 @@ class maintenance_contract_wizard(osv.osv_memory):
         if not ids:
             return False
 
+        module_proxy = self.pool.get('ir.module.module')
+        module_ids = module_proxy.search(cr, uid, [('state', '=', 'installed')])
+        modules = module_proxy.read(cr, uid, module_ids, ['name', 'installed_version'])
+
         contract = self.read(cr, uid, ids, ['name', 'password'])[0]
 
         login, password, remote_db, remote_server, port = 'admin', 'admin', 'trunk', 'localhost', 8069
@@ -99,12 +104,12 @@ class maintenance_contract_wizard(osv.osv_memory):
         rpc = xmlrpclib.ServerProxy('http://%s:%d/xmlrpc/common' % (remote_server, port))
         ruid = rpc.login(remote_db, login, password)
         rpc = xmlrpclib.ServerProxy('http://%s:%d/xmlrpc/object' % (remote_server, port))
-        contract_info = rpc.execute(remote_db, ruid, password, 
-                          'maintenance.maintenance', 'get_module_for_contract', contract['name'], contract['password'])
-        if contract_info:
-            if contract_info['modules']:
+        contract_info = rpc.execute(remote_db, ruid, password, 'maintenance.maintenance', 'check_contract', modules, contract )
+        is_ok = contract_info['status'] in ('partial', 'full')
+        if is_ok:
+            if contract_info['modules_with_contract']:
                 module_ids = []
-                for name, version in contract_info['modules']:
+                for name, version in contract_info['modules_with_contract']:
                     contract_module = self.pool.get('maintenance.contract.module')
                     res = contract_module.search(cr, uid, [('name', '=', name),('version', '=', version)])
                     if not res:
@@ -120,11 +125,12 @@ class maintenance_contract_wizard(osv.osv_memory):
                     'password' : contract['password'],
                     'date_start' : contract_info['date_from'],
                     'date_stop' : contract_info['date_to'],
+                    'kind' : contract_info['status'],
                     'module_ids' : [(6,0,module_ids)],
                 }
             )
 
-        return self.write(cr, uid, ids, {'state' : ('unvalidated', 'validated')[bool(contract_info)] }, context=context)
+        return self.write(cr, uid, ids, {'state' : ('unvalidated', 'validated')[is_ok] }, context=context)
 
 maintenance_contract_wizard()
 

From 15856a5d38cb51d27bd3c802297f700f04df230c Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Fri, 5 Dec 2008 19:34:01 +0530
Subject: [PATCH 56/82] bug-fix : problem with the menu nowits possible to have
 single page multiple menus

bzr revid: mga@tinyerp.com-20081205140401-u1e0xyqccb872fj2
---
 addons/wiki/wiki.py               | 13 +++++++++++--
 addons/wiki/wizard/create_menu.py |  3 ++-
 addons/wiki/wizard/open_page.py   | 13 ++++++-------
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index 77092a92fd0..874516847cc 100644
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -31,6 +31,16 @@ import time
 from StringIO import StringIO
 from HTMLParser import HTMLParser
 
+class GroupLink(osv.osv):
+    _name = "wiki.groups.link"
+    _description="Wiki Groups Links"
+    _rec_name = 'action_id'
+    _columns={
+       'group_id':fields.many2one('wiki.groups', 'Parent Group', ondelete='set null'),
+       'action_id': fields.many2one('ir.ui.menu', 'Menu')
+    }
+GroupLink()
+
 class WikiGroup(osv.osv):
     _name = "wiki.groups"
     _description="Wiki Groups"
@@ -44,8 +54,7 @@ class WikiGroup(osv.osv):
        'create_date':fields.datetime("Created Date", select=True),
        'template': fields.text('Wiki Template'),
        'section': fields.boolean("Make Section ?"),
-       'home':fields.many2one('wiki.wiki', 'Pages'),
-       'action_id': fields.many2one('ir.ui.menu', 'Menu')
+       'home':fields.many2one('wiki.wiki', 'Pages')
     }
 WikiGroup()
 
diff --git a/addons/wiki/wizard/create_menu.py b/addons/wiki/wizard/create_menu.py
index 611a05a3c6d..84da749015f 100644
--- a/addons/wiki/wizard/create_menu.py
+++ b/addons/wiki/wizard/create_menu.py
@@ -52,11 +52,12 @@ def wiki_menu_create(self, cr, uid, data, context):
     }, context)
     
     home = data['form']['page']
+    group_id = data['id']
     res = {
         'home':home,
-        'action_id':menu_id
     }
     pool.get('wiki.groups').write(cr, uid, [data['id']], res)
+    pool.get('wiki.groups.link').create(cr, uid, {'group_id':group_id, 'action_id':menu_id})
     
     return {}
 
diff --git a/addons/wiki/wizard/open_page.py b/addons/wiki/wizard/open_page.py
index e4135df2bb9..d601f303d61 100644
--- a/addons/wiki/wizard/open_page.py
+++ b/addons/wiki/wizard/open_page.py
@@ -33,13 +33,12 @@ class wiz_timesheet_open(wizard.interface):
     def _open_wiki_page(self, cr, uid, data, context):
         pool = pooler.get_pool(cr.dbname)
         menu_id = data['id']
-        group_ids = pool.get('wiki.groups').search(cr, uid, [('action_id','=',menu_id)])
-
-        group = pool.get('wiki.groups').browse(cr, uid, group_ids[0])
+        group_ids = pool.get('wiki.groups.link').search(cr, uid, [('action_id','=',menu_id)])
+        group = pool.get('wiki.groups.link').browse(cr, uid, group_ids[0])
         
         value = {
-            'context': "{'group_id':%d}" % (group.id),
-            'domain': "[('group_id','child_of',[%s])]" % (group.id),
+            'context': "{'group_id':%d}" % (group.group_id.id),
+            'domain': "[('group_id','child_of',[%s])]" % (group.group_id.id),
             'name': 'Wiki Page',
             'view_type': 'form',
             'view_mode': 'form,tree',
@@ -47,8 +46,8 @@ class wiz_timesheet_open(wizard.interface):
             'view_id': False,
             'type': 'ir.actions.act_window',
         }
-        if group.home :
-            value['res_id'] = group.home.id
+        if group.group_id.home:
+            value['res_id'] = group.group_id.home.id
         else:
             value['view_type'] = 'form'
             value['view_mode'] = 'tree,form'

From 3fc4fd57135e6b0b4c49c95c2f65603bbc3bd55d Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Fri, 5 Dec 2008 20:17:34 +0530
Subject: [PATCH 57/82] fix the problem of the dependency

bzr revid: mga@tinyerp.com-20081205144734-74be0bqklt0hxr3v
---
 addons/wiki/wiki.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index 874516847cc..f034d5a0dac 100644
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -31,16 +31,6 @@ import time
 from StringIO import StringIO
 from HTMLParser import HTMLParser
 
-class GroupLink(osv.osv):
-    _name = "wiki.groups.link"
-    _description="Wiki Groups Links"
-    _rec_name = 'action_id'
-    _columns={
-       'group_id':fields.many2one('wiki.groups', 'Parent Group', ondelete='set null'),
-       'action_id': fields.many2one('ir.ui.menu', 'Menu')
-    }
-GroupLink()
-
 class WikiGroup(osv.osv):
     _name = "wiki.groups"
     _description="Wiki Groups"
@@ -58,6 +48,16 @@ class WikiGroup(osv.osv):
     }
 WikiGroup()
 
+class GroupLink(osv.osv):
+    _name = "wiki.groups.link"
+    _description="Wiki Groups Links"
+    _rec_name = 'action_id'
+    _columns={
+       'group_id':fields.many2one('wiki.groups', 'Parent Group', ondelete='set null'),
+       'action_id': fields.many2one('ir.ui.menu', 'Menu')
+    }
+GroupLink()
+
 class Wiki(osv.osv):
     _name="wiki.wiki"
     _description="Wiki Page"

From 284f847e4b5da39e4e0939759297d930f391801e Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Fri, 5 Dec 2008 20:24:49 +0530
Subject: [PATCH 58/82] fix dependency problem

bzr revid: mga@tinyerp.com-20081205145449-xmzj1ivbymn64x80
---
 addons/wiki/wiki.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index f034d5a0dac..15677c56367 100644
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -31,6 +31,10 @@ import time
 from StringIO import StringIO
 from HTMLParser import HTMLParser
 
+class Wiki(osv.osv):
+    _name="wiki.wiki"
+Wiki()
+
 class WikiGroup(osv.osv):
     _name = "wiki.groups"
     _description="Wiki Groups"
@@ -59,7 +63,7 @@ class GroupLink(osv.osv):
 GroupLink()
 
 class Wiki(osv.osv):
-    _name="wiki.wiki"
+    _inherit="wiki.wiki"
     _description="Wiki Page"
     _order = 'section,create_date desc'
     _columns={

From a2798d40306f5a646d7338cf832cfdcad7f3d5be Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Sat, 6 Dec 2008 18:48:05 +0530
Subject: [PATCH 59/82] initial bug-fix for the voucher entry

bzr revid: mga@tinyerp.com-20081206131805-p352xscr1ccxeyh6
---
 addons/account_voucher/account_report.xml     | 23 ++++++++-------
 .../account_voucher_wizard.xml                |  4 +--
 .../account_voucher_workflow.xml              |  4 +--
 .../account_voucher/report/report_voucher.rml |  2 +-
 addons/account_voucher/voucher.py             | 28 ++++++++-----------
 addons/account_voucher/voucher_view.xml       |  4 +--
 6 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/addons/account_voucher/account_report.xml b/addons/account_voucher/account_report.xml
index 134581c8816..d19ba827348 100755
--- a/addons/account_voucher/account_report.xml
+++ b/addons/account_voucher/account_report.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 			
 		<report id="report_account_voucher"
-			string="Voucher Report (Cr/Dr)"
+			string="Voucher Report"
 			model="account.voucher"
 			name="voucher.cash_receipt"
 			rml="account_voucher/report/report_voucher.rml"
@@ -11,15 +11,14 @@
 			header = "False"
 			menu="True"/>
 			
-			
-		<report id="report_account_voucher_amt"
-			string="Voucher Report"
-			model="account.voucher"
-			name="voucher.cash_amount"
-			rml="account_voucher/report/report_voucher_amount.rml"
-			auto="False"
-			header = "False"
-			menu="True"/>
+<!--		<report id="report_account_voucher_amt"-->
+<!--			string="Voucher Report"-->
+<!--			model="account.voucher"-->
+<!--			name="voucher.cash_amount"-->
+<!--			rml="account_voucher/report/report_voucher_amount.rml"-->
+<!--			auto="False"-->
+<!--			header = "False"-->
+<!--			menu="True"/>-->
 			
 	</data>
-</terp>
\ No newline at end of file
+</openerp>
\ No newline at end of file
diff --git a/addons/account_voucher/account_voucher_wizard.xml b/addons/account_voucher/account_voucher_wizard.xml
index ffe7b25c87c..9557ffb4f4f 100644
--- a/addons/account_voucher/account_voucher_wizard.xml
+++ b/addons/account_voucher/account_voucher_wizard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<terp>
+<openerp>
 	<data>
 	
         <wizard 
@@ -17,4 +17,4 @@
         	type="wizard"
         />
 	</data>
-</terp>
\ No newline at end of file
+</openerp>
\ No newline at end of file
diff --git a/addons/account_voucher/account_voucher_workflow.xml b/addons/account_voucher/account_voucher_workflow.xml
index 0299c79997d..9609e105444 100644
--- a/addons/account_voucher/account_voucher_workflow.xml
+++ b/addons/account_voucher/account_voucher_workflow.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<terp>
+<openerp>
 	<data>
 
 		<record id="wkf_voucher" model="workflow">
@@ -72,4 +72,4 @@
             <field name="signal">open_voucher</field>
         </record>
 	</data>
-</terp>
\ No newline at end of file
+</openerp>
\ No newline at end of file
diff --git a/addons/account_voucher/report/report_voucher.rml b/addons/account_voucher/report/report_voucher.rml
index 685983045ae..c4c210551c5 100755
--- a/addons/account_voucher/report/report_voucher.rml
+++ b/addons/account_voucher/report/report_voucher.rml
@@ -180,7 +180,7 @@
           <blockTable colWidths="251.0,110.0,115.0" style="Table2">
             <tr>
               <td>
-                <para style="P11">[[ (move_ids.partner_id and move_ids.partner_id.name) or '']] :</para>
+                <para style="P11">[[ (move_ids.partner_id and move_ids.partner_id.name) or 'Account']] :</para>
                 <para style="P28">[[ move_ids.account_id.name ]] </para>
                 <para style="P31">[[ get_ref(voucher.id,move_ids) ]]</para>
               </td>
diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index 873d6c19668..10b3862f3c8 100755
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -29,6 +29,16 @@ from mx.DateTime import RelativeDateTime
 
 from tools import config
 
+type2journal = {
+    'rec_voucher':'cash', 
+    'bank_rec_voucher':'cash',
+    'pay_voucher': 'cash',
+    'bank_pay_voucher':'cash',
+    'cont_voucher':'cash',
+    'journal_sale_voucher':'sale',
+    'journal_pur_voucher':'purchase'
+}
+
 class account_voucher(osv.osv):
     def _get_period(self, cr, uid, context):
         periods = self.pool.get('account.period').find(cr, uid)
@@ -45,9 +55,9 @@ class account_voucher(osv.osv):
         return [('none', 'Free Reference')]
     
     def _get_journal(self, cr, uid, context):
-        type_inv = context #.get('type', 'rec_voucher')
-        type2journal = {'rec_voucher': 'cash', 'bank_rec_voucher': 'cash','pay_voucher': 'cash','bank_pay_voucher': 'cash', 'cont_voucher': 'cash','journal_sale_voucher': 'sale','journal_pur_voucher': 'purchase' }
+        type_inv = context.get('type', 'rec_voucher')
         journal_obj = self.pool.get('account.journal')
+        res = False
         res = journal_obj.search(cr, uid, [('type', '=', type2journal.get(type_inv, 'cash'))], limit=1)
         if res:
             return res[0]
@@ -99,18 +109,6 @@ class account_voucher(osv.osv):
         'move_ids':fields.many2many('account.move.line', 'voucher_id', 'account_id', 'rel_account_move', 'Real Entry'),
     }
     
-#    def get_bank(self, cr, uid, context={}):
-#        type = context.get('type', 'bank_payment')
-#        journal = self.pool.get('account.journal')
-#        if type == 'bank_payment':
-#            id = journal.search(cr, uid, [('name','ilike','Bank')])
-#            return id
-#        elif type == 'cash_payment':
-#            id = journal.search(cr, uid, [('name','ilike','Cash')])
-#            return id
-#
-#        return 3
-    
     _defaults = {
         #'journal_id':get_bank,
         'state': lambda *a: 'draft',
@@ -123,8 +121,6 @@ class account_voucher(osv.osv):
                 self.pool.get('res.users').browse(cr, uid, uid,
                     context=context).company_id.id,
         'currency_id': _get_currency,
-
-
     }
     
     def _get_analytic_lines(self, cr, uid, id):
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index a1f6907c701..872d831fa79 100755
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<terp>
+<openerp>
 	<data>
 		<record model="ir.ui.view" id="view_voucher_tree">
 			<field name="name">account.voucher.tree</field>
@@ -293,4 +293,4 @@
 		<menuitem name="Financial Management/Voucher Entries/Other Vouchers/Journal Purchase Voucher" id="menu_action_view_jour_pur_voucher_form" action="action_view_jour_pur_voucher_form"/>
 		
 		</data>
-</terp>
\ No newline at end of file
+</openerp>
\ No newline at end of file

From d87d56b4ba2a4c579a099be961420e9b1ab1f982 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 7 Dec 2008 03:15:41 +0100
Subject: [PATCH 60/82] improvement

bzr revid: fp@tinyerp.com-20081207021541-hoxme31i15s1aiog
---
 addons/account/account.py                     | 155 +++++++-----------
 addons/account/account_view.xml               |   2 +
 addons/account/invoice.py                     |  59 ++++---
 .../account_tax_include/invoice_tax_incl.py   | 136 +++++++--------
 4 files changed, 158 insertions(+), 194 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 1b618d24cc4..1b7727e9737 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1232,6 +1232,7 @@ class account_tax(osv.osv):
         'include_base_amount': fields.boolean('Include in base amount', help="Indicate if the amount of tax must be included in the base amount for the computation of the next taxes"),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'description': fields.char('Internal Name',size=32),
+        'price_include': fields.boolean('Tax Included in Price', help="Check this is the price you use on the product and invoices is including this tax.")
     }
 
     def name_get(self, cr, uid, ids, context={}):
@@ -1254,6 +1255,7 @@ class account_tax(osv.osv):
         'applicable_type': lambda *a: 'true',
         'type': lambda *a: 'percent',
         'amount': lambda *a: 0,
+        'price_include': lambda *a: 0,
         'active': lambda *a: 1,
         'sequence': lambda *a: 1,
         'tax_group': lambda *a: 'vat',
@@ -1286,11 +1288,8 @@ class account_tax(osv.osv):
         for tax in taxes:
             # we compute the amount for the current tax object and append it to the result
 
-            if tax.type=='percent':
-                amount = cur_price_unit * tax.amount
-                res.append({'id':tax.id,
+            data = {'id':tax.id,
                             'name':tax.name,
-                            'amount':amount,
                             'account_collected_id':tax.account_collected_id.id,
                             'account_paid_id':tax.account_paid_id.id,
                             'base_code_id': tax.base_code_id.id,
@@ -1303,47 +1302,21 @@ class account_tax(osv.osv):
                             'price_unit': cur_price_unit,
                             'tax_code_id': tax.tax_code_id.id,
                             'ref_tax_code_id': tax.ref_tax_code_id.id,
-                            })
+            }
+            res.append(data)
+            if tax.type=='percent':
+                amount = cur_price_unit * tax.amount
+                data['amount'] = amount
 
             elif tax.type=='fixed':
-                res.append({'id':tax.id,
-                            'name':tax.name,
-                            'amount':tax.amount,
-                            'account_collected_id':tax.account_collected_id.id,
-                            'account_paid_id':tax.account_paid_id.id,
-                            'base_code_id': tax.base_code_id.id,
-                            'ref_base_code_id': tax.ref_base_code_id.id,
-                            'sequence': tax.sequence,
-                            'base_sign': tax.base_sign,
-                            'tax_sign': tax.tax_sign,
-                            'ref_base_sign': tax.ref_base_sign,
-                            'ref_tax_sign': tax.ref_tax_sign,
-                            'price_unit': 1,
-                            'tax_code_id': tax.tax_code_id.id,
-                            'ref_tax_code_id': tax.ref_tax_code_id.id,})
+                data['amount'] = tax.amount
             elif tax.type=='code':
                 address = address_id and self.pool.get('res.partner.address').browse(cr, uid, address_id) or None
                 localdict = {'price_unit':cur_price_unit, 'address':address, 'product':product, 'partner':partner}
                 exec tax.python_compute in localdict
                 amount = localdict['result']
-                res.append({
-                    'id': tax.id,
-                    'name': tax.name,
-                    'amount': amount,
-                    'account_collected_id': tax.account_collected_id.id,
-                    'account_paid_id': tax.account_paid_id.id,
-                    'base_code_id': tax.base_code_id.id,
-                    'ref_base_code_id': tax.ref_base_code_id.id,
-                    'sequence': tax.sequence,
-                    'base_sign': tax.base_sign,
-                    'tax_sign': tax.tax_sign,
-                    'ref_base_sign': tax.ref_base_sign,
-                    'ref_tax_sign': tax.ref_tax_sign,
-                    'price_unit': cur_price_unit,
-                    'tax_code_id': tax.tax_code_id.id,
-                    'ref_tax_code_id': tax.ref_tax_code_id.id,
-                })
-            amount2 = res[-1]['amount']
+                data['amount'] = amount
+            amount2 = data['amount']
             if len(tax.child_ids):
                 if tax.child_depend:
                     del res[-1]
@@ -1369,86 +1342,72 @@ class account_tax(osv.osv):
             r['amount'] *= quantity
         return res
 
-    def _unit_compute_inv(self, cr, uid, taxes, price_unit, address_id=None, product=None, partner=None,tax_parent_tot=0.0):
+    def _unit_compute_inv(self, cr, uid, taxes, price_unit, address_id=None, product=None, partner=None):
         taxes = self._applicable(cr, uid, taxes, price_unit, address_id, product, partner)
 
         res = []
         taxes.reverse()
         cur_price_unit=price_unit
-        for tax in taxes:
-            # we compute the amount for the current tax object and append it to the result
 
+        tax_parent_tot = 0.0
+        for tax in taxes:
+            if (tax.type=='percent') and not tax.include_base_amount:
+                tax_parent_tot+=tax.amount
+
+        for tax in taxes:
             if tax.type=='percent':
-                amount = cur_price_unit - (cur_price_unit / (1 + tax.amount))
-                res.append({'id':tax.id,
-                            'name':tax.name,
-                            'amount':amount,
-                            'account_collected_id':tax.account_collected_id.id,
-                            'account_paid_id':tax.account_paid_id.id,
-                            'base_code_id': tax.base_code_id.id,
-                            'ref_base_code_id': tax.ref_base_code_id.id,
-                            'sequence': tax.sequence,
-                            'base_sign': tax.base_sign,
-                            'tax_sign': tax.tax_sign,
-                            'ref_base_sign': tax.ref_base_sign,
-                            'ref_tax_sign': tax.ref_tax_sign,
-                            'price_unit': cur_price_unit - amount,
-                            'tax_code_id': tax.tax_code_id.id,
-                            'ref_tax_code_id': tax.ref_tax_code_id.id,})
+                if tax.include_base_amount:
+                    amount = cur_price_unit - (cur_price_unit / (1 + tax.amount))
+                else:
+                    amount = (cur_price_unit / (1 + tax_parent_tot)) * tax.amount
 
             elif tax.type=='fixed':
-                res.append({'id':tax.id,
-                            'name':tax.name,
-                            'amount':tax.amount,
-                            'account_collected_id':tax.account_collected_id.id,
-                            'account_paid_id':tax.account_paid_id.id,
-                            'base_code_id': tax.base_code_id.id,
-                            'ref_base_code_id': tax.ref_base_code_id.id,
-                            'sequence': tax.sequence,
-                            'base_sign': tax.base_sign,
-                            'tax_sign': tax.tax_sign,
-                            'ref_base_sign': tax.ref_base_sign,
-                            'ref_tax_sign': tax.ref_tax_sign,
-                            'price_unit': 1,
-                            'tax_code_id': tax.tax_code_id.id,
-                            'ref_tax_code_id': tax.ref_tax_code_id.id,})
+                amount = tax.amount
 
             elif tax.type=='code':
                 address = address_id and self.pool.get('res.partner.address').browse(cr, uid, address_id) or None
                 localdict = {'price_unit':cur_price_unit, 'address':address, 'product':product, 'partner':partner}
                 exec tax.python_compute_inv in localdict
                 amount = localdict['result']
-                res.append({
-                    'id': tax.id,
-                    'name': tax.name,
-                    'amount': amount,
-                    'account_collected_id': tax.account_collected_id.id,
-                    'account_paid_id': tax.account_paid_id.id,
-                    'base_code_id': tax.base_code_id.id,
-                    'ref_base_code_id': tax.ref_base_code_id.id,
-                    'sequence': tax.sequence,
-                    'base_sign': tax.base_sign,
-                    'tax_sign': tax.tax_sign,
-                    'ref_base_sign': tax.ref_base_sign,
-                    'ref_tax_sign': tax.ref_tax_sign,
-                    'price_unit': cur_price_unit - amount,
-                    'tax_code_id': tax.tax_code_id.id,
-                    'ref_tax_code_id': tax.ref_tax_code_id.id,
-                })
 
-            amount2 = res[-1]['amount']
+            if tax.include_base_amount:
+                cur_price_unit -= amount
+                todo = 0
+            else:
+                todo = 1
+            res.append({
+                'id': tax.id,
+                'todo': todo,
+                'name': tax.name,
+                'amount': amount,
+                'account_collected_id': tax.account_collected_id.id,
+                'account_paid_id': tax.account_paid_id.id,
+                'base_code_id': tax.base_code_id.id,
+                'ref_base_code_id': tax.ref_base_code_id.id,
+                'sequence': tax.sequence,
+                'base_sign': tax.base_sign,
+                'tax_sign': tax.tax_sign,
+                'ref_base_sign': tax.ref_base_sign,
+                'ref_tax_sign': tax.ref_tax_sign,
+                'price_unit': cur_price_unit,
+                'tax_code_id': tax.tax_code_id.id,
+                'ref_tax_code_id': tax.ref_tax_code_id.id,
+            })
             if len(tax.child_ids):
                 if tax.child_depend:
                     del res[-1]
                     amount = price_unit
-                else:
-                    amount = amount2
-            for t in tax.child_ids:
-                parent_tax = self._unit_compute_inv(cr, uid, [t], amount, address_id, product, partner)
-                res.extend(parent_tax)
-            if tax.include_base_amount:
-                cur_price_unit-=amount
-        taxes.reverse()
+
+            parent_tax = self._unit_compute_inv(cr, uid, tax.child_ids, amount, address_id, product, partner)
+            res.extend(parent_tax)
+
+        total = 0.0
+        for r in res:
+            if r['todo']:
+                total += r['amount']
+        for r in res:
+            r['price_unit'] -= total
+            r['todo'] = 0
         return res
 
     def compute_inv(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index c3053513fde..c73b829f14b 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -557,6 +557,7 @@
             <field name="arch" type="xml">
                 <tree string="Account Tax">
                     <field name="name"/>
+                    <field name="price_include"/>
                     <field name="description"/>
                 </tree>
             </field>
@@ -588,6 +589,7 @@
                             <label colspan="2" nolabel="1" string="Keep empty to use the expense account"/>
                             <field groups="base.group_extended" name="child_depend"/>
                             <field groups="base.group_extended" name="sequence"/>
+                            <field groups="base.group_extended" name="price_include"/>
                             <newline/>
                             <field colspan="4" groups="base.group_extended" name="child_ids"/>
                         </page>
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index a511d79bf2a..a67653b8d55 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -31,24 +31,19 @@ from tools import config
 from tools.translate import _
 
 class account_invoice(osv.osv):
-    def _amount_untaxed(self, cr, uid, ids, name, args, context={}):
-        id_set=",".join(map(str,ids))
-        cr.execute("SELECT s.id,COALESCE(SUM(l.price_subtotal),0)::decimal(16,2) AS amount FROM account_invoice s LEFT OUTER JOIN account_invoice_line l ON (s.id=l.invoice_id) WHERE s.id IN ("+id_set+") GROUP BY s.id ")
-        res=dict(cr.fetchall())
-        return res
-
-    def _amount_tax(self, cr, uid, ids, name, args, context={}):
-        id_set=",".join(map(str,ids))
-        cr.execute("SELECT s.id,COALESCE(SUM(l.amount),0)::decimal(16,2) AS amount FROM account_invoice s LEFT OUTER JOIN account_invoice_tax l ON (s.id=l.invoice_id) WHERE s.id IN ("+id_set+") GROUP BY s.id ")
-        res=dict(cr.fetchall())
-        return res
-
-    def _amount_total(self, cr, uid, ids, name, args, context={}):
-        untax = self._amount_untaxed(cr, uid, ids, name, args, context)
-        tax = self._amount_tax(cr, uid, ids, name, args, context)
+    def _amount_all(self, cr, uid, ids, name, args, context={}):
         res = {}
-        for id in ids:
-            res[id] = untax.get(id,0.0) + tax.get(id,0.0)
+        for invoice in self.browse(cr,uid,ids):
+            res[invoice.id] = {
+                'amount_untaxed': 0.0,
+                'amount_tax': 0.0,
+                'amount_total': 0.0
+            }
+            for line in invoice.invoice_line:
+                res[invoice.id]['amount_untaxed'] += line.price_subtotal
+            for line in invoice.tax_line:
+                res[invoice.id]['amount_tax'] += line.amount
+            res[invoice.id]['amount_total'] = res[invoice.id]['amount_tax'] + res[invoice.id]['amount_untaxed']
         return res
 
     def _get_journal(self, cr, uid, context):
@@ -118,6 +113,12 @@ class account_invoice(osv.osv):
                 res[id]=[x for x in l if x <> line.id]
         return res
 
+    def _get_invoice_tax(self, cr, uid, ids, context={}):
+        result = {}
+        for tax in self.pool.get('account.invoice.tax').browse(cr, uid, ids, context=context):
+            result[tax.invoice_id.id] = True
+        return result.keys()
+
     def _compute_lines(self, cr, uid, ids, name, args, context={}):
         result = {}
         for invoice in self.browse(cr, uid, ids, context):
@@ -178,14 +179,30 @@ 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_untaxed, method=True, digits=(16,2),string='Untaxed', store=True),
-        'amount_tax': fields.function(_amount_tax, method=True, digits=(16,2), string='Tax', store=True),
-        'amount_total': fields.function(_amount_total, method=True, digits=(16,2), string='Total', store=True),
+        'amount_untaxed': fields.function(_amount_all, method=True, digits=(16,2),string='Untaxed',
+            store={
+                'account.invoice': (lambda self, cr, uid, ids, c={}: ids, None, 10),
+                'account.invoice.tax': (_get_invoice_tax, None, 10),
+            },
+            multi='all'),
+        'amount_tax': fields.function(_amount_all, method=True, digits=(16,2), string='Tax',
+            store={
+                'account.invoice': (lambda self, cr, uid, ids, c={}: ids, None, 10),
+                'account.invoice.tax': (_get_invoice_tax, None, 10),
+            },
+            multi='all'),
+        'amount_total': fields.function(_amount_all, method=True, digits=(16,2), string='Total',
+            store={
+                'account.invoice': (lambda self, cr, uid, ids, c={}: ids, None, 10),
+                'account.invoice.tax': (_get_invoice_tax, None, 10),
+            },
+            multi='all'),
         '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)]}),
-        'reconciled': fields.function(_reconciled, method=True, string='Paid/Reconciled', type='boolean', store=True, help="The account moves of the invoice have been reconciled with account moves of the payment(s)."),
+        'reconciled': fields.function(_reconciled, method=True, string='Paid/Reconciled', type='boolean',
+            store=True, help="The account moves of the invoice have been reconciled with account moves of the payment(s)."),
         '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'),
diff --git a/addons/account_tax_include/invoice_tax_incl.py b/addons/account_tax_include/invoice_tax_incl.py
index 66ec0ecf0a5..be2c1e37a27 100644
--- a/addons/account_tax_include/invoice_tax_incl.py
+++ b/addons/account_tax_include/invoice_tax_incl.py
@@ -26,42 +26,12 @@ from osv import fields, osv
 import ir
 
 class account_invoice(osv.osv):
-    def _amount_untaxed(self, cr, uid, ids, name, args, context={}):
-        res = {}
-        for invoice in self.browse(cr,uid,ids):
-            if invoice.price_type == 'tax_included':
-                res[invoice.id] = reduce( lambda x, y: x+y.price_subtotal, invoice.invoice_line,0)
-            else:
-                res[invoice.id] = super(account_invoice, self)._amount_untaxed(cr, uid, [invoice.id], name, args, context)[invoice.id]
-        return res
-
-    def _amount_tax(self, cr, uid, ids, name, args, context={}):
-        res = {}
-        for invoice in self.browse(cr,uid,ids):
-            if invoice.price_type == 'tax_included':
-                res[invoice.id] = reduce( lambda x, y: x+y.amount, invoice.tax_line,0)
-            else:
-                res[invoice.id] = super(account_invoice, self)._amount_tax(cr, uid, [invoice.id], name, args, context)[invoice.id]
-        return res
-
-    def _amount_total(self, cr, uid, ids, name, args, context={}):
-        res = {}
-        for invoice in self.browse(cr,uid,ids):
-            if invoice.price_type == 'tax_included':
-                res[invoice.id]= invoice.amount_untaxed + invoice.amount_tax
-            else:
-                res[invoice.id] = super(account_invoice, self)._amount_total(cr, uid, [invoice.id], name, args, context)[invoice.id]
-        return res
-
     _inherit = "account.invoice"
     _columns = {
         'price_type': fields.selection([('tax_included','Tax included'),
                                         ('tax_excluded','Tax excluded')],
                                         'Price method', required=True, readonly=True,
                                         states={'draft':[('readonly',False)]}),
-        'amount_untaxed': fields.function(_amount_untaxed, digits=(16,2), method=True,string='Untaxed Amount'),
-        'amount_tax': fields.function(_amount_tax, method=True, string='Tax', store=True),
-        'amount_total': fields.function(_amount_total, method=True, string='Total', store=True),
     }
     _defaults = {
         'price_type': lambda *a: 'tax_excluded',
@@ -70,47 +40,51 @@ account_invoice()
 
 class account_invoice_line(osv.osv):
     _inherit = "account.invoice.line"
-    def _amount_line(self, cr, uid, ids, name, args, context={}):
+    def _amount_line2(self, cr, uid, ids, name, args, context={}):
         """
         Return the subtotal excluding taxes with respect to price_type.
         """
         res = {}
         tax_obj = self.pool.get('account.tax')
-        res = super(account_invoice_line, self)._amount_line(cr, uid, ids, name, args, context)
-        res2 = res.copy()
+        res_init = super(account_invoice_line, self)._amount_line(cr, uid, ids, name, args, context)
         for line in self.browse(cr, uid, ids):
+            res[line.id] = {
+                'price_subtotal': 0.0,
+                'price_subtotal_incl': 0.0,
+                'data': []
+            }
             if not line.quantity:
-                res[line.id] = 0.0
                 continue
             if line.invoice_id and line.invoice_id.price_type == 'tax_included':
-                product_taxes = None
+                product_taxes = []
                 if line.product_id:
                     if line.invoice_id.type in ('out_invoice', 'out_refund'):
-                        product_taxes = line.product_id.taxes_id
+                        product_taxes = filter(lambda x: x.price_include, line.product_id.taxes_id)
                     else:
-                        product_taxes = line.product_id.supplier_taxes_id
-                if product_taxes:
-                    for tax in tax_obj.compute_inv(cr, uid, product_taxes, res[line.id]/line.quantity, line.quantity):
-                        res[line.id] = res[line.id] - round(tax['amount'], 2)
+                        product_taxes = filter(lambda x: x.price_include, line.product_id.supplier_taxes_id)
+
+                if (set(product_taxes) == set(line.invoice_line_tax_id)) or not product_taxes:
+                    res[line.id]['price_subtotal_incl'] = res_init[line.id]
                 else:
-                    for tax in tax_obj.compute_inv(cr, uid,line.invoice_line_tax_id, res[line.id]/line.quantity, line.quantity):
-                        res[line.id] = res[line.id] - round(tax['amount'], 2)
-            if name == 'price_subtotal_incl' and line.invoice_id and line.invoice_id.price_type == 'tax_included':
-                prod_taxe_ids = None
-                line_taxe_ids = None
-                if product_taxes:
-                    prod_taxe_ids = [ t.id for t in product_taxes ]
-                    prod_taxe_ids.sort()
-                    line_taxe_ids = [ t.id for t in line.invoice_line_tax_id ]
-                    line_taxe_ids.sort()
-                if product_taxes and prod_taxe_ids == line_taxe_ids:
-                    res[line.id] = res2[line.id]
-                elif not line.product_id:
-                    res[line.id] = res2[line.id]
-                else:
-                    for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, res[line.id]/line.quantity, line.quantity):
-                        res[line.id] = res[line.id] + tax['amount']
-            res[line.id]= round(res[line.id], 2)
+                    res[line.id]['price_subtotal'] = res_init[line.id]
+                    for tax in tax_obj.compute_inv(cr, uid, product_taxes, res_init[line.id]/line.quantity, line.quantity):
+                        res[line.id]['price_subtotal'] = res[line.id]['price_subtotal'] - round(tax['amount'], 2)
+            else:
+                res[line.id]['price_subtotal'] = res_init[line.id]
+
+            if res[line.id]['price_subtotal']:
+                res[line.id]['price_subtotal_incl'] = res[line.id]['price_subtotal']
+                for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, res[line.id]['price_subtotal']/line.quantity, line.quantity):
+                    res[line.id]['price_subtotal_incl'] = res[line.id]['price_subtotal_incl'] + tax['amount']
+                    res[line.id]['data'].append( tax)
+            else:
+                res[line.id]['price_subtotal'] = res[line.id]['price_subtotal_incl']
+                for tax in tax_obj.compute_inv(cr, uid, line.invoice_line_tax_id, res[line.id]['price_subtotal_incl']/line.quantity, line.quantity):
+                    res[line.id]['price_subtotal'] = res[line.id]['price_subtotal'] - tax['amount']
+                    res[line.id]['data'].append( tax)
+
+        res[line.id]['price_subtotal']= round(res[line.id]['price_subtotal'], 2)
+        res[line.id]['price_subtotal_incl']= round(res[line.id]['price_subtotal_incl'], 2)
         return res
 
     def _price_unit_default(self, cr, uid, context={}):
@@ -125,9 +99,17 @@ class account_invoice_line(osv.osv):
             return super(account_invoice_line, self)._price_unit_default(cr, uid, context)
         return 0
 
+    def _get_invoice(self, cr, uid, ids, context):
+        result = {}
+        for inv in self.pool.get('account.invoice').browse(cr, uid, ids, context=context):
+            for line in inv.invoice_line:
+                result[line.id] = True
+        return result.keys()
     _columns = {
-        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal w/o tax', store=True),
-        'price_subtotal_incl': fields.function(_amount_line, method=True, string='Subtotal'),
+        'price_subtotal': fields.function(_amount_line2, method=True, string='Subtotal w/o tax', multi='amount',
+            store={'account.invoice':(_get_invoice,None), 'account.invoice.line': (lambda self,cr,uid,ids,c={}: ids, None)}),
+        'price_subtotal_incl': fields.function(_amount_line2, method=True, string='Subtotal', multi='amount',
+            store={'account.invoice':(_get_invoice,None), 'account.invoice.line': (lambda self,cr,uid,ids,c={}: ids, None)}),
     }
 
     _defaults = {
@@ -147,32 +129,36 @@ class account_invoice_line(osv.osv):
                 'account_analytic_id':line.account_analytic_id.id,
             }
 
-    def product_id_change_unit_price_inv(self, cr, uid, tax_id, price_unit, qty, address_invoice_id, product, partner_id, context={}):
-        if context.get('price_type', False) == 'tax_included':
-            return {'price_unit': price_unit,'invoice_line_tax_id': tax_id}
-        else:
-            return super(account_invoice_line, self).product_id_change_unit_price_inv(cr, uid, tax_id, price_unit, qty, address_invoice_id, product, partner_id, context=context)
-
-    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, price_unit=False, address_invoice_id=False, price_type='tax_excluded', context={}):
-        context.update({'price_type': price_type})
-        return super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, price_unit, address_invoice_id, context=context)
+# TODO: check why ?
+#
+#    def product_id_change_unit_price_inv(self, cr, uid, tax_id, price_unit, qty, address_invoice_id, product, partner_id, context={}):
+#        if context.get('price_type', False) == 'tax_included':
+#            return {'price_unit': price_unit,'invoice_line_tax_id': tax_id}
+#        else:
+#            return super(account_invoice_line, self).product_id_change_unit_price_inv(cr, uid, tax_id, price_unit, qty, address_invoice_id, product, partner_id, context=context)
+#
+#    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, price_unit=False, address_invoice_id=False, price_type='tax_excluded', context={}):
+#        context.update({'price_type': price_type})
+#        return super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, price_unit, address_invoice_id, context=context)
 account_invoice_line()
 
 class account_invoice_tax(osv.osv):
     _inherit = "account.invoice.tax"
 
-    def compute(self, cr, uid, invoice_id):
+    def compute(self, cr, uid, invoice_id, context={}):
+        inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id)
+        line_ids = map(lambda x: x.id, inv.invoice_line)
+
+
+
         tax_grouped = {}
         tax_obj = self.pool.get('account.tax')
         cur_obj = self.pool.get('res.currency')
-        inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id)
         cur = inv.currency_id
 
-        if inv.price_type=='tax_excluded':
-            return super(account_invoice_tax,self).compute(cr, uid, invoice_id)
-
         for line in inv.invoice_line:
-            for tax in tax_obj.compute_inv(cr, uid, line.invoice_line_tax_id, (line.price_unit * (1-(line.discount or 0.0)/100.0)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id):
+            data = self.pool.get('account.invoice.line')._amount_line2(cr, uid, [line.id], [], [], context)[line.id]
+            for tax in data['data']:
                 val={}
                 val['invoice_id'] = inv.id
                 val['name'] = tax['name']

From e9ee8121655e88e00639ce760d2b4b39e2ef9709 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 7 Dec 2008 03:24:43 +0100
Subject: [PATCH 61/82] improve

bzr revid: fp@tinyerp.com-20081207022443-wb8b31izgky1elpa
---
 addons/account_tax_include/invoice_tax_incl.py | 4 ++--
 addons/membership/membership.py                | 2 +-
 addons/mrp_operations/mrp_operations.py        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account_tax_include/invoice_tax_incl.py b/addons/account_tax_include/invoice_tax_incl.py
index be2c1e37a27..eee35f75676 100644
--- a/addons/account_tax_include/invoice_tax_incl.py
+++ b/addons/account_tax_include/invoice_tax_incl.py
@@ -107,9 +107,9 @@ class account_invoice_line(osv.osv):
         return result.keys()
     _columns = {
         'price_subtotal': fields.function(_amount_line2, method=True, string='Subtotal w/o tax', multi='amount',
-            store={'account.invoice':(_get_invoice,None), 'account.invoice.line': (lambda self,cr,uid,ids,c={}: ids, None)}),
+            store={'account.invoice':(_get_invoice,['price_type']), 'account.invoice.line': (lambda self,cr,uid,ids,c={}: ids, None)}),
         'price_subtotal_incl': fields.function(_amount_line2, method=True, string='Subtotal', multi='amount',
-            store={'account.invoice':(_get_invoice,None), 'account.invoice.line': (lambda self,cr,uid,ids,c={}: ids, None)}),
+            store={'account.invoice':(_get_invoice,['price_type']), 'account.invoice.line': (lambda self,cr,uid,ids,c={}: ids, None)}),
     }
 
     _defaults = {
diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index ca096a0045f..4c47a5f9187 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -437,7 +437,7 @@ class Partner(osv.osv):
 #       'membership_state': fields.function(_membership_state, method=True, string='Current membership state',
 #           type='selection', selection=STATE, fnct_search=_membership_state_search),
         'membership_state': fields.function(_membership_state, method=True, string='Current membership state',
-            type='selection',selection=STATE,store={'account.invoice':(['state'],_membership_state_search_inv)}),
+            type='selection',selection=STATE,store={'account.invoice':(_membership_state_search_inv,['state'])}),
 #       'associate_member': fields.many2one('res.partner', 'Associate member'),
         'free_member': fields.boolean('Free member'),
         'membership_start': fields.function(_membership_start, method=True,
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index 789236def0b..26c96f32d43 100755
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -294,7 +294,7 @@ class mrp_operations_operation(osv.osv):
         'code_id':fields.many2one('mrp_operations.operation.code','Code',required=True),
         'date_start': fields.datetime('Start Date'),
         'date_finished': fields.datetime('End Date'),
-        'order_date': fields.function(_get_order_date,method=True,string='Order Date',type='date',store={'mrp.production':(['date_planned'],_order_date_search_production)}),
+        'order_date': fields.function(_get_order_date,method=True,string='Order Date',type='date',store={'mrp.production':(_order_date_search_production,['date_planned'])}),
         }
     _defaults={
               'date_start': lambda *a:DateTime.now().strftime('%Y-%m-%d %H:%M:%S')

From 429afac3cc72ef82bf6a51a13059259a8c6b005b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 7 Dec 2008 03:45:43 +0100
Subject: [PATCH 62/82] improve

bzr revid: fp@tinyerp.com-20081207024543-o6qegm8gzs8s0l63
---
 addons/account/invoice.py                      | 7 ++++++-
 addons/account_tax_include/invoice_tax_incl.py | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index a67653b8d55..fa4cde66bdf 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -206,7 +206,12 @@ 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', store=True, help="Remaining amount due."),
+        'residual': fields.function(_amount_residual, method=True, digits=(16,2),string='Residual',
+            store={
+                'account.invoice': (lambda self, cr, uid, ids, c={}: ids, None, 12),
+                'account.invoice.tax': (_get_invoice_tax, None, 12),
+            },
+            help="Remaining amount due."),
         'payment_ids': fields.function(_compute_lines, method=True, relation='account.move.line', type="many2many", string='Payments'),
         'move_name': fields.char('Account Move', size=64),
     }
diff --git a/addons/account_tax_include/invoice_tax_incl.py b/addons/account_tax_include/invoice_tax_incl.py
index eee35f75676..68b4a944966 100644
--- a/addons/account_tax_include/invoice_tax_incl.py
+++ b/addons/account_tax_include/invoice_tax_incl.py
@@ -55,7 +55,7 @@ class account_invoice_line(osv.osv):
             }
             if not line.quantity:
                 continue
-            if line.invoice_id and line.invoice_id.price_type == 'tax_included':
+            if line.invoice_id:
                 product_taxes = []
                 if line.product_id:
                     if line.invoice_id.type in ('out_invoice', 'out_refund'):
@@ -63,7 +63,7 @@ class account_invoice_line(osv.osv):
                     else:
                         product_taxes = filter(lambda x: x.price_include, line.product_id.supplier_taxes_id)
 
-                if (set(product_taxes) == set(line.invoice_line_tax_id)) or not product_taxes:
+                if ((set(product_taxes) == set(line.invoice_line_tax_id)) or not product_taxes) and (line.invoice_id.price_type == 'tax_included'):
                     res[line.id]['price_subtotal_incl'] = res_init[line.id]
                 else:
                     res[line.id]['price_subtotal'] = res_init[line.id]

From f8842554a8b069f9e2feca52029d8c2500dd1a7b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 7 Dec 2008 04:06:16 +0100
Subject: [PATCH 63/82] improve

bzr revid: fp@tinyerp.com-20081207030616-48t5jpfe3kn606r2
---
 addons/account_followup/report/rappel.rml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_followup/report/rappel.rml b/addons/account_followup/report/rappel.rml
index 328e9645e5b..5f05a2b9628 100644
--- a/addons/account_followup/report/rappel.rml
+++ b/addons/account_followup/report/rappel.rml
@@ -106,11 +106,11 @@
     <para style="P18">
       <font color="white"> </font>
     </para>
-    <para style="P18">Exception made if there was a mistake of ours, it seems that the following bills staid unpaid. Please, take appropriate measures in order to carry out this payment in the next 8 days.</para>
+    <para style="P18">According to our accounting, the following Invoices are unpaid. Could you please verify on your side, and take appropriate measures to pay the balance due in the next 8 days.</para>
     <para style="P18">
       <font color="white"> </font>
     </para>
-    <para style="P18">Would your payment have been carried out after this mail was sent, please consider the present one as void. Do not hesitate to contact our accounting departement at (+32).10.68.94.39.</para>
+    <para style="P18">If the payment has been very recently made i.e. as this reminder was issued, consider this reminder as void. Do not hesitate to contact our accounting department for further queries.</para>
     <para style="P18">
       <font color="white"> </font>
     </para>

From 75019e2eabe8f989ad9dbf9a9881cdf17009675c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 7 Dec 2008 13:45:27 +0100
Subject: [PATCH 65/82] bugfixes

bzr revid: fp@tinyerp.com-20081207124527-q60i5wo0ymhd3u4o
---
 addons/account/invoice.py |  9 +++++++
 addons/sale/sale.py       | 52 +++++++++++++++++----------------------
 2 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index fa4cde66bdf..40191d48a91 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -113,6 +113,12 @@ class account_invoice(osv.osv):
                 res[id]=[x for x in l if x <> line.id]
         return res
 
+    def _get_invoice_line(self, cr, uid, ids, context={}):
+        result = {}
+        for tax in self.pool.get('account.invoice.line').browse(cr, uid, ids, context=context):
+            result[tax.invoice_id.id] = True
+        return result.keys()
+
     def _get_invoice_tax(self, cr, uid, ids, context={}):
         result = {}
         for tax in self.pool.get('account.invoice.tax').browse(cr, uid, ids, context=context):
@@ -183,18 +189,21 @@ class account_invoice(osv.osv):
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, None, 10),
                 'account.invoice.tax': (_get_invoice_tax, None, 10),
+                'account.invoice.line': (_get_invoice_line, None, 10),
             },
             multi='all'),
         'amount_tax': fields.function(_amount_all, method=True, digits=(16,2), string='Tax',
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, None, 10),
                 'account.invoice.tax': (_get_invoice_tax, None, 10),
+                'account.invoice.line': (_get_invoice_line, None, 10),
             },
             multi='all'),
         'amount_total': fields.function(_amount_all, method=True, digits=(16,2), string='Total',
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, None, 10),
                 'account.invoice.tax': (_get_invoice_tax, None, 10),
+                'account.invoice.line': (_get_invoice_line, None, 10),
             },
             multi='all'),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 598f22151d3..494891dd2cd 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -60,38 +60,29 @@ class sale_order(osv.osv):
         })
         return super(sale_order, self).copy(cr, uid, id, default, context)
 
-    def _amount_untaxed(self, cr, uid, ids, field_name, arg, context):
-        res = {}
-        cur_obj=self.pool.get('res.currency')
-        for sale in self.browse(cr, uid, ids):
-            res[sale.id] = 0.0
-            for line in sale.order_line:
-                res[sale.id] += line.price_subtotal
-            cur = sale.pricelist_id.currency_id
-            res[sale.id] = cur_obj.round(cr, uid, cur, res[sale.id])
-        return res
+    def _amount_line_tax(self, cr, uid, line, context={}):
+        val = 0.0
+        for c in self.pool.get('account.tax').compute(cr, uid, line.tax_id, line.price_unit * (1-(line.discount or 0.0)/100.0), line.product_uom_qty, line.order_id.partner_invoice_id.id, line.product_id, line.order_id.partner_id):
+            val+= c['amount']
+        return val
 
-    def _amount_tax(self, cr, uid, ids, field_name, arg, context):
+    def _amount_all(self, cr, uid, ids, field_name, arg, context):
         res = {}
         cur_obj=self.pool.get('res.currency')
         for order in self.browse(cr, uid, ids):
-            val = 0.0
+            res[order.id] = {
+                'amount_untaxed': 0.0,
+                'amount_tax': 0.0,
+                'amount_total': 0.0,
+            }
+            val = val1 = 0.0
             cur=order.pricelist_id.currency_id
             for line in order.order_line:
-                for c in self.pool.get('account.tax').compute(cr, uid, line.tax_id, line.price_unit * (1-(line.discount or 0.0)/100.0), line.product_uom_qty, order.partner_invoice_id.id, line.product_id, order.partner_id):
-                    val+= c['amount']
-            res[order.id]=cur_obj.round(cr, uid, cur, val)
-        return res
-
-    def _amount_total(self, cr, uid, ids, field_name, arg, context):
-        res = {}
-        untax = self._amount_untaxed(cr, uid, ids, field_name, arg, context)
-        tax = self._amount_tax(cr, uid, ids, field_name, arg, context)
-        cur_obj=self.pool.get('res.currency')
-        for id in ids:
-            order=self.browse(cr, uid, [id])[0]
-            cur=order.pricelist_id.currency_id
-            res[id] = cur_obj.round(cr, uid, cur, untax.get(id, 0.0) + tax.get(id, 0.0))
+                val1 += line.price_subtotal
+                val += self._amount_line_tax(cr, uid, line, context)
+            res[order.id]['amount_tax']=cur_obj.round(cr, uid, cur, val)
+            res[order.id]['amount_untaxed']=cur_obj.round(cr, uid, cur, val1)
+            res[order.id]['amount_total']=res[order.id]['amount_untaxed'] + res[order.id]['amount_tax']
         return res
 
     def _picked_rate(self, cr, uid, ids, name, arg, context=None):
@@ -231,9 +222,12 @@ class sale_order(osv.osv):
         'invoiced': fields.function(_invoiced, method=True, string='Paid',
             fnct_search=_invoiced_search, type='boolean'),
         'note': fields.text('Notes'),
-        'amount_untaxed': fields.function(_amount_untaxed, method=True, string='Untaxed Amount'),
-        'amount_tax': fields.function(_amount_tax, method=True, string='Taxes', store=True),
-        'amount_total': fields.function(_amount_total, method=True, string='Total', store=True),
+
+        'amount_untaxed': fields.function(_amount_all, method=True, string='Untaxed Amount',
+            store=True, multi='sums'),
+        'amount_tax': fields.function(_amount_all, method=True, string='Taxes', store=True, multi='sums'),
+        'amount_total': fields.function(_amount_all, method=True, string='Total', store=True, multi='sums'),
+
         'invoice_quantity': fields.selection([('order','Ordered Quantities'),('procurement','Shipped Quantities')], 'Invoice on', help="The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks.",required=True),
         'payment_term' : fields.many2one('account.payment.term', 'Payment Term'),
     }

From dc3cb6c1a5d44f0db55c01e007d129dc9122ce63 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 7 Dec 2008 14:06:32 +0100
Subject: [PATCH 66/82] bugfix_305746

bzr revid: fp@tinyerp.com-20081207130632-lhj85qmo7zgdfye0
---
 addons/account/account_bank_statement.py   |  2 +-
 addons/mrp/schedulers.py                   | 39 ++++++++++------------
 addons/mrp/wizard/wizard_schedulers_all.py |  2 +-
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index e28edc87f4a..a1d47dd027d 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -66,7 +66,7 @@ class account_bank_statement(osv.osv):
                 else:
                     if line.account_id.id == \
                             statement.journal_id.default_credit_account_id.id:
-                        res[statement.id] += res_currency_obj.compute(cursor,
+                        res[statement.id] -= res_currency_obj.compute(cursor,
                                 user, company_currency_id, currency_id,
                                 line.credit, context=context)
             if statement.state == 'draft':
diff --git a/addons/mrp/schedulers.py b/addons/mrp/schedulers.py
index cd1ddcd341e..a15cc9c42c7 100644
--- a/addons/mrp/schedulers.py
+++ b/addons/mrp/schedulers.py
@@ -132,40 +132,37 @@ class mrp_procurement(osv.osv):
         warehouse_obj = self.pool.get('stock.warehouse')
         wf_service = netsvc.LocalService("workflow")
 
-        cr.execute('select id from stock_warehouse')
-        warehouses = [x for x, in cr.fetchall()]
+        warehouse_ids = warehouse_obj.search(cr, uid, [], context=context)
+
         cr.execute('select id from product_product')
         products_id = [x for x, in cr.fetchall()]
-        products = dict(zip(products_id, product_obj.browse(cr, uid, products_id, context)))
-        for warehouse in warehouses:
-            v_stock = product_obj._product_virtual_available(cr, uid, products_id, None, {'warehouse': warehouse})
-            cr.execute("select lot_stock_id from stock_warehouse")
-            location_ids_str = ','.join([str(id) for id, in cr.fetchall()])
-            stock_locations = warehouse_obj.read(cr, uid, [warehouse], ['lot_input_id', 'lot_stock_id'])[0]
-            for prod_id, available in v_stock.items():
-                if available >= 0:
+
+        for warehouse in warehouse_obj.browse(cr, uid, warehouse_ids, context=context):
+            context['warehouse'] = warehouse
+            for product in self.pool.get('product.product').browse(cr, uid, products_id, context=context):
+                if product.virtual_available>=0.0:
                     continue
-                newdate = DateTime.now() + DateTime.RelativeDateTime(days=products[prod_id].seller_delay)
-                if products[prod_id].supply_method == 'buy':
-                    location_id = stock_locations['lot_input_id'][0]
-                elif products[prod_id].supply_method == 'produce':
-                    location_id = stock_locations['lot_stock_id'][0]
+
+                newdate = DateTime.now()
+                if product.supply_method == 'buy':
+                    location_id = warehouse.lot_input_id.id
+                elif product.supply_method == 'produce':
+                    location_id = warehouse.lot_stock_id.id
                 else:
                     continue
                 proc_id = proc_obj.create(cr, uid, {
-                    'name': 'PROC:Automatic OP for product:%s' % products[prod_id].name,
+                    'name': 'PROC:Automatic OP for product:%s' % product.name,
                     'origin': 'SCHEDULER',
-                    'date_planned': newdate.strftime('%Y-%m-%d'),
-                    'product_id': prod_id,
-                    'product_qty': -available,
-                    'product_uom': products[prod_id].uom_id.id,
+                    'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'),
+                    'product_id': product.id,
+                    'product_qty': -product.virtual_available,
+                    'product_uom': product.uom_id.id,
                     'location_id': location_id,
                     'procure_method': 'make_to_order',
                     })
                 wf_service.trg_validate(uid, 'mrp.procurement', proc_id, 'button_confirm', cr)
                 wf_service.trg_validate(uid, 'mrp.procurement', proc_id, 'button_check', cr)
 
-
     def _procure_orderpoint_confirm(self, cr, uid, automatic=False,\
             use_new_cursor=False, context=None, user_id=False):
         '''
diff --git a/addons/mrp/wizard/wizard_schedulers_all.py b/addons/mrp/wizard/wizard_schedulers_all.py
index a21ac3e38fe..d2ca06c5e53 100644
--- a/addons/mrp/wizard/wizard_schedulers_all.py
+++ b/addons/mrp/wizard/wizard_schedulers_all.py
@@ -30,7 +30,7 @@ parameter_form = '''<?xml version="1.0"?>
 </form>'''
 
 parameter_fields = {
-    'automatic': {'string': 'Automatic orderpoint', 'type': 'boolean', 'help': 'Triggers an automatic procurement for all products that have a virtual stock under 0.', 'default': lambda *a: False},
+    'automatic': {'string': 'Automatic orderpoint', 'type': 'boolean', 'help': 'Triggers an automatic procurement for all products that have a virtual stock under 0. You should probably not use this option, we suggest using a MTO configuration on products.', 'default': lambda *a: False},
 }
 
 def _procure_calculation_all(self, db_name, uid, data, context):

From 3b415259d65801c3cd1bdb899ec622f447aaf973 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 7 Dec 2008 14:13:06 +0100
Subject: [PATCH 67/82] modified_terp_voucher

bzr revid: fp@tinyerp.com-20081207131306-vb41zmoz2hsac3p5
---
 addons/account_voucher/__terp__.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/account_voucher/__terp__.py b/addons/account_voucher/__terp__.py
index 8b63b59102a..9696cc5c65c 100755
--- a/addons/account_voucher/__terp__.py
+++ b/addons/account_voucher/__terp__.py
@@ -20,13 +20,12 @@
 #
 ##############################################################################
 {
-    "name" : "India Accounting",
+    "name" : "Accounting - Voucher Management",
     "version" : "1.0",
     "author" : "Tiny",
     "description": """
-    India Accounting module includes all the basic requirenment of 
-    Basic Accounting, plus new things which available are 
-    * Indian Account Chart
+India Accounting module includes all the basic requirenment of 
+Basic Accounting, plus new things which available are:
     * New Invoice - (Local, Retail)
     * Invoice Report
     * Tax structure
@@ -51,4 +50,4 @@
     ],
     "active": False,
     "installable": True
-}
\ No newline at end of file
+}

From aec0dafa1712a16c3208ebfec398b05224bbaaff Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 8 Dec 2008 08:56:41 +0100
Subject: [PATCH 68/82] modifs

bzr revid: fp@tinyerp.com-20081208075641-3i3clllhoa8u180n
---
 addons/account/invoice.py   | 9 ++++++---
 addons/document/document.py | 1 -
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 40191d48a91..e60c04d9851 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -33,7 +33,8 @@ from tools.translate import _
 class account_invoice(osv.osv):
     def _amount_all(self, cr, uid, ids, name, args, context={}):
         res = {}
-        for invoice in self.browse(cr,uid,ids):
+        print ids
+        for invoice in self.browse(cr,uid,ids, context=context):
             res[invoice.id] = {
                 'amount_untaxed': 0.0,
                 'amount_tax': 0.0,
@@ -115,8 +116,10 @@ class account_invoice(osv.osv):
 
     def _get_invoice_line(self, cr, uid, ids, context={}):
         result = {}
-        for tax in self.pool.get('account.invoice.line').browse(cr, uid, ids, context=context):
-            result[tax.invoice_id.id] = True
+        for line in self.pool.get('account.invoice.line').browse(cr, uid, ids, context=context):
+            print '\t', line.invoice_id
+            result[line.invoice_id.id] = True
+        print result
         return result.keys()
 
     def _get_invoice_tax(self, cr, uid, ids, context={}):
diff --git a/addons/document/document.py b/addons/document/document.py
index 942eefb2682..84c70b56c30 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -94,7 +94,6 @@ class node_class(object):
                     if test_nodename.find('/'):
                         test_nodename=test_nodename.replace('/', '_')
                     path = self.path+'/'+test_nodename
-                    #path = self.path+'/'+self.object2.name + (content.suffix or '') + (content.extension or '')
                     if not nodename:
                         n = node_class(self.cr, self.uid,path, self.object2, False, content=content, type='content', root=False)
                         res2.append( n)

From 66b97cdc419da3125ea982c83c8eabfaec45c3b3 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 8 Dec 2008 12:48:14 +0100
Subject: [PATCH 69/82] removed_unused_file

bzr revid: fp@tinyerp.com-20081208114814-rus1b6tfqfdj7xac
---
 addons/sale/__init__.py |  1 -
 addons/sale/partner.py  | 34 ----------------------------------
 2 files changed, 35 deletions(-)
 delete mode 100644 addons/sale/partner.py

diff --git a/addons/sale/__init__.py b/addons/sale/__init__.py
index fc825d7ac2a..83fd6ab23b1 100644
--- a/addons/sale/__init__.py
+++ b/addons/sale/__init__.py
@@ -26,7 +26,6 @@
 
 import sale
 import stock
-import partner
 import product
 
 import wizard
diff --git a/addons/sale/partner.py b/addons/sale/partner.py
deleted file mode 100644
index 000408cf40c..00000000000
--- a/addons/sale/partner.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution	
-#    Copyright (C) 2004-2008 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, osv
-
-
-#class res_partner(osv.osv):
-#    _name = 'res.partner'
-#    _inherit = 'res.partner'
-#    _columns = {
-#        'sales': fields.one2many('sale.order', 'partner_id', 'Sales'),
-#    }
-#
-#res_partner()
-#

From 7f9fe360f32e46af275081a7477972d1a55b9c63 Mon Sep 17 00:00:00 2001
From: qdp <qdp@tinyerp.com>
Date: Mon, 8 Dec 2008 18:08:40 +0100
Subject: [PATCH 70/82] *merge of the ~activity/openobject-addons/trunk branch.
 Improvement of translatability and small bugfixes *small modifs on mrp_repair
 module

bzr revid: qdp@tinyerp.com-20081208170840-ryh5435c5heqsngl
---
 addons/account/account.py                     |  3 +-
 addons/account/invoice.py                     |  4 +-
 .../wizard/wizard_account_analytic_line.py    |  3 +-
 addons/account/wizard/wizard_account_chart.py |  5 ++
 .../account/wizard/wizard_bank_reconcile.py   |  3 +-
 .../wizard/wizard_general_ledger_report.py    | 29 +----------
 .../wizard/wizard_partner_balance_report.py   |  2 +-
 .../account/wizard/wizard_reconcile_select.py |  4 +-
 .../wizard/wizard_third_party_ledger.py       |  2 +-
 addons/audittrail/audittrail.py               | 14 +++---
 addons/crm/crm.py                             | 36 ++++++++------
 .../wizard/meeting_planify.py                 |  4 +-
 addons/crm_profiling/crm_profiling.py         |  6 +--
 addons/document/document.py                   |  8 ++--
 addons/document/ftpserver/__init__.py         |  3 +-
 addons/event/event.py                         |  7 ++-
 addons/hr/hr_department.py                    |  5 +-
 addons/hr_timesheet/report/user_timesheet.py  | 15 +++++-
 addons/hr_timesheet/report/user_timesheet.xsl |  4 +-
 addons/hr_timesheet/report/users_timesheet.py | 19 +++++++-
 .../hr_timesheet/report/users_timesheet.xsl   | 10 ++--
 .../hr_timesheet_final_invoice_create.py      |  4 +-
 .../wizard/hr_timesheet_invoice_create.py     |  9 ++--
 addons/mrp/mrp.py                             | 10 ++--
 addons/mrp/report/price.py                    | 48 ++++++++++---------
 addons/mrp/report/workcenter_load.py          |  4 +-
 addons/mrp_repair/mrp_repair.py               | 11 ++---
 addons/mrp_repair/mrp_repair_view.xml         | 17 +++++--
 addons/product/pricelist.py                   | 25 ++++++++--
 addons/product/report/product_label.xsl       |  2 +-
 addons/product/report/product_pricelist.py    | 14 ++++--
 .../wizard/wizard_product_margin.py           |  4 +-
 addons/project/report/gantt.py                |  1 +
 addons/project/report/project_report.xsl      | 24 +++++-----
 addons/project_timesheet/project_timesheet.py |  2 +-
 addons/report_task/report_task_view.xml       |  2 +
 .../sale_analytic_plans_view.xml              |  5 +-
 addons/stock/product.py                       | 24 +++++-----
 addons/stock/wizard/wizard_return.py          |  6 ++-
 39 files changed, 234 insertions(+), 164 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 1b7727e9737..30a18ac6efe 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1442,7 +1442,8 @@ class account_model(osv.osv):
     }
 
     _defaults = {
-        'legend':lambda *a:'''You can specify year, month and date in the name of the model using the following labels:\n\n%(year)s : To Specify Year \n%(month)s : To Specify Month \n%(date)s : Current Date\n\ne.g. My model on %(date)s''',
+        'legend': lambda self, cr, uid, context:_('You can specify year, month and date in the name of the model using the following labels:\n\n%(year)s : To Specify Year \n%(month)s : To Specify Month \n%(date)s : Current Date\n\ne.g. My model on %(date)s'),
+
     }
 
 account_model()
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index e60c04d9851..c57626d5720 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -82,8 +82,8 @@ class account_invoice(osv.osv):
             res[id] = self.test_paid(cr, uid, [id])
         return res
 
-    def _get_reference_type(self, cursor, user, context=None):
-        return [('none', 'Free Reference')]
+    def _get_reference_type(self, cr, uid, context=None):
+        return [('none', _('Free Reference'))]
 
     def _amount_residual(self, cr, uid, ids, name, args, context={}):
         res = {}
diff --git a/addons/account/project/wizard/wizard_account_analytic_line.py b/addons/account/project/wizard/wizard_account_analytic_line.py
index 59b1d7069e3..3c3a47e7cc6 100644
--- a/addons/account/project/wizard/wizard_account_analytic_line.py
+++ b/addons/account/project/wizard/wizard_account_analytic_line.py
@@ -23,6 +23,7 @@
 import wizard
 import pooler
 import time
+from tools.translate import _
 
 def _action_open_window(self, cr, uid, data, context): 
     domain=[]
@@ -35,7 +36,7 @@ def _action_open_window(self, cr, uid, data, context):
     elif to_date:
         domain=[('date','<=',to_date)]
     return {
-        'name': 'Analytic Entries',
+        'name': _('Analytic Entries'),
         'view_type': 'form',
         "view_mode": 'tree,form',
         'res_model': 'account.analytic.line',
diff --git a/addons/account/wizard/wizard_account_chart.py b/addons/account/wizard/wizard_account_chart.py
index eeeeb85e30a..a2edc2fec2f 100644
--- a/addons/account/wizard/wizard_account_chart.py
+++ b/addons/account/wizard/wizard_account_chart.py
@@ -60,6 +60,11 @@ class wizard_account_chart(wizard.interface):
         result = mod_obj._get_id(cr, uid, 'account', 'action_account_tree')
         id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
         result = act_obj.read(cr, uid, [id])[0]
+        if 'lang' in context:
+            import tools
+            trans_name = tools.translate(cr, 'ir.actions.act_window,name', 'model', context['lang'], result['name'])
+            if trans_name:
+                result['name'] = trans_name
         result['context'] = str({'fiscalyear': data['form']['fiscalyear'],'target_move':data['form']['target_move']})
         if data['form']['fiscalyear']:
             result['name']+=':'+pooler.get_pool(cr.dbname).get('account.fiscalyear').read(cr,uid,[data['form']['fiscalyear']])[0]['code']
diff --git a/addons/account/wizard/wizard_bank_reconcile.py b/addons/account/wizard/wizard_bank_reconcile.py
index 961ae553924..0c80ed5a7fb 100644
--- a/addons/account/wizard/wizard_bank_reconcile.py
+++ b/addons/account/wizard/wizard_bank_reconcile.py
@@ -40,7 +40,8 @@ def _action_open_window(self, cr, uid, data, context):
         raise Exception, _('You have to define the bank account\nin the journal definition for reconciliation.')
     return {
         'domain': "[('journal_id','=',%d), ('account_id','=',%d), ('state','<>','draft')]" % (form['journal_id'],account_id),
-        'name': 'Saisie Standard',
+        'name': _('Standard Encoding'),
+
         'view_type': 'form',
         'view_mode': 'tree,form',
         'res_model': 'account.move.line',
diff --git a/addons/account/wizard/wizard_general_ledger_report.py b/addons/account/wizard/wizard_general_ledger_report.py
index 1d5896204db..57cf73b2941 100644
--- a/addons/account/wizard/wizard_general_ledger_report.py
+++ b/addons/account/wizard/wizard_general_ledger_report.py
@@ -25,32 +25,6 @@ import pooler
 import locale
 import time
 
-#report_type =  '''<?xml version="1.0"?>
-#<form string="Select Report Type">
-#</form>'''
-#
-#dates_form = '''<?xml version="1.0"?>
-#<form string="Select period ">
-#    <field name="date_from" colspan="4"/>
-#    <field name="date_to" colspan="4"/>
-#    <field name="sortbydate" colspan="4"/>
-#    <field name="display_account" colspan="4"/>
-#    <field name="landscape" colspan="4"/>
-#    <field name="soldeinit"/>
-#    <field name="amount_currency" colspan="4"/>
-#</form>'''
-#
-#dates_fields = {
-#    'date_from': {'string':"Start date",'type':'date','required':True ,'default': lambda *a: time.strftime('%Y-01-01')},
-#    'date_to': {'string':"End date",'type':'date','required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
-#    'sortbydate':{'string':"Sort by",'type':'selection','selection':[('sort_date','Date'),('sort_mvt','Mouvement')]},
-#    'display_account':{'string':"Display accounts ",'type':'selection','selection':[('bal_mouvement','With movements'),('bal_all','All'),('bal_solde','With balance is not equal to 0')]},
-#    'landscape':{'string':"Print in Landscape Mode",'type':'boolean'},
-#    'soldeinit':{'string':"Inclure les soldes initiaux",'type':'boolean'},
-#    'amount_currency':{'string':"with amount in currency",'type':'boolean'}
-#
-#}
-
 account_form = '''<?xml version="1.0"?>
 <form string="Select Chart">
     <field name="Account_list" colspan="4"/>
@@ -108,11 +82,10 @@ period_fields = {
     'sortbydate':{'string':"Sort by:",'type':'selection','selection':[('sort_date','Date'),('sort_mvt','Movement')]},
     'display_account':{'string':"Display accounts ",'type':'selection','selection':[('bal_mouvement','With movements'),('bal_all','All'),('bal_solde','With balance is not equal to 0')]},
     'landscape':{'string':"Landscape Mode",'type':'boolean'},
-    'soldeinit':{'string':"Inclure les soldes initiaux",'type':'boolean'},
+    'soldeinit':{'string':"Include initial balances",'type':'boolean'},
     'amount_currency':{'string':"With Currency",'type':'boolean'},
     'date_from': {'string':"           Start date",'type':'date','required':True ,'default': lambda *a: time.strftime('%Y-01-01')},
     'date_to': {'string':"End date",'type':'date','required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
-    
 }
 def _check_path(self, cr, uid, data, context):
     if data['model'] == 'account.account':
diff --git a/addons/account/wizard/wizard_partner_balance_report.py b/addons/account/wizard/wizard_partner_balance_report.py
index 697b08fd16b..1c5290832dc 100644
--- a/addons/account/wizard/wizard_partner_balance_report.py
+++ b/addons/account/wizard/wizard_partner_balance_report.py
@@ -68,7 +68,7 @@ period_fields = {
         'selection':[('customer','Receivable Accounts'),('supplier','Payable Accounts'),('all','Receivable and Payable Accounts')],
         'required':True
     },
-    'soldeinit':{'string':" Inclure les soldes initiaux",'type':'boolean'},
+    'soldeinit':{'string':"Include initial balances",'type':'boolean'},
     'date1': {'string':'          Start date', 'type':'date', 'required':True,'default': lambda *a: time.strftime('%Y-01-01')},
     'date2': {'string':'End date', 'type':'date', 'required':True,'default': lambda *a: time.strftime('%Y-%m-%d')},
 }
diff --git a/addons/account/wizard/wizard_reconcile_select.py b/addons/account/wizard/wizard_reconcile_select.py
index d63725fdb1f..d61504003bb 100644
--- a/addons/account/wizard/wizard_reconcile_select.py
+++ b/addons/account/wizard/wizard_reconcile_select.py
@@ -21,6 +21,8 @@
 ##############################################################################
 
 import wizard
+from tools.translate import _
+
 
 _journal_form = '''<?xml version="1.0"?>
 <form string="%s">
@@ -34,7 +36,7 @@ _journal_fields = {
 def _action_open_window(self, cr, uid, data, context):
     return {
         'domain': "[('account_id','=',%d),('reconcile_id','=',False),('state','<>','draft')]" % data['form']['account_id'],
-        'name': 'Reconciliation',
+        'name': _('Reconciliation'),
         'view_type': 'form',
         'view_mode': 'tree,form',
         'view_id': False,
diff --git a/addons/account/wizard/wizard_third_party_ledger.py b/addons/account/wizard/wizard_third_party_ledger.py
index 80827378e0f..c84dbbbe4e0 100755
--- a/addons/account/wizard/wizard_third_party_ledger.py
+++ b/addons/account/wizard/wizard_third_party_ledger.py
@@ -74,7 +74,7 @@ period_fields = {
         'selection':[('customer','Receivable Accounts'),('supplier','Payable Accounts'),('all','Receivable and Payable Accounts')],
         'required':True
     },
-    'soldeinit':{'string':"Inclure les soldes initiaux",'type':'boolean'},
+    'soldeinit':{'string':"Include initial balances",'type':'boolean'},
     'reconcil':{'string':"       Include Reconciled Entries",'type':'boolean'},
     'page_split':{'string':"One Partner Per Page",'type':'boolean'},
     'date1': {'string':'        Start date', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-01-01')},
diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index 09fc74507fe..51459003d6b 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -144,17 +144,16 @@ def get_value_text(cr, uid, field_name,values,object, context={}):
                     if values:
                         if type(values)==tuple:
                             values=values[0]
-                        val=pool.get(model).read(cr,uid,[values],['name'])
+                        val=pool.get(model).read(cr,uid,[values],[pool.get(model)._rec_name])
                         if len(val):
-                            return val[0]['name']
-
+                            return val[0][pool.get(model)._rec_name]
                 elif field['ttype'] == 'many2many':
                     value=[]
                     if values:
                         for id in values:
-                            val=pool.get(model).read(cr,uid,[id],['name'])
+                            val=pool.get(model).read(cr,uid,[id],[pool.get(model)._rec_name])
                             if len(val):
-                                value.append(val[0]['name'])
+                                value.append(val[0][pool.get(model)._rec_name])
                     return value
 
                 elif field['ttype'] == 'one2many':
@@ -162,9 +161,10 @@ def get_value_text(cr, uid, field_name,values,object, context={}):
                     if values:
                         value=[]
                         for id in values:
-                            val=pool.get(model).read(cr,uid,[id],['name'])
+                            val=pool.get(model).read(cr,uid,[id],[pool.get(model)._rec_name])
+
                             if len(val):
-                                value.append(val[0]['name'])
+                                value.append(val[0][pool.get(model)._rec_name])
                         return value
             return values
         
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index d284da54904..85cab98107f 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -223,6 +223,7 @@ class crm_case_rule(osv.osv):
             ('create','Creation Date'),
             ('action_last','Last Action Date'),
             ('deadline','Deadline'),
+            ('date','Date'),
             ], 'Trigger Date', size=16),
         'trg_date_range': fields.integer('Delay after trigger date'),
         'trg_date_range_type': fields.selection([('minutes', 'Minutes'),('hour','Hours'),('day','Days'),('month','Months')], 'Delay type'),
@@ -435,6 +436,8 @@ class crm_case(osv.osv):
                             base = mx.DateTime.strptime(case.create_date[:19], '%Y-%m-%d %H:%M:%S')
                     elif action.trg_date_type=='deadline' and case.date_deadline:
                         base = mx.DateTime.strptime(case.date_deadline, '%Y-%m-%d')
+                    elif action.trg_date_type=='date' and case.date:
+                        base = mx.DateTime.strptime(case.date, '%Y-%m-%d')
                     if base:
                         fnct = {
                             'minutes': lambda interval: mx.DateTime.RelativeDateTime(minutes=interval),
@@ -531,7 +534,10 @@ class crm_case(osv.osv):
             return False
         for case in cases:
             if case.partner_id:
-                name = 'Case ' + keyword + ': ' + case.name
+                translated_keyword = keyword
+                if 'translated_keyword' in context:
+                    translated_keyword = context['translated_keyword']
+                name = _('Case') +  ' ' + translated_keyword + ': ' + case.name
                 if isinstance(name, str):
                     name = unicode(name, 'utf-8')
                 if len(name) > 64:
@@ -574,7 +580,7 @@ class crm_case(osv.osv):
         res = super(crm_case, self).create(cr, uid, *args, **argv)
         cases = self.browse(cr, uid, [res])
         cases[0].state # to fill the browse record cache
-        self.__log(cr,uid, cases, 'draft')
+        self.__log(cr,uid, cases, 'draft', context={'translated_keyword': _('draft')})
         self._action(cr,uid, cases, 'draft')
         return res
 
@@ -626,7 +632,7 @@ class crm_case(osv.osv):
 
     def case_log(self, cr, uid, ids,context={}, email=False, *args):
         cases = self.browse(cr, uid, ids)
-        self.__history(cr, uid, cases, 'Historize', history=True, email=email)
+        self.__history(cr, uid, cases, _('Historize'), history=True, email=email)
         return self.write(cr, uid, ids, {'description': False, 'som': False,
             'canal_id': False})
 
@@ -636,7 +642,7 @@ class crm_case(osv.osv):
             if not case.email_from:
                 raise osv.except_osv(_('Error!'),
                         _('You must put a Partner eMail to use this action!'))
-        self.__history(cr, uid, cases, 'Send', history=True, email=False)
+        self.__history(cr, uid, cases, _('Send'), history=True, email=False)
         for case in cases:
             self.write(cr, uid, [case.id], {
                 'description': False,
@@ -685,8 +691,8 @@ class crm_case(osv.osv):
     def case_close(self, cr, uid, ids, *args):
         cases = self.browse(cr, uid, ids)
         cases[0].state # to fill the browse record cache
-        self.__log(cr,uid, cases, 'done')
-        self.__history(cr, uid, cases, 'Close')
+        self.__log(cr,uid, cases, 'done', context={'translated_keyword': _('done')})
+        self.__history(cr, uid, cases, _('Close'))
         self.write(cr, uid, ids, {'state':'done', 'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')})
         #
         # We use the cache of cases to keep the old case state
@@ -705,15 +711,15 @@ class crm_case(osv.osv):
             else:
                 raise osv.except_osv(_('Error !'), _('You can not escalate this case.\nYou are already at the top level.'))
             self.write(cr, uid, ids, data)
-        self.__history(cr, uid, cases, 'escalate')
+        self.__history(cr, uid, cases, _('Escalate'))
         self._action(cr, uid, cases, 'escalate')
         return True
 
 
     def case_open(self, cr, uid, ids, *args):
         cases = self.browse(cr, uid, ids)
-        self.__log(cr, uid, cases, 'open')
-        self.__history(cr, uid, cases, 'Open')
+        self.__log(cr, uid, cases, 'open', context={'translated_keyword': _('open')})
+        self.__history(cr, uid, cases, _('Open'))
         for case in cases:
             data = {'state':'open', 'active':True}
             if not case.user_id:
@@ -729,8 +735,8 @@ class crm_case(osv.osv):
     def case_cancel(self, cr, uid, ids, *args):
         cases = self.browse(cr, uid, ids)
         cases[0].state # to fill the browse record cache
-        self.__log(cr, uid, cases, 'cancel')
-        self.__history(cr, uid, cases, 'Cancel')
+        self.__log(cr, uid, cases, 'cancel', context={'translated_keyword': _('cancel')})
+        self.__history(cr, uid, cases, _('Cancel'))
         self.write(cr, uid, ids, {'state':'cancel', 'active':True})
         self._action(cr,uid, cases, 'cancel')
         return True
@@ -738,8 +744,8 @@ class crm_case(osv.osv):
     def case_pending(self, cr, uid, ids, *args):
         cases = self.browse(cr, uid, ids)
         cases[0].state # to fill the browse record cache
-        self.__log(cr, uid, cases, 'pending')
-        self.__history(cr, uid, cases, 'Pending')
+        self.__log(cr, uid, cases, 'pending', context={'translated_keyword': _('draft')})
+        self.__history(cr, uid, cases, _('Pending'))
         self.write(cr, uid, ids, {'state':'pending', 'active':True})
         self._action(cr,uid, cases, 'pending')
         return True
@@ -747,8 +753,8 @@ class crm_case(osv.osv):
     def case_reset(self, cr, uid, ids, *args):
         cases = self.browse(cr, uid, ids)
         cases[0].state # to fill the browse record cache
-        self.__log(cr, uid, cases, 'draft')
-        self.__history(cr, uid, cases, 'Draft')
+        self.__log(cr, uid, cases, 'draft', context={'translated_keyword': _('draft')})
+        self.__history(cr, uid, cases, _('Draft'))
         self.write(cr, uid, ids, {'state':'draft', 'active':True})
         self._action(cr, uid, cases, 'draft')
         return True
diff --git a/addons/crm_configuration/wizard/meeting_planify.py b/addons/crm_configuration/wizard/meeting_planify.py
index f0c050de30f..9cf6ea89d62 100644
--- a/addons/crm_configuration/wizard/meeting_planify.py
+++ b/addons/crm_configuration/wizard/meeting_planify.py
@@ -27,6 +27,8 @@ import netsvc
 import ir
 import pooler
 
+from tools.translate import _
+
 case_form = """<?xml version="1.0"?>
 <form string="Planify Meeting">
     <field name="date"/>
@@ -54,7 +56,7 @@ class make_meeting(wizard.interface):
             'date': data['form']['date'],
             'duration': data['form']['duration']
         }, context=context)
-        case_obj._history(cr, uid, case_obj.browse(cr, uid, [data['id']]), 'meeting')
+        case_obj._history(cr, uid, case_obj.browse(cr, uid, [data['id']]), _('meeting'))
         return {}
 
     states = {
diff --git a/addons/crm_profiling/crm_profiling.py b/addons/crm_profiling/crm_profiling.py
index dc68e62ef1b..a7e702bec05 100644
--- a/addons/crm_profiling/crm_profiling.py
+++ b/addons/crm_profiling/crm_profiling.py
@@ -22,6 +22,8 @@
 from osv import fields,osv
 from osv import orm
 
+from tools.translate import _
+
 def _get_answers(cr, uid, ids):
     query = """
     select distinct(answer)
@@ -131,11 +133,9 @@ class questionnaire(osv.osv):
         from crm_profiling_question
         where id in ( select question from profile_questionnaire_quest_rel where questionnaire = %s)"""% data['form']['questionnaire_name']
         cr.execute(query)
-        
         quest_fields={}
         quest_form='''<?xml version="1.0"?>
-            <form string="Questionnaire">'''
-        
+            <form string="%s">''' % _('Questionnaire')
         for x in cr.fetchall():
             quest_form = quest_form + '''<field name="quest_form'''+str(x[1])+'''"/><newline/>'''
             quest_fields['quest_form'+str(x[1])] = {'string': str(x[0]), 'type': 'many2one', 'relation': 'crm_profiling.answer', 'domain': [('question_id','=',x[1])] }
diff --git a/addons/document/document.py b/addons/document/document.py
index 84c70b56c30..e7929f2ba90 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -36,6 +36,7 @@ import StringIO
 import random
 import string
 
+from tools import config
 
 def random_name():
     random.seed()
@@ -261,8 +262,9 @@ class document_directory(osv.osv):
             _parent(dir_id,path)
             path.append(self.pool.get(directory.ressource_type_id.model).browse(cr,uid,res_id).name)
             user=self.pool.get('res.users').browse(cr,uid,uid)
-            return "ftp://%s:%s@localhost:8021/%s/%s"%(user.login,user.password,cr.dbname,'/'.join(path))
-        return False    
+            return "ftp://%s:%s@localhost:%s/%s/%s"%(user.login,user.password,config.get('ftp_server_port',8021),cr.dbname,'/'.join(path))
+        return False
+
     def _check_recursion(self, cr, uid, ids):
         level = 100
         while len(ids):
@@ -364,7 +366,7 @@ class document_directory(osv.osv):
                     ressource_id=directory.ressource_id and directory.ressource_id.id or 0                
                 res=self.search(cr,uid,[('id','<>',directory.id),('name','=',name),('parent_id','=',parent_id),('ressource_parent_type_id','=',ressource_parent_type_id),('ressource_id','=',ressource_id)])
                 if len(res):
-	                return False
+                    return False
         if op=='create':
             res=self.search(cr,uid,[('name','=',name),('parent_id','=',parent_id),('ressource_parent_type_id','=',ressource_parent_type_id),('ressource_id','=',ressource_id)])
             if len(res):
diff --git a/addons/document/ftpserver/__init__.py b/addons/document/ftpserver/__init__.py
index f4b12525426..3856c5d47e1 100644
--- a/addons/document/ftpserver/__init__.py
+++ b/addons/document/ftpserver/__init__.py
@@ -4,7 +4,8 @@ import authorizer
 import abstracted_fs
 import netsvc
 
-PORT = 8021
+from tools import config
+PORT = config.get('ftp_server_port', 8021)
 HOST = ''
 
 class ftp_server(threading.Thread):
diff --git a/addons/event/event.py b/addons/event/event.py
index e593a1c38e8..e45f878456c 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -137,10 +137,12 @@ class event(osv.osv):
         'mail_confirm': fields.text('Confirmation Email', help="This email will be sent when the event gets confimed or when someone subscribes to a confirmed event. This is also the email sent to remind someone about the event."),
         'product_id':fields.many2one('product.product','Product', required=True),
     }
+
     _defaults = {
         'state': lambda *args: 'draft',
         'code': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'event.event'),
         'user_id': lambda self,cr,uid,ctx: uid,
+
     }
 event()
 
@@ -148,6 +150,8 @@ class event_registration(osv.osv):
 
     def _history(self, cr, uid,ids,keyword, history=False, email=False, context={}):
         for case in self.browse(cr, uid, ids):
+            if not case.case_id:
+                return True
             data = {
                 'name': keyword,
                 'som': case.som.id,
@@ -333,7 +337,8 @@ class event_registration(osv.osv):
         case_data = self.browse(cr,uid,ids)
         new_ids=[]
         for case in case_data:
-            new_ids.append(case.case_id.id)
+            if case.case_id:
+                new_ids.append(case.case_id.id)
         return getattr(self.pool.get('crm.case'),method)(cr, uid, new_ids, *args, **argv)
 
 
diff --git a/addons/hr/hr_department.py b/addons/hr/hr_department.py
index dc7deb8799b..fe687266521 100644
--- a/addons/hr/hr_department.py
+++ b/addons/hr/hr_department.py
@@ -73,7 +73,10 @@ class ir_action_window(osv.osv):
                 r['domain'] = r['domain'].replace(mystring, str(
                     self.pool.get('hr.department')._get_members(cr, uid)))
         if isinstance(ids, (int, long)):
-            return res[0]
+            if res:
+                return res[0]
+            else:
+                return False
         return res
 
 ir_action_window()
diff --git a/addons/hr_timesheet/report/user_timesheet.py b/addons/hr_timesheet/report/user_timesheet.py
index 3a90781135f..07742b451b1 100644
--- a/addons/hr_timesheet/report/user_timesheet.py
+++ b/addons/hr_timesheet/report/user_timesheet.py
@@ -24,6 +24,7 @@ import datetime
 
 from report.interface import report_rml
 from report.interface import toxml 
+from tools.translate import _
 
 import pooler
 
@@ -33,13 +34,23 @@ def lengthmonth(year, month):
     return [0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month]
 
 class report_custom(report_rml):
+
+    def get_month_name(self, cr, uid, month):
+        _months = {1:_("January"), 2:_("February"), 3:_("March"), 4:_("April"), 5:_("May"), 6:_("June"), 7:_("July"), 8:_("August"), 9:_("September"), 10:_("October"), 11:_("November"), 12:_("December")}
+        return _months[month]
+    def get_weekday_name(self, cr, uid, weekday):
+        _weekdays = {1:_('Mon'), 2:_('Tue'), 3:_('Wed'), 4:_('Thu'), 5:_('Fri'), 6:_('Sat'), 7:_('Sun')}
+        return _weekdays[weekday]
+
     def create_xml(self, cr, uid, ids, data, context):
 
         # Computing the dates (start of month: som, and end of month: eom)
         som = datetime.date(data['form']['year'], data['form']['month'], 1)
         eom = som + datetime.timedelta(lengthmonth(som.year, som.month))
-        date_xml = ['<date month="%s" year="%d" />' % (som.strftime('%B'), som.year), '<days>']
-        date_xml += ['<day number="%d" name="%s" />' % (x, som.replace(day=x).strftime('%a')) for x in range(1, lengthmonth(som.year, som.month)+1)]
+
+        date_xml = ['<date month="%s" year="%d" />' % (self.get_month_name(cr, uid, som.month), som.year), '<days>']
+        date_xml += ['<day number="%d" name="%s" weekday="%d" />' % (x, self.get_weekday_name(cr, uid, som.replace(day=x).weekday()+1), som.replace(day=x).weekday()+1) for x in range(1, lengthmonth(som.year, som.month)+1)]
+
         date_xml.append('</days>')
         date_xml.append('<cols>2.5cm%s,2cm</cols>\n' % (',0.7cm' * lengthmonth(som.year, som.month)))
         
diff --git a/addons/hr_timesheet/report/user_timesheet.xsl b/addons/hr_timesheet/report/user_timesheet.xsl
index d48e890ac4f..07bbd778ded 100644
--- a/addons/hr_timesheet/report/user_timesheet.xsl
+++ b/addons/hr_timesheet/report/user_timesheet.xsl
@@ -30,7 +30,7 @@
 					<blockFont name="Helvetica" size="6" start="0,2" stop="-2,-2"/>
 					<blockFont name="Helvetica-BoldOblique" size="8" start="0,-1" stop="-1,-1"/>
 					<blockBackground colorName="#AAAAAA" start="1,0" stop="-2,1"/>
-					<xsl:for-each select="/report/days/day[@name='Sat' or @name='Sun']">
+					<xsl:for-each select="/report/days/day[@weekday=6 or @weekday=7]">
 						<xsl:variable name="col" select="attribute::number" />
 						<blockBackground>
 							<xsl:attribute name="colorName">lightgrey</xsl:attribute>
@@ -131,4 +131,4 @@
 			</td>
 		</tr>
     </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/addons/hr_timesheet/report/users_timesheet.py b/addons/hr_timesheet/report/users_timesheet.py
index f84d8388aa7..8ba187da4a2 100644
--- a/addons/hr_timesheet/report/users_timesheet.py
+++ b/addons/hr_timesheet/report/users_timesheet.py
@@ -24,6 +24,9 @@ import datetime
 from report.interface import report_rml
 from report.interface import toxml
 
+from tools.translate import _
+
+
 def lengthmonth(year, month):
     if month == 2 and ((year % 4 == 0) and ((year % 100 != 0) or (year % 400 == 0))):
         return 29
@@ -67,13 +70,22 @@ def emp_create_xml(cr, id, som, eom):
     return xml
 
 class report_custom(report_rml):
+
+    def get_month_name(self, cr, uid, month):
+        _months = {1:_("January"), 2:_("February"), 3:_("March"), 4:_("April"), 5:_("May"), 6:_("June"), 7:_("July"), 8:_("August"), 9:_("September"), 10:_("October"), 11:_("November"), 12:_("December")}
+        return _months[month]
+    
+    def get_weekday_name(self, cr, uid, weekday):
+        _weekdays = {1:_('Mon'), 2:_('Tue'), 3:_('Wed'), 4:_('Thu'), 5:_('Fri'), 6:_('Sat'), 7:_('Sun')}
+        return _weekdays[weekday]
+
     def create_xml(self, cr, uid, ids, data, context):
     
         # Computing the dates (start of month: som, and end of month: eom)
         som = datetime.date(data['form']['year'], data['form']['month'], 1)
         eom = som + datetime.timedelta(lengthmonth(som.year, som.month))
-        date_xml = ['<date month="%s" year="%d" />' % (som.strftime('%B'), som.year), '<days>']
-        date_xml += ['<day number="%d" name="%s" />' % (x, som.replace(day=x).strftime('%a')) for x in range(1, lengthmonth(som.year, som.month)+1)]
+        date_xml = ['<date month="%s" year="%d" />' % (self.get_month_name(cr, uid, som.month), som.year), '<days>']
+        date_xml += ['<day number="%d" name="%s" weekday="%d" />' % (x, self.get_weekday_name(cr, uid, som.replace(day=x).weekday()+1), som.replace(day=x).weekday()+1) for x in range(1, lengthmonth(som.year, som.month)+1)]
         date_xml.append('</days>')
         date_xml.append('<cols>2.5cm%s,2cm</cols>\n' % (',0.7cm' * lengthmonth(som.year, som.month)))
         
@@ -82,6 +94,9 @@ class report_custom(report_rml):
             emp_xml += emp_create_xml(cr, id, som, eom)
 
         # Computing the xml
+        #Without this, report don't show non-ascii characters (TO CHECK)
+        date_xml = '\n'.join(date_xml)
+
         xml='''<?xml version="1.0" encoding="UTF-8" ?>
         <report>
         %s
diff --git a/addons/hr_timesheet/report/users_timesheet.xsl b/addons/hr_timesheet/report/users_timesheet.xsl
index b800ae2d008..7a06e04b409 100644
--- a/addons/hr_timesheet/report/users_timesheet.xsl
+++ b/addons/hr_timesheet/report/users_timesheet.xsl
@@ -30,7 +30,7 @@
 					<blockFont name="Helvetica" size="6" start="0,2" stop="-2,-2"/>
 					<blockFont name="Helvetica-BoldOblique" size="8" start="0,-1" stop="-1,-1"/>
 					<blockBackground colorName="#AAAAAA" start="1,0" stop="-2,1"/>
-					<xsl:for-each select="/report/days/day[@name='Sat' or @name='Sun']">
+					<xsl:for-each select="/report/days/day[@weekday=6 or @weekday=7]">
 						<xsl:variable name="col" select="attribute::number" />
 						<blockBackground>
 							<xsl:attribute name="colorName">lightgrey</xsl:attribute>
@@ -107,17 +107,17 @@
 						</td>
 					</xsl:for-each>
 					<td>
-						<xsl:value-of select="format-number(sum(//employee[@id=$id]/time-element),'##.##')"/>
+					    <xsl:value-of select="format-number(sum(//employee[@id=$id]/time-element),'##.##')"/>
 					</td>
 				</tr>
 			</xsl:for-each>
 			<tr>
-				<td>Total</td>
+				<td t="1">Total</td>
 				<xsl:for-each select="report/days/day">
 					<xsl:variable name="today" select="attribute::number"/>
-					<td t="1"><xsl:value-of select="format-number(sum(//time-element[@date=$today]),'##.##')"/></td>
+					<td><xsl:value-of select="format-number(sum(//time-element[@date=$today]),'##.##')"/></td>
 				</xsl:for-each>
-				<td t="1"><xsl:value-of select="format-number(sum(//time-element),'##.##')"/></td>
+				<td><xsl:value-of select="format-number(sum(//time-element),'##.##')"/></td>
 			</tr>
 		</blockTable>
 	</xsl:template>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
index 086136781bd..62353018520 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
@@ -117,7 +117,7 @@ class final_invoice_create(wizard.interface):
                     'discount': 0.0,
                     'invoice_line_tax_id': [(6,0,tax)],
                     'invoice_id': last_invoice,
-                    'name': ref+(product and ' - '+product.name or ''),
+                    'name': ref or '' +(product and ' - '+product.name or ''),
                     'product_id': product_id,
                     'uos_id': product_uom_id,
                     'account_id': account_id,
@@ -139,7 +139,7 @@ class final_invoice_create(wizard.interface):
                 'invoice_line_tax_id': [(6,0,tax)],
                 'invoice_id': last_invoice,
                 'name': product.name,
-                'product_id': product_id,
+                'product_id': product.id,
                 'uos_id': product.uom_id.id,
                 'account_id': account_id,
                 'account_analytic_id': account.id
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 8125ce3f2fe..b85cba38bf4 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -52,8 +52,11 @@ class invoice_create(wizard.interface):
             partner = account.partner_id
             if (not partner) or not (account.pricelist_id):
                 raise wizard.except_wizard(_('Analytic account incomplete'),
-                        _('Please fill in the partner and pricelist field '
-                        'in the analytic account:\n%s') % (account.name,))
+                        _('Please fill in the partner and pricelist field in the analytic account:\n%s') % (account.name,))
+
+            if not partner.address:
+                raise wizard.except_wizard(_('Partner incomplete'),
+                        _('Please fill in the address field in the partner: %s.') % (partner.name,))
 
             date_due = False
             if partner.property_payment_term:
@@ -150,7 +153,7 @@ class invoice_create(wizard.interface):
 
         return {
             'domain': "[('id','in', ["+','.join(map(str,invoices))+"])]",
-            'name': 'Invoices',
+            'name': _('Invoices'),
             'view_type': 'form',
             'view_mode': 'tree,form',
             'res_model': 'account.invoice',
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index e0b326f7fca..36e7492d8b9 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -874,7 +874,7 @@ class mrp_procurement(osv.osv):
         properties = [x.id for x in procurement.property_ids]
         bom_id = self.pool.get('mrp.bom')._bom_find(cr, uid, procurement.product_id.id, procurement.product_uom.id, properties)
         if not bom_id:
-            cr.execute('update mrp_procurement set message=%s where id=%d', ('No BoM defined for this product !', procurement.id))
+            cr.execute('update mrp_procurement set message=%s where id=%d', (_('No BoM defined for this product !'), procurement.id))
             return False
         return True
 
@@ -912,7 +912,7 @@ class mrp_procurement(osv.osv):
             if procurement.product_id.product_tmpl_id.supply_method<>'buy':
                 return False
             if not procurement.product_id.seller_ids:
-                cr.execute('update mrp_procurement set message=%s where id=%d', ('No supplier defined for this product !', procurement.id))
+                cr.execute('update mrp_procurement set message=%s where id=%d', (_('No supplier defined for this product !'), procurement.id))
                 return False
             partner = procurement.product_id.seller_ids[0].name
             if user.company_id and user.company_id.partner_id:
@@ -920,7 +920,7 @@ class mrp_procurement(osv.osv):
                     return False
             address_id = self.pool.get('res.partner').address_get(cr, uid, [partner.id], ['delivery'])['delivery']
             if not address_id:
-                cr.execute('update mrp_procurement set message=%s where id=%d', ('No address defined for the supplier', procurement.id))
+                cr.execute('update mrp_procurement set message=%s where id=%d', (_('No address defined for the supplier'), procurement.id))
                 return False
         return True
 
@@ -956,7 +956,7 @@ class mrp_procurement(osv.osv):
         return True
 
     def action_move_assigned(self, cr, uid, ids):
-        self.write(cr, uid, ids, {'state':'running','message':'from stock: products assigned.'})
+        self.write(cr, uid, ids, {'state':'running','message':_('from stock: products assigned.')})
         return True
 
     def _check_make_to_stock_service(self, cr, uid, procurement, context={}):
@@ -970,7 +970,7 @@ class mrp_procurement(osv.osv):
                 ok = ok and self.pool.get('stock.move').action_assign(cr, uid, [id])
                 cr.execute('select count(id) from stock_warehouse_orderpoint where product_id=%d', (procurement.product_id.id,))
                 if not cr.fetchone()[0]:
-                    cr.execute('update mrp_procurement set message=%s where id=%d', ('from stock and no minimum orderpoint rule defined', procurement.id))
+                    cr.execute('update mrp_procurement set message=%s where id=%d', (_('from stock and no minimum orderpoint rule defined'), procurement.id))
         return ok
 
     def action_produce_assign_service(self, cr, uid, ids, context={}):
diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py
index 5a044a32935..5342e5b9e87 100644
--- a/addons/mrp/report/price.py
+++ b/addons/mrp/report/price.py
@@ -25,6 +25,8 @@ import pooler
 from report.interface import report_rml
 from report.interface import toxml
 
+from tools.translate import _
+
 
 #FIXME: we should use toxml
 class report_custom(report_rml):
@@ -116,38 +118,38 @@ class report_custom(report_rml):
         """
         header = """
             <header>
-            <field>Product name</field>
-            <field>Product supplier</field>
-            <field>Product quantity</field>
-            <field>Product uom</field>
-            <field>Product Standard Price</field>
-            <field>Unit Product Price</field>
+            <field>%s</field>
+            <field>%s</field>
+            <field>%s</field>
+            <field>%s</field>
+            <field>%s</field>
+            <field>%s</field>
             </header>
-            """
+            """ % (_('Product name'), _('Product supplier'), _('Product quantity'), _('Product uom'), _('Product Standard Price'), _('Unit Product Price'))
         workcenter_header = """
             <lines style='header'>
                 <row>
-                    <col>Workcenter name</col>
+                    <col>%s</col>
                     <col/>
                     <col/>
                     <col/>
-                    <col>Cycles Cost</col>
-                    <col>Hours Cost</col>
+                    <col>%s</col>
+                    <col>%s</col>
                 </row>
             </lines>
-        """
+        """ % (_('Workcenter name'), _('Cycles Cost'), _('Hours Cost'))
         prod_header = """
             <lines style='header'>
                 <row>
-                    <col para='yes'>Product name</col>
-                    <col para='yes'>Product supplier</col>
-                    <col para='yes'>Product Quantity</col>
-                    <col para='yes'>Product uom</col>
-                    <col para='yes'>Product Standard Price</col>
-                    <col para='yes'>Unit Product Price</col>
+                    <col para='yes'>%s</col>
+                    <col para='yes'>%s</col>
+                    <col para='yes'>%s</col>
+                    <col para='yes'>%s</col>
+                    <col para='yes'>%s</col>
+                    <col para='yes'>%s</col>
                 </row>
             </lines>
-        """
+        """ % (_('Product name'), _('Product supplier'), _('Product Quantity'), _('Product uom'), _('Product Standard Price'), _('Unit Product Price'))
 
         company_currency = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid).company_id.currency_id.id
         first = True
@@ -171,8 +173,7 @@ class report_custom(report_rml):
                 if not first:
                     xml += prod_header
                 xml += "<lines style='lines'>" + xml_tmp + '</lines>'
-                xml += "<lines style='sub_total'><row><col>SUBTOTAL : </col><col>(for " + str(number) + " products)</col><col/><col/><col>" + '%.2f' % total_strd + '</col><col>' + '%.2f' % total  + '</col></row></lines>'
-
+                xml += "<lines style='sub_total'><row><col>%s : </col><col>(" % (_('SUBTOTAL')) + str(number) + " %s)</col><col/><col/><col>" % (_('products')) + '%.2f' % total_strd + '</col><col>' + '%.2f' % total  + '</col></row></lines>'
                 total2 = 0
                 xml_tmp = ''
                 for wrk in (sub_boms and sub_boms[1]):
@@ -182,11 +183,12 @@ class report_custom(report_rml):
                 if xml_tmp:
                     xml += workcenter_header
                     xml += "<lines style='lines'>" + xml_tmp + '</lines>'
-                    xml += "<lines style='sub_total'><row><col>SUBTOTAL : </col><col>(for " + str(number) + " products)</col><col/><col/><col/><col>" + '%.2f' % total2 + '</col></row></lines>'
-                xml += "<lines style='total'><row><col>TOTAL : </col><col>(for " + str(number) + " products)</col><col/><col/><col>" + '%.2f' % (total_strd+total2) + "</col><col>" + '%.2f' % (total+total2) + '</col></row></lines>'
+                    xml += "<lines style='sub_total'><row><col>%s : </col><col>(" % (_('SUBTOTAL')) + str(number) + " %s)</col><col/><col/><col/><col>" % (_('products')) + '%.2f' % total2 + '</col></row></lines>'
+                xml += "<lines style='total'><row><col>%s : </col><col>(" % (_('TOTAL')) + str(number) + " %s)</col><col/><col/><col>" % (_('products')) + '%.2f' % (total_strd+total2) + "</col><col>" + '%.2f' % (total+total2) + '</col></row></lines>'
+
                 first = False
 
-        xml = '<?xml version="1.0" ?><report>' + config_start + '<report-header>Product Cost Structure\n\r' + prod.name  + '</report-header>'+ config_stop +  header + xml + '</report>'
+        xml = '<?xml version="1.0" ?><report>' + config_start + '<report-header>%s\n\r' % (_('Product Cost Structure')) + prod.name  + '</report-header>'+ config_stop +  header + xml + '</report>'
 
         return xml
 
diff --git a/addons/mrp/report/workcenter_load.py b/addons/mrp/report/workcenter_load.py
index cb0c6378546..820654b821e 100644
--- a/addons/mrp/report/workcenter_load.py
+++ b/addons/mrp/report/workcenter_load.py
@@ -110,7 +110,7 @@ class report_custom(report_int):
         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'])
+        dates = self._compute_dates(datas['form']['time_unit'], time.strftime('%Y-%m-%d'), res['stop'][:10])
         dates_list = dates.keys()
         dates_list.sort()
         x_index = []
@@ -151,7 +151,7 @@ class report_custom(report_int):
                                 AND (mrp_workcenter.id=%d) \
                                 AND (mrp_production.date_planned BETWEEN %s AND %s) \
                             GROUP BY mrp_production_workcenter_line.workcenter_id, mrp_workcenter.name, mrp_workcenter.id \
-                            ORDER BY mrp_workcenter.id", (workcenter['id'], dates[date]['start'], dates[date]['stop']))
+                            ORDER BY mrp_workcenter.id", (workcenter['id'], dates[date]['start'] + ' 00:00:00', dates[date]['stop'] + ' 23:59:59'))
                 res = cr.dictfetchall()
                 if not res:
                     vals.append(0.0)
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index bf8a9f8a640..53ae321f60c 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -93,7 +93,7 @@ class mrp_repair(osv.osv):
         'guarantee_limit': fields.date('Guarantee limit', help="The garantee limit is computed as: last move date + warranty defined on selected product. If the current date is below the garantee limit, each operation and fee you will add will be set as 'not to invoiced' by default. Note that you can change manually afterwards."),
         'operations' : fields.one2many('mrp.repair.line', 'repair_id', 'Operation Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', help='The pricelist comes from the selected partner, by default.'),
-        'partner_invoice_id':fields.many2one('res.partner.address', 'Invoice to',  domain="[('partner_id','=',partner_id)]"),
+        'partner_invoice_id':fields.many2one('res.partner.address', 'Invoicing Address',  domain="[('partner_id','=',partner_id)]"),
         'invoice_method':fields.selection([
             ("none","No Invoice"),
             ("b4repair","Before Repair"),
@@ -374,7 +374,6 @@ class mrp_repair(osv.osv):
         res = {}    
         company = self.pool.get('res.users').browse(cr, uid, uid).company_id
         for repair in self.browse(cr, uid, ids, context=context): 
-            #TODO: create the moves add/remove
             for move in repair.operations:
                 move_id = self.pool.get('stock.move').create(cr, uid, {
                     'name': move.name,
@@ -385,7 +384,7 @@ class mrp_repair(osv.osv):
                     'location_id': move.location_id.id,
                     'location_dest_id': move.location_dest_id.id,
                     'tracking_id': False,
-                    'state': 'assigned',
+                    'state': 'done',
                 })
                 self.pool.get('mrp.repair.line').write(cr, uid, [move.id], {'move_id': move_id})
 
@@ -397,7 +396,7 @@ class mrp_repair(osv.osv):
                     'address_id': repair.address_id and repair.address_id.id or False,
                     'note': repair.internal_notes,
                     'invoice_state': 'none',
-                    'type': 'out',  # FIXME delivery ?
+                    'type': 'out',
                 })
                 wf_service = netsvc.LocalService("workflow")
                 wf_service.trg_validate(uid, 'stock.picking', picking, 'button_confirm', cr)
@@ -499,8 +498,8 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
         'product_uom_qty': fields.float('Quantity (UoM)', digits=(16,2), required=True),
         'product_uom': fields.many2one('product.uom', 'Product UoM', required=True),
         'invoice_line_id': fields.many2one('account.invoice.line', 'Invoice Line', readonly=True),
-        'location_id': fields.many2one('stock.location', 'Source Location', required=True, select=True),
-        'location_dest_id': fields.many2one('stock.location', 'Dest. Location', required=True, select=True),      
+        'location_id': fields.many2one('stock.location', 'Source Location', domain=[('type','!=','view')], required=True, select=True),
+        'location_dest_id': fields.many2one('stock.location', 'Dest. Location', domain=[('type','!=','view')], required=True, select=True),
         'move_id': fields.many2one('stock.move', 'Inventory Move', readonly=True),
         'state': fields.selection([('draft','Draft'),('confirmed','Confirmed'),('done','Done'),('cancel','Canceled')], 'Status', required=True, readonly=True),
     }
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index ae13bc09f64..15dfd109b59 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -199,9 +199,18 @@
             <field name="res_model">mrp.repair</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','=','confirmed')]</field>
+            <field name="domain">[('state','=','under_repair')]</field>
         </record>
-        
+
+        <record id="action_repair_ready_tree" model="ir.actions.act_window">
+            <field name="name">Repairs Ready to Start</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.repair</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','!=','draft'),('state','!=','under_repair'),('state','!=','2binvoiced'),('state','!=','invoice_except'),('state','!=','done'),('state','!=','cancel'),]</field>
+        </record>
+
         <record id="action_repair_2binvoiced_tree" model="ir.actions.act_window">
             <field name="name">Repairs to be invoiced</field>
             <field name="type">ir.actions.act_window</field>
@@ -214,8 +223,10 @@
         <menuitem action="action_repair_order_tree" id="menu_repair_order" parent="mrp.menu_mrp_root" name="Repairs"/>
         
         <menuitem action="action_repair_quotation_tree" id="menu_repair_quotation" parent="menu_repair_order"/>
-        
+
         <menuitem action="action_repair_progress_tree" id="menu_repair_progress" parent="menu_repair_order"/>
+
+        <menuitem action="action_repair_ready_tree" id="menu_repair_ready" parent="menu_repair_order"/>
     	
     	<menuitem action="action_repair_2binvoiced_tree" id="menu_repair_2binvoiced" parent="menu_repair_order"/>
     	
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 247d098e69c..8df19271288 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -36,8 +36,16 @@ class price_type(osv.osv):
         sale and purchase prices based on some fields of the product.
     """
     def _price_field_get(self, cr, uid, context={}):
-        cr.execute('select name, field_description from ir_model_fields where model in (%s,%s) and ttype=%s order by name', ('product.product', 'product.template', 'float'))
-        return cr.fetchall()
+        import tools
+        cr.execute('select name, field_description, model from ir_model_fields where model in (%s,%s) and ttype=%s order by name', ('product.product', 'product.template', 'float'))
+        res = []
+        for field in cr.dictfetchall():
+            desc = tools.translate(cr, field['model'] + ',' + field['name'], 'field', context.get('lang', False) or 'en_US')
+            if not desc:
+                desc = field['field_description']
+            res.append((field['name'], desc))
+        return res
+
     def _get_currency(self, cr, uid, ctx):
         comp = self.pool.get('res.users').browse(cr,uid,uid).company_id
         if not comp:
@@ -297,9 +305,16 @@ product_pricelist_version()
 class product_pricelist_item(osv.osv):
     def _price_field_get(self, cr, uid, context={}):
         cr.execute('select id,name from product_price_type where active')
-        result = cr.fetchall()
-        result.append((-1,'Other Pricelist'))
-        result.append((-2,'Partner section of the product form'))
+        import tools
+        result = []
+        for line in cr.fetchall():
+            transl_name = tools.translate(cr, 'product.price.type,name', 'model', ('lang' in context) and context['lang'] or 'en_US', line[1])
+            if not transl_name:
+                transl_name = line[1]
+            result.append((line[0], transl_name))
+
+        result.append((-1, _('Other Pricelist')))
+        result.append((-2, _('Partner section of the product form')))
         return result
 
     _name = "product.pricelist.item"
diff --git a/addons/product/report/product_label.xsl b/addons/product/report/product_label.xsl
index 2b3d05d2f14..5c52e21227f 100644
--- a/addons/product/report/product_label.xsl
+++ b/addons/product/report/product_label.xsl
@@ -66,7 +66,7 @@
 				<td>
 					<para style="nospace"><xsl:value-of select="code"/></para>
 				</td><td>
-					<para style="nospace"><xsl:value-of select="price"/> EUR</para>
+					<para style="nospace" t="1"><xsl:value-of select="price"/> EUR</para>
 				</td>
 			</tr><tr>
 				<td>
diff --git a/addons/product/report/product_pricelist.py b/addons/product/report/product_pricelist.py
index 87b7d6ad3e9..513d396a4b4 100644
--- a/addons/product/report/product_pricelist.py
+++ b/addons/product/report/product_pricelist.py
@@ -24,6 +24,9 @@ import time
 from report import report_sxw
 from osv import osv
 import pooler
+
+from tools.translate import _
+
 parents = {
     'tr':1,
     'li':1,
@@ -45,16 +48,19 @@ class product_pricelist(report_sxw.rml_parse):
             'qty_header':self._qty_header,
         })
     def _qty_header(self,form):
+        def _get_unit_text(obj, cr, uid, par_qty):
+            if form[q]==1:
+                return _('%d unit')%(par_qty)
+            else:
+                return _('%d units')%(par_qty)
+
         qty=[]
         self.pricelist=form['price_list']
         for i in range(1,6):
             q = 'qty%d'%i
             if form[q]:
                 self.quantity.append(form[q])
-                if form[q]==1:
-                    qty.append('%d unit'%(form[q]))
-                else:
-                    qty.append('%d units'%(form[q]))
+                qty.append(_get_unit_text(self, self.cr, self.uid, form[q]))
         return qty
 
 
diff --git a/addons/product_margin/wizard/wizard_product_margin.py b/addons/product_margin/wizard/wizard_product_margin.py
index fec60501960..920fd3469ee 100644
--- a/addons/product_margin/wizard/wizard_product_margin.py
+++ b/addons/product_margin/wizard/wizard_product_margin.py
@@ -24,6 +24,8 @@ import wizard
 import pooler
 import time
 
+from tools.translate import _
+
 def _action_open_window(self, cr, uid, data, context):
     cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('product.margin.graph', 'graph'))
     view_res3 = cr.fetchone()[0]
@@ -32,7 +34,7 @@ def _action_open_window(self, cr, uid, data, context):
     cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('product.margin.tree', 'tree'))
     view_res = cr.fetchone()[0]
     return {
-        'name': 'Product Margins',
+        'name': _('Product Margins'),
         'context':{'date_from':data['form']['from_date'],'date_to':data['form']['to_date'],'invoice_state' : data['form']['invoice_state']},
         'view_type': 'form',
         "view_mode": 'tree,form,graph',
diff --git a/addons/project/report/gantt.py b/addons/project/report/gantt.py
index 801f61a14f2..fb426a098a3 100644
--- a/addons/project/report/gantt.py
+++ b/addons/project/report/gantt.py
@@ -42,6 +42,7 @@ class GanttCanvas(object):
             user=user.replace('/', '//')
         if hasattr(name, 'replace'):
             name=name.replace('/', '//')
+        name = name.encode('ascii', 'ignore')
         if user not in self._datas:
             self._datas[user] = []
         for f in datas:
diff --git a/addons/project/report/project_report.xsl b/addons/project/report/project_report.xsl
index f87611b1b5a..c0b475805c7 100644
--- a/addons/project/report/project_report.xsl
+++ b/addons/project/report/project_report.xsl
@@ -59,11 +59,11 @@
 	<xsl:template match="tasks">
 		<blockTable style="tasks" colWidths="10cm,1.6cm,1.6cm,2cm,2.5cm">
 		<tr>
-			<td>Tasks</td>
-			<td>Hours</td>
-			<td>Done</td>
-			<td>Deadline</td>
-			<td>Responsible</td>
+			<td t="True">Tasks</td>
+			<td t="True">Hours</td>
+			<td t="True">Done</td>
+			<td t="True">Deadline</td>
+			<td t="True">Responsible</td>
 		</tr>
 		<xsl:apply-templates select="task"/>
 		</blockTable>
@@ -76,24 +76,24 @@
 		<spacer length="1cm"/>
 		<blockTable colWidths="3cm,6cm,3cm,6cm" style="project">
 		<tr>
-			<td>Manager:</td>
+			<td t="True">Manager:</td>
 			<td><para><b><xsl:value-of select="manager"/></b></para></td>
-			<td>Members:</td>
+			<td t="True">Members:</td>
 			<td><para><xsl:apply-templates select="members"/></para></td>
 		</tr><tr>
-			<td>Project:</td>
+			<td t="True">Project:</td>
 			<td><xsl:value-of select="parent"/></td>
 			<td></td>
 			<td></td>
 		</tr><tr>
-			<td>Date Start:</td>
+			<td t="True">Date Start:</td>
 			<td><xsl:value-of select="date_start"/></td>
-			<td>Date Stop:</td>
+			<td t="True">Date Stop:</td>
 			<td><xsl:value-of select="date_stop"/></td>
 		</tr><tr>
-			<td>Planned Hours:</td>
+			<td t="True">Planned Hours:</td>
 			<td><xsl:value-of select="planned_hours"/></td>
-			<td>Effective Hours:</td>
+			<td t="True">Effective Hours:</td>
 			<td><xsl:value-of select="effective_hours"/></td>
 		</tr>
 		</blockTable>
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index b0dac7dd5f5..655029f1c68 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -57,7 +57,7 @@ class project_work(osv.osv):
         if line_id in list_avail_ids:
             obj = self.pool.get('hr.analytic.timesheet')
             if 'name' in vals:
-                vals_line['name']=task.name+': '+vals['name']
+            vals_line['name']=task.name+': '+vals['name']
             if 'user_id' in vals:
                 vals_line['user_id']=vals['user_id']
             if 'date' in vals:
diff --git a/addons/report_task/report_task_view.xml b/addons/report_task/report_task_view.xml
index b258465dd0d..60a2a0a7894 100644
--- a/addons/report_task/report_task_view.xml
+++ b/addons/report_task/report_task_view.xml
@@ -15,6 +15,7 @@
                     <field name="task_nbr" select="2"/>
                     <field name="task_hrs" select="2"/>
                     <field name="task_progress" select="2"/>
+                    <field name="task_state" select="1"/>
                 </form>
             </field>
         </record>
@@ -42,6 +43,7 @@
                     <field name="task_nbr"/>
                     <field name="task_hrs"/>
                     <field name="task_progress"/>
+                    <field name="task_state"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/sale_analytic_plans/sale_analytic_plans_view.xml b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
index fdab5de1399..0fe67b5ff22 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans_view.xml
+++ b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
@@ -18,10 +18,7 @@
 		<field name="type">form</field>
 		<field name="inherit_id" ref="sale.view_order_form"/>
 		<field name="arch" type="xml">
-			<field name="product_id"
-				on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], True, parent.date_order)"
-				context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
-				select="1" position="after">
+			<field name="product_id" position="after">
 				<field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]"/>
 			</field>
 		</field>
diff --git a/addons/stock/product.py b/addons/stock/product.py
index 23fa32b7e27..35e49f5f95e 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -21,6 +21,8 @@
 ##############################################################################
 
 from osv import fields, osv
+from tools.translate import _
+
 
 class product_product(osv.osv):
     _inherit = "product.product"
@@ -161,36 +163,36 @@ class product_product(osv.osv):
             if fields:
                 if location_info.usage == 'supplier':
                     if fields.get('virtual_available'):
-                        res['fields']['virtual_available']['string'] = 'Futur Receptions'
+                        res['fields']['virtual_available']['string'] = _('Futur Receptions')
                     if fields.get('qty_available'):
-                        res['fields']['qty_available']['string'] = 'Received Qty'
+                        res['fields']['qty_available']['string'] = _('Received Qty')
 
                 if location_info.usage == 'internal':
                     if fields.get('virtual_available'):
-                        res['fields']['virtual_available']['string'] = 'Futur Stock'
+                        res['fields']['virtual_available']['string'] = _('Futur Stock')
 
                 if location_info.usage == 'customer':
                     if fields.get('virtual_available'):
-                        res['fields']['virtual_available']['string'] = 'Futur Deliveries'
+                        res['fields']['virtual_available']['string'] = _('Futur Deliveries')
                     if fields.get('qty_available'):
-                        res['fields']['qty_available']['string'] = 'Delivered Qty'
+                        res['fields']['qty_available']['string'] = _('Delivered Qty')
 
                 if location_info.usage == 'inventory':
                     if fields.get('virtual_available'):
-                        res['fields']['virtual_available']['string'] = 'Futur P&L'
-                    res['fields']['qty_available']['string'] = 'P&L Qty'
+                        res['fields']['virtual_available']['string'] = _('Futur P&L')
+                    res['fields']['qty_available']['string'] = _('P&L Qty')
 
                 if location_info.usage == 'procurement':
                     if fields.get('virtual_available'):
-                        res['fields']['virtual_available']['string'] = 'Futur Qty'
+                        res['fields']['virtual_available']['string'] = _('Futur Qty')
                     if fields.get('qty_available'):
-                        res['fields']['qty_available']['string'] = 'Unplanned Qty'
+                        res['fields']['qty_available']['string'] = _('Unplanned Qty')
 
                 if location_info.usage == 'production':
                     if fields.get('virtual_available'):
-                        res['fields']['virtual_available']['string'] = 'Futur Productions'
+                        res['fields']['virtual_available']['string'] = _('Futur Productions')
                     if fields.get('qty_available'):
-                        res['fields']['qty_available']['string'] = 'Produced Qty'
+                        res['fields']['qty_available']['string'] = _('Produced Qty')
 
         return res
 product_product()
diff --git a/addons/stock/wizard/wizard_return.py b/addons/stock/wizard/wizard_return.py
index 44b75ec5e2e..c9a02ce27c0 100644
--- a/addons/stock/wizard/wizard_return.py
+++ b/addons/stock/wizard/wizard_return.py
@@ -27,6 +27,8 @@ from tools.misc import UpdateableStr
 import netsvc
 import time
 
+from tools.translate import _
+
 arch=UpdateableStr()
 fields={}
 
@@ -41,7 +43,7 @@ def _get_returns(self, cr, uid, data, context):
     pick=pick_obj.browse(cr, uid, [data['id']])[0]
     res={}
     fields.clear()
-    arch_lst=['<?xml version="1.0"?>', '<form string="Return lines">', '<label string="Provide the quantities of the returned products." colspan="4"/>']
+    arch_lst=['<?xml version="1.0"?>', '<form string="%s">' % _('Return lines'), '<label string="%s" colspan="4"/>' % _('Provide the quantities of the returned products.')]
     for m in [line for line in pick.move_lines]:
         quantity=m.product_qty
         arch_lst.append('<field name="return%s"/>\n<newline/>' % (m.id,))
@@ -52,7 +54,7 @@ def _get_returns(self, cr, uid, data, context):
         new_invoice_state='2binvoiced'
     else:
         new_invoice_state=pick.invoice_state
-    fields['invoice_state']={'string':'Invoice state', 'type':'selection', 'default':make_default(new_invoice_state), 'required':True, 'selection':[('2binvoiced', 'to be invoiced'), ('none', 'None')]}
+    fields['invoice_state']={'string':_('Invoice state'), 'type':'selection', 'default':make_default(new_invoice_state), 'required':True, 'selection':[('2binvoiced', _('to be invoiced')), ('none', _('None'))]}
     arch_lst.append('</form>')
     arch.string='\n'.join(arch_lst)
     return res

From 693aa09f7aa0b0f603cb2ea1104d01f3c1e2f5c7 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 8 Dec 2008 21:35:47 +0100
Subject: [PATCH 71/82] merge

bzr revid: fp@tinyerp.com-20081208203547-047ga2mbu6h19e2w
---
 addons/account_budget/__terp__.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/addons/account_budget/__terp__.py b/addons/account_budget/__terp__.py
index e61f81ffbae..5f946b91fa5 100644
--- a/addons/account_budget/__terp__.py
+++ b/addons/account_budget/__terp__.py
@@ -27,16 +27,21 @@
     "category" : "Generic Modules/Accounting",
     "description": """This module allow accountants to manage analytic and crossovered budgets.
 
-    Once the Master Budgets and the Budgets defined (in Financial Management/Budgets/), the Project Managers can set the planned amount on each Analytic Account.
+Once the Master Budgets and the Budgets defined (in Financial
+Management/Budgets/), the Project Managers can set the planned amount on each
+Analytic Account.
 
-    The accountant has the possibility to see the total of amount planned for each Budget and Master Budget in order to ensure the total planned is not greater/lower than what he planned for this Budget/Master Budget. Each list of record can also be switched to a graphical view of it.
+The accountant has the possibility to see the total of amount planned for each
+Budget and Master Budget in order to ensure the total planned is not
+greater/lower than what he planned for this Budget/Master Budget. Each list of
+record can also be switched to a graphical view of it.
 
-    Three reports are available:
-        1. The first is available from a list of Budgets. It gives the spreading, for these Budgets, of the Analytic Accounts per Master Budgets.
+Three reports are available:
+    1. The first is available from a list of Budgets. It gives the spreading, for these Budgets, of the Analytic Accounts per Master Budgets.
 
-        2. The second is a summary of the previous one, it only gives the spreading, for the selected Budgets, of the Analytic Accounts.
+    2. The second is a summary of the previous one, it only gives the spreading, for the selected Budgets, of the Analytic Accounts.
 
-        3. The last one is available from the Analytic Chart of Accounts. It gives the spreading, for the selected Analytic Accounts, of the Master Budgets per Budgets.
+    3. The last one is available from the Analytic Chart of Accounts. It gives the spreading, for the selected Analytic Accounts, of the Master Budgets per Budgets.
 
 """,
     "depends" : ["account"],

From c965e0d18acd52e9b2e74de4344fbbd5eee79bf0 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 9 Dec 2008 09:07:06 +0100
Subject: [PATCH 72/82] improved

bzr revid: fp@tinyerp.com-20081209080706-65dhy5y1o4046lvb
---
 addons/sale/sale_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index b23567199bd..41b6d336b4d 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -388,6 +388,7 @@
                             <field name="product_uom_qty" readonly="1" select="2"/>
                             <field name="product_uom" readonly="2"/>
                             <field name="product_id" readonly="1" select="1"/>
+                            <field name="order_partner_id" readonly="1" select="1" invisible="1"/>
 
                             <separator colspan="4" string="Manual Designation"/>
                             <field colspan="4" name="name" select="2"/>

From 64439019ac7e07ed44f68a43271fdfff900d4b03 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <christophe@tinyerp.com>
Date: Tue, 9 Dec 2008 11:16:57 +0100
Subject: [PATCH 73/82] [FIX] ident error

bzr revid: christophe@tinyerp.com-20081209101657-k65qmr4jr21o9kbb
---
 addons/project_timesheet/project_timesheet.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 655029f1c68..7d24e4a1fc0 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -57,7 +57,7 @@ class project_work(osv.osv):
         if line_id in list_avail_ids:
             obj = self.pool.get('hr.analytic.timesheet')
             if 'name' in vals:
-            vals_line['name']=task.name+': '+vals['name']
+				vals_line['name']=task.name+': '+vals['name']
             if 'user_id' in vals:
                 vals_line['user_id']=vals['user_id']
             if 'date' in vals:

From 37eea663e59fb57a8ed9e7ad2c4db75cea4a1cdb Mon Sep 17 00:00:00 2001
From: Christophe Simonis <christophe@tinyerp.com>
Date: Tue, 9 Dec 2008 13:05:11 +0100
Subject: [PATCH 74/82] [FIX] the server pass the context to search
 functions...

bzr revid: christophe@tinyerp.com-20081209120511-el7ekjsfgc3jhkh2
---
 addons/membership/membership.py         | 4 ++--
 addons/mrp_operations/mrp_operations.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 4c47a5f9187..a7049c0f204 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -225,8 +225,8 @@ membership_line()
 class Partner(osv.osv):
     '''Partner'''
 
-    def _membership_state_search_inv(self,cr,uid,ids):
-        data_inv = self.pool.get('account.invoice').browse(cr,uid,ids)
+    def _membership_state_search_inv(self, cr, uid, ids, context=None):
+        data_inv = self.pool.get('account.invoice').browse(cr, uid, ids, context)
         list_partner = []
         for data in data_inv:
             list_partner.append(data.partner_id.id)
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index 26c96f32d43..923a5a5d600 100755
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -138,8 +138,8 @@ mrp_operations_operation_code()
 class mrp_operations_operation(osv.osv):
     _name="mrp_operations.operation"
 
-    def _order_date_search_production(self,cr,uid,ids):
-        operation_ids=self.pool.get('mrp_operations.operation').search(cr,uid,[('production_id','=',ids[0])])
+    def _order_date_search_production(self, cr, uid, ids, context=None):
+        operation_ids=self.pool.get('mrp_operations.operation').search(cr, uid, [('production_id','=',ids[0])], context=context)
         return operation_ids
 
     def _get_order_date(self, cr, uid, ids, field_name, arg, context):

From d0acb43a36a7fd3ac1d43ff1eb646bcaf20ac31d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 9 Dec 2008 14:22:04 +0100
Subject: [PATCH 75/82] cleaned_module_recorder

bzr revid: fp@tinyerp.com-20081209132204-mv5zthr877ikqffz
---
 addons/base_module_record/base_module_record.py             | 6 +++++-
 addons/base_module_record/base_module_record_wizard.xml     | 2 +-
 .../base_module_record/wizard/base_module_record_objects.py | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py
index 37e044d1399..a00a2448928 100644
--- a/addons/base_module_record/base_module_record.py
+++ b/addons/base_module_record/base_module_record.py
@@ -285,7 +285,10 @@ class base_module_record(osv.osv):
             rec=copy_rec
             rec_data=[(self.recording_data[0][0],rec,self.recording_data[0][2],self.recording_data[0][3])]
             self.recording_data=rec_data
-            id = self._create_id(cr, uid, rec[3],rec[6])
+
+            id,update = self._get_id(cr, uid, rec[3], rec[5])
+            if not id:
+                id = self._create_id(cr, uid, rec[3],rec[6])
             record,noupdate = self._create_record(cr, uid, doc, rec[3], rec[6], id)
             self.ids[(rec[3],result)] = id
             record_list += record
@@ -294,6 +297,7 @@ class base_module_record(osv.osv):
 
     def _generate_assert_xml(self, rec, doc):
         pass
+
     def generate_xml(self, cr, uid):
         # Create the minidom document
         if len(self.recording_data):
diff --git a/addons/base_module_record/base_module_record_wizard.xml b/addons/base_module_record/base_module_record_wizard.xml
index 095d5fa81c8..11113e12f5a 100644
--- a/addons/base_module_record/base_module_record_wizard.xml
+++ b/addons/base_module_record/base_module_record_wizard.xml
@@ -49,7 +49,7 @@
 			name="base_module_record.module_record_objects"/>
 		<menuitem
 			parent="menu_wizard_base_mod_rec"
-			name="Record Objects of your choice"
+			name="Export Customizations As a Module"
 			type="wizard"
 			action="wizard_base_module_record_objects"
 			id="menu_wizard_base_module_record_objects"/>
diff --git a/addons/base_module_record/wizard/base_module_record_objects.py b/addons/base_module_record/wizard/base_module_record_objects.py
index 55862399917..6fb50376018 100644
--- a/addons/base_module_record/wizard/base_module_record_objects.py
+++ b/addons/base_module_record/wizard/base_module_record_objects.py
@@ -78,7 +78,7 @@ def _record_objects(self, cr, uid, data, context):
         elif filter =='modified':
             search_condition =[('write_date','>',check_date)]
         elif filter =='created_modified':
-            search_condition =[('create_date','>',check_date),('write_date','>',check_date)]
+            search_condition =['|',('create_date','>',check_date),('write_date','>',check_date)]
         if '_log_access' in dir(obj_pool):
               if not (obj_pool._log_access):
                   search_condition=[]

From c488c1820865c710be084c09fd37ae923dba7cd7 Mon Sep 17 00:00:00 2001
From: Najlaa <nel@silver>
Date: Tue, 9 Dec 2008 17:52:55 +0100
Subject: [PATCH 76/82] change syntax of ref: list0

bzr revid: nel@silver-20081209165255-q73pcddinzdafbm9
---
 addons/product/product_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 4460711ed7a..f88b5036d18 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -86,7 +86,7 @@ parameter) will see those record just disappear.
         <record forcecreate="True" id="property_product_pricelist" model="ir.property">
             <field name="name">property_product_pricelist</field>
             <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_product_pricelist')]"/>
-            <field eval="'product.pricelist,'+str(list0)" name="value"/>
+            <field eval="'product.pricelist,'+str(ref('list0'))" name="value"/>
         </record>
         
         

From baa2da5bf254517cfcdb9bcac3efc4e96ee3f591 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 9 Dec 2008 21:04:28 +0100
Subject: [PATCH 77/82] merge

bzr revid: fp@tinyerp.com-20081209200428-s79v7nb3hetgbyyp
---
 addons/product/product_data.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 4460711ed7a..0d784421a07 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -81,14 +81,12 @@ parameter) will see those record just disappear.
         </record>
         
         <!--
-	Property
-	-->
+        Property
+        -->
         <record forcecreate="True" id="property_product_pricelist" model="ir.property">
             <field name="name">property_product_pricelist</field>
             <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_product_pricelist')]"/>
-            <field eval="'product.pricelist,'+str(list0)" name="value"/>
+            <field eval="'product.pricelist,'+ref('list0')" name="value"/>
         </record>
-        
-        
     </data>
 </openerp>

From f3e7dc68d32e1f4b000126878962f111efcfc761 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 11 Dec 2008 09:19:31 +0100
Subject: [PATCH 78/82] bugfixes_in_flight

bzr revid: fp@tinyerp.com-20081211081931-z2f8y6fuqk7hf65x
---
 bin/addons/base/base_menu.xml                 |  6 +-
 bin/addons/base/base_update.xml               |  2 +-
 bin/addons/base/ir/ir.xml                     | 28 +++----
 bin/addons/base/ir/ir_ui_view.py              |  1 -
 bin/addons/base/ir/workflow/workflow_view.xml |  8 +-
 bin/addons/base/module/module.py              | 68 +++++++----------
 .../module/report/ir_module_reference.rml     |  7 ++
 bin/addons/base/res/ir_property_view.xml      |  3 +-
 bin/addons/base/rng/view.rng                  | 75 +++++++++++++++----
 9 files changed, 121 insertions(+), 77 deletions(-)

diff --git a/bin/addons/base/base_menu.xml b/bin/addons/base/base_menu.xml
index 1204ab5b42b..84a5bb9e230 100644
--- a/bin/addons/base/base_menu.xml
+++ b/bin/addons/base/base_menu.xml
@@ -2,7 +2,11 @@
 <openerp>
     <data>
         <menuitem icon="terp-administration" id="menu_administration" name="Administration" sequence="20"/>
-        <menuitem id="menu_custom" name="Custom" parent="base.menu_administration" sequence="2"/>
+        <menuitem id="next_id_4" name="Low Level Objects" parent="base.menu_administration" sequence="3"/>
+        <menuitem id="menu_low_workflow" name="Workflow Items" parent="base.next_id_4"/>
+        <menuitem id="menu_custom" name="Customization" parent="base.menu_administration" sequence="2"/>
+        <menuitem id="menu_custom_action" name="Actions" parent="base.menu_custom" sequence="20"/>
+        <menuitem id="menu_config" name="Configuration" parent="base.menu_administration" sequence="1"/>
         <menuitem id="menu_translation" name="Translations" parent="base.menu_administration" sequence="4"/>
         <menuitem id="menu_translation_app" name="Application Terms" parent="base.menu_translation" sequence="4"/>
         <menuitem id="menu_translation_export" name="Import / Export" parent="base.menu_translation" sequence="4"/>
diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index a8b8e269919..49bc289f337 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -6,7 +6,7 @@
     Languages
     ======================
     -->
-        <menuitem id="next_id_2" name="Interface" parent="base.menu_custom"/>
+        <menuitem id="next_id_2" name="User Interface" parent="base.menu_custom"/>
 
         <!--
     ======================
diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 0e195d3980a..421b7ae680f 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -41,7 +41,7 @@
         </record>
         
         <record id="act_values_form" model="ir.actions.act_window">
-            <field name="name">Values</field>
+            <field name="name">Client Actions Connections</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">ir.values</field>
             <field name="view_type">form</field>
@@ -49,7 +49,6 @@
             <field name="context">{'read':'default'}</field>
         </record>
         
-        <menuitem id="next_id_4" name="Low Level" parent="menu_custom"/>
         <menuitem action="act_values_form" id="menu_values_form" parent="next_id_4"/>
         
         <!-- Sequences -->
@@ -114,7 +113,7 @@
             <field name="view_id" ref="sequence_view_tree"/>
             <field name="context">{'active_test': False}</field>
         </record>
-        <menuitem id="next_id_5" name="Sequences" parent="base.menu_custom"/>
+        <menuitem id="next_id_5" name="Sequences" parent="base.menu_config"/>
         <menuitem action="ir_sequence_form" id="menu_ir_sequence_form" parent="next_id_5"/>
         
         <!-- Sequences Types -->
@@ -464,7 +463,7 @@
             <field name="model">ir.ui.view</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="User Interface - Views">
+                <form string="Views">
                     <field name="name" select="1"/>
                     <field name="type" select="1"/>
                     <field name="model" select="1"/>
@@ -480,7 +479,7 @@
             <field name="model">ir.ui.view</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree>
+                <tree string="Views">
                     <field name="name"/>
                     <field name="type"/>
                     <field name="model"/>
@@ -488,7 +487,7 @@
             </field>
         </record>
         <record id="action_ui_view" model="ir.actions.act_window">
-            <field name="name">View</field>
+            <field name="name">Views</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">ir.ui.view</field>
             <field name="view_id" ref="view_view_tree"/>
@@ -719,7 +718,7 @@
                         </page>
                         <page string="Access Rights">
                             <field colspan="4" name="access_ids" select="1" nolabel="1">
-                                <tree string="Access Rules" editable="bottom" colspan="4">
+                                <tree string="Access Rules" editable="bottom">
                                     <field name="group_id"/>
                                     <field name="perm_read"/>
                                     <field name="perm_write"/>
@@ -786,7 +785,7 @@
                                 <field name="on_delete" attrs="{'readonly': [('ttype','!=','many2one')]}"/>
                             </group>
                         </page>
-                        <page string="Security on Groups" colspan="4">
+                        <page string="Security on Groups">
                             <field name="groups" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
@@ -933,7 +932,7 @@
             </field>
         </record>
         <record id="grant_menu_access" model="ir.actions.act_window">
-            <field name="name">Grant access to menu</field>
+            <field name="name">Grant Access To Menus</field>
             <field name="res_model">ir.ui.menu</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="edit_menu"/>
@@ -991,7 +990,7 @@
             <field name="context">{'active_test': False}</field>
             <field name="view_id" ref="ir_cron_view_tree"/>
         </record>
-        <menuitem id="next_id_10" name="Scheduler" parent="base.menu_custom"/>
+        <menuitem id="next_id_10" name="Scheduler" parent="base.menu_config"/>
         <menuitem action="ir_cron_act" id="menu_ir_cron_act" parent="next_id_10"/>
         
         
@@ -1175,12 +1174,12 @@
                                 <tree string="Field Mappings" editable="top">
                                     <field name="col1" domain="[('model_id','=',parent.srcmodel_id or parent.model_id)]"/>
                                     <field name="type"/>
-                                    <field name="value" colsapan="4"/>
+                                    <field name="value" colspan="4"/>
                                 </tree>
                                 <form string="Field Mapping"> 
                                     <field name="col1" domain="[('model_id','=',parent.srcmodel_id or parent.model_id)]"/>
                                     <field name="type"/>
-                                    <field name="value" colsapan="4"/>
+                                    <field name="value" colspan="4"/>
                                 </form>
                             </field>
                             <label colspan="4" string="If you use a formula type, use a python expression using the variable 'object'." align="0.0"/>
@@ -1218,7 +1217,7 @@
             <field name="view_id" ref="view_server_action_tree"/>
             <field name="context">{'key':'server_action'}</field>
         </record>
-        <menuitem action="action_server_action" id="menu_server_action" parent="base.next_id_6"/>
+        <menuitem action="action_server_action" id="menu_server_action" parent="base.menu_custom_action"/>
 
         <record id="view_model_fields_tree" model="ir.ui.view">
             <field name="name">ir.model.fields.tree</field>
@@ -1278,7 +1277,8 @@
             <field name="view_type">form</field>
 			<field name="domain">[('type','=','configure')]</field>
         </record>
-        <menuitem id="next_id_11" name="Configuration Wizards" parent="base.menu_custom"/><menuitem action="act_ir_actions_todo_form" id="menu_ir_actions_todo_form" parent="next_id_11"/>
+        <menuitem id="next_id_11" name="Configuration Wizards" parent="base.menu_config" sequence="1"/>
+        <menuitem action="act_ir_actions_todo_form" id="menu_ir_actions_todo_form" parent="next_id_11"/>
         
         <record id="view_config_wizard_form" model="ir.ui.view">
             <field name="name">Main Configuration Wizard</field>
diff --git a/bin/addons/base/ir/ir_ui_view.py b/bin/addons/base/ir/ir_ui_view.py
index 74badb96846..30ec2135b3d 100644
--- a/bin/addons/base/ir/ir_ui_view.py
+++ b/bin/addons/base/ir/ir_ui_view.py
@@ -27,7 +27,6 @@ import netsvc
 import os
 
 def _check_xml(self, cr, uid, ids, context={}):
-    return True
     for view in self.browse(cr, uid, ids, context):
         eview = etree.fromstring(view.arch)
         frng = tools.file_open(os.path.join('base','rng','view.rng'))
diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml
index 20f1cf1685b..b21b996bda1 100644
--- a/bin/addons/base/ir/workflow/workflow_view.xml
+++ b/bin/addons/base/ir/workflow/workflow_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem id="menu_workflow_root" name="Workflows" parent="menu_custom"/>
+        <menuitem id="menu_workflow_root" name="Workflow Definitions" parent="menu_custom"/>
         
         <!--
 	================================
@@ -110,7 +110,7 @@
         </record>
         
         <record id="action_workflow_activity_form" model="ir.actions.act_window">
-            <field name="name">Activites</field>
+            <field name="name">Activities</field>
             <field name="res_model">workflow.activity</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_workflow_activity_tree"/>
@@ -207,7 +207,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_workflow_instance_tree"/>
         </record>
-        <menuitem action="action_workflow_instance_form" id="menu_workflow_instance" parent="base.menu_workflow_root"/>
+        <menuitem action="action_workflow_instance_form" id="menu_workflow_instance" parent="base.menu_low_workflow"/>
         
         <!--
 	================================
@@ -248,7 +248,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_workflow_workitem_tree"/>
         </record>
-        <menuitem action="action_workflow_workitem_form" id="menu_workflow_workitem" parent="base.menu_workflow_root"/>
+        <menuitem action="action_workflow_workitem_form" id="menu_workflow_workitem" parent="base.menu_low_workflow"/>
         
     </data>
 </openerp>
diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index 49450970a6f..0505d8629a6 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -107,49 +107,33 @@ class module(osv.osv):
                 res[m.id] = ''
         return res
 
-    def _get_menus(self, cr, uid, ids, field_name=None, arg=None, context={}):
-        res = {}
-        model_data_obj = self.pool.get('ir.model.data')
-        menu_obj = self.pool.get('ir.ui.menu')
-        for m in self.browse(cr, uid, ids):
-            if m.state == 'installed':
-                menu_txt = ''
-                menus_id = model_data_obj.search(cr,uid,[('module','=',m.name),('model','=','ir.ui.menu')])
-                for data_id in model_data_obj.browse(cr,uid,menus_id):
-                    menu_txt += menu_obj.browse(cr,uid,data_id.res_id).complete_name + '\n'
-                res[m.id] = menu_txt
-            else:
-                res[m.id] = ''
-        return res
-
-    def _get_reports(self, cr, uid, ids, field_name=None, arg=None, context={}):
-        res = {}
-        model_data_obj = self.pool.get('ir.model.data')
-        report_obj = self.pool.get('ir.actions.report.xml')
-        for m in self.browse(cr, uid, ids):
-            if m.state == 'installed':
-                report_txt = ''
-                report_id = model_data_obj.search(cr,uid,[('module','=',m.name),('model','=','ir.actions.report.xml')])
-                for data_id in model_data_obj.browse(cr,uid,report_id):
-                    report_txt += report_obj.browse(cr,uid,data_id.res_id).name + '\n'
-                res[m.id] = report_txt
-            else:
-                res[m.id] = ''
-        return res
-
     def _get_views(self, cr, uid, ids, field_name=None, arg=None, context={}):
         res = {}
         model_data_obj = self.pool.get('ir.model.data')
         view_obj = self.pool.get('ir.ui.view')
-        for m in self.browse(cr, uid, ids, context=context):
-            if m.state == 'installed':
-                view_txt = ''
-                view_id = model_data_obj.search(cr,uid,[('module','=',m.name),('model','=','ir.ui.view')])
-                for data_id in model_data_obj.browse(cr,uid,view_id):
-                    view_txt += view_obj.browse(cr,uid,data_id.res_id).name + '\n'
-                res[m.id] = view_txt
-            else:
-                res[m.id] = ''
+        report_obj = self.pool.get('ir.actions.report.xml')
+        menu_obj = self.pool.get('ir.ui.menu')
+        mlist = self.browse(cr, uid, ids, context=context)
+        mnames = {}
+        for m in mlist:
+            mnames[m.name] = m.id
+            res[m.id] = {
+                'menus_by_module':'',
+                'reports_by_module':'',
+                'views_by_module': ''
+            }
+        view_id = model_data_obj.search(cr,uid,[('module','in', mnames.keys()),
+            ('model','in',('ir.ui.view','ir.actions.report.xml','ir.ui.menu'))])
+        for data_id in model_data_obj.browse(cr,uid,view_id,context):
+            key = data_id['model']
+            if key=='ir.ui.view':
+                v = view_obj.browse(cr,uid,data_id.res_id)
+                aa = v.inherit_id and '* INHERIT ' or ''
+                res[mnames[data_id.module]]['views_by_module'] += aa + v.name + ' ('+v.type+')\n'
+            elif key=='ir.actions.report.xml':
+                res[mnames[data_id.module]]['reports_by_module'] += report_obj.browse(cr,uid,data_id.res_id).name + '\n'
+            elif key=='ir.ui.menu':
+                res[mnames[data_id.module]]['menus_by_module'] += menu_obj.browse(cr,uid,data_id.res_id).complete_name + '\n'
         return res
 
     _columns = {
@@ -182,9 +166,9 @@ class module(osv.osv):
                 ('GPL-3 or any later version', 'GPL-3 or later version'),
                 ('Other proprietary', 'Other proprietary')
             ], string='License', readonly=True),
-        'menus_by_module': fields.function(_get_menus, method=True, string='Menus', type='text'),
-        'reports_by_module': fields.function(_get_reports, method=True, string='Reports', type='text'),
-        'views_by_module': fields.function(_get_views, method=True, string='Views', type='text'),
+        'menus_by_module': fields.function(_get_views, method=True, string='Menus', type='text', multi="meta"),
+        'reports_by_module': fields.function(_get_views, method=True, string='Reports', type='text', multi="meta"),
+        'views_by_module': fields.function(_get_views, method=True, string='Views', type='text', multi="meta"),
     }
 
     _defaults = {
diff --git a/bin/addons/base/module/report/ir_module_reference.rml b/bin/addons/base/module/report/ir_module_reference.rml
index 472c8d7427c..811436ea29c 100644
--- a/bin/addons/base/module/report/ir_module_reference.rml
+++ b/bin/addons/base/module/report/ir_module_reference.rml
@@ -137,6 +137,13 @@
         </tr>
       </blockTable>
       <para style="P6">[[ format(module.description or '') ]]</para>
+      <h1>Menus</h1>
+      <para style="P6">[[ format(module.menus_by_module or '') ]]</para>
+      <h1>Reports</h1>
+      <para style="P6">[[ format(module.reports_by_module or '') ]]</para>
+      <h1>Views</h1>
+      <para style="P6">[[ format(module.views_by_module or '') ]]</para>
+      <h1>Objects</h1>
       <section>
         <para style="Standard">[[ repeatIn(findobj(module.name) ,'object') ]]</para>
         <blockTable colWidths="510.0" repeatRows="1" style="Tableau3">
diff --git a/bin/addons/base/res/ir_property_view.xml b/bin/addons/base/res/ir_property_view.xml
index 9bb00b3061b..b04fc15f67e 100644
--- a/bin/addons/base/res/ir_property_view.xml
+++ b/bin/addons/base/res/ir_property_view.xml
@@ -38,7 +38,8 @@
             <field name="domain">[('res_id','=',False)]</field>
             <field name="view_id" ref="ir_property_view_tree"/>
         </record>
-        <menuitem id="next_id_15" name="Properties" parent="base.menu_custom"/><menuitem action="ir_property_form" id="menu_ir_property_form" parent="next_id_15"/>
+        <menuitem id="next_id_15" name="Properties" parent="base.menu_config"/>
+        <menuitem action="ir_property_form" id="menu_ir_property_form" parent="next_id_15"/>
         
         <record id="ir_property_form_all" model="ir.actions.act_window">
             <field name="name">All Properties</field>
diff --git a/bin/addons/base/rng/view.rng b/bin/addons/base/rng/view.rng
index aac75e1e565..fc75dc23f5d 100644
--- a/bin/addons/base/rng/view.rng
+++ b/bin/addons/base/rng/view.rng
@@ -7,6 +7,7 @@
             <rng:optional><rng:attribute name="editable"/></rng:optional>
             <rng:optional><rng:attribute name="type"/></rng:optional>
             <rng:optional><rng:attribute name="position"/></rng:optional>
+            <rng:optional><rng:attribute name="link"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:choice>
                     <rng:ref name="notebook"/>
@@ -33,6 +34,7 @@
             <rng:optional><rng:attribute name="editable"/></rng:optional>
             <rng:optional><rng:attribute name="toolbar"/></rng:optional>
             <rng:optional><rng:attribute name="position"/></rng:optional>
+            <rng:optional><rng:attribute name="link"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:choice>
                     <rng:ref name="field"/>
@@ -60,6 +62,31 @@
         </rng:element>
     </rng:define>
 
+    <rng:define name="level">
+        <rng:element name="level">
+            <rng:optional><rng:attribute name="object"/></rng:optional>
+            <rng:optional><rng:attribute name="link"/></rng:optional>
+            <rng:optional><rng:attribute name="domain"/></rng:optional>
+            <rng:oneOrMore>
+                <rng:optional><rng:ref name="field"/></rng:optional>
+            </rng:oneOrMore>
+        </rng:element>
+    </rng:define>
+
+    <rng:define name="gantt">
+        <rng:element name="gantt">
+            <rng:optional><rng:attribute name="color"/></rng:optional>
+            <rng:optional><rng:attribute name="date_delay"/></rng:optional>
+            <rng:optional><rng:attribute name="date_start"/></rng:optional>
+            <rng:optional><rng:attribute name="date_string"/></rng:optional>
+            <rng:optional><rng:attribute name="string"/></rng:optional>
+            <rng:zeroOrMore>
+                <rng:optional><rng:ref name="level"/></rng:optional>
+                <rng:optional><rng:ref name="field"/></rng:optional>
+            </rng:zeroOrMore>
+        </rng:element>
+    </rng:define>
+
     <rng:define name="hpaned">
         <rng:element name="hpaned">
             <rng:optional><rng:attribute name="position"/></rng:optional>
@@ -123,6 +150,17 @@
             <rng:optional><rng:attribute name="col"/></rng:optional>
             <rng:optional><rng:attribute name="select"/></rng:optional>
             <rng:optional><rng:attribute name="position"/></rng:optional>
+            <rng:zeroOrMore>
+                <rng:choice>
+                    <rng:ref name="separator"/>
+                    <rng:ref name="button"/>
+                    <rng:ref name="field"/>
+                    <rng:ref name="label" />
+                    <rng:ref name="group" />
+                    <rng:element name="properties"><rng:empty/></rng:element>
+                    <rng:element name="newline"><rng:empty/></rng:element>
+                </rng:choice>
+            </rng:zeroOrMore>
         </rng:element>
     </rng:define>
 
@@ -132,9 +170,10 @@
             <rng:optional><rng:attribute name="position"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:choice>
-		            <rng:ref name="notebook" />
-		            <rng:ref name="graph" />
-		            <rng:ref name="calendar" />
+                    <rng:ref name="notebook" />
+                    <rng:ref name="graph" />
+                    <rng:ref name="calendar" />
+                    <rng:ref name="gantt" />
                     <rng:ref name="form"/>
                     <rng:ref name="tree"/>
                     <rng:ref name="field"/>
@@ -181,13 +220,18 @@
             <rng:optional><rng:attribute name="digits"/></rng:optional>
             <rng:optional><rng:attribute name="icon"/></rng:optional>
             <rng:optional><rng:attribute name="mode"/></rng:optional>
+            <rng:optional><rng:attribute name="img_width"/></rng:optional>
+            <rng:optional><rng:attribute name="img_height"/></rng:optional>
             <rng:optional><rng:attribute name="size"/></rng:optional>
+            <rng:optional><rng:attribute name="filename"/></rng:optional>
+            <rng:optional><rng:attribute name="fieldname"/></rng:optional>
             <rng:optional><rng:attribute name="height"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:choice>
                     <rng:ref name="form"/>
                     <rng:ref name="tree"/>
                     <rng:ref name="field"/>
+                    <rng:ref name="label"/>
                     <rng:ref name="separator"/>
                     <rng:ref name="xpath"/>
                     <rng:ref name="button"/>
@@ -203,12 +247,14 @@
             <rng:optional><rng:attribute name="attrs"/></rng:optional>
             <rng:optional><rng:attribute name="col"/></rng:optional>
             <rng:optional><rng:attribute name="colspan"/></rng:optional>
+            <rng:optional><rng:attribute name="position"/></rng:optional>
             <rng:optional><rng:attribute name="expand"/></rng:optional>
             <rng:optional><rng:attribute name="states"/></rng:optional>
             <rng:optional><rng:attribute name="groups"/></rng:optional>
             <rng:optional><rng:attribute name="string"/></rng:optional>
             <rng:optional><rng:attribute name="fill"/></rng:optional>
             <rng:optional><rng:attribute name="height"/></rng:optional>
+            <rng:optional><rng:attribute name="name"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:choice>
                     <rng:ref name="separator"/>
@@ -265,16 +311,17 @@
             <rng:optional><rng:attribute name="position"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:choice>
-		            <rng:ref name="form" />
-		            <rng:ref name="field" />
-		            <rng:ref name="tree" />
-		            <rng:ref name="notebook" />
-		            <rng:ref name="graph" />
-		            <rng:ref name="calendar" />
-		            <rng:ref name="xpath" />
-		            <rng:ref name="page" />
-		            <rng:ref name="separator"/>
-		            <rng:ref name="button"/>
+                    <rng:ref name="form" />
+                    <rng:ref name="field" />
+                    <rng:ref name="tree" />
+                    <rng:ref name="notebook" />
+                    <rng:ref name="graph" />
+                    <rng:ref name="calendar" />
+                    <rng:ref name="gantt" />
+                    <rng:ref name="xpath" />
+                    <rng:ref name="page" />
+                    <rng:ref name="separator"/>
+                    <rng:ref name="button"/>
                     <rng:element name="properties"><rng:empty/></rng:element>
                     <rng:element name="newline"><rng:empty/></rng:element>
                 </rng:choice>
@@ -286,11 +333,13 @@
     <rng:start>
         <rng:choice>
             <rng:ref name="form" />
+            <rng:ref name="group" />
             <rng:ref name="field" />
             <rng:ref name="tree" />
             <rng:ref name="notebook" />
             <rng:ref name="graph" />
             <rng:ref name="calendar" />
+            <rng:ref name="gantt" />
             <rng:ref name="xpath" />
             <rng:ref name="page" />
             <rng:ref name="separator"/>

From 7b19f3ef8a5ffb12a7b412440690f141afe6910f Mon Sep 17 00:00:00 2001
From: Christophe Simonis <christophe@tinyerp.com>
Date: Thu, 11 Dec 2008 09:58:25 +0100
Subject: [PATCH 79/82] [FIX] convert message to string before stripping

bzr revid: christophe@tinyerp.com-20081211085825-24fmjnkjn0db0y8q
---
 bin/netsvc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/netsvc.py b/bin/netsvc.py
index cc0ef093b17..9072421c0b7 100644
--- a/bin/netsvc.py
+++ b/bin/netsvc.py
@@ -206,7 +206,7 @@ class Logger(object):
         log = logging.getLogger(name)
         level_method = getattr(log, level)
 
-        result = msg.strip().split('\n')
+        result = str(msg).strip().split('\n')
         if len(result)>1:
             for idx, s in enumerate(result):
                 level_method('[%02d]: %s' % (idx+1, s,))

From 9f9df50a03fbc44c8c736902facb0eaa1de01093 Mon Sep 17 00:00:00 2001
From: Jay Vora <jvo@tinyerp.com>
Date: Thu, 11 Dec 2008 15:11:21 +0530
Subject: [PATCH 80/82] Res.Lang :Removed legend column ,converted it to xml
 view.

bzr revid: jvo@tinyerp.com-20081211094121-vkhxal6yb5q6a3u4
---
 bin/addons/base/res/res_lang.py       | 35 ---------------
 bin/addons/base/res/res_lang_view.xml | 62 +++++++++++++++++++++++++--
 2 files changed, 59 insertions(+), 38 deletions(-)

diff --git a/bin/addons/base/res/res_lang.py b/bin/addons/base/res/res_lang.py
index c90c02e3b98..4c01687e4a5 100644
--- a/bin/addons/base/res/res_lang.py
+++ b/bin/addons/base/res/res_lang.py
@@ -44,7 +44,6 @@ class lang(osv.osv):
         'grouping':fields.char('Separator Format',size=64,required=True,help="The Separator Format should be like [,n] where 0 < n :starting from Unit digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be 1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as 106,500. Provided ',' as the thousand separator in each case."),        
         'decimal_point':fields.char('Decimal Separator', size=64,required=True),
         'thousands_sep':fields.char('Thousands Separator',size=64),
-        'legend':fields.text('Legends for Date and Time Formats',readonly=True),
     }
     _defaults = {
         'active': lambda *a: 1,
@@ -55,40 +54,6 @@ class lang(osv.osv):
         'grouping':lambda *a: '[]',
         'decimal_point':lambda *a: '.',
         'thousands_sep':lambda *a: ',',
-        'legend': lambda *a: '%a  - Abbreviated weekday name.\
-\n%A  - Full weekday name.\
-\n%b  - Abbreviated month name.\
-\n%B  - Full month name.     \
-\n%c  - Appropriate date and time representation.\
-\n%d  - Day of the month as a decimal number [01,31].\
-\n%H  - Hour (24-hour clock) as a decimal number [00,23].\
-\n%I  - Hour (12-hour clock) as a decimal number [01,12].\
-\n%j  - Day of the year as a decimal number [001,366].\
-\n%m  - Month as a decimal number [01,12].\
-\n%M  - Minute as a decimal number [00,59].\
-\n%p  - Equivalent of either AM or PM.\
-\n%S  - Second as a decimal number [00,61].\
-\n%U  - Week number of the year (Sunday as the first day of the week) as a decimal number [00,53]. All days in a new year preceding the first Sunday are considered to be in week 0.\
-\n%w  - Weekday as a decimal number [0(Sunday),6].\
-\n%W  - Week number of the year (Monday as the first day of the week) as a decimal number [00,53]. All days in a new year preceding the first Monday are considered to be in week 0.\
-\n%x  - Appropriate date representation.\
-\n%X  - Appropriate time representation.\
-\n%y  - Year without century as a decimal number [00,99].\
-\n%Y  - Year with century as a decimal number.\
-\n ==========================================\
-\n\nExamples:\
-\n1.  %c ==> Fri Dec  5 18:25:20 2008\
-\n2.  %a ,%A ==> Fri, Friday\
-\n3.  %x ,%X ==> 12/05/08, 18:25:20\
-\n4.  %b, %B ==> Dec, December\
-\n5.  %y, %Y ==> 08, 2008\
-\n6.  %d, %m ==> 05, 12\
-\n7.  %H:%M:%S ==> 18:25:20\
-\n8.  %I:%M:%S %p ==> 06:25:20 PM\
-\n9.  %j ==> 340\
-\n10. %S ==> 20\
-\n11. %U or %W ==> 48 (49th week)\
-\n12. %w ==> 5 ( Friday is the 6th day)',
     }
     
     def _group(self,cr,uid,ids,s, monetary=False):
diff --git a/bin/addons/base/res/res_lang_view.xml b/bin/addons/base/res/res_lang_view.xml
index 428edcdad44..fda3b43107b 100644
--- a/bin/addons/base/res/res_lang_view.xml
+++ b/bin/addons/base/res/res_lang_view.xml
@@ -27,18 +27,74 @@
                     <field name="active" />
                     <field name="translatable"/>
                     <field name="grouping" />
+                    <field name="direction" />
                     <newline/>
                     <field name="date_format"/>
                     <field name="time_format"/>                    
                     <field name="decimal_point"/>
                     <field name="thousands_sep"/>
                     <newline/>
-                    <field name="direction" />
-                    </group>
                     
                     <newline/>
+                    </group>
                     <separator colspan="4" string="Legends for Date and Time Formats"/>
-                    <field name="legend" nolabel="1" colspan="4"/>                    
+                    <group col="4" colspan="4">
+	                     <label align="0.0" string="%%a - Abbreviated weekday name."/>
+	                     <label align="0.0" string="%%A - Full weekday name."/>
+	                     <newline/>
+	                     <label align="0.0" string="%%b - Abbreviated month name."/>
+	                     <label align="0.0" string="%%B - Full month name." />
+	                     <newline/>
+	                     <label align="0.0" string="%%c - Appropriate date and time representation." />
+	                     <label align="0.0" string="%%d - Day of the month as a decimal number [01,31]." />
+	                     <newline/>
+	                     <label align="0.0" string="%%H - Hour (24-hour clock) as a decimal number [00,23]." />
+	                     <label align="0.0" string="%%I - Hour (12-hour clock) as a decimal number [01,12]." />
+	                     <newline/>
+	                     <label align="0.0" string="%%j - Day of the year as a decimal number [001,366]." />
+	                     <label align="0.0" string="%%m - Month as a decimal number [01,12]." />
+	                     <newline/>
+	                     <label align="0.0" string="%%M - Minute as a decimal number [00,59]." />
+	                     <label align="0.0" string="%%p - Equivalent of either AM or PM." />
+	                     <newline/>
+	                     <label align="0.0" string="%%S - Second as a decimal number [00,61]." />
+	                     <label align="0.0" string="%%w - Weekday as a decimal number [0(Sunday),6]." />
+	                     <newline/>
+	                     <label align="0.0" string="%%x - Appropriate date representation." />
+	                     <label align="0.0" string="%%X - Appropriate time representation." />
+	                     <newline/>
+	                     <label align="0.0" string="%%y - Year without century as a decimal number [00,99]." />
+	                     <label align="0.0" string="%%Y - Year with century as a decimal number." />
+	                     <newline/>
+	                     <label align="0.0" string="%%U - Week number of the year (Sunday as the first day of the week) as a decimal number [00,53]. All days in a new year preceding the first Sunday are considered to be in week 0." />
+	                	 <label align="0.0" string="%%W - Week number of the year (Monday as the first day of the week) as a decimal number [00,53]. All days in a new year preceding the first Monday are considered to be in week 0." />
+	                	 <newline/>
+	                     <label align="0.0" string="======================================================" />
+                    </group>
+                    <newline/>
+                    <group colspan="4" cols="4">
+	                    <separator string="Examples"/>
+	                    <newline/>
+	                    <label align="0.0" string="1.  %%c              ==> Fri Dec  5 18:25:20 2008"/>
+		                <label align="0.0" string="2.  %%a ,%%A         ==> Fri, Friday"/>
+		                <newline/>
+		                <label align="0.0" string="3.  %%x ,%%X         ==> 12/05/08, 18:25:20"/>
+		                <label align="0.0" string="4.  %%b, %%B         ==> Dec, December"/>
+		                <newline/>
+		                <label align="0.0" string="5.  %%y, %%Y         ==> 08, 2008"/>
+		                <label align="0.0" string="6.  %%d, %%m         ==> 05, 12"/>
+		                <newline/>
+		                <label align="0.0" string="7.  %%H:%%M:%%S      ==> 18:25:20"/>
+		                <label align="0.0" string="8.  %%I:%%M:%%S %%p  ==> 06:25:20 PM"/>
+		                <newline/>
+		                <label align="0.0" string="9.  %%j              ==> 340"/>
+		                <label align="0.0" string="10. %%S              ==> 20"/>
+		                <newline/>
+		                <label align="0.0" string="11. %%U or %%W       ==> 48 (49th week)"/>
+		                <label align="0.0" string="12. %%w              ==> 5 ( Friday is the 6th day)"/>
+		                <newline/>
+                    </group>
+                                      
                 </form>
             </field>
         </record>

From 8b42bf288760b852aadaccfd9463c654bae29730 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@tinyerp.com>
Date: Thu, 11 Dec 2008 11:17:53 +0100
Subject: [PATCH 81/82] [FIX] Remove the unicode function

bzr revid: stephane@tinyerp.com-20081211101753-9qgab643m504jnka
---
 bin/addons/base/ir/ir_translation.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/ir/ir_translation.py b/bin/addons/base/ir/ir_translation.py
index c7eb75211fe..dac4a550e45 100644
--- a/bin/addons/base/ir/ir_translation.py
+++ b/bin/addons/base/ir/ir_translation.py
@@ -48,7 +48,7 @@ class ir_translation(osv.osv, Cacheable):
         lang_ids = lang_obj.search(cr, uid, [('translatable', '=', True)],
                 context=context)
         langs = lang_obj.browse(cr, uid, lang_ids, context=context)
-        res = [(lang.code, unicode(lang.name,'utf-8')) for lang in langs]
+        res = [(lang.code, lang.name) for lang in langs]
         for lang_dict in tools.scan_languages():
             if lang_dict not in res:
                 res.append(lang_dict)

From aee44fd6719cb3e6c9651632ca4bc6552aa517af Mon Sep 17 00:00:00 2001
From: Jay Vora <jvo@tinyerp.com>
Date: Thu, 11 Dec 2008 15:58:48 +0530
Subject: [PATCH 82/82] [Correction]]Res.Lang :Removed legend column ,converted
 it to xml view.

bzr revid: jvo@tinyerp.com-20081211102848-i1urmkdp359hl9wh
---
 bin/addons/base/res/res_lang_view.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/bin/addons/base/res/res_lang_view.xml b/bin/addons/base/res/res_lang_view.xml
index fda3b43107b..e212e997051 100644
--- a/bin/addons/base/res/res_lang_view.xml
+++ b/bin/addons/base/res/res_lang_view.xml
@@ -33,8 +33,6 @@
                     <field name="time_format"/>                    
                     <field name="decimal_point"/>
                     <field name="thousands_sep"/>
-                    <newline/>
-                    
                     <newline/>
                     </group>
                     <separator colspan="4" string="Legends for Date and Time Formats"/>
@@ -72,7 +70,7 @@
 	                     <label align="0.0" string="======================================================" />
                     </group>
                     <newline/>
-                    <group colspan="4" cols="4">
+                    <group colspan="4" col="4">
 	                    <separator string="Examples"/>
 	                    <newline/>
 	                    <label align="0.0" string="1.  %%c              ==> Fri Dec  5 18:25:20 2008"/>