From bef2f4f82ade6a7713ab90d89d69452676757db3 Mon Sep 17 00:00:00 2001
From: "p_christ@hol.gr" <>
Date: Thu, 5 Aug 2010 10:58:15 +0530
Subject: [PATCH 01/14] [FIX] Project: Task search fix regression

bzr revid: mra@mra-laptop-20100805052815-3gum037ihtbp5bp3
---
 addons/project/project.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index f0e1ceaaddd..fd839149422 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -335,28 +335,29 @@ class task(osv.osv):
     _description = "Task"
     _log_create = True
     _date_name = "date_start"
-    
+
     def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
+        obj_project = self.pool.get('project.project')
         for domain in args:
             if domain[0] == 'project_id' and (not isinstance(domain[2], str)):
-                id = isinstance(domain[2], list) and int(domain[2][0]) or int(domain[2])
-                if id:
-                    if self.pool.get('project.project').read(cr, user, id, ['state'])['state'] == 'template':
-                        args.append(['active', '=', False])
+                id = isinstance(domain[2], list) and domain[2][0] or domain[2]
+                if id and isinstance(id, (long, int)):
+                    if obj_project.read(cr, user, id, ['state'])['state'] == 'template':
+                        args.append(('active', '=', False))
         return super(task, self).search(cr, user, args, offset=offset, limit=limit, order=order, context=context, count=count)
 
     def _str_get(self, task, level=0, border='***', context=None):
         return border+' '+(task.user_id and task.user_id.name.upper() or '')+(level and (': L'+str(level)) or '')+(' - %.1fh / %.1fh'%(task.effective_hours or 0.0,task.planned_hours))+' '+border+'\n'+ \
             border[0]+' '+(task.name or '')+'\n'+ \
             (task.description or '')+'\n\n'
-    
+
     # Compute: effective_hours, total_hours, progress
     def _hours_get(self, cr, uid, ids, field_names, args, context=None):
         project_obj = self.pool.get('project.project')
         res = {}
         cr.execute("SELECT task_id, COALESCE(SUM(hours),0) FROM project_task_work WHERE task_id IN %s GROUP BY task_id",(tuple(ids),))
         hours = dict(cr.fetchall())
-        
+
         uom_obj = self.pool.get('product.uom')
         user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)
         if user_uom != default_uom:

From fa1990b532f9602beee7e955c0a61ab4d9299b66 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 5 Aug 2010 11:09:52 +0530
Subject: [PATCH 02/14] [Fix] stock : Fix the packing report

bzr revid: sbh@tinyerp.com-20100805053952-8suzix8brrra4x8s
---
 addons/stock/report/packing.rml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/stock/report/packing.rml b/addons/stock/report/packing.rml
index 3db817996d9..7288615da6d 100644
--- a/addons/stock/report/packing.rml
+++ b/addons/stock/report/packing.rml
@@ -276,12 +276,11 @@
         <font color="white"> </font>
       </para>
     </section>
-    <para style="terp_default_5cm_Above_Space">[[ (move_lines.state == 'done' or move_lines.state == 'confirmed') and removeParentNode('para') ]]</para>
-    <para style="terp_default_Bold_9">Non Assigned Products: [[ ( move_lines.state == 'assigned' or move_lines.state == 'done' or move_lines.state == 'confirmed' ) and removeParentNode('para') ]]</para>
-    <para style="terp_default_1cm_above_space">[[ (move_lines.state == 'done' or move_lines.state == 'confirmed') and removeParentNode('para') ]]</para>
-    <section>
-      <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state != 'assigned' )],'move_lines') ]]</para>
+	
+	<para style="terp_default_Bold_9">[[ ([line for line in picking.move_lines if (line.state == 'draft' )])  and 'Non Assigned Products:' or removeParentNode('para') ]]</para>
+	 <section>
       <blockTable colWidths="197.0,68.0,61.0,57,46.0,26.0,74.0" style="Move_Line_Content_Other_State">
+      <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state != 'assigned' )],'move_lines') ]]</para>
         <tr>
           <td>
             <para style="terp_default_9">[ [[ move_lines.product_id.default_code ]] ] [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']]</para>

From 5b52666f71e44d2478ab2399b30360acf6db717b Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Thu, 5 Aug 2010 11:18:57 +0530
Subject: [PATCH 03/14] [IMP]: Use Tooltips in auction form and change menu
 name.

bzr revid: atp@tinyerp.co.in-20100805054857-iw21bieed73n29ns
---
 addons/auction/auction.py       | 16 ++++++++--------
 addons/auction/auction_view.xml | 10 +++++-----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index 41c75e0fe7b..6a241873f98 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -72,14 +72,14 @@ class auction_dates(osv.osv):
 
     _columns = {
         'name': fields.char('Auction Name', size=64, required=True), 
-        'expo1': fields.date('First Exposition Day', required=True), 
-        'expo2': fields.date('Last Exposition Day', required=True), 
-        'auction1': fields.date('First Auction Day', required=True), 
-        'auction2': fields.date('Last Auction Day', required=True), 
-        'journal_id': fields.many2one('account.journal', 'Buyer Journal', required=True), 
-        'journal_seller_id': fields.many2one('account.journal', 'Seller Journal', required=True), 
-        'buyer_costs': fields.many2many('account.tax', 'auction_buyer_taxes_rel', 'auction_id', 'tax_id', 'Buyer Costs'), 
-        'seller_costs': fields.many2many('account.tax', 'auction_seller_taxes_rel', 'auction_id', 'tax_id', 'Seller Costs'), 
+        'expo1': fields.date('First Exposition Day', required=True, help="Beginning Exposition Date For Auction"), 
+        'expo2': fields.date('Last Exposition Day', required=True, help="Last Exposition Date For Auction"), 
+        'auction1': fields.date('First Auction Day', required=True, help="Start Date Of Auction"), 
+        'auction2': fields.date('Last Auction Day', required=True, help="End Date Of Auction"), 
+        'journal_id': fields.many2one('account.journal', 'Buyer Journal', required=True, help="Account Journal For Buyer"), 
+        'journal_seller_id': fields.many2one('account.journal', 'Seller Journal', required=True, help="Account Journal For Seller"), 
+        'buyer_costs': fields.many2many('account.tax', 'auction_buyer_taxes_rel', 'auction_id', 'tax_id', 'Buyer Costs', help="Account Tax For Buyer"), 
+        'seller_costs': fields.many2many('account.tax', 'auction_seller_taxes_rel', 'auction_id', 'tax_id', 'Seller Costs', help="Account Tax For Seller"), 
         'acc_income': fields.many2one('account.account', 'Income Account', required=True), 
         'acc_expense': fields.many2one('account.account', 'Expense Account', required=True), 
         'adj_total': fields.function(_adjudication_get, method=True, string='Total Adjudication', store=True), 
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index 46d49754d16..6079081c417 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -55,6 +55,7 @@
            </tree>
         </field>
     </record>
+    
     <record model="ir.ui.view" id="view_auction_object_categories_form">
         <field name="name">auction.lot.category.form</field>
         <field name="model">auction.lot.category</field>
@@ -91,7 +92,6 @@
                <field name="auction2" string="End of auction"/>
                <field name="name" string="Names"/>
                <field name="state"/>
-               <button string="Create Invoices" help="Create Invoices" name="close" states="draft" type="object" icon="gtk-yes"/>
             </tree>
         </field>
     </record>
@@ -183,7 +183,7 @@
         <field name="priority" eval="2"/>
         <field name="arch" type="xml">
             <calendar string="Next Auction"
-                date_start="auction1" color="name">
+                date_start="auction1" color="">
                 <field name="name" />
                 <field name="auction1"/>
             </calendar>
@@ -191,7 +191,7 @@
     </record>
 
     <record model="ir.actions.act_window" id="action_auction_dates_next">
-        <field name="name">Next Auctions Dates</field>
+        <field name="name">Auctions</field>
         <field name="res_model">auction.dates</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form,calendar</field>  
@@ -206,8 +206,8 @@
         id="act_auction_lot_line_open"/>
 
 
-    <menuitem name="Auction Dates" parent="auction_menu_root" id="auction_date_menu" sequence="1"/>
-    <menuitem name="Next Auction Dates" parent="auction_date_menu" id="menu_auction_dates_next1" action="action_auction_dates_next"/>
+    <menuitem name="Auctions" parent="auction_menu_root" id="auction_date_menu" sequence="1"/>
+    <menuitem name="Auctions" parent="auction_date_menu" id="menu_auction_dates_next1" action="action_auction_dates_next"/>
     
     
  

From 724c4ebb44cdf20db0a925e91b3937fd3b168b8b Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 5 Aug 2010 11:51:57 +0530
Subject: [PATCH 04/14] [REF] stock,delivery :Remove the unused import
 statemnet, and comment code

bzr revid: sbh@tinyerp.com-20100805062157-a6dm6rmqd8nwdqq3
---
 addons/delivery/delivery.py                  |  1 -
 addons/delivery/stock.py                     |  2 --
 addons/stock/report/report_stock.py          |  3 ---
 addons/stock/report/stock_graph.py           |  2 +-
 addons/stock/wizard/stock_inventory_merge.py |  6 ------
 addons/stock/wizard/stock_partial_move.py    | 10 ++--------
 6 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index f1fadd81bd4..6501e0aa230 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 import time
-import netsvc
 from osv import fields,osv
 from tools.translate import _
 
diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py
index 6193a6299a1..76897d46e58 100644
--- a/addons/delivery/stock.py
+++ b/addons/delivery/stock.py
@@ -19,10 +19,8 @@
 #
 ##############################################################################
 
-import netsvc
 from osv import fields,osv
 from tools.translate import _
-import tools
 
 import decimal_precision as dp
 
diff --git a/addons/stock/report/report_stock.py b/addons/stock/report/report_stock.py
index 81e2bb125fd..5ea8c83c602 100644
--- a/addons/stock/report/report_stock.py
+++ b/addons/stock/report/report_stock.py
@@ -24,9 +24,6 @@ from tools.translate import _
 import tools
 from tools.sql import drop_view_if_exists
 
-#
-# Check if it works with UoM ???
-#
 class stock_report_prodlots(osv.osv):
     _name = "stock.report.prodlots"
     _description = "Stock report by production lots"
diff --git a/addons/stock/report/stock_graph.py b/addons/stock/report/stock_graph.py
index d20baa08d58..bb97119c299 100644
--- a/addons/stock/report/stock_graph.py
+++ b/addons/stock/report/stock_graph.py
@@ -24,7 +24,7 @@ import time
 from report.misc import choice_colors
 
 #
-# dRAw a graph for stocks
+# Draw a graph for stocks
 #
 class stock_graph(object):
     def __init__(self, io):
diff --git a/addons/stock/wizard/stock_inventory_merge.py b/addons/stock/wizard/stock_inventory_merge.py
index 30450e4d253..b08f0ca79c8 100644
--- a/addons/stock/wizard/stock_inventory_merge.py
+++ b/addons/stock/wizard/stock_inventory_merge.py
@@ -20,13 +20,7 @@
 ##############################################################################
 
 from osv import fields, osv
-from service import web_services
-from tools.misc import UpdateableStr, UpdateableDict
 from tools.translate import _
-import netsvc
-import pooler
-import time
-import wizard
 
 class stock_inventory_merge(osv.osv_memory):
     _name = "stock.inventory.merge"
diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index 01e8a712dca..f3af091d58b 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -186,8 +186,7 @@ class stock_partial_move(osv.osv_memory):
                 res['move%s_product_qty'%(m.id)] = m.product_qty
             if 'move%s_product_uom'%(m.id) in fields:
                 res['move%s_product_uom'%(m.id)] = m.product_uom.id
-
-            if (m.picking_id.type == 'out') and (m.product_id.cost_method == 'average'):
+            if (m.picking_id.type == 'out') and (m.product_id.cost_method == 'average') and 'sale_id' in m.picking_id._columns.keys():
                 price = 0
                 if hasattr(m, 'sale_line_id') and m.sale_line_id:
                     price = m.sale_line_id.price_unit
@@ -201,7 +200,7 @@ class stock_partial_move(osv.osv_memory):
                 if 'move%s_product_currency'%(m.id) in fields:
                     res['move%s_product_currency'%(m.id)] = currency
 
-            if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
+            if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average') and 'purchase_id' in m.picking_id._columns.keys():
                 price = 0
                 if hasattr(m, 'purchase_line_id') and m.purchase_line_id:
                     price = m.purchase_line_id.price_unit
@@ -227,11 +226,6 @@ class stock_partial_move(osv.osv_memory):
         """
 
         rec_id = context and context.get('active_id', False)
-        #tracking_lot = context.get('tracking_lot', False)
-        #if tracking_lot:
-        #    tracking = self.pool.get('stock.tracking')
-        #    tracking_lot = tracking.get_create_tracking_lot(cr, uid,[rec_id], tracking_lot)
-        #    context ['tracking_lot'] = tracking_lot
         move_obj = self.pool.get('stock.move')
         move_ids = context.get('active_ids', False)
         partial = self.browse(cr, uid, ids[0], context)

From 90fd4877f711c14d822ff51add54805eebf35f8c Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 5 Aug 2010 12:18:18 +0530
Subject: [PATCH 05/14] [REF] purchase : Remove the comment code

bzr revid: sbh@tinyerp.com-20100805064818-0vnoc9uw3vxa8scz
---
 addons/purchase/purchase.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index e7f5473b42a..afefebd4bb9 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -535,7 +535,6 @@ class purchase_order(osv.osv):
                 'fiscal_position': porder.fiscal_position and porder.fiscal_position.id or False,
                 })
             else:
-                #order_infos['name'] += ', %s' % porder.name
                 if porder.notes:
                     order_infos['notes'] = (order_infos['notes'] or '') + ('\n%s' % (porder.notes,))
                 if porder.origin:

From 1cf2f0aeb5e6c4a5136120f95a8e2d58ee54d9c1 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 5 Aug 2010 12:50:23 +0530
Subject: [PATCH 06/14] [IMP] Project: improve code

bzr revid: mra@mra-laptop-20100805072023-lhqjd5eb6g38d6dn
---
 addons/project/project.py | 149 +++++++++++++++++---------------------
 1 file changed, 66 insertions(+), 83 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index fd839149422..211fc78a6a6 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -29,12 +29,12 @@ from osv import fields, osv
 class project_task_type(osv.osv):
     _name = 'project.task.type'
     _description = 'Task Stage'
+    _order = 'sequence'
     _columns = {
         'name': fields.char('Stage Name', required=True, size=64, translate=True),
         'description': fields.text('Description'),
         'sequence': fields.integer('Sequence'),
     }
-    _order = 'sequence'
 
     _defaults = {
         'sequence': 1
@@ -55,8 +55,7 @@ class project(osv.osv):
                            LEFT JOIN account_analytic_account account ON account.id = project.analytic_account_id
                            LEFT JOIN project_user_rel rel ON rel.project_id = project.analytic_account_id
                            WHERE (account.user_id = %s or rel.uid = %s)"""%(user, user))
-                res = cr.fetchall()
-                return [(r[0]) for r in res]
+                return [(r[0]) for r in cr.fetchall()]
         return super(project, self).search(cr, user, args, offset=offset, limit=limit, order=order,
             context=context, count=count)
 
@@ -66,10 +65,6 @@ class project(osv.osv):
             res[m.id] = (m.parent_id and (m.parent_id.name + '/') or '') + m.name
         return res
 
-    def check_recursion(self, cursor, user, ids, parent=None):
-        return super(project, self).check_recursion(cursor, user, ids,
-                parent=parent)
-
     def onchange_partner_id(self, cr, uid, ids, part=False, context=None):
         partner_obj = self.pool.get('res.partner')
         if not part:
@@ -80,30 +75,29 @@ class project(osv.osv):
         return {'value':{'contact_id': addr['contact'], 'pricelist_id': pricelist_id}}
 
     def get_all_child_projects(self, cr, uid, ids, context=None):
+        # Calculate child project for Given project id => For progress rate + planned time + Time spent
         cr.execute('''select prpc.id as id from account_analytic_account as p
-join account_analytic_account as c  on p.id = c.parent_id
-join project_project as prp on prp.analytic_account_id = p.id
-join project_project as prpc on prpc.analytic_account_id = c.id
-where prp.id in %s''',(tuple(ids),))
+                    join account_analytic_account as c  on p.id = c.parent_id
+                    join project_project as prp on prp.analytic_account_id = p.id
+                    join project_project as prpc on prpc.analytic_account_id = c.id
+                    where prp.id in %s''',(tuple(ids),))
 
         child_ids = cr.fetchall()
         if child_ids:
-          child_ids = [x[0] for x in child_ids]
-          child_ids = self.get_all_child_projects(cr, uid, child_ids)
+            child_ids = [x[0] for x in child_ids]
+            child_ids = self.get_all_child_projects(cr, uid, child_ids)
+        return ids + child_ids
 
-        return ids+child_ids
-    
     def _get_user_and_default_uom_ids(self, cr, uid):
         users_obj = self.pool.get('res.users')
         model_data_obj = self.pool.get('ir.model.data')
-        
         model_data_id = model_data_obj._get_id(cr, uid, 'product', 'uom_hour')
         default_uom = user_uom = model_data_obj.read(cr, uid, [model_data_id], ['res_id'])[0]['res_id']
         obj_tm = users_obj.browse(cr, uid, uid).company_id.project_time_mode_id
         if obj_tm:
             user_uom = obj_tm.id
         return user_uom, default_uom
-    
+
     def _progress_rate(self, cr, uid, ids, names, arg, context=None):
         res = {}.fromkeys(ids, 0.0)
         progress = {}
@@ -138,19 +132,19 @@ where prp.id in %s''',(tuple(ids),))
                 p = tocompute.pop()
                 for i in range(3):
                     s[i] += progress.get(p, (0.0, 0.0, 0.0))[i]
-            
-            uom_obj = self.pool.get('product.uom')        
+
+            uom_obj = self.pool.get('product.uom')
             user_uom, def_uom = self._get_user_and_default_uom_ids(cr, uid)
             if user_uom != def_uom:
                 s[0] = uom_obj._compute_qty(cr, uid, user_uom, s[0], def_uom)
                 s[1] = uom_obj._compute_qty(cr, uid, user_uom, s[1], def_uom)
                 s[2] = uom_obj._compute_qty(cr, uid, user_uom, s[2], def_uom)
-                
+
             if project.state == 'close':
                 progress_rate = 100.0
             else:
                 progress_rate = s[1] and round(min(100.0 * s[2] / s[1], 99.99), 2)
-            
+
             res[project.id] = {
                 'planned_hours': s[0],
                 'effective_hours': s[2],
@@ -164,7 +158,7 @@ where prp.id in %s''',(tuple(ids),))
             if proj.tasks:
                 raise osv.except_osv(_('Operation Not Permitted !'), _('You can not delete a project with tasks. I suggest you to deactivate it.'))
         return super(project, self).unlink(cr, uid, ids, *args, **kwargs)
-    
+
     _columns = {
         'complete_name': fields.function(_complete_name, method=True, string="Project Name", type='char', size=250),
         'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the project without removing it."),
@@ -253,21 +247,20 @@ where prp.id in %s''',(tuple(ids),))
             default['name'] = proj.name+_(' (copy)')
         res = super(project, self).copy(cr, uid, id, default, context)
 
-        task_ids = task_obj.search(cr, uid, [('project_id','=', res), ('active','=',True)])
-        tasks = task_obj.browse(cr, uid, task_ids)
-        for task in tasks:
-            date_deadline = None
-            if task.date_start:
-                ds = date(*time.strptime(task.date_start,'%Y-%m-%d %H:%M:%S')[:3])
-                if task.date_deadline:
-                    dd = date(*time.strptime(task.date_deadline,'%Y-%m-%d')[:3])
-                    diff = dd-ds
-                    date_deadline = (datetime.now()+diff).strftime('%Y-%m-%d %H:%M:%S')
-            task_obj.write(cr, uid, task.id, {'active':True,
-                                              'date_start': False,
-                                              'date_end': False,
-                                              'date_deadline':date_deadline,
-                                              })
+#        task_ids = task_obj.search(cr, uid, [('project_id','=', res), ('active','=',True)])
+#        tasks = task_obj.browse(cr, uid, task_ids)
+#        for task in tasks:
+#            date_deadline = None
+#            if task.date_start:
+#                ds = date(*time.strptime(task.date_start,'%Y-%m-%d %H:%M:%S')[:3])
+#                if task.date_deadline:
+#                    dd = date(*time.strptime(task.date_deadline,'%Y-%m-%d')[:3])
+#                    diff = dd-ds
+#                    date_deadline = (datetime.now()+diff).strftime('%Y-%m-%d %H:%M:%S')
+#            task_obj.write(cr, uid, task.id, {'date_start': False,
+#                                              'date_end': False,
+#                                              'date_deadline':date_deadline,
+#                                              })
 
         return res
 
@@ -365,7 +358,7 @@ class task(osv.osv):
                 if hours.get(task.id, False):
                     dur_in_user_uom =  uom_obj._compute_qty(cr, uid, default_uom, hours.get(task.id, 0.0), user_uom)
                     hours[task.id] = dur_in_user_uom
-            
+
         for task in self.browse(cr, uid, ids, context=context):
             res[task.id] = {'effective_hours': hours.get(task.id, 0.0), 'total_hours': task.remaining_hours + hours.get(task.id, 0.0)}
             res[task.id]['delay_hours'] = res[task.id]['total_hours'] - task.planned_hours
@@ -413,7 +406,7 @@ class task(osv.osv):
                 if task.project_id.active == False or task.project_id.state == 'template':
                     res[task.id] = False
         return res
-    
+
     _columns = {
         'active': fields.function(_is_template, method=True, store=True, string='Not a Template Task', type='boolean', help="This field is computed automatically and have the same behavior than the boolean 'active' field: if the task is linked to a template or unactivated project, it will be hidden unless specifically asked."),
         'name': fields.char('Task Summary', size=128, required=True),
@@ -461,7 +454,7 @@ class task(osv.osv):
     _order = "sequence, priority, date_start, id"
 
     _constraints = [
-        (_check_dates, 'Error! task start-date must be lower then task end-date.', ['date_start', 'date_end'])
+        (_check_dates, 'Error! Task start-date must be lower then task end-date.', ['date_start', 'date_end'])
     ]
     #
     # Override view according to the company definition
@@ -493,7 +486,6 @@ class task(osv.osv):
         for f in res['fields']:
             if 'Hours' in res['fields'][f]['string']:
                 res['fields'][f]['string'] = res['fields'][f]['string'].replace('Hours',tm)
-
         return res
 
     def do_close(self, cr, uid, ids, *args):
@@ -602,7 +594,6 @@ class task(osv.osv):
         self.write(cr, uid, ids, {'state': 'draft'})
         return True
 
-
     def do_pending(self, cr, uid, ids, *args):
         self.write(cr, uid, ids, {'state': 'pending'})
         for (id, name) in self.name_get(cr, uid, ids):
@@ -636,7 +627,7 @@ task()
 
 class project_work(osv.osv):
     _name = "project.task.work"
-    _description = "Task Work"
+    _description = "Project Task Work"
     _columns = {
         'name': fields.char('Work summary', size=128),
         'date': fields.datetime('Date'),
@@ -652,34 +643,36 @@ class project_work(osv.osv):
     }
 
     _order = "date desc"
-    
+
     def create(self, cr, uid, vals, *args, **kwargs):
-        if (not 'task_id' in vals) or (not 'hours' in vals):
-            return super(project_work,self).create(cr, uid, vals, *args, **kwargs)
-        if not vals['hours']:
-            vals['hours'] = 0.00
-         
         project_obj = self.pool.get('project.project')
         uom_obj = self.pool.get('product.uom')
+
+        if (not 'task_id' in vals) or (not 'hours' in vals):
+            return super(project_work, self).create(cr, uid, vals, *args, **kwargs)
+        if not vals['hours']:
+            vals['hours'] = 0.00
+
         user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)
         duration = vals['hours']
-        
+
         if user_uom != default_uom:
             duration =  uom_obj._compute_qty(cr, uid, default_uom, duration, user_uom)
         cr.execute('update project_task set remaining_hours=remaining_hours - %s where id=%s', (duration, vals['task_id']))
         return super(project_work,self).create(cr, uid, vals, *args, **kwargs)
 
     def write(self, cr, uid, ids, vals, context=None):
+        project_obj = self.pool.get('project.project')
+        uom_obj = self.pool.get('product.uom')
+
         if context is None:
             context = {}
         if not vals['hours']:
-            vals['hours'] = 0.00        
-         
-        project_obj = self.pool.get('project.project')
-        uom_obj = self.pool.get('product.uom')
-        user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)   
+            vals['hours'] = 0.00
+
+        user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)
         duration = vals['hours']
-         
+
         if user_uom == default_uom:
             for work in self.browse(cr, uid, ids, context):
                 cr.execute('update project_task set remaining_hours=remaining_hours - %s + (%s) where id=%s', (duration, work.hours, work.task_id.id))
@@ -688,14 +681,14 @@ class project_work(osv.osv):
                 duration =  uom_obj._compute_qty(cr, uid, default_uom, duration, user_uom)
                 del_work =  uom_obj._compute_qty(cr, uid, default_uom, work.hours, user_uom)
                 cr.execute('update project_task set remaining_hours=remaining_hours - %s + (%s) where id=%s', (duration, del_work, work.task_id.id))
-            
+
         return super(project_work,self).write(cr, uid, ids, vals, context)
 
     def unlink(self, cr, uid, ids, *args, **kwargs):
         context = kwargs.get('context', {})
         project_obj = self.pool.get('project.project')
-        user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)   
-         
+        user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)
+
         if user_uom == default_uom:
             for work in self.browse(cr, uid, ids, context):
                 cr.execute('update project_task set remaining_hours=remaining_hours + %s where id=%s', (work.hours, work.task_id.id))
@@ -710,64 +703,54 @@ project_work()
 class config_compute_remaining(osv.osv_memory):
     _name='config.compute.remaining'
 
-    def _get_remaining(self,cr, uid, ctx):
-        task_obj = self.pool.get('project.task')
-        if 'active_id' in ctx:
-            return task_obj.browse(cr, uid, ctx['active_id'], context=ctx).remaining_hours
+    def _get_remaining(self,cr, uid, context=None):
+        if context and 'active_id' in context:
+            return self.pool.get('project.task').browse(cr, uid, ctx['active_id'], context=context).remaining_hours
         return False
 
     _columns = {
         'remaining_hours' : fields.float('Remaining Hours', digits=(16,2), help="Put here the remaining hours required to close the task."),
     }
 
-    def _get_analytic_account(self, cr, uid, context={}):
-        if context.get('account_id', False):
-            return context.get('account_id')
-        return False
-
-    _defaults = {
-              'account_id' : _get_analytic_account,
-              }
-
     _defaults = {
         'remaining_hours': _get_remaining
     }
-    
+
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
             users_obj = self.pool.get('res.users')
             obj_tm = users_obj.browse(cr, uid, uid, context).company_id.project_time_mode_id
             tm = obj_tm and obj_tm.name or 'Hours'
-    
+
             res = super(config_compute_remaining, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu=submenu)
-    
+
             if tm in ['Hours','Hour']:
                 return res
-    
+
             eview = etree.fromstring(res['arch'])
-    
+
             def _check_rec(eview):
                 if eview.attrib.get('widget','') == 'float_time':
                     eview.set('widget','float')
                 for child in eview:
                     _check_rec(child)
                 return True
-    
+
             _check_rec(eview)
-    
+
             res['arch'] = etree.tostring(eview)
-    
+
             for f in res['fields']:
                 if 'Hours' in res['fields'][f]['string']:
                     res['fields'][f]['string'] = res['fields'][f]['string'].replace('Hours',tm)
-
             return res
+
     def compute_hours(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
         task_obj = self.pool.get('project.task')
         request = self.pool.get('res.request')
         if 'active_id' in context:
-            remaining_hrs=self.browse(cr,uid,ids)[0].remaining_hours
+            remaining_hrs = self.browse(cr,uid,ids)[0].remaining_hours
             task_obj.write(cr,uid,context['active_id'],{'remaining_hours':remaining_hrs})
         if context.get('button_reactivate', False):
             tasks = task_obj.browse(cr, uid, [context['active_id']], context=context)
@@ -787,7 +770,7 @@ class config_compute_remaining(osv.osv_memory):
         return {
                 'type': 'ir.actions.act_window_close',
          }
-        
+
 config_compute_remaining()
 
 class message(osv.osv):

From d7744b204fe8a0ef62dce6b1c49e8efafe41e529 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Thu, 5 Aug 2010 14:34:12 +0530
Subject: [PATCH 07/14] [REMOVE] configuration wizard : profile_bookstore
 option from module list

bzr revid: vir@tinyerp.com-20100805090412-0dp02g6ox0bz05i3
---
 addons/base_setup/base_setup_installer.xml | 21 ++++++++++-----------
 addons/base_setup/installer.py             |  4 ----
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 3af1a070104..08a85d32436 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -23,18 +23,17 @@
             <attribute name="string">Install Generic Modules</attribute>
           </separator>
           <group colspan="8">
-            <field name="crm" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction,profile_bookstore)"/> <field name="sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction,profile_bookstore)"/>
-            <field name="project" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction,profile_bookstore)"/> <field name="knowledge" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction,profile_bookstore)"/>
-            <field name="stock" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction,profile_bookstore)"/> <field name="mrp" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction,profile_bookstore)"/>
-            <field name="account" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction,profile_bookstore)"/> <field name="purchase" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction,profile_bookstore)"/>
-            <field name="hr" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction,profile_bookstore)"/> <field name="point_of_sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction,profile_bookstore)"/>
-            <field name="marketing" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction,profile_bookstore)"/> <field name="misc_tools" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction,profile_bookstore)"/>
-            <field name="report_designer" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction,profile_bookstore)"/>
+            <field name="crm" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction)"/> <field name="sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction)"/>
+            <field name="project" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction)"/> <field name="knowledge" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction)"/>
+            <field name="stock" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction)"/> <field name="mrp" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction)"/>
+            <field name="account" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction)"/> <field name="purchase" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction)"/>
+            <field name="hr" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction)"/> <field name="point_of_sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction)"/>
+            <field name="marketing" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction)"/> <field name="misc_tools" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction)"/>
+            <field name="report_designer" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction)"/>
             <separator string="Install Specific Business Modules" colspan="4"/>
-            <field name="association" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction,profile_bookstore)"/>
-            <field name="auction" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction,profile_bookstore)"/>
-            <field name="profile_bookstore" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction,profile_bookstore)"/>
-            <field name="product_expiry" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction,profile_bookstore)"/>
+            <field name="association" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction)"/>
+            <field name="auction" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction)"/>
+            <field name="product_expiry" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction)"/>
           </group>
         </data>
       </field>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 3e340ca8c6f..9c02c5f20c1 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -86,10 +86,6 @@ class base_setup_installer(osv.osv_memory):
             help="Installs a preselected set of OpenERP "
                  "applications selected to help you manage your auctions "
                  "as well as the business processes around them."),
-        'profile_bookstore':fields.boolean('Book Stores',
-            help="Installs a preselected set of OpenERP "
-                 "applications which will help you manage your book store "
-                 "or your library."),
         }
     _defaults = {
         'crm': True,

From c4f3dc085d65a102c2c0824b3a0d2d8109efec2a Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 5 Aug 2010 11:19:09 +0200
Subject: [PATCH 08/14] [IMP] mail_gateway: improve email headers detection for
 mail user agents that do not set the References but just the In-Reply-To
 headers

bzr revid: odo@openerp.com-20100805091909-cv91l3380kkpr4a7
---
 addons/mail_gateway/mail_gateway.py | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index ef36be3a3ef..81050b1dac9 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -234,16 +234,16 @@ class mailgate_tool(osv.osv_memory):
         msg_pool = self.pool.get('mailgate.message')
         for res_id in res_ids:
             msg_data = {
-                        'name': msg.get('subject', 'No subject'), 
-                        'date': msg.get('date') , 
-                        'description': msg.get('body', msg.get('from')), 
+                        'name': msg.get('subject', 'No subject'),
+                        'date': msg.get('date'),
+                        'description': msg.get('body', msg.get('from')),
                         'history': True,
-                        'res_model': model, 
-                        'email_cc': msg.get('cc'), 
-                        'email_from': msg.get('from'), 
+                        'res_model': model,
+                        'email_cc': msg.get('cc'),
+                        'email_from': msg.get('from'),
                         'email_to': msg.get('to'), 
-                        'message_id': msg.get('message-id'), 
-                        'references': msg.get('references'), 
+                        'message_id': msg.get('message-id'),
+                        'references': msg.get('references') or msg.get('in-reply-to'),
                         'res_id': res_id,
                         'user_id': uid,
                         'attachment_ids': [(6, 0, attach)]
@@ -380,6 +380,9 @@ class mailgate_tool(osv.osv_memory):
         if 'References' in fields:
             msg['references'] = msg_txt.get('References')
 
+        if 'In-Reply-To' in fields:
+            msg['in-reply-to'] = msg_txt.get('In-Reply-To')
+
         if 'X-Priority' in fields:
             msg['priority'] = msg_txt.get('X-Priority', '3 (Normal)').split(' ')[0]
 
@@ -425,12 +428,12 @@ class mailgate_tool(osv.osv_memory):
         res_ids = []
         attachment_ids = []
         new_res_id = False
-        if msg.get('references'):
-            references = msg.get('references')
+        if msg.get('references') or msg.get('in-reply-to'):
+            references = msg.get('references') or msg.get('in-reply-to')
             if '\r\n' in references:
-                references = msg.get('references').split('\r\n')
+                references = references.split('\r\n')
             else:
-                references = msg.get('references').split(' ')
+                references = references.split(' ')
             for ref in references:
                 ref = ref.strip()
                 res_id = tools.misc.reference_re.search(ref)
@@ -464,7 +467,7 @@ class mailgate_tool(osv.osv_memory):
                             email_from = msg.get('from'),
                             email_cc = msg.get('cc'),
                             message_id = msg.get('message-id'),
-                            references = msg.get('references', False),
+                            references = msg.get('references', False) or msg.get('in-reply-to', False),
                             attach = attachments.items(),
                             context = context)
         else:

From 80e39cbe2e5a30020775993a34ab7c5b35fb8518 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 5 Aug 2010 15:24:18 +0530
Subject: [PATCH 09/14] [FIX] Project: rename ctx to context

bzr revid: mra@mra-laptop-20100805095418-4votyplo006tdb8s
---
 addons/project/project.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 211fc78a6a6..7be2956bed0 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -705,7 +705,7 @@ class config_compute_remaining(osv.osv_memory):
 
     def _get_remaining(self,cr, uid, context=None):
         if context and 'active_id' in context:
-            return self.pool.get('project.task').browse(cr, uid, ctx['active_id'], context=context).remaining_hours
+            return self.pool.get('project.task').browse(cr, uid, context['active_id'], context=context).remaining_hours
         return False
 
     _columns = {

From 06145300d218a1f996c3f68da488c8074b672c49 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 5 Aug 2010 15:45:50 +0530
Subject: [PATCH 10/14] [FIX]: base_contact: Changed size of field of contact
 and job table, made compatible with that of partner address

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

bzr revid: rpa@tinyerp.com-20100805101550-jzcssnf0z4kictxy
---
 addons/base_contact/base_contact.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index 848bed39783..85a2241aaa0 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -45,9 +45,9 @@ class res_partner_contact(osv.osv):
         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),
+        'name': fields.char('Last Name', size=64, required=True),
+        'first_name': fields.char('First Name', size=64),
+        'mobile': fields.char('Mobile', size=64),
         'title': fields.many2one('res.partner.title','Title'),
         'website': fields.char('Website', size=120),
         'lang_id': fields.many2one('res.lang', 'Language'),
@@ -203,7 +203,7 @@ class res_partner_job(osv.osv):
         'address_id': fields.many2one('res.partner.address', 'Address', \
                         help='Address which is linked to the Partner'), # TO Correct: domain=[('partner_id', '=', name)]
         'contact_id': fields.many2one('res.partner.contact','Contact', required=True, ondelete='cascade'),
-        'function': fields.char('Partner Function', size=34, help="Function of this contact with this partner"),
+        'function': fields.char('Partner Function', size=64, help="Function of this contact with this partner"),
         'sequence_contact': fields.integer('Contact Seq.',help='Order of\
                      importance of this address in the list of addresses of the linked contact'),
         'sequence_partner': fields.integer('Partner Seq.',help='Order of importance\

From 91418b747758147656627d1c08209661f1146f3a Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Thu, 5 Aug 2010 15:56:19 +0530
Subject: [PATCH 11/14] [IMP]: Usability Improvement

bzr revid: atp@tinyerp.co.in-20100805102619-822pt3hx06rppbn2
---
 addons/auction/auction.py                     |  52 +++---
 addons/auction/auction_view.xml               | 172 ++++++++++--------
 .../wizard/auction_lots_auction_move_view.xml |  17 +-
 .../wizard/auction_lots_make_invoice.py       |   2 +-
 .../wizard/auction_lots_make_invoice_buyer.py |   4 +-
 .../auction_lots_make_invoice_buyer_view.xml  |   6 +-
 .../wizard/auction_lots_make_invoice_view.xml |   8 +-
 addons/auction/wizard/auction_pay_buy.py      |  14 +-
 .../auction/wizard/auction_pay_buy_view.xml   |  44 +++--
 9 files changed, 179 insertions(+), 140 deletions(-)

diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index 6a241873f98..53ba107ae40 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -289,6 +289,7 @@ class auction_lots(osv.osv):
                 elif name == "gross_revenue":
                     if lot.auction_id:
                         result = lot.buyer_price - lot.seller_price
+                        
                 elif name == "net_revenue":
                     if lot.auction_id:
                         result = lot.buyer_price - lot.seller_price - lot.costs
@@ -343,39 +344,40 @@ class auction_lots(osv.osv):
 
     _columns = {
         'bid_lines':fields.one2many('auction.bid_line', 'lot_id', 'Bids'), 
-        'auction_id': fields.many2one('auction.dates', 'Auction Date', select=1), 
-        'bord_vnd_id': fields.many2one('auction.deposit', 'Depositer Inventory', required=True), 
-        'name': fields.char('Short Description', size=64, required=True), 
+        'auction_id': fields.many2one('auction.dates', 'Auctions', select=1, help="Auction For Objects"), 
+        'bord_vnd_id': fields.many2one('auction.deposit', 'Depositer Inventory', required=True, help="Auction Deposit For Deposit Inventory"), 
+        'name': fields.char('Title', size=64, required=True, help='Auction Objects Name'), 
         'name2': fields.char('Short Description (2)', size=64), 
         'lot_type': fields.selection(_type_get, 'Object category', size=64), 
-        'author_right': fields.many2one('account.tax', 'Author rights'), 
-        'lot_est1': fields.float('Minimum Estimation'), 
-        'lot_est2': fields.float('Maximum Estimation'), 
-        'lot_num': fields.integer('List Number', required=True, select=1), 
+        'author_right': fields.many2one('account.tax', 'Author rights', help="Account Tax For Author Commission"), 
+        'lot_est1': fields.float('Minimum Estimation', help="Minimum Estimate Price Of Objects"), 
+        'lot_est2': fields.float('Maximum Estimation', help="Maximum Estimate Price Of Objects"), 
+        'lot_num': fields.integer('List Number', required=True, select=1, help="List Number For selected Object in Deposit"), 
         'create_uid': fields.many2one('res.users', 'Created by', readonly=True), 
         'history_ids':fields.one2many('auction.lot.history', 'lot_id', 'Auction history'), 
-        'lot_local':fields.char('Location', size=64), 
+        'lot_local':fields.char('Location', size=64, help="Auction Location"), 
         'artist_id':fields.many2one('auction.artists', 'Artist/Author'), 
-        'artist2_id':fields.many2one('auction.artists', 'Artist/Author 2'), 
+        'artist2_id':fields.many2one('auction.artists', 'Artist/Author2'), 
         'important':fields.boolean('To be Emphatized'), 
         'product_id':fields.many2one('product.product', 'Product', required=True), 
         'obj_desc': fields.text('Object Description'), 
         'obj_num': fields.integer('Catalog Number'), 
-        'obj_ret': fields.float('Price retired'), 
+        'obj_ret': fields.float('Price retired', help="Objects Ret"), 
         'obj_comm': fields.boolean('Commission'), 
-        'obj_price': fields.float('Adjudication price'), 
+        'obj_price': fields.float('Adjudication price', help="Objects Price"), 
         'ach_avance': fields.float('Buyer Advance'), 
         'ach_login': fields.char('Buyer Username', size=64), 
-        'ach_uid': fields.many2one('res.partner', 'Buyer'), 
-        'ach_emp': fields.boolean('Taken Away', readonly=True), 
-        'is_ok': fields.boolean('Buyer\'s payment'), 
+        'ach_uid': fields.many2one('res.partner', 'Buyer'),
+        'seller_id': fields.related('bord_vnd_id','partner_id', type='many2one', relation='res.partner', string='Seller', readonly=True, help="Seller who is related to depositor Inventory"), 
+        'ach_emp': fields.boolean('Taken Away', readonly=True, help="When This Field is True means, Objects is taken away by Buyer"), 
+        'is_ok': fields.boolean('Buyer\'s payment', help="When Buyer Pay For Account Bank statement', This field is selected as True."), 
         'ach_inv_id': fields.many2one('account.invoice', 'Buyer Invoice', readonly=True, states={'draft':[('readonly', False)]}), 
         'sel_inv_id': fields.many2one('account.invoice', 'Seller Invoice', readonly=True, states={'draft':[('readonly', False)]}), 
         'vnd_lim': fields.float('Seller limit'), 
         'vnd_lim_net': fields.boolean('Net limit ?', readonly=True), 
-        'image': fields.binary('Image'), 
-        'paid_vnd':fields.function(_getprice, string='Seller Paid', method=True, type='boolean', store=True, multi="paid_vnd"), 
-        'paid_ach':fields.function(_getprice, string='Buyer invoice reconciled', method=True, type='boolean', store=True, multi="paid_ach"), 
+        'image': fields.binary('Image', help="Object Image"), 
+        'paid_vnd':fields.function(_getprice, string='Seller Paid', method=True, type='boolean', store=True, multi="paid_vnd", help="When state of Seller Invoice is 'Paid', This field is selected as True."), 
+        'paid_ach':fields.function(_getprice, string='Buyer Invoice Reconciled', method=True, type='boolean', store=True, multi="paid_ach", help="When state of Buyer Invoice is 'Paid', This field is selected as True."), 
         'state': fields.selection((
             ('draft', 'Draft'), 
             ('unsold', 'Unsold'), 
@@ -386,14 +388,14 @@ class auction_lots(osv.osv):
                 \n* The \'Unsold\' state is used when object does not sold for long time, user can also set it as draft state after unsold. \
                 \n* The \'Paid\' state is used when user pay for the object \
                 \n* The \'Sold\' state is used when user buy the object.'), 
-        'buyer_price': fields.function(_getprice, method=True, string='Buyer price', store=True, multi="buyer_price"), 
-        'seller_price': fields.function(_getprice, method=True, string='Seller price', store=True, multi="seller_price"), 
-        'gross_revenue':fields.function(_getprice, method=True, string='Gross revenue', store=True, multi="gross_revenue"), 
-        'gross_margin':fields.function(_getprice, method=True, string='Gross Margin (%)', store=True, multi="gross_margin"), 
-        'costs':fields.function(_getprice, method=True, string='Indirect costs', store=True, multi="costs"), 
-        'statement_id': fields.many2many('account.bank.statement.line', 'auction_statement_line_rel', 'auction_id', 'statement', 'Payment'), 
-        'net_revenue':fields.function(_getprice, method=True, string='Net revenue', store=True, multi="net_revenue"), 
-        'net_margin':fields.function(_getprice, method=True, string='Net Margin (%)', store=True, multi="net_margin"), 
+        'buyer_price': fields.function(_getprice, method=True, string='Buyer price', store=True, multi="buyer_price", help="Objects Price which Buyer Given For Objects"), 
+        'seller_price': fields.function(_getprice, method=True, string='Seller price', store=True, multi="seller_price", help="Seller Price"), 
+        'gross_revenue':fields.function(_getprice, method=True, string='Gross revenue', store=True, multi="gross_revenue", help="Revenue Minus Cost Of Objects Sold."), 
+        'gross_margin':fields.function(_getprice, method=True, string='Gross Margin (%)', store=True, multi="gross_margin", help="Gross Income Divided by Net Sales"), 
+        'costs':fields.function(_getprice, method=True, string='Indirect costs', store=True, multi="costs", help="Total credit of analytic account"), 
+        'statement_id': fields.many2many('account.bank.statement.line', 'auction_statement_line_rel', 'auction_id', 'statement', 'Payment', help="Account Bank statement Line For Given Buyer"), 
+        'net_revenue':fields.function(_getprice, method=True, string='Net revenue', store=True, multi="net_revenue", help="Total Revenue Minus Returns"), 
+        'net_margin':fields.function(_getprice, method=True, string='Net Margin (%)', store=True, multi="net_margin", help="The ratio of net profits to revenues"), 
     }
     _defaults = {
         'state':lambda *a: 'draft', 
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index 6079081c417..4972d605cbe 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -111,7 +111,7 @@
                         <separator string="Auction Dates" colspan="4"/>
                         <field name="auction1" select="1"/>
                         <field name="auction2" select="1"/>
-                        <label string="" colspan="4"/>
+                        <separator string="" colspan="4"/>
                         <field name="state"/>
                         <button name="close" states="draft" string="Create Invoices" type="object" colspan="2" icon="gtk-yes"/>
                     </page>
@@ -209,7 +209,6 @@
     <menuitem name="Auctions" parent="auction_menu_root" id="auction_date_menu" sequence="1"/>
     <menuitem name="Auctions" parent="auction_date_menu" id="menu_auction_dates_next1" action="action_auction_dates_next"/>
     
-    
  
     <record model="ir.ui.view" id="view_auction_lot_tree">
         <field name="name">Auction lots</field>
@@ -246,57 +245,90 @@
         <field name="priority" eval="8"/>
         <field name="arch" type="xml">
             <form string="Objects">
-              <group colspan="4" col="4">
-                  <group colspan="2" col="4">  
-                    <field colspan="2" name="name"/>
-                    <field name="obj_num" select="1"/>
-                    <field name="lot_type"/>
-                    <field name="auction_id" select="1"/>
-                    <field name="artist_id"/>
-                    <field name="artist2_id"/>
-                    <field name="lot_est1"/>
-                    <field name="lot_est2"/>
-                    <field name="product_id"/>
-                    <field name="lot_local"/>
-                    <field name="bord_vnd_id" select="1"/>
-                    <field name="lot_num"/>
-                    <newline/>
-                   </group> 
-                  <group colspan="2" col="1">
-                    <field name="image" widget='image' nolabel="1"/>
-                  </group>
-              </group>
+              <group colspan="4" col="8">
+                <field name="name" colspan="4"/>
+                <field name="obj_num"/>
+                <newline/>
+                <field name="auction_id"/>
+                <field name="lot_type"/>
+                <field name="lot_local"/> 
+              </group>  
               <notebook colspan="4">
-                  <page string="Buyer">
-                      <separator string="Buyer information" colspan="4"/>
+                  <page string="Catalog">
+                      <separator string="Inventory" colspan="2"/>
                       <group colspan="4" col="6">
-                          <field name="ach_uid" />
-                          <field name="ach_login" select="1" />
-                          <field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False),('type_tax_use','&lt;&gt;','sale')]"/>
-                          <field name="obj_price"/>
-                          <field name="obj_ret"/>
-                          <field name="obj_comm"/>
-                          <field name="buyer_price"/>
-                          <field name="seller_price"/>
-                          <field name="ach_emp"/>
-                          <field name="gross_revenue"/>
-                          <field name="net_revenue"/>
-                          <field name="gross_margin"/>
-                          <field name="net_margin"/>
-                          <field name="costs"/>
-                          <newline/>
-                          <field name="ach_inv_id"/>
-                          <field name="paid_ach"/>
-                          <field name="is_ok"/>
+                          <group colspan="2" col="4">  
+                            <field name="product_id" colspan="4"/>
+                            <field name="lot_num" select="1" />
+                            <field name="bord_vnd_id"/>
+                          </group>
+                          <group colspan="2" col="1">
+                            <field name="image" widget='image' nolabel="1"/>
+                          </group>
+                      </group>
+                      <group colspan="4" col="6">
+                        <group colspan="2" col="1">
+                            <separator string="Authors" colspan="2"/>
+                            <field name="artist_id"/>
+                            <field name="artist2_id"/>
+                            <field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False),('type_tax_use','&lt;&gt;','sale')]"/>
+                        </group>
+                        <group colspan="2" col="1">
+                            <separator string="Price" colspan="4"/>
+                            <field name="lot_est1"/>
+                            <field name="lot_est2"/>
+                            <field name="obj_price"/>
+                            <field name="obj_comm"/>
+                        </group>
+                        <group colspan="2" col="1">
+                            <separator string="Statistical" colspan="4"/>
+                            <field name="gross_revenue"/>
+                            <field name="net_revenue"/>
+                            <field name="gross_margin"/>
+                            <field name="net_margin"/>
+                            <field name="costs"/>
+                        </group>
+                      </group>
+                      <group colspan="4" col="4">
+                        <separator string="Seller Information" colspan="4"/>
+                        <field name="seller_id"/>
+                        <field name="seller_price"/>
+                        <newline/>
+                        <field name="vnd_lim"/>
+                        <field name="vnd_lim_net"/>
+                        <field name="sel_inv_id"/>
+                        <field name="paid_vnd"/>
+                        <separator string="" colspan="4"/>
+                        <field name="state" colspan="1"/>
+                        <group col="8" colspan="2">
+                            <button name="button_bought" string="Sold" states="draft" type="object" icon="gtk-jump-to"/>
+                            <button name="button_not_bought" string="Not sold" states="draft" type="object" icon="gtk-undo"/>
+                            <button name="button_taken_away" string="Taken away" states="sold" type="object" icon="gtk-goto-last"/>
+                            <button name="button_unpaid" string="Set to draft" states="sold,unsold,paid" type="object" icon="gtk-convert"/>
+                        </group> 
+                      </group>    
+                   </page>
+                   <page string="Bids">
+                       <separator string="Finalists Bid" colspan="4"/>
+                       <group colspan="4" col="6">
+                        <field name="ach_uid"/>
+                        <field name="ach_login" select="1" />
+                        <newline/>
+                        <field name="buyer_price"/>
+                        <field name="ach_inv_id"/>
+                        <newline/>
+                        <field name="is_ok"/>
+                        <field name="paid_ach"/>
+                        <field name="ach_emp"/>
                        </group>
-                      <field name="statement_id" domain="[('state','=','draft')]" colspan="4" nolabel="1"
+                       <field name="statement_id" domain="[('state','=','draft')]" colspan="4" nolabel="1"
                           widget="one2many_list">
-                          <tree string="Payment's history">
+                          <tree string="Buyer's Payment History">
                               <field name="statement_id"/>
                               <field name="amount"/>
                               <field name="date"/>
                           </tree>
-                          <form string="Bank Statement">
+                          <form string="Buyer's Payment History">
                               <field name="name"/>
                               <field name="sequence"/>
                               <field name="date"/>
@@ -308,38 +340,14 @@
                               <field name="amount"/>
                               <field name="reconcile_amount"/>
                           </form>
-                      </field>
-                      <field name="state" colspan="1"/>
-                      <group col="8" colspan="2">
-                          <button name="button_bought" string="Sold" states="draft" type="object" icon="gtk-jump-to"/>
-                          <button name="button_not_bought" string="Not sold" states="draft" type="object" icon="gtk-undo"/>
-                          <button name="button_taken_away" string="Taken away" states="sold" type="object" icon="gtk-goto-last"/>
-                          <button name="button_unpaid" string="Set to draft" states="sold,unsold,paid" type="object" icon="gtk-convert"/>
-                      </group> 
-                   </page>
-                   <page string="Seller">
-                       <separator string="Seller information" colspan="4"/>
-                       <field name="vnd_lim"/>
-                       <field name="vnd_lim_net"/>
-                       <field name="sel_inv_id"/>
-                       <field name="paid_vnd"/>
-                       <field name="history_ids" colspan="4" readonly="1" nolabel="1">
-                           <tree string="History">
-                               <field name="name"/>
-                               <field name="lot_id"/>
-                               <field name="auction_id"/>
-                               <field name="price"/>
-                           </tree>
                        </field>
-                    </page>
-                    <page string="Bids">
-                        <field name="bid_lines" colspan="4" nolabel="1" editable="top">
-                            <tree string="Bids"  editable="top">
+                       <field name="bid_lines" colspan="4" nolabel="1" editable="top">
+                            <tree string="Bids Details"  editable="top">
                                 <field name="bid_id"/>
                                 <field name="price"/>
                                 <field name="call"/>
                             </tree>
-                            <form string="Bids" >
+                            <form string="Bids Details" >
                                 <field name="bid_id"/>
                                 <field name="lot_id" domain="[('auction_id','=',parent['auction_id'])]" on_change="onchange_name(lot_id)"/>
                                 <field name="price"/>
@@ -347,6 +355,16 @@
                             </form>
                         </field>
                     </page>
+                    <page string="History">
+                       <field name="history_ids" colspan="4" readonly="1" nolabel="1">
+                          <tree string="History">
+                             <field name="name"/>
+                             <field name="lot_id"/>
+                             <field name="auction_id"/>
+                             <field name="price"/>
+                          </tree>
+                       </field>
+                    </page>
                     <page string="Note">
                         <field name="obj_desc" colspan="4" nolabel="1"/>
                     </page>
@@ -421,6 +439,14 @@
         <field name="search_view_id" ref="view_auction_lots_filter"/>
         <field name="context">{"search_default_draft": "1"}</field>
     </record>
+    
+    <!-- Action for Bids -->
+    
+    <act_window name="Open Bids"
+        domain="[('lot_id', '=', active_id)]"
+        res_model="auction.bid_line"
+        src_model="auction.lots"
+        id="act_auction_lot_open_bid"/>
 
     <menuitem name="Objects" parent="auction_menu_root" id="auction_objects_menu" sequence="2"/>
     <menuitem name="Objects" action="action_all_objects" parent="auction_objects_menu" id="auction_all_objects_menu"/>
@@ -684,7 +710,7 @@
     
     <menuitem name="Reporting" id="auction_report_menu" parent="auction_menu_root" sequence="6"/>
 
-    <act_window name="Bordereau de dépôt"
+    <act_window name="Deposit slip"
         domain="[('partner_id', '=', active_id)]"
         res_model="auction.deposit"
         src_model="res.partner"
diff --git a/addons/auction/wizard/auction_lots_auction_move_view.xml b/addons/auction/wizard/auction_lots_auction_move_view.xml
index cd81bfbb633..fc216cd1893 100644
--- a/addons/auction/wizard/auction_lots_auction_move_view.xml
+++ b/addons/auction/wizard/auction_lots_auction_move_view.xml
@@ -7,16 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Change Auction Date">
-                	<label string="Warning, this will erase the object adjudication price and its buyer!" colspan="4"/>
-                	<newline/>
-              		<separator string="" colspan="4"/>
-              		<field name="auction_id"/>
-                    <separator string="" colspan="4" />
+                    <label string ="Warning, This will Erase The Object Adjudication Price and Its Buyer!" colspan="4"/>
+                    <separator string="" colspan="4"/>
+                    <field name="auction_id"/>
+                    <separator string="" colspan="4"/>   
                     <group colspan="4" col="4">
-                        <label string=" " colspan="2"/>
-                    	<button  icon="gtk-close" special="cancel" string="Close"/>
-                    	<button  icon="gtk-redo" string="Move to Auction date" name="auction_move_set" type="object"/>
-                   </group>
+                       <label string=" " colspan="2"/>
+               	       <button  icon="gtk-close" special="cancel" string="Close"/>
+               	       <button  icon="gtk-redo" string="Move to Auction date" name="auction_move_set" type="object"/>
+                    </group>
                </form>
             </field>
   		</record>
diff --git a/addons/auction/wizard/auction_lots_make_invoice.py b/addons/auction/wizard/auction_lots_make_invoice.py
index 8e463937c50..5d32e644283 100644
--- a/addons/auction/wizard/auction_lots_make_invoice.py
+++ b/addons/auction/wizard/auction_lots_make_invoice.py
@@ -31,7 +31,7 @@ class auction_lots_make_invoice(osv.osv_memory):
     _description = "Make invoice"
     
     _columns = {
-       'amount': fields.float('Invoiced Amount', required =True, readonly=True), 
+       'amount': fields.float('Invoiced Amount', required =True, readonly=True, help="Seller Price"), 
        'objects':fields.integer('# of objects', required =True, readonly=True), 
        'number':fields.char('Invoice Number', size=64), 
     }
diff --git a/addons/auction/wizard/auction_lots_make_invoice_buyer.py b/addons/auction/wizard/auction_lots_make_invoice_buyer.py
index 1c36570129c..5eb9a649556 100644
--- a/addons/auction/wizard/auction_lots_make_invoice_buyer.py
+++ b/addons/auction/wizard/auction_lots_make_invoice_buyer.py
@@ -25,14 +25,12 @@ class auction_lots_make_invoice_buyer(osv.osv_memory):
     
     _name = "auction.lots.make.invoice.buyer"
     _description = __doc__
-    
     _columns= {
-       'amount': fields.float('Invoiced Amount', required =True, readonly=True), 
+       'amount': fields.float('Invoiced Amount', required =True, readonly=True, help="Buyer Price"), 
        'objects':fields.integer('# of objects', required =True, readonly=True), 
        'number':fields.char('Invoice Number', size=64), 
        'buyer_id':fields.many2one('res.partner', 'Buyer', required=True), 
     }
-
     _defaults={
        'number': lambda *a: False,
     }
diff --git a/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml b/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
index d71cfb59414..8ec4746dcf8 100644
--- a/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
+++ b/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
@@ -6,16 +6,18 @@
             <field name="model">auction.lots.make.invoice.buyer</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Paid">
+                <form string="Buyer Invoice">
                 	<group colspan="4" >
+                	     <separator string="Create Invoices For Buyer" colspan="4"/>
                 		 <field name="amount"/>
                 		 <field name="objects"/>
                 		 <field name="number"/>
                 		 <label string="(Keep empty for automatic number)" colspan="2"/>
                 		 <field name="buyer_id"/>
                     </group>
-                       	<separator string="" colspan="4" />
+                    <separator string="" colspan="4" />
                     <group colspan="4" col="6">
+                        <label string=" " colspan="2"/>
                     	<button icon="gtk-close" special="cancel" string="Close"/>
                     	<button icon="gtk-yes" string="Create invoices" name="makeInvoices" type="object"/>
                    </group>
diff --git a/addons/auction/wizard/auction_lots_make_invoice_view.xml b/addons/auction/wizard/auction_lots_make_invoice_view.xml
index ca650f48afd..ddd82ac3cda 100644
--- a/addons/auction/wizard/auction_lots_make_invoice_view.xml
+++ b/addons/auction/wizard/auction_lots_make_invoice_view.xml
@@ -6,13 +6,15 @@
             <field name="model">auction.lots.make.invoice</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Paid">
+                <form string="Seller Invoice">
                 	<group colspan="4" >
+                	     <separator string="Create Invoices For Seller" colspan="4"/>  
                 		 <field name="amount"/>
                 		 <field name="objects"/>
-                		 <field name="number" colspan="3"/>
+                		 <field name="number" colspan="1"/>
+                		 <label string="(Keep empty for automatic number)" colspan="2"/>
                     </group>
-                       	<separator string="" colspan="4" />
+                    <separator string="" colspan="4"/>
                     <group colspan="4" col="6">
                     	<button icon="gtk-close" special="cancel" string="Close"/>
                     	<button icon="gtk-yes" string="Create invoices" name="makeInvoices" type="object"/>
diff --git a/addons/auction/wizard/auction_pay_buy.py b/addons/auction/wizard/auction_pay_buy.py
index bc20eb75fbe..108ed00eddc 100644
--- a/addons/auction/wizard/auction_pay_buy.py
+++ b/addons/auction/wizard/auction_pay_buy.py
@@ -28,14 +28,14 @@ class auction_pay_buy(osv.osv_memory):
     _name = "auction.pay.buy"
     _description = "Pay buy"
     _columns= {
-       'amount': fields.float('Amount paid', digits= (16, 2)), 
+       'amount': fields.float('Amount', digits= (16, 2), help="Amount For First Bank Statement"), 
        'buyer_id':fields.many2one('res.partner', 'Buyer'), 
-       'statement_id1':fields.many2one('account.bank.statement', 'Statement', required=True), 
-       'amount2': fields.float('Amount paid', digits= (16, 2)), 
-       'statement_id2':fields.many2one('account.bank.statement', 'Statement'), 
-       'amount3': fields.float('Amount paid', digits = (16, 2)), 
-       'statement_id3':fields.many2one('account.bank.statement', 'Statement'), 
-       'total': fields.float('Amount paid', digits = (16, 2), readonly =True), 
+       'statement_id1':fields.many2one('account.bank.statement', 'Statement', required=True, help="First Bank Statement For Buyer"), 
+       'amount2': fields.float('Amount', digits= (16, 2), help="Amount For Second Bank Statement"), 
+       'statement_id2':fields.many2one('account.bank.statement', 'Statement', help="Second Bank Statement For Buyer"), 
+       'amount3': fields.float('Amount', digits = (16, 2), help="Amount For Third Bank Statement"), 
+       'statement_id3':fields.many2one('account.bank.statement', 'Statement', help="Third Bank Statement For Buyer"), 
+       'total': fields.float('Total Amount', digits = (16, 2), readonly =True), 
     }
     
     def default_get(self, cr, uid, fields, context=None):
diff --git a/addons/auction/wizard/auction_pay_buy_view.xml b/addons/auction/wizard/auction_pay_buy_view.xml
index 002c4ffd839..d4ba91cad84 100644
--- a/addons/auction/wizard/auction_pay_buy_view.xml
+++ b/addons/auction/wizard/auction_pay_buy_view.xml
@@ -7,23 +7,33 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Pay objects">
-                	<group colspan="4" >
-                         <separator string="Pay Objects" colspan="4" />
-                		 <field name="amount"/>
-                		 <field name="statement_id1" domain="[('state','=','draft')]"/>
-                		 <field name="amount2"/>
-                		 <field name="statement_id2"  domain="[('state','=','draft')]"/>
-                		 <field name="amount3"/>
-                		 <field name="statement_id3"  domain="[('state','=','draft')]"/>
-                		 <newline/>
-                		 <field name="buyer_id"/>
-                		 <field name="total"/>
-                    </group>
-                       	<separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                    	<button icon="gtk-close" special="cancel" string="Close"/>
-                    	<button icon="gtk-yes"  string="Pay" name="pay_and_reconcile" type="object"/>
-                   </group>
+                  <group colspan="4" col="4" >
+                     <separator string="Pay Objects" colspan="4" />
+			         <field name="buyer_id"/>
+			         <field name="total"/> 
+			   		 <newline/>
+                  </group>
+                  <separator string="Payment Lines" colspan="4"/>
+                  <group colspan="4" col="4">
+                       <label string="Line1"/>
+                       <field name="amount"/>
+                       <field name="statement_id1" domain="[('state','=','draft')]"/>    
+                  </group> 
+                  <group colspan="4" col="4">
+                       <label string="Line2"/>
+                       <field name="amount2"/>
+                       <field name="statement_id2" domain="[('state','=','draft')]"/>
+                  </group>
+                  <group colspan="4" col="4">
+                    <label string="Line3" />
+                    <field name="amount3"/>
+                    <field name="statement_id3"  domain="[('state','=','draft')]"/>
+                  </group>
+                  <separator string="" colspan="4" />
+                  <group colspan="4" col="6">
+                   	<button icon="gtk-close" special="cancel" string="Close"/>
+                   	<button icon="gtk-yes"  string="Pay" name="pay_and_reconcile" type="object"/>
+                  </group>
                </form>
             </field>
   		</record>

From c5d49c63f4579d291b1954d34f31f22d64b4bbf2 Mon Sep 17 00:00:00 2001
From: "JAM (OpenERP)" <>
Date: Thu, 5 Aug 2010 16:08:45 +0530
Subject: [PATCH 12/14] [IMP] outlook: improvement

bzr revid: hmo@tinyerp.com-20100805103845-fiiiavbohbka01pl
---
 addons/outlook/__openerp__.py                 |   6 +-
 addons/outlook/plugin/dialogs/dialog_map.py   |   2 +-
 .../plugin/dialogs/resources/OpenERP_Logo.bmp | Bin 0 -> 80062 bytes
 .../plugin/dialogs/resources/dialogs.py       |   6 +-
 .../plugin/dialogs/resources/dialogs.rc       |  28 ++---
 addons/outlook/plugin/eml.py                  |   5 +-
 addons/outlook/plugin/tiny_xmlrpc.py          | 111 ++++++++++--------
 7 files changed, 85 insertions(+), 73 deletions(-)
 create mode 100755 addons/outlook/plugin/dialogs/resources/OpenERP_Logo.bmp

diff --git a/addons/outlook/__openerp__.py b/addons/outlook/__openerp__.py
index b59f158e5e0..7a6d56b9e59 100644
--- a/addons/outlook/__openerp__.py
+++ b/addons/outlook/__openerp__.py
@@ -23,15 +23,15 @@
     "version" : "1.0",
     "author" : "OpenERP SA",
     "website" : "http://www.openerp.com/",
-    "depends" : ["base"],
+    "depends" : ["base", "mail_gateway"],
     "category" : "Generic Modules/Outlook interface",
     "description": '''
       This module provide the Outlook plug-in. 
 
       Outlook plug-in allows you to select an object that you’d like to add
       to your email and its attachments from MS Outlook. You can select a partner, a task,
-      a project, an analytical account, or any other object and attach selected
-      mail as .eml file in attachment of selected record.
+      a project, an analytical account, or any other object and Archived selected
+      mail in mailgate.messages with attachments.
 
       ''',
     "init_xml" : [],
diff --git a/addons/outlook/plugin/dialogs/dialog_map.py b/addons/outlook/plugin/dialogs/dialog_map.py
index 2cb9477d2a8..98dcc6baa2c 100755
--- a/addons/outlook/plugin/dialogs/dialog_map.py
+++ b/addons/outlook/plugin/dialogs/dialog_map.py
@@ -711,7 +711,7 @@ def SearchObjectsForText(btnProcessor,*args):
 
     search_txt = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
     if not search_txt:
-        win32ui.MessageBox("Enter text to search for", "", flag_info)
+        win32ui.MessageBox("Enter text to search for", "Archive to OpenERP", flag_info)
         return
     # Get titles from list
     obj_titles=[]
diff --git a/addons/outlook/plugin/dialogs/resources/OpenERP_Logo.bmp b/addons/outlook/plugin/dialogs/resources/OpenERP_Logo.bmp
new file mode 100755
index 0000000000000000000000000000000000000000..c8bb6091839f35a092455f2e783608d725e9c470
GIT binary patch
literal 80062
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
CdP<G}

literal 0
HcmV?d00001

diff --git a/addons/outlook/plugin/dialogs/resources/dialogs.py b/addons/outlook/plugin/dialogs/resources/dialogs.py
index 164bc9f2fe2..6e277297356 100755
--- a/addons/outlook/plugin/dialogs/resources/dialogs.py
+++ b/addons/outlook/plugin/dialogs/resources/dialogs.py
@@ -1,9 +1,9 @@
 #C:\Python26\openerp-outlook-plugin\plugin_trunk\dialogs\resources\dialogs.py
 #This is a generated file. Please edit C:\Python26\openerp-outlook-plugin\plugin_trunk\dialogs\resources\dialogs.rc instead.
-_rc_size_=11814
-_rc_mtime_=1280872016
+_rc_size_=11427
+_rc_mtime_=1280992064
 class FakeParser:
-	dialogs = {'IDD_VIEW_PARTNER_DIALOG': [['Open Contact', (0, 0, 350, 215), -1865940928, 1024, (8, 'Tahoma')], [130, 'Email ID : ', -1, (32, 17, 40, 12), 1342177280], [129, '', 2051, (70, 15, 200, 12), 1350631552], [128, 'Search Partner ', 2052, (280, 15, 60, 14), 1342242816], [130, 'Partner Name : ', -1, (13, 42, 50, 17), 1342177280], [133, '', 2069, (70, 42, 200, 80), 1344339971], [128, 'New Partner', 2070, (280, 41, 60, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 65, 175, 125), 1342177287], [130, 'Contact Name : ', -1, (18, 83, 50, 17), 1342177280], [129, '', 2046, (76, 82, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 97, 50, 17), 1342177280], [129, '', 2053, (76, 96, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 112, 50, 17), 1342177280], [129, '', 2054, (76, 111, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 126, 50, 14), 1342177280], [129, '', 40010, (76, 125, 100, 12), 1350631552], [130, 'City : ', -1, (18, 140, 50, 17), 1342177280], [129, '', 40011, (76, 139, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 154, 50, 17), 1342177280], [133, '', 2060, (76, 153, 100, 50), 1344339971], [130, 'Country :', -1, (18, 169, 35, 17), 1342177280], [133, '', 2061, (76, 168, 100, 50), 1344339971], [128, 'Communication ', 2024, (188, 65, 152, 125), 1342177287], [130, 'Phone : ', -1, (194, 83, 30, 17), 1342177280], [129, '', 2048, (224, 82, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 97, 30, 17), 1342177280], [129, '', 2050, (224, 96, 100, 12), 1350631552], [130, 'Email : ', -1, (194, 111, 30, 17), 1342177280], [129, '', 2058, (224, 110, 100, 12), 1350568064], [130, 'Fax : ', -1, (194, 125, 30, 17), 1342177280], [129, '', 2047, (224, 124, 100, 12), 1350631552], [128, 'Create a New Contact', 2071, (124, 195, 82, 14), 1342242816], [128, 'Save', 2059, (213, 195, 60, 14), 1342242816], [128, 'Cancel', 2, (281, 195, 60, 14), 1342242816]], 'IDD_GENERAL': [['Connection Parameters', (0, 0, 430, 210), 1355284544, None, (8, 'Tahoma')], [128, '', 2024, (10, 10, 250, 130), 1342177287], [130, 'Server   : ', -1, (30, 30, 100, 17), 1342177280], [129, '', 2003, (85, 30, 120, 12), 1350633472], [128, 'Change', 2021, (210, 30, 30, 13), 1342242816], [130, 'Database : ', -1, (30, 50, 100, 17), 1342177280], [133, '', 2004, (85, 50, 120, 40), 1344339971], [128, 'Reload', 2038, (210, 50, 30, 13), 1342242816], [130, 'Username : ', -1, (30, 70, 100, 17), 1342177280], [129, '', 2005, (85, 70, 154, 12), 1350631552], [130, 'Password : ', -1, (30, 90, 100, 17), 1342177280], [129, '', 2006, (85, 90, 154, 12), 1350631584], [128, 'Test Connection', 2007, (179, 110, 60, 13), 1342242816]], 'IDD_OBJECT_SETTINGS': [['Documents Setting', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'Document Attributes', 2024, (2, 2, 340, 32), 1342177287], [130, 'Title', -1, (6, 15, 30, 17), 1342177280], [129, '', 2013, (20, 14, 57, 12), 1350631552], [130, 'Document Name', -1, (83, 15, 60, 17), 1342177280], [129, '', 2014, (138, 14, 57, 12), 1350631552], [130, 'Image', -1, (200, 15, 20, 17), 1342177280], [129, '', 2015, (220, 14, 57, 12), 1350631552], [128, 'Load Image', 2010, (286, 13, 50, 15), 1342242816], [128, 'Add', 2011, (347, 13, 38, 15), 1342242816], [128, 'Remove', 2012, (391, 13, 38, 15), 1342242816], ['SysListView32', 'List1', 2016, (8, 40, 535, 160), 1353711657]], 'IDD_NEW_PARTNER_DIALOG': [['Create a New Partner', (0, 0, 140, 40), -1865940928, 1024, (8, 'Tahoma')], [130, 'Name : ', -1, (5, 3, 100, 17), 1342177280], [129, '', 2036, (40, 3, 94, 12), 1350631552], [128, 'Cancel', 2, (90, 22, 45, 14), 1342242816], [128, 'Save', 2035, (40, 22, 45, 14), 1342242817]], 'IDD_MANAGER': [['OpenERP Configuarion', (0, 0, 460, 260), -1865940800, None, (8, 'Tahoma')], [128, 'Done', 2008, (400, 239, 50, 14), 1342177281], [128, 'Cancel', 2, (340, 239, 50, 14), 1342177280], ['SysTabControl32', '', 1068, (8, 7, 440, 228), 1342177280], ['SysListView32', '', 2016, (0, 0, 0, 0), 1353711657]], 'IDD_ABOUT': [['About', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'About Plugin', -1, (7, 3, 422, 200), 1342177287], [130, '1062', 1062, (60, 30, 20, 20), 1342179342], [130, '', 2028, (80, 90, 250, 100), 1342177280]], 'IDD_NEW_CONTACT_DIALOG': [['Create a New Contact', (0, 0, 350, 190), -1865940928, 1024, (8, 'Tahoma')], [130, 'Select Partner : ', -1, (13, 20, 50, 17), 1342177280], [133, '', 2032, (70, 18, 200, 80), 1344339971], [128, 'New Partner', 2033, (280, 17, 55, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 35, 175, 125), 1342177287], [130, 'Contact Name : ', -1, (18, 53, 100, 17), 1342177280], [129, '', 40005, (76, 52, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 67, 40, 17), 1342177280], [129, '', 2062, (76, 66, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 81, 40, 17), 1342177280], [129, '', 2063, (76, 80, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 94, 50, 17), 1342177280], [129, '', 2068, (76, 93, 100, 12), 1350631552], [130, 'City : ', -1, (18, 108, 50, 17), 1342177280], [129, '', 2067, (76, 107, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 123, 40, 17), 1342177280], [133, '', 2064, (76, 122, 100, 80), 1344339971], [130, 'Country : ', -1, (18, 137, 40, 17), 1342177280], [133, '', 2065, (76, 136, 100, 80), 1344339971], [128, 'Communication ', 2024, (188, 35, 150, 125), 1342177287], [130, 'Office : ', -1, (194, 53, 30, 17), 1342177280], [129, '', 40006, (224, 52, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 67, 30, 17), 1342177280], [129, '', 40007, (224, 66, 100, 12), 1350631552], [130, 'Fax : ', -1, (194, 81, 30, 17), 1342177280], [129, '', 2066, (224, 80, 100, 12), 1350631552], [130, 'Email  : ', -1, (194, 95, 30, 17), 1342177280], [129, '', 40008, (224, 94, 100, 12), 1350631552], [128, 'Cancel', 2, (290, 170, 45, 14), 1342242816], [128, 'Save', 40009, (240, 170, 45, 14), 1342242816]], 'IDD_SERVER_PORT_DIALOG': [['Server and Port', (0, 0, 160, 90), -1865940928, 1024, (8, 'Tahoma')], [130, 'Server : ', -1, (5, 3, 150, 17), 1342177280], [129, '', 2001, (40, 3, 94, 12), 1350631552], [130, 'Port   : ', -1, (5, 18, 100, 17), 1342177280], [129, '', 2002, (40, 18, 94, 12), 1350631552], [128, ' Protocol ', 2024, (5, 35, 150, 30), 1342177287], [128, 'XML-RPC', 2041, (8, 45, 50, 14), 1342242825], [128, 'XML-RPCS', 2042, (55, 45, 50, 14), 1342242825], [128, 'NET-RPC', 2043, (105, 45, 45, 14), 1342242825], [128, 'Close', 2, (60, 70, 45, 14), 1342242816], [128, 'OK', 1, (110, 70, 45, 14), 1342242817]], 'IDD_SYNC': [['Archive to OpenERP', (0, 0, 470, 300), -1865940928, 1024, (8, 'Tahoma')], [128, ' Link to an Existing Documents ', 2024, (8, 5, 250, 290), 1342242823], [130, 'Search for : ', -1, (15, 17, 40, 12), 1342177280], [129, '', 40003, (60, 15, 120, 12), 1350631552], [128, 'Search', 40004, (187, 15, 40, 14), 1342242816], ['SysListView32', 'List1', 2026, (15, 150, 234, 110), 1350631433], [128, 'Upload to OpenERP', 2019, (160, 270, 85, 14), 1342242816], [128, ' Create a Document ', 2024, (263, 5, 202, 100), 1342242823], [130, 'Type of Document : ', -1, (266, 25, 100, 12), 1342177280], [133, '', 2025, (332, 24, 75, 45), 1344339971], [128, 'Create', 2020, (412, 23, 50, 14), 1342242816], [128, ' Create a Contact ', 2024, (263, 110, 202, 185), 1342242823], [130, 'Create a New Contact : ', -1, (280, 140, 100, 12), 1342177280], [128, 'Create Contact', 2018, (360, 138, 60, 14), 1342242816], [128, 'Cancel', 2, (385, 270, 60, 14), 1342242816]]}
+	dialogs = {'IDD_VIEW_PARTNER_DIALOG': [['Open Contact', (0, 0, 350, 215), -1865940928, 1024, (8, 'Tahoma')], [130, 'Email ID : ', -1, (32, 17, 40, 12), 1342177280], [129, '', 2051, (70, 15, 200, 12), 1350631552], [128, 'Search Partner ', 2052, (280, 15, 60, 14), 1342242816], [130, 'Partner Name : ', -1, (13, 42, 50, 17), 1342177280], [133, '', 2069, (70, 42, 200, 80), 1344339971], [128, 'New Partner', 2070, (280, 41, 60, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 65, 175, 125), 1342177287], [130, 'Contact Name : ', -1, (18, 83, 50, 17), 1342177280], [129, '', 2046, (76, 82, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 97, 50, 17), 1342177280], [129, '', 2053, (76, 96, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 112, 50, 17), 1342177280], [129, '', 2054, (76, 111, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 126, 50, 14), 1342177280], [129, '', 40010, (76, 125, 100, 12), 1350631552], [130, 'City : ', -1, (18, 140, 50, 17), 1342177280], [129, '', 40011, (76, 139, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 154, 50, 17), 1342177280], [133, '', 2060, (76, 153, 100, 50), 1344339971], [130, 'Country :', -1, (18, 169, 35, 17), 1342177280], [133, '', 2061, (76, 168, 100, 50), 1344339971], [128, 'Communication ', 2024, (188, 65, 152, 125), 1342177287], [130, 'Phone : ', -1, (194, 83, 30, 17), 1342177280], [129, '', 2048, (224, 82, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 97, 30, 17), 1342177280], [129, '', 2050, (224, 96, 100, 12), 1350631552], [130, 'Email : ', -1, (194, 111, 30, 17), 1342177280], [129, '', 2058, (224, 110, 100, 12), 1350568064], [130, 'Fax : ', -1, (194, 125, 30, 17), 1342177280], [129, '', 2047, (224, 124, 100, 12), 1350631552], [128, 'Create a New Contact', 2071, (124, 195, 82, 14), 1342242816], [128, 'Save', 2059, (213, 195, 60, 14), 1342242816], [128, 'Cancel', 2, (281, 195, 60, 14), 1342242816]], 'IDD_GENERAL': [['Connection Parameters', (0, 0, 430, 210), 1355284544, None, (8, 'Tahoma')], [128, '', 2024, (10, 10, 250, 130), 1342177287], [130, 'Server   : ', -1, (30, 30, 100, 17), 1342177280], [129, '', 2003, (85, 30, 120, 12), 1350633472], [128, 'Change', 2021, (210, 30, 30, 13), 1342242816], [130, 'Database : ', -1, (30, 50, 100, 17), 1342177280], [133, '', 2004, (85, 50, 120, 40), 1344339971], [128, 'Reload', 2038, (210, 50, 30, 13), 1342242816], [130, 'Username : ', -1, (30, 70, 100, 17), 1342177280], [129, '', 2005, (85, 70, 154, 12), 1350631552], [130, 'Password : ', -1, (30, 90, 100, 17), 1342177280], [129, '', 2006, (85, 90, 154, 12), 1350631584], [128, 'Connect', 2007, (179, 110, 60, 13), 1342242816]], 'IDD_OBJECT_SETTINGS': [['Documents Setting', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'Document Attributes', 2024, (2, 2, 340, 32), 1342177287], [130, 'Title', -1, (6, 15, 30, 17), 1342177280], [129, '', 2013, (20, 14, 57, 12), 1350631552], [130, 'Document Name', -1, (83, 15, 60, 17), 1342177280], [129, '', 2014, (138, 14, 57, 12), 1350631552], [130, 'Image', -1, (200, 15, 20, 17), 1342177280], [129, '', 2015, (220, 14, 57, 12), 1350631552], [128, 'Load Image', 2010, (286, 13, 50, 15), 1342242816], [128, 'Add', 2011, (347, 13, 38, 15), 1342242816], [128, 'Remove', 2012, (391, 13, 38, 15), 1342242816], ['SysListView32', 'List1', 2016, (8, 40, 535, 160), 1353711657]], 'IDD_NEW_PARTNER_DIALOG': [['Create a New Partner', (0, 0, 140, 40), -1865940928, 1024, (8, 'Tahoma')], [130, 'Name : ', -1, (5, 3, 100, 17), 1342177280], [129, '', 2036, (40, 3, 94, 12), 1350631552], [128, 'Cancel', 2, (90, 22, 45, 14), 1342242816], [128, 'Save', 2035, (40, 22, 45, 14), 1342242817]], 'IDD_MANAGER': [['OpenERP Configuarion', (0, 0, 460, 260), -1865940800, None, (8, 'Tahoma')], [128, 'Cancel', 2008, (400, 239, 50, 14), 1342177281], ['SysTabControl32', '', 1068, (8, 7, 440, 228), 1342177280], ['SysListView32', '', 2016, (0, 0, 0, 0), 1353711657]], 'IDD_ABOUT': [['About', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'About Plugin', -1, (7, 3, 422, 200), 1342177287], [130, '1062', 1062, (60, 30, 20, 20), 1342179342], [130, '', 2028, (80, 90, 250, 100), 1342177280]], 'IDD_NEW_CONTACT_DIALOG': [['Create a New Contact', (0, 0, 350, 190), -1865940928, 1024, (8, 'Tahoma')], [130, 'Select Partner : ', -1, (13, 20, 50, 17), 1342177280], [133, '', 2032, (70, 18, 200, 80), 1344339971], [128, 'New Partner', 2033, (280, 17, 55, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 35, 175, 125), 1342177287], [130, 'Contact Name : ', -1, (18, 53, 100, 17), 1342177280], [129, '', 40005, (76, 52, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 67, 40, 17), 1342177280], [129, '', 2062, (76, 66, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 81, 40, 17), 1342177280], [129, '', 2063, (76, 80, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 94, 50, 17), 1342177280], [129, '', 2068, (76, 93, 100, 12), 1350631552], [130, 'City : ', -1, (18, 108, 50, 17), 1342177280], [129, '', 2067, (76, 107, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 123, 40, 17), 1342177280], [133, '', 2064, (76, 122, 100, 80), 1344339971], [130, 'Country : ', -1, (18, 137, 40, 17), 1342177280], [133, '', 2065, (76, 136, 100, 80), 1344339971], [128, 'Communication ', 2024, (188, 35, 150, 125), 1342177287], [130, 'Office : ', -1, (194, 53, 30, 17), 1342177280], [129, '', 40006, (224, 52, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 67, 30, 17), 1342177280], [129, '', 40007, (224, 66, 100, 12), 1350631552], [130, 'Fax : ', -1, (194, 81, 30, 17), 1342177280], [129, '', 2066, (224, 80, 100, 12), 1350631552], [130, 'Email  : ', -1, (194, 95, 30, 17), 1342177280], [129, '', 40008, (224, 94, 100, 12), 1350631552], [128, 'Cancel', 2, (290, 170, 45, 14), 1342242816], [128, 'Save', 40009, (240, 170, 45, 14), 1342242816]], 'IDD_SERVER_PORT_DIALOG': [['OpenERP Connection', (0, 0, 160, 55), -1865940928, 1024, (8, 'Tahoma')], [130, 'Server : ', -1, (5, 3, 150, 17), 1342177280], [129, '', 2001, (40, 3, 100, 12), 1350631552], [130, 'Port   : ', -1, (5, 18, 100, 17), 1342177280], [129, '', 2002, (40, 18, 100, 12), 1350631552], [128, 'Close', 2, (110, 35, 45, 14), 1342242816], [128, 'OK', 1, (60, 35, 45, 14), 1342242817]], 'IDD_SYNC': [['Archive to OpenERP', (0, 0, 470, 320), -1865940928, 1024, (8, 'Tahoma')], [128, ' Link to an Existing Documents ', 2024, (8, 5, 250, 290), 1342242823], [130, 'Search for : ', -1, (15, 17, 40, 12), 1342177280], [129, '', 40003, (60, 15, 120, 12), 1350631552], [128, 'Search', 40004, (187, 15, 40, 14), 1342242816], [130, 'Documents : ', -1, (15, 140, 100, 14), 1342177280], ['SysListView32', 'List1', 2026, (15, 150, 234, 110), 1350631433], [128, 'Archive to OpenERP', 2019, (160, 270, 85, 14), 1342242816], [128, ' Create a Document ', 2024, (263, 5, 202, 100), 1342242823], [130, 'Type of Document : ', -1, (266, 25, 100, 12), 1342177280], [133, '', 2025, (332, 24, 75, 45), 1344339971], [128, 'Create', 2020, (412, 23, 50, 14), 1342242816], [128, ' Create a Contact ', 2024, (263, 110, 202, 185), 1342242823], [130, 'Create a New Contact : ', -1, (280, 140, 100, 12), 1342177280], [128, 'Create Contact', 2018, (360, 138, 60, 14), 1342242816], [128, 'Close', 2, (385, 300, 60, 14), 1342242816]]}
 	ids = {'IDC_BUT_DEL_OBJECT': 2012, 'IDC_DELAY1_SLIDER': 1056, 'IDC_PROGRESS': 1000, 'IDD_MANAGER': 101, 'IDC_ABOUT': 2028, 'IDD_DIAGNOSTIC': 113, 'IDET_PARTNER_COUNTRY': 2057, 'IDD_TRAINING': 102, 'ID_CONTACT_EMAIL_TEXT': 40008, 'IDC_DELAY2_TEXT': 1059, 'IDC_DELAY1_TEXT': 1057, 'IDD_WIZARD': 114, 'IDC_CHKBX': 2023, 'IDC_STATIC_HAM': 1002, 'IDC_PROGRESS_TEXT': 1001, 'IDR_XMLS_PROTOCOL': 2042, 'IDD_GENERAL': 108, 'IDD_ABOUT': 2027, 'IDC_TAB': 1068, 'IDC_FOLDER_UNSURE': 1033, 'IDC_VERBOSE_LOG': 1061, 'IDC_EDIT1': 1094, 'IDC_BROWSE': 1037, 'ID_DB_DROPDOWNLIST': 2004, 'IDC_BACK_BTN': 1069, 'IDD_WIZARD_FINISHED_UNCONFIGURED': 119, 'IDC_ACTION_CERTAIN': 1025, 'IDC_BUT_ACT_ALL': 1019, 'IDD_FILTER_NOW': 104, 'ID_PROTOCOL_GRP': 2040, 'IDC_HEADER': 2017, 'IDC_MARK_SPAM_AS_READ': 1047, 'ID_PARTNER_NAME_TEXT': 2036, 'IDC_RECOVER_RS': 1075, 'IDC_NAME_LIST1': 2037, 'ID_CONTACT_OFFICE_TEXT': 40006, 'IDC_STATIC': -1, 'IDC_PAGE_PLACEHOLDER': 1078, 'IDC_BROWSE_WATCH': 1039, 'IDET_ZIP': 40010, 'IDET_PARTNER_CITY': 40011, 'IDC_FOLDER_HAM': 1083, 'IDD_WIZARD_FOLDERS_REST': 117, 'IDC_SHOW_DATA_FOLDER': 1071, 'IDC_BUT_ACT_SCORE': 1018, '_APS_NEXT_RESOURCE_VALUE': 128, '_APS_NEXT_SYMED_VALUE': 101, 'IDC_CONTACT_LIST': 2029, 'IDC_SLIDER_CERTAIN': 1023, 'IDET_PARTNER_STREET': 2053, 'IDC_BUT_UNREAD': 1020, 'ID_PARTNER_DROPDOWNLIST': 2032, 'ID_COUNTRY_DROPLIST': 2065, 'IDC_BUT_ABOUT': 1017, 'IDC_BUT_RESCORE': 1008, 'IDC_BUT_SEARCHSUB': 1041, 'IDC_BUT_TRAIN_FROM_SPAM_FOLDER': 1010, 'IDET_PARTNER_MOBILENO': 2050, 'IDD_VIEW_PARTNER_DIALOG': 2044, 'IDD_WIZARD_FOLDERS_TRAIN': 120, 'IDC_BUT_FILTER_ENABLE': 1013, 'IDC_ABOUT_BTN': 1072, 'IDD_WIZARD_FINISHED_TRAINED': 122, 'ID_SERVER': 2001, 'IDD_FOLDER_SELECTOR': 105, 'IDC_BUT_SET_SERVER_PORT': 2021, 'ID_DONE': 2008, 'IDC_LIST_FOLDERS': 1040, 'IDC_IMAGE_PATH': 2015, 'IDB_SBWIZLOGO': 125, 'IDB_OPENERPLOGO': 1062, 'ID_ZIP_TEXT': 2068, 'IDD_NEW_PARTNER_DIALOG': 2034, 'ID_PARTNER_DROPLIST': 2069, 'IDC_BUT_VIEW_LOG': 1093, 'IDC_STATUS2': 1044, 'IDC_STATUS1': 1043, 'IDCANCEL': 2, 'IDC_BROWSE_HAM': 1004, 'ID_BUT_TESTCONNECTION': 2007, 'IDR_NETRPC_PROTOCOL': 2043, 'IDC_BROWSE_SPAM': 1005, 'IDD_WIZARD_FINISHED_UNTRAINED': 116, 'IDC_MARK_UNSURE_AS_READ': 1051, 'ID_PARTNER_CITY_TEXT': 2067, 'IDC_BUT_WIZARD': 1070, 'IDC_VERSION': 1009, 'ID_NEW_PARTNER_BUTTON': 2033, 'IDC_FOLDER_NAMES': 1036, 'ID_ATT_METHOD_DROPDOWNLIST': 2025, 'IDC_BUT_TIMER_ENABLED': 1091, 'IDPB_WRITE_CHANGES': 2059, 'IDC_SLIDER_UNSURE': 1029, 'IDC_BUT_NEW': 1046, 'IDC_FOLDER_WATCH': 1038, 'IDC_BUT_UNTRAINED': 1088, 'IDC_STATIC_SPAM': 1003, 'IDD_NEW_CONTACT_DIALOG': 2031, 'IDC_EDIT_UNSURE': 1030, 'IDC_BUT_CLEARALL': 1042, 'IDC_BUT_UNSEEN': 1021, 'IDC_OBJECT_NAME': 2014, 'IDD_WIZARD_FOLDERS_WATCH': 118, 'IDC_BUT_SAVE_OBJECT': 2011, 'ID_FED_STATE_DROPLIST': 2064, 'ID_ALL_COUNTRY_DROPDOWNLIST': 2061, 'IDC_EDIT_CERTAIN': 1024, 'IDC_BUT_FILTER_DEFINE': 1016, 'ID_NEW_PART_BUTTON': 2070, 'ID_FAX_TEXT': 2066, 'IDD_WIZARD_TRAINING_IS_IMPORTANT': 123, 'ID_ALL_STATE_DROPDOWNLIST': 2060, 'IDC_INBOX_TIMER_ONLY': 1060, 'IDPB_SEARCH_PARTNER': 2052, 'ID_USERNAME': 2005, '_APS_NEXT_CONTROL_VALUE': 1096, 'IDC_WIZ_GRAPHIC': 1092, 'IDD_OBJECT_SETTINGS': 2009, 'IDD_FILTER_UNSURE': 111, 'IDC_DEL_SPAM_RS': 1074, 'ID_SERVER_PORT': 2003, 'IDR_XML_PROTOCOL': 2041, 'IDET_PARTNER_OFFICENO': 2048, 'IDB_FOLDERS': 127, 'IDC_BUT_PREPARATION': 1081, 'ID_STREET2_TEXT': 2063, 'IDC_DELAY2_SLIDER': 1058, 'IDC_SAVE_SPAM_SCORE': 1048, 'IDC_OBJECT_TITLE': 2013, 'IDC_FOLDER_CERTAIN': 1027, 'IDC_BROWSE_UNSURE': 1034, 'IDC_STATISTICS': 1095, 'ID_MAKE_ATTACHMENT': 2019, 'IDC_BUT_LOAD_IMAGE': 2010, 'IDC_NAME_LIST': 2026, 'IDC_BUT_TRAIN_TO_SPAM_FOLDER': 1011, 'IDC_BUT_RESET': 1073, 'IDET_PARTNER_CONTACT_NAME': 2046, 'ID_CONTACT_MOBILE_TEXT': 40007, 'IDC_ACTION_UNSURE': 1031, 'IDD_WIZARD_TRAIN': 121, 'IDC_STATIC_GROUP': 2024, 'IDPB_NEWPARTNER_BUTTON': 2071, 'IDD_SYNC': 40002, 'IDD_WIZARD_FINISHED_TRAIN_LATER': 124, 'IDET_PARTNER_NAME': 2045, 'ID_CONTACT_NAME_TEXT': 40005, 'IDC_BUT_REBUILD': 1007, 'IDET_PARTNER_STREET2': 2054, 'ID_SAVE_PARTNER_BUTTON': 2035, 'ID_STREET_TEXT': 2062, '_APS_NEXT_COMMAND_VALUE': 40001, 'IDET_SEARCH_PARTNER': 2051, 'ID_PORT': 2002, 'IDD_SERVER_PORT_DIALOG': 2022, 'ID_SEARCH_TEXT': 40003, 'ID_SEARCH': 40004, 'ID_CREATE_CONTACT': 2018, 'IDC_FORWARD_BTN': 1077, 'IDC_TRAINING_STATUS': 1035, 'IDD_WIZARD_WELCOME': 115, 'IDET_PARTNER_FAX': 2058, 'IDC_BUT_TRAIN': 1089, 'IDC_LIST': 2016, 'ID_CREATE_CASE': 2020, 'IDET_PARTNER_EMAIL': 2047, 'IDC_START': 1006, 'IDD_FILTER': 103, 'IDC_RELOAD': 2038, 'ID_PASSWORD': 2006, 'ID_NAME_TEXT': 2030, 'IDC_FILTER_STATUS': 1014, 'ID_CONTACT_SAVE_BUTTON': 40009, 'IDOK': 1, 'IDC_BROWSE_CERTAIN': 1028, 'IDC_BUT_SHOW_DIAGNOSTICS': 1080, 'IDC_BUT_TRAIN_NOW': 1012}
 	names = {1024: 'IDC_EDIT_CERTAIN', 1: 'IDOK', 2: 'IDCANCEL', 1027: 'IDC_FOLDER_CERTAIN', 1028: 'IDC_BROWSE_CERTAIN', 1029: 'IDC_SLIDER_UNSURE', 1030: 'IDC_EDIT_UNSURE', 1031: 'IDC_ACTION_UNSURE', 1033: 'IDC_FOLDER_UNSURE', 1034: 'IDC_BROWSE_UNSURE', 1035: 'IDC_TRAINING_STATUS', 1036: 'IDC_FOLDER_NAMES', 1037: 'IDC_BROWSE', 1038: 'IDC_FOLDER_WATCH', 1039: 'IDC_BROWSE_WATCH', 1040: 'IDC_LIST_FOLDERS', 1041: 'IDC_BUT_SEARCHSUB', 1042: 'IDC_BUT_CLEARALL', 1043: 'IDC_STATUS1', 1044: 'IDC_STATUS2', 2069: 'ID_PARTNER_DROPLIST', 1046: 'IDC_BUT_NEW', 1047: 'IDC_MARK_SPAM_AS_READ', 1048: 'IDC_SAVE_SPAM_SCORE', 2052: 'IDPB_SEARCH_PARTNER', 1051: 'IDC_MARK_UNSURE_AS_READ', 2053: 'IDET_PARTNER_STREET', 1056: 'IDC_DELAY1_SLIDER', 1057: 'IDC_DELAY1_TEXT', 1058: 'IDC_DELAY2_SLIDER', 1059: 'IDC_DELAY2_TEXT', 1060: 'IDC_INBOX_TIMER_ONLY', 1061: 'IDC_VERBOSE_LOG', 1062: 'IDB_OPENERPLOGO', 2047: 'IDET_PARTNER_EMAIL', 1068: 'IDC_TAB', 1069: 'IDC_BACK_BTN', 1070: 'IDC_BUT_WIZARD', 1071: 'IDC_SHOW_DATA_FOLDER', 1072: 'IDC_ABOUT_BTN', 1073: 'IDC_BUT_RESET', 1074: 'IDC_DEL_SPAM_RS', 1075: 'IDC_RECOVER_RS', 1077: 'IDC_FORWARD_BTN', 1078: 'IDC_PAGE_PLACEHOLDER', 2057: 'IDET_PARTNER_COUNTRY', 1080: 'IDC_BUT_SHOW_DIAGNOSTICS', 1081: 'IDC_BUT_PREPARATION', 1083: 'IDC_FOLDER_HAM', 2058: 'IDET_PARTNER_FAX', 1088: 'IDC_BUT_UNTRAINED', 1089: 'IDC_BUT_TRAIN', 40002: 'IDD_SYNC', 1091: 'IDC_BUT_TIMER_ENABLED', 1025: 'IDC_ACTION_CERTAIN', 1093: 'IDC_BUT_VIEW_LOG', 1094: 'IDC_EDIT1', 1095: 'IDC_STATISTICS', 1096: '_APS_NEXT_CONTROL_VALUE', 2060: 'ID_ALL_STATE_DROPDOWNLIST', 40010: 'IDET_ZIP', 40011: 'IDET_PARTNER_CITY', 2061: 'ID_ALL_COUNTRY_DROPDOWNLIST', 2062: 'ID_STREET_TEXT', 2063: 'ID_STREET2_TEXT', 2064: 'ID_FED_STATE_DROPLIST', 101: 'IDD_MANAGER', 102: 'IDD_TRAINING', 103: 'IDD_FILTER', 104: 'IDD_FILTER_NOW', 105: 'IDD_FOLDER_SELECTOR', 106: 'IDD_ABOUT', 108: 'IDD_GENERAL', 2066: 'ID_FAX_TEXT', 111: 'IDD_FILTER_UNSURE', 113: 'IDD_DIAGNOSTIC', 114: 'IDD_WIZARD', 115: 'IDD_WIZARD_WELCOME', 116: 'IDD_WIZARD_FINISHED_UNTRAINED', 117: 'IDD_WIZARD_FOLDERS_REST', 118: 'IDD_WIZARD_FOLDERS_WATCH', 119: 'IDD_WIZARD_FINISHED_UNCONFIGURED', 120: 'IDD_WIZARD_FOLDERS_TRAIN', 121: 'IDD_WIZARD_TRAIN', 122: 'IDD_WIZARD_FINISHED_TRAINED', 123: 'IDD_WIZARD_TRAINING_IS_IMPORTANT', 124: 'IDD_WIZARD_FINISHED_TRAIN_LATER', 125: 'IDB_SBWIZLOGO', 127: 'IDB_FOLDERS', 2067: 'ID_PARTNER_CITY_TEXT', 2050: 'IDET_PARTNER_MOBILENO', 2070: 'ID_NEW_PART_BUTTON', 2071: 'IDPB_NEWPARTNER_BUTTON', 2068: 'ID_ZIP_TEXT', 2051: 'IDET_SEARCH_PARTNER', 40004: 'ID_SEARCH', 2046: 'IDET_PARTNER_CONTACT_NAME', 2054: 'IDET_PARTNER_STREET2', 128: '_APS_NEXT_RESOURCE_VALUE', 2040: 'ID_PROTOCOL_GRP', 2065: 'ID_COUNTRY_DROPLIST', 2048: 'IDET_PARTNER_OFFICENO', 2024: 'IDC_STATIC_GROUP', 2041: 'IDR_XML_PROTOCOL', 2025: 'ID_ATT_METHOD_DROPDOWNLIST', 2026: 'IDC_NAME_LIST', 2027: 'IDD_ABOUT', 40001: '_APS_NEXT_COMMAND_VALUE', 2028: 'IDC_ABOUT', 2029: 'IDC_CONTACT_LIST', 2059: 'IDPB_WRITE_CHANGES', 2042: 'IDR_XMLS_PROTOCOL', 40003: 'ID_SEARCH_TEXT', 2030: 'ID_NAME_TEXT', 1092: 'IDC_WIZ_GRAPHIC', 2031: 'IDD_NEW_CONTACT_DIALOG', 40005: 'ID_CONTACT_NAME_TEXT', 2032: 'ID_PARTNER_DROPDOWNLIST', 40006: 'ID_CONTACT_OFFICE_TEXT', 2033: 'ID_NEW_PARTNER_BUTTON', 40007: 'ID_CONTACT_MOBILE_TEXT', 2034: 'IDD_NEW_PARTNER_DIALOG', 2043: 'IDR_NETRPC_PROTOCOL', 40008: 'ID_CONTACT_EMAIL_TEXT', 2035: 'ID_SAVE_PARTNER_BUTTON', 40009: 'ID_CONTACT_SAVE_BUTTON', 2036: 'ID_PARTNER_NAME_TEXT', 2037: 'IDC_NAME_LIST1', 2038: 'IDC_RELOAD', 2044: 'IDD_VIEW_PARTNER_DIALOG', 2001: 'ID_SERVER', 2002: 'ID_PORT', 2003: 'ID_SERVER_PORT', 2004: 'ID_DB_DROPDOWNLIST', 2005: 'ID_USERNAME', 2006: 'ID_PASSWORD', 2007: 'ID_BUT_TESTCONNECTION', 2008: 'ID_DONE', 2009: 'IDD_OBJECT_SETTINGS', 2010: 'IDC_BUT_LOAD_IMAGE', 2011: 'IDC_BUT_SAVE_OBJECT', 2012: 'IDC_BUT_DEL_OBJECT', 2013: 'IDC_OBJECT_TITLE', 2014: 'IDC_OBJECT_NAME', 2015: 'IDC_IMAGE_PATH', 2016: 'IDC_LIST', 2017: 'IDC_HEADER', 2018: 'ID_CREATE_CONTACT', 2019: 'ID_MAKE_ATTACHMENT', 2020: 'ID_CREATE_CASE', 2021: 'IDC_BUT_SET_SERVER_PORT', 2022: 'IDD_SERVER_PORT_DIALOG', 2023: 'IDC_CHKBX', 1000: 'IDC_PROGRESS', 1001: 'IDC_PROGRESS_TEXT', 1002: 'IDC_STATIC_HAM', 1003: 'IDC_STATIC_SPAM', 1004: 'IDC_BROWSE_HAM', 1005: 'IDC_BROWSE_SPAM', 1006: 'IDC_START', 1007: 'IDC_BUT_REBUILD', 1008: 'IDC_BUT_RESCORE', 1009: 'IDC_VERSION', 1010: 'IDC_BUT_TRAIN_FROM_SPAM_FOLDER', 1011: 'IDC_BUT_TRAIN_TO_SPAM_FOLDER', 1012: 'IDC_BUT_TRAIN_NOW', 1013: 'IDC_BUT_FILTER_ENABLE', 1014: 'IDC_FILTER_STATUS', 2045: 'IDET_PARTNER_NAME', 1016: 'IDC_BUT_FILTER_DEFINE', 1017: 'IDC_BUT_ABOUT', 1018: 'IDC_BUT_ACT_SCORE', 1019: 'IDC_BUT_ACT_ALL', 1020: 'IDC_BUT_UNREAD', 1021: 'IDC_BUT_UNSEEN', -1: 'IDC_STATIC', 1023: 'IDC_SLIDER_CERTAIN'}
 	bitmaps = {'IDB_OPENERPLOGO': 'OpenERP_Logo.bmp'}
diff --git a/addons/outlook/plugin/dialogs/resources/dialogs.rc b/addons/outlook/plugin/dialogs/resources/dialogs.rc
index 39fb50a1e45..63fe9f64ba4 100755
--- a/addons/outlook/plugin/dialogs/resources/dialogs.rc
+++ b/addons/outlook/plugin/dialogs/resources/dialogs.rc
@@ -33,8 +33,7 @@ STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME
 CAPTION "OpenERP Configuarion"
 FONT 8, "Tahoma", 1000, 0, 0x0
 BEGIN
-    DEFPUSHBUTTON   "Done",ID_DONE,400,239,50,14//,WS_VISIBLE //| WS_TABSTOP
-    PUSHBUTTON      "Cancel",IDCANCEL,340,239,50,14//, WS_VISIBLE //| WS_TABSTOP
+    DEFPUSHBUTTON   "Cancel",ID_DONE,400,239,50,14//,WS_VISIBLE //| WS_TABSTOP
     CONTROL         "",IDC_TAB,"SysTabControl32",0x0,8,7,440,228
     CONTROL         "",IDC_LIST,"SysListView32",WS_CHILD | WS_VISIBLE | WS_BORDER | WS_HSCROLL | WS_VSCROLL |
             		 LVS_SHOWSELALWAYS | LVS_REPORT | LVS_EX_FULLROWSELECT | LVS_EX_GRIDLINES,0,0,0,0
@@ -57,7 +56,7 @@ BEGIN
     EDITTEXT        ID_USERNAME,85,70,154,12,ES_AUTOHSCROLL | WS_VISIBLE | WS_TABSTOP
     LTEXT           "Password : ",IDC_STATIC,30,90,100,17
     EDITTEXT        ID_PASSWORD,85,90,154,12,ES_AUTOHSCROLL | WS_VISIBLE | WS_TABSTOP | ES_PASSWORD
-    PUSHBUTTON      "Test Connection",ID_BUT_TESTCONNECTION,179,110,60,13, WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON      "Connect",ID_BUT_TESTCONNECTION,179,110,60,13, WS_VISIBLE | WS_TABSTOP
 END
 
 IDD_OBJECT_SETTINGS DIALOGEX 0, 0, 430, 210
@@ -92,25 +91,21 @@ BEGIN
     LTEXT           "",IDC_ABOUT,80,90,250,100
 END
 
-IDD_SERVER_PORT_DIALOG DIALOGEX 0, 0, 160, 90
+IDD_SERVER_PORT_DIALOG DIALOGEX 0, 0, 160, 55
 STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
-CAPTION "Server and Port"
+CAPTION "OpenERP Connection"
 FONT 8, "Tahoma", 400, 0, 0x0
 BEGIN
     LTEXT           "Server : ",IDC_STATIC,5,3,150,17
-    EDITTEXT        ID_SERVER,40,3,94,12,ES_AUTOHSCROLL | WS_TABSTOP
+    EDITTEXT        ID_SERVER,40,3,100,12,ES_AUTOHSCROLL | WS_TABSTOP
     LTEXT           "Port   : ",IDC_STATIC,5,18,100,17
-    EDITTEXT        ID_PORT,40,18,94,12,ES_AUTOHSCROLL | WS_TABSTOP
-    GROUPBOX        " Protocol ", IDC_STATIC_GROUP, 5, 35, 150, 30
-    PUSHBUTTON      "XML-RPC",IDR_XML_PROTOCOL,8,45,50,14,BS_AUTORADIOBUTTON | BST_CHECKED |WS_TABSTOP
-    PUSHBUTTON      "XML-RPCS",IDR_XMLS_PROTOCOL,55,45,50,14,BS_AUTORADIOBUTTON | WS_TABSTOP
-    PUSHBUTTON      "NET-RPC",IDR_NETRPC_PROTOCOL,105,45,45,14,BS_AUTORADIOBUTTON | WS_TABSTOP
-    PUSHBUTTON      "Close",IDCANCEL,60,70,45,14,WS_TABSTOP
-    DEFPUSHBUTTON   "OK",IDOK,110,70,45,14,WS_TABSTOP
+    EDITTEXT        ID_PORT,40,18,100,12,ES_AUTOHSCROLL | WS_TABSTOP
+    PUSHBUTTON      "Close",IDCANCEL,110,35,45,14,WS_TABSTOP
+    DEFPUSHBUTTON   "OK",IDOK,60,35,45,14,WS_TABSTOP
 END
 
-IDD_SYNC DIALOGEX 0, 0, 470, 300
+IDD_SYNC DIALOGEX 0, 0, 470, 320
 STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "Archive to OpenERP"
@@ -120,8 +115,9 @@ BEGIN
 	LTEXT           "Search for : ",IDC_STATIC,15,17,40,12
 	EDITTEXT        ID_SEARCH_TEXT,60,15,120,12,ES_AUTOHSCROLL | WS_TABSTOP// left top width height
     PUSHBUTTON   	"Search",ID_SEARCH,187,15,40,14,WS_TABSTOP
+	LTEXT           "Documents : ",IDC_STATIC,15,140,100,14
     CONTROL         "List1",IDC_NAME_LIST,"SysListView32",WS_CHILD | WS_VISIBLE | WS_BORDER | LVS_SHOWSELALWAYS | LVS_REPORT | WS_TABSTOP, 15,150,234,110
-    PUSHBUTTON      "Upload to OpenERP",ID_MAKE_ATTACHMENT,160,270,85,14,WS_TABSTOP
+    PUSHBUTTON      "Archive to OpenERP",ID_MAKE_ATTACHMENT,160,270,85,14,WS_TABSTOP
 
 	GROUPBOX        " Create a Document ", IDC_STATIC_GROUP, 263,5,202,100,WS_TABSTOP
 	LTEXT           "Type of Document : ",IDC_STATIC,266,25,100,12
@@ -132,7 +128,7 @@ BEGIN
 	GROUPBOX        " Create a Contact ", IDC_STATIC_GROUP, 263, 110,202,185,WS_TABSTOP
 	LTEXT           "Create a New Contact : ",IDC_STATIC,280,140,100,12
     PUSHBUTTON   	"Create Contact",ID_CREATE_CONTACT,360,138,60,14,WS_TABSTOP
-    PUSHBUTTON      "Cancel",IDCANCEL,385,270,60,14,WS_TABSTOP
+    PUSHBUTTON      "Close",IDCANCEL,385,300,60,14,WS_TABSTOP
 END
 
 IDD_NEW_CONTACT_DIALOG DIALOGEX 0, 0, 350, 190
diff --git a/addons/outlook/plugin/eml.py b/addons/outlook/plugin/eml.py
index d74abcf7a36..03d2328a980 100755
--- a/addons/outlook/plugin/eml.py
+++ b/addons/outlook/plugin/eml.py
@@ -37,7 +37,8 @@ def generateEML(mail):
 
     eml_name= ustr(sub).encode('iso-8859-1')+'-'+str(mail.EntryID)[-9:]
     ls = ['*', '/', '\\', '<', '>', ':', '?', '"', '|', '\t', '\n']
-    attachments_folder_path = os.path.abspath(os.path.dirname(__file__)+"\\dialogs\\resources\\attachments\\")
+    mails_folder_path = os.path.abspath(os.path.dirname(__file__)+"\\dialogs\\resources\\mails\\")
+    attachments_folder_path = mails_folder_path + "\\attachments\\"
     if not os.path.exists(attachments_folder_path):
         os.makedirs(attachments_folder_path)
     for i in xrange(1, attachments.Count+1):
@@ -62,7 +63,7 @@ def generateEML(mail):
             print mail.lastErrorText()
             sys.exit()
 
-    mails_folder_path = os.path.abspath(os.path.dirname(__file__)+"\\dialogs\\resources\\mails\\")
+
     if not os.path.exists(mails_folder_path):
         os.makedirs(mails_folder_path)
     for c in ls:
diff --git a/addons/outlook/plugin/tiny_xmlrpc.py b/addons/outlook/plugin/tiny_xmlrpc.py
index b5153ee88cc..a6ac9081307 100755
--- a/addons/outlook/plugin/tiny_xmlrpc.py
+++ b/addons/outlook/plugin/tiny_xmlrpc.py
@@ -26,11 +26,11 @@ import os
 import pythoncom
 import time
 from manager import ustr
-
 waittime = 10
 wait_count = 0
 wait_limit = 12
-
+import binascii
+import base64
 def execute(connector, method, *args):
     global wait_count
     res = False
@@ -119,7 +119,7 @@ class XMLRpcConn(object):
 
     def InsertObj(self, obj_title,obj_name,image_path):
         self._obj_list=list(self._obj_list)
-        self._obj_list.append((obj_title,obj_name,ustr(image_path).encode('iso-8859-1')))
+        self._obj_list.append((obj_title,obj_name,ustr(image_path)))
         self._obj_list.sort(reverse=True)
 
     def DeleteObject(self,sel_text):
@@ -133,46 +133,53 @@ class XMLRpcConn(object):
         import win32ui, win32con
         conn = xmlrpclib.ServerProxy(self._uri + '/xmlrpc/object')
         import eml
-        msg = ""
-        ext_msg = ""
+        new_msg = files = ext_msg =""
         eml_path=eml.generateEML(mail)
         att_name = ustr(eml_path.split('\\')[-1])
-        cnt=1
         flag=False
-        for rec in recs: #[('res.partner', 3, 'Agrolait')]
-            cnt+=1
-            obj = rec[0]
-            obj_id = rec[1]
-            ids=execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.attachment','search',[('res_id','=',obj_id),('name','=',att_name)])
-            object_ids = execute ( conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[('model','=',obj)])
-            object_name = execute( conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','read',object_ids,['name'])[0]['name']
-            sub = ustr(mail.Subject)
-            if ids:
-                name=execute(conn,'execute',self._dbname,int(self._uid),self._pwd,obj,'read',obj_id,['name'])['name']
-                ext_msg+="""  - File "{0}.eml" is already archived to {1} "{2}" .
-""".format(sub,object_name,name)
-                continue
-            if len(sub) > 60:
-                l = 60 - len(sub)
-                sub = sub[0:l]
-            res={}
-            res['res_model'] = obj
-            content = "".join(open(eml_path,"r").readlines()).encode('base64')
-            res['name'] = att_name
-            res['datas_fname'] = sub+".eml"
-            res['datas'] = content
-            res['res_id'] = obj_id
-            execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.attachment','create',res)
-            msg+="""  - File "{0}.eml"  archived to {1} "{2}".
-""".format(sub,object_name,str(rec[2]))
-            flag=True
-        if flag:
-            t = "Mail archived to OpenERP.\nArchive Summary : \n"
-            if ext_msg != "" :
-                t+="\nAlready Attached Documents : \n"+ext_msg +"\n"
-            t+="Newly Attachment Documents:\n"+msg
-            win32ui.MessageBox(t,"Archive To OpenERP",win32con.MB_ICONINFORMATION)
+        attachments=mail.Attachments
 
+        for rec in recs: #[('res.partner', 3, 'Agrolait')]
+            model = rec[0]
+            res_id = rec[1]
+
+            object_ids = execute ( conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[('model','=',model)])
+            object_name  = execute( conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','read',object_ids,['name'])[0]['name']
+
+
+            #Reading the Object ir.model Name
+
+            ext_ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'mailgate.message','search',[('message_id','=',mail.EntryID),('model','=',model),('res_id','=',res_id)])
+            if ext_ids:
+                name = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,model,'read',res_id,['name'])['name']
+                ext_msg += """This mail is already archived to {1} '{2}'.
+""".format(object_name,name)
+                continue
+
+            msg = {
+                'subject':mail.Subject,
+                'date':str(mail.ReceivedTime),
+                'body':mail.Body,
+                'cc':mail.CC,
+                'from':mail.SenderEmailAddress,
+                'to':mail.To,
+                'message-id':str(mail.EntryID),## we are use Entry_Id as a MessageID Because MessageID is not provided by Outlook API, http://msdn.microsoft.com/en-us/library/bb176688%28v=office.12%29.aspx
+                'references':False,
+            }
+            result = {}
+            if attachments:
+                result = self.MakeAttachment([rec], mail)
+
+            attachment_ids = result.get(model, {}).get(res_id, [])
+            ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'email.server.tools','history',model, res_id, msg, attachment_ids)
+
+            new_msg += """- {0} : {1}\n""".format(object_name,str(rec[2]))
+            flag = True
+
+        if flag:
+            t = ext_msg
+            t += """Mail archived Successfully with attachments.\n"""+new_msg
+            win32ui.MessageBox(t,"Archived to OpenERP",win32con.MB_ICONINFORMATION)
         return flag
 
     def IsCRMInstalled(self):
@@ -189,7 +196,7 @@ class XMLRpcConn(object):
         obj_list.append((-999, ustr('')))
         for id in ids:
             object = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.partner','read',[id],['id','name'])[0]
-            obj_list.append((object['id'], ustr(object['name']).encode('iso-8859-1')))
+            obj_list.append((object['id'], ustr(object['name'])))
         return obj_list
 
     def GetObjectItems(self, search_list=[], search_text=''):
@@ -203,17 +210,17 @@ class XMLRpcConn(object):
                 ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,obj,'search',['|',('name','ilike',ustr(search_text)),('email','ilike',ustr(search_text))])
                 recs = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,obj,'read',ids,['id','name','street','city'])
                 for rec in recs:
-                    name = ustr(rec['name']).encode('iso-8859-1')
+                    name = ustr(rec['name'])
                     if rec['street']:
-                        name += ', ' + ustr(rec['street']).encode('iso-8859-1')
+                        name += ', ' + ustr(rec['street'])
                     if rec['city']:
-                        name += ', ' + ustr(rec['city']).encode('iso-8859-1')
+                        name += ', ' + ustr(rec['city'])
                     res.append((obj,rec['id'],name,object_name))
             else:
                 ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,obj,'search',[('name','ilike',ustr(search_text))])
                 recs = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,obj,'read',ids,['id','name'])
                 for rec in recs:
-                    name = ustr(rec['name']).encode('iso-8859-1')
+                    name = ustr(rec['name'])
                     res.append((obj,rec['id'],name,object_name))
         return res
 
@@ -247,17 +254,22 @@ class XMLRpcConn(object):
 
     def MakeAttachment(self, recs, mail):
         attachments = mail.Attachments
+        result = {}
         conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
         att_folder_path = os.path.abspath(os.path.dirname(__file__)+"\\dialogs\\resources\\attachments\\")
         if not os.path.exists(att_folder_path):
             os.makedirs(att_folder_path)
         for rec in recs: #[('res.partner', 3, 'Agrolait')]
+
             obj = rec[0]
             obj_id = rec[1]
             res={}
             res['res_model'] = obj
+            attachment_ids = []
+            if obj not in result:
+                result[obj] = {}
             for i in xrange(1, attachments.Count+1):
-                fn = ustr(attachments[i].FileName).encode('iso-8859-1')
+                fn = ustr(attachments[i].FileName)
                 if len(fn) > 64:
                     l = 64 - len(fn)
                     f = fn.split('.')
@@ -271,7 +283,10 @@ class XMLRpcConn(object):
                 res['datas_fname'] = ustr(fn)
                 res['datas'] = content
                 res['res_id'] = obj_id
-                execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.attachment','create',res)
+                id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.attachment','create',res)
+                attachment_ids.append(id)
+            result[obj].update({obj_id: attachment_ids})
+        return result
 
     def CreateContact(self, sel=None, res=None):
         res=eval(str(res))
@@ -345,7 +360,7 @@ class XMLRpcConn(object):
         state_ids = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country.state', 'search', [])
         for state_id in state_ids:
             obj = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country.state', 'read', [state_id],['id','name'])[0]
-            state_list.append((obj['id'], ustr(obj['name']).encode('iso-8859-1')))
+            state_list.append((obj['id'], ustr(obj['name'])))
         return state_list
 
     def GetAllCountry(self):
@@ -356,5 +371,5 @@ class XMLRpcConn(object):
         country_ids = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country', 'search', [])
         for country_id in country_ids:
             obj = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country','read', [country_id], ['id','name'])[0]
-            country_list.append((obj['id'], ustr(obj['name']).encode('iso-8859-1')))
+            country_list.append((obj['id'], ustr(obj['name'])))
         return country_list

From 86c6ecb5b21393f79cfdd006b9ce40e4be9b69e3 Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Thu, 5 Aug 2010 16:24:03 +0530
Subject: [PATCH 13/14] [FIX] account: added notification on absence of invoice
 sequence number

bzr revid: vra@tinyerp.com-20100805105403-j7ipqdt6zjfao1k7
---
 addons/account/invoice.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 1816f4c31bf..d40d4037c97 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -942,6 +942,9 @@ class account_invoice(osv.osv):
                     number = self.pool.get('ir.sequence').get_id(cr, uid, sid, 'id', {'fiscalyear_id': obj_inv.period_id.fiscalyear_id.id})
                 else:
                     number = self.pool.get('ir.sequence').get(cr, uid, 'account.invoice.' + invtype)
+
+                if not number:
+                    raise osv.except_osv(_('Warning !'), _('There is no active invoice sequence defined for the journal !'))
                 
                 if invtype in ('in_invoice', 'in_refund'):
                     ref = reference

From 183f7ca6850769e492020c481d21d11da8d03b49 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 5 Aug 2010 16:53:26 +0530
Subject: [PATCH 14/14] [IMP] purchase_requisition: Remove the unused import
 statement

bzr revid: sbh@tinyerp.com-20100805112326-4w04x63xu943uwlm
---
 addons/claim_from_delivery/__init__.py                        | 2 +-
 addons/purchase_requisition/__openerp__.py                    | 2 +-
 addons/purchase_requisition/purchase_requisition.py           | 4 +---
 .../wizard/purchase_requisition_partner.py                    | 3 ---
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/addons/claim_from_delivery/__init__.py b/addons/claim_from_delivery/__init__.py
index 801c814fdf9..6c1b79535b5 100644
--- a/addons/claim_from_delivery/__init__.py
+++ b/addons/claim_from_delivery/__init__.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py
index f4c8942bf47..841f8ed318b 100644
--- a/addons/purchase_requisition/__openerp__.py
+++ b/addons/purchase_requisition/__openerp__.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index 532c9918b60..37a2aaafd3a 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -23,8 +23,6 @@
 import time
 
 from osv import fields,osv
-from osv import orm
-import netsvc
 from tools.translate import _
 
 class purchase_requisition(osv.osv):
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
index c82dfdb3bd2..56e56799700 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
@@ -23,9 +23,6 @@ import time
 from mx import DateTime
 
 from osv import fields, osv
-from service import web_services
-import netsvc
-import pooler
 from osv.orm import browse_record, browse_null
 
 class purchase_requisition_partner(osv.osv_memory):