From a33cbbd0735f5176282a3172d93a1f770e6f678b Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Wed, 22 Dec 2010 12:53:17 +0530
Subject: [PATCH 01/61] [IMP]:Improve demo data for purchase

bzr revid: ksa@tinyerp.co.in-20101222072317-jbcu40mjvj0vguc0
---
 addons/purchase/purchase_demo.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/purchase/purchase_demo.xml b/addons/purchase/purchase_demo.xml
index 053c6f17b14..26593d419a6 100644
--- a/addons/purchase/purchase_demo.xml
+++ b/addons/purchase/purchase_demo.xml
@@ -5,7 +5,7 @@
         <record id="base.user_demo" model="res.users">
             <field eval="[(4, ref('group_purchase_user'))]" name="groups_id"/>
         </record>
-    
+
     <!--Resource: purchase.order-->
 
         <record id="order_purchase1" model="purchase.order">
@@ -26,7 +26,7 @@
 
         <record id="line1_purchase" model="purchase.order.line">
             <field name="order_id" ref="order_purchase1"/>
-            <field name="date_planned">2010/09/15</field>
+            <field name="date_planned">2010/12/23</field>
             <field name="name">New server config + material</field>
             <field model="product.product" name="product_id" search="[]"/>
             <field model="product.uom" name="product_uom" search="[]"/>
@@ -36,7 +36,7 @@
 
         <record id="line2_purchase" model="purchase.order.line">
             <field name="order_id" ref="order_purchase1"/>
-            <field name="date_planned">2010/09/15</field>
+            <field name="date_planned">2010/12/23</field>
             <field name="name">[PC1] Basic PC</field>
             <field name="product_id" ref="product.product_product_pc1"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -46,7 +46,7 @@
 
         <record id="line3_purchase" model="purchase.order.line">
             <field name="order_id" ref="order_purchase2"/>
-            <field name="date_planned">2010/09/15</field>
+            <field name="date_planned">2010/12/23</field>
             <field name="name">[PC3] Medium PC</field>
             <field name="product_id" ref="product.product_product_pc1"/>
             <field name="product_uom" ref="product.product_uom_unit"/>

From 3583858ee66a8222398bf6fcf8d24eb1690d8f46 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 31 Dec 2010 15:59:40 +0530
Subject: [PATCH 02/61] [REF]: stock: Removed print statement

bzr revid: rpa@tinyerp.com-20101231102940-o6r6fdcwno4zy70m
---
 addons/stock/wizard/stock_partial_move.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index b982a4023ef..8a3b5fd7694 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -190,11 +190,7 @@ class stock_partial_move(osv.osv_memory):
         
         p_moves = {}
         picking_type = self.__get_picking_type(cr, uid, move_ids)
-        print picking_type
         moves_list = picking_type == 'product_moves_in' and partial.product_moves_in  or partial.product_moves_out
-        print picking_type == 'product_moves_in'
-        print partial.product_moves_out
-        print moves_list
         for product_move in moves_list:
             p_moves[product_move.move_id.id] = product_move
             
@@ -205,9 +201,6 @@ class stock_partial_move(osv.osv_memory):
             if not p_moves.get(move.id):
                 continue
             
-            print p_moves[move.id].product_id.id
-            print p_moves[move.id].quantity
-            print p_moves[move.id].product_uom.id
             
             partial_datas['move%s' % (move.id)] = {
                 'product_id' : p_moves[move.id].id,
@@ -224,7 +217,6 @@ class stock_partial_move(osv.osv_memory):
                 })
                 
             
-        print partial_datas
         move_obj.do_partial(cr, uid, moves_ids_final, partial_datas, context=context)
         return {}
 

From 29cf676c6573b43275e4b70f2849314af88dee36 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 31 Dec 2010 17:13:54 +0530
Subject: [PATCH 03/61] [IMP]Improvement on code price_multi_get()bug:-693056

bzr revid: ron@tinyerp.com-20101231114354-61298bobh43f71uw
---
 addons/product/pricelist.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index cd8c338da89..5d2a639384b 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -166,10 +166,9 @@ class product_pricelist(osv.osv):
             pricelist_version_ids = pricelist_ids
         else:
             # all pricelists:
-            pricelist_version_ids = product_pricelist_version_obj.search(cr, uid, [])
+            pricelist_version_ids = self.pool.get('product.pricelist').search(cr, uid, [])
 
         pricelist_version_ids = list(set(pricelist_version_ids))
-
         plversions_search_args = [
             ('pricelist_id', 'in', pricelist_version_ids),
             '|',

From bf00ee7f5cbd05edf189e1e1c7e9743b26a1d6c6 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 31 Dec 2010 18:17:48 +0530
Subject: [PATCH 04/61] [FIX]procurement exception when there is stock

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

bzr revid: ron@tinyerp.com-20101231124748-dsl8xcr1nslppgqp
---
 addons/sale/sale.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index cac858d765b..1051d035fa7 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -739,12 +739,13 @@ class sale_order(osv.osv):
                                             proc_obj.write(cr, uid, [proc_id], {'product_qty': mov.product_qty, 'product_uos_qty': mov.product_uos_qty})
 
             val = {}
-            for proc_id in proc_ids:
-                wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
 
             if picking_id:
                 wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
 
+            for proc_id in proc_ids:
+                wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
+
             if order.state == 'shipping_except':
                 val['state'] = 'progress'
                 val['shipped'] = False

From 2a55f1bc7720d09f3bc42557f7c1941080dd4fda Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 3 Jan 2011 11:39:04 +0530
Subject: [PATCH 05/61] [FIX]purchase_requisition:After Install
 purchase_requisition Error opening on Purchange Menu

bzr revid: ron@tinyerp.com-20110103060904-davd50590m3aea69
---
 addons/purchase_requisition/purchase_requisition_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index ce67b0921c3..e21f893f9ac 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -21,7 +21,7 @@
         <field name="model">purchase.order</field>
         <field name="inherit_id" ref="purchase.view_purchase_order_filter"/>
         <field name="arch" type="xml">
-            <xpath expr="/search/group/filter[@string='To be Invoiced']" position="after">
+            <xpath expr="/search/group/filter[@string='State']" position="after">
              <filter icon="terp-gtk-jump-to-rtl" string="Requisition" domain="[('requisition_id','!=',False)]" separator="1"/>
             </xpath>
         </field>

From 89a30feb3b152ab0872d4d56caf460d8010a21aa Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 3 Jan 2011 11:49:02 +0530
Subject: [PATCH 06/61] [FIX]: purchase: Fixed wrong product reference in demo

bzr revid: rpa@tinyerp.com-20110103061902-reeh2wyfm6q94loi
---
 addons/purchase/purchase_demo.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/purchase_demo.xml b/addons/purchase/purchase_demo.xml
index 053c6f17b14..c4d69699d5e 100644
--- a/addons/purchase/purchase_demo.xml
+++ b/addons/purchase/purchase_demo.xml
@@ -48,7 +48,7 @@
             <field name="order_id" ref="order_purchase2"/>
             <field name="date_planned">2010/09/15</field>
             <field name="name">[PC3] Medium PC</field>
-            <field name="product_id" ref="product.product_product_pc1"/>
+            <field name="product_id" ref="product.product_product_pc3"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="price_unit">900</field>
             <field name="product_qty">1</field>

From 675823ac968a53a46ec7045a8700e8733f110c99 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 3 Jan 2011 12:21:36 +0530
Subject: [PATCH 07/61] [FIX]Purchase:Statistics report should not be allow for
 Purchase/User group

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

bzr revid: ron@tinyerp.com-20110103065136-zbgq7czfl7klo9v0
---
 addons/purchase/report/purchase_report_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 7f52ca73cf0..40c05e2955c 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -171,7 +171,8 @@
     </record>
 
 
-    <menuitem id="base.next_id_73" name="Reporting" parent="base.menu_purchase_root" sequence="8"/>
+    <menuitem id="base.next_id_73" name="Reporting" parent="base.menu_purchase_root" sequence="8"
+        groups="purchase.group_purchase_manager"/>
     <menuitem action="action_purchase_order_report_all" id="menu_action_purchase_order_report_all" parent="base.next_id_73" sequence="3"/>
 
     <record id="action_stock_move_report_po" model="ir.actions.act_window">

From 3555482395cb9530bc27dbffd3ac677995d54f07 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 3 Jan 2011 12:28:05 +0530
Subject: [PATCH 08/61] [IMP]: purchase: Improvement in translation file

bzr revid: rpa@tinyerp.com-20110103065805-2fibb5jpavl01tl8
---
 addons/purchase/i18n/purchase.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot
index f2618d4263b..00e6459d82f 100644
--- a/addons/purchase/i18n/purchase.pot
+++ b/addons/purchase/i18n/purchase.pot
@@ -539,7 +539,7 @@ msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
-msgid "To be Invoiced"
+msgid "No Invoice"
 msgstr ""
 
 #. module: purchase

From 11479a625fb8895ddee33e1df70f0a253961a7d3 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Mon, 3 Jan 2011 16:10:49 +0530
Subject: [PATCH 09/61] [FIX]:mrp repair does not work with products with lot
 tracking

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

bzr revid: ksa@tinyerp.co.in-20110103104049-ujw59m9j8kh96pok
---
 addons/mrp_repair/mrp_repair.py       | 2 ++
 addons/mrp_repair/mrp_repair_view.xml | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 899a7460fdf..8fde87c0e00 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -535,6 +535,7 @@ class mrp_repair(osv.osv):
                     'location_id': move.location_id.id,
                     'location_dest_id': move.location_dest_id.id,
                     'tracking_id': False,
+                    'prodlot_id': move.prodlot_id and move.prodlot_id.id or False,
                     'state': 'done',
                 })
                 repair_line_obj.write(cr, uid, [move.id], {'move_id': move_id, 'state': 'done'}, context=context)
@@ -661,6 +662,7 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
         'tax_id': fields.many2many('account.tax', 'repair_operation_line_tax', 'repair_operation_line_id', 'tax_id', 'Taxes'),
         'product_uom_qty': fields.float('Quantity (UoM)', digits=(16,2), required=True),
         'product_uom': fields.many2one('product.uom', 'Product UoM', required=True),
+        'prodlot_id': fields.many2one('stock.production.lot', 'Lot Number',domain="[('product_id','=',product_id)]"),
         'invoice_line_id': fields.many2one('account.invoice.line', 'Invoice Line', readonly=True),
         'location_id': fields.many2one('stock.location', 'Source Location', required=True, select=True),
         'location_dest_id': fields.many2one('stock.location', 'Dest. Location', required=True, select=True),
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 11a9eadb249..724dafc741d 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -49,7 +49,8 @@
                                 <notebook>
                                     <page string="Repair Line">
                                         <field name="name" colspan="4"/>
-                                        <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id)" colspan="4"/>
+                                        <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id)"/>
+                                        <field name='prodlot_id'/>
                                         <field name="product_uom_qty" string="Qty" />
                                         <field name="product_uom" string="UoM"/>
                                         <field name="price_unit"/>
@@ -178,7 +179,7 @@
           <field name="arch" type="xml">
               <search string="Search Reair Orders">
                   <group col='4' colspan='4'>
-                       <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/>   
+                       <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/>
                        <filter icon="terp-check" string="Confirmed" domain="[('state','=','confirmed')]" name="current" />
                        <filter icon="terp-emblem-important" string="Ready To Repair" domain="[('state','=','ready')]"/>
                        <separator orientation="vertical"/>
@@ -202,7 +203,7 @@
           </field>
     </record>
 
-        
+
 
          <record id="action_repair_order_tree" model="ir.actions.act_window">
             <field name="name">Repair Orders</field>
@@ -212,7 +213,7 @@
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_repair_order_form_filter"/>
             <field name="help">Repair orders allow you to organize your product repairs. In a repair order, you can detail the components you remove, add or replace and record the time you spent on the different operations. The repair order uses the warranty date on the production lot in order to know if whether the repair should be invoiced to the customer or not.</field>
-        </record>    
+        </record>
 
         <menuitem action="action_repair_order_tree" id="menu_repair_order" parent="mrp.menu_mrp_manufacturing" groups="mrp.group_mrp_user" name="Repair Orders" sequence="50"/>
 

From b430f760ae82b5aee42522a4560d9558d87a0715 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Mon, 3 Jan 2011 16:19:33 +0530
Subject: [PATCH 10/61] [FIX] stock:Cancelling periodic inventory is now cancel
 account move

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

bzr revid: aag@tinyerp.co.in-20110103104933-qip7fqkxbl5gyaar
---
 addons/stock/stock.py       | 13 ++++++++++++-
 addons/stock/stock_view.xml |  4 ++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 88924105c16..42eeb615f84 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2573,8 +2573,19 @@ class stock_inventory(osv.osv):
         """ Cancels the stock move and change inventory state to draft.
         @return: True
         """
+        move_obj = self.pool.get('stock.move')
+        account_move_obj = self.pool.get('account.move')
         for inv in self.browse(cr, uid, ids, context=context):
-            self.pool.get('stock.move').action_cancel(cr, uid, [x.id for x in inv.move_ids], context)
+            move_obj.action_cancel(cr, uid, [x.id for x in inv.move_ids], context)
+            for move in inv.move_ids:
+                 account_move_ids = account_move_obj.search(cr, uid, [('name','=',move.name)])
+                 if account_move_ids:
+                     account_move_data_l = account_move_obj.read(cr, uid, account_move_ids, ['state'])
+                     for account_move in account_move_data_l:
+                         if account_move['state'] == 'posted':
+                             raise osv.except_osv(_('UserError'),
+                                                  _('You can not cancel inventory which has any account move with posted state.'))
+                         account_move_obj.unlink(cr, uid, [account_move['id']])
             self.write(cr, uid, [inv.id], {'state': 'draft'})
         return True
 
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 86135e8f13d..95e97161e5e 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -170,8 +170,8 @@
                     <group col="2" colspan="2">
                      <field name="state"/>
                     </group>
-                    <group col="2" colspan="2">
-                        <button name="action_cancel_inventary" states="draft" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
+                    <group col="3" colspan="2">
+                        <button name="action_cancel_inventary" states="draft,confirm,done" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
                         <button name="action_confirm" states="draft" string="Confirm Inventory" type="object" icon="gtk-apply"/>
                         <button name="action_done" states="confirm" string="Validate Inventory" type="object" icon="gtk-jump-to"/>
                         <button name="action_cancel" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>

From f162ad8845ada71545bfcd79d5a77e923e904618 Mon Sep 17 00:00:00 2001
From: "rha@tinyerp.com" <>
Date: Mon, 3 Jan 2011 16:24:56 +0530
Subject: [PATCH 11/61] [Fix] stock: incoming shipments price is wrong

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

bzr revid: rha@tinyerp.com-20110103105456-46dhel6b7b8891uc
---
 addons/purchase/purchase.py                  |  3 +-
 addons/stock/wizard/stock_partial_picking.py | 46 ++++++++++----------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 0de19189fc3..6adb726b97a 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -455,6 +455,7 @@ class purchase_order(osv.osv):
                         'state': 'draft',
                         'purchase_line_id': order_line.id,
                         'company_id': order.company_id.id,
+                        'price_unit': order_line.price_unit
                     })
                     if order_line.move_dest_id:
                         self.pool.get('stock.move').write(cr, uid, [order_line.move_dest_id.id], {'location_id':order.location_id.id})
@@ -672,7 +673,7 @@ class purchase_order_line(osv.osv):
         seller_delay = 0
 
         prod_name = self.pool.get('product.product').name_get(cr, uid, [prod.id], context=context)[0][1]
-        res = {} 
+        res = {}
         for s in prod.seller_ids:
             if s.name.id == partner_id:
                 seller_delay = s.delay
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index ad75c142a96..305304e8c7e 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -32,24 +32,24 @@ class stock_partial_picking(osv.osv_memory):
         'product_moves_out' : fields.one2many('stock.move.memory.out', 'wizard_id', 'Moves'),
         'product_moves_in' : fields.one2many('stock.move.memory.in', 'wizard_id', 'Moves'),
      }
-    
+
     def __is_in(self,cr, uid, pick_ids):
         """
             @return: True if one of the moves has as picking type 'in'
         """
         if not pick_ids:
             return False
-       
+
         pick_obj = self.pool.get('stock.picking')
         pick_ids = pick_obj.search(cr, uid, [('id','in',pick_ids)])
-        
-       
+
+
         for pick in pick_obj.browse(cr, uid, pick_ids):
             for move in pick.move_lines:
                 if pick.type == 'in' and move.product_id.cost_method == 'average':
                     return True
         return False
-    
+
     def __get_picking_type(self, cr, uid, pick_ids):
         if self.__is_in(cr, uid, pick_ids):
             return "product_moves_in"
@@ -62,11 +62,11 @@ class stock_partial_picking(osv.osv_memory):
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
         result = super(stock_partial_picking, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)
-       
-        
+
+
         picking_ids = context.get('active_ids', False)
         picking_type = self.__get_picking_type(cr, uid, picking_ids)
-        
+
         _moves_arch_lst = """<form string="%s">
                         <field name="date" invisible="1"/>
                         <separator colspan="4" string="%s"/>
@@ -77,7 +77,7 @@ class stock_partial_picking(osv.osv_memory):
                             'product_moves_in' : {'relation': 'stock.move.memory.in', 'type' : 'one2many', 'string' : 'Product Moves'},
                             'product_moves_out' : {'relation': 'stock.move.memory.out', 'type' : 'one2many', 'string' : 'Product Moves'}
                             })
-            
+
         _moves_arch_lst += """
                 <separator string="" colspan="4" />
                 <label string="" colspan="2"/>
@@ -100,10 +100,10 @@ class stock_partial_picking(osv.osv_memory):
             'prodlot_id' : picking.prodlot_id.id,
             'move_id' : picking.id,
         }
-    
+
         if is_in:
             move_memory.update({
-                'cost' : picking.product_id.standard_price,
+                'cost' : picking.price_unit,
                 'currency' : picking.product_id.company_id.currency_id.id,
             })
         return move_memory
@@ -112,23 +112,23 @@ class stock_partial_picking(osv.osv_memory):
         pick_obj = self.pool.get('stock.picking')
         if not context:
             context = {}
-               
+
         res = []
         for pick in pick_obj.browse(cr, uid, context.get('active_ids', []), context):
             need_product_cost = (pick.type == 'in')
             for m in pick.move_lines:
                 if m.state in ('done', 'cancel'):
-                    continue           
+                    continue
                 res.append(self.__create_partial_picking_memory(m, need_product_cost))
-            
+
         return res
-    
+
     _defaults = {
         'product_moves_in' : __get_active_stock_pickings,
         'product_moves_out' : __get_active_stock_pickings,
         'date' : lambda *a : time.strftime('%Y-%m-%d %H:%M:%S'),
     }
-    
+
 
     def do_partial(self, cr, uid, ids, context=None):
         """ Makes partial moves and pickings done.
@@ -152,22 +152,22 @@ class stock_partial_picking(osv.osv_memory):
             p_moves = {}
             for product_move in moves_list:
                 p_moves[product_move.move_id.id] = product_move
-            
-            
+
+
             for move in pick.move_lines:
                 if move.state in ('done', 'cancel'):
                     continue
                 if not p_moves.get(move.id):
                     continue
-                
+
                 partial_datas['move%s' % (move.id)] = {
                     'product_id' : p_moves[move.id].id,
                     'product_qty' : p_moves[move.id].quantity,
                     'product_uom' :p_moves[move.id].product_uom.id,
                     'prodlot_id' : p_moves[move.id].prodlot_id.id,
                 }
-            
-               
+
+
                 if (move.picking_id.type == 'in') and (move.product_id.cost_method == 'average'):
                     partial_datas['move%s' % (move.id)].update({
                                                     'product_price' : p_moves[move.id].cost,
@@ -176,8 +176,8 @@ class stock_partial_picking(osv.osv_memory):
         pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)
         return {}
 
-        
-   
+
+
 
 stock_partial_picking()
 

From d77ad35e79abd24cdbce8dac14c0875f41f898c9 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 3 Jan 2011 17:37:35 +0530
Subject: [PATCH 12/61] [FIX]: product: Passed proper context in Pricelist
 report

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

bzr revid: rpa@tinyerp.com-20110103120735-mou9vrd4bkamsgax
---
 addons/product/report/product_pricelist.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/product/report/product_pricelist.py b/addons/product/report/product_pricelist.py
index 1148718668b..7e9748c2523 100644
--- a/addons/product/report/product_pricelist.py
+++ b/addons/product/report/product_pricelist.py
@@ -62,18 +62,18 @@ class product_pricelist(report_sxw.rml_parse):
 
     def _get_pricelist(self, pricelist_id):
         pool = pooler.get_pool(self.cr.dbname)
-        pricelist = pool.get('product.pricelist').read(self.cr, self.uid, [pricelist_id], ['name'])[0]
+        pricelist = pool.get('product.pricelist').read(self.cr, self.uid, [pricelist_id], ['name'], context=self.localcontext)[0]
         return pricelist['name']
 
     def _get_currency(self, pricelist_id):
         pool = pooler.get_pool(self.cr.dbname)
-        pricelist = pool.get('product.pricelist').read(self.cr, self.uid, [pricelist_id], ['currency_id'])[0]
+        pricelist = pool.get('product.pricelist').read(self.cr, self.uid, [pricelist_id], ['currency_id'], context=self.localcontext)[0]
         return pricelist['currency_id'][1]
 
     def _get_currency_symbol(self, pricelist_id):
         pool = pooler.get_pool(self.cr.dbname)
-        pricelist = pool.get('product.pricelist').read(self.cr, self.uid, [pricelist_id], ['currency_id'])[0]
-        symbol = pool.get('res.currency').read(self.cr, self.uid, [pricelist['currency_id'][0]], ['symbol'])[0]
+        pricelist = pool.get('product.pricelist').read(self.cr, self.uid, [pricelist_id], ['currency_id'], context=self.localcontext)[0]
+        symbol = pool.get('res.currency').read(self.cr, self.uid, [pricelist['currency_id'][0]], ['symbol'], context=self.localcontext)[0]
         return symbol['symbol'] or ''
 
     def _get_categories(self, products,form):
@@ -88,13 +88,13 @@ class product_pricelist(report_sxw.rml_parse):
             if product.categ_id.id not in cat_ids:
                 cat_ids.append(product.categ_id.id)
 
-        cats = pool.get('product.category').name_get(self.cr, self.uid, cat_ids)
+        cats = pool.get('product.category').name_get(self.cr, self.uid, cat_ids, context=self.localcontext)
         if not cats:
             return res
         for cat in cats:
-            product_ids=pool.get('product.product').search(self.cr, self.uid, [('id','in',pro_ids),('categ_id','=',cat[0])])
+            product_ids=pool.get('product.product').search(self.cr, self.uid, [('id', 'in', pro_ids), ('categ_id', '=', cat[0])], context=self.localcontext)
             products = []
-            for product in pool.get('product.product').read(self.cr, self.uid, product_ids, ['name','code']):
+            for product in pool.get('product.product').read(self.cr, self.uid, product_ids, ['name', 'code'], context=self.localcontext):
                 val = {
                      'id':product['id'],
                      'name':product['name'],
@@ -114,7 +114,7 @@ class product_pricelist(report_sxw.rml_parse):
     def _get_price(self,pricelist_id, product_id,qty):
         sale_price_digits = self.get_digits(dp='Sale Price')
         pool = pooler.get_pool(self.cr.dbname)
-        price_dict = pool.get('product.pricelist').price_get(self.cr, self.uid, [pricelist_id], product_id,qty)
+        price_dict = pool.get('product.pricelist').price_get(self.cr, self.uid, [pricelist_id], product_id, qty, context=self.localcontext)
         if price_dict[pricelist_id]:
             price = self.formatLang(price_dict[pricelist_id], digits=sale_price_digits)
         else:

From a722db2cc744783d3f400880b020eee130b1983b Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Tue, 4 Jan 2011 16:00:48 +0530
Subject: [PATCH 13/61] [IMP]:bug 690700 Wrong Partner used when invoicing from
 picking coming from a puchase with sent_to_address

bzr revid: ksa@tinyerp.co.in-20110104103048-2gwkh19mmac5e9y6
---
 addons/purchase/stock.py | 13 +++++++++++++
 addons/sale/stock.py     | 13 +++++++++++++
 addons/stock/stock.py    |  7 ++++---
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index 0d82baa96aa..4fc154a3de8 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -58,6 +58,19 @@ class stock_picking(osv.osv):
         'purchase_id': False,
     }
 
+    def _get_address_invoice(self, cr, uid, picking):
+        """ Gets invoice address of a partner
+        @return {'contact': address, 'invoice': address} for invoice
+        """
+        res = super(stock_picking, self)._get_address_invoice(cr, uid, picking)
+        if picking.purchase_id:
+            partner_obj = self.pool.get('res.partner')
+            partner = (picking.purchase_id and picking.purchase_id.partner_id) or picking.address_id.partner_id
+            data = partner_obj.address_get(cr, uid, [partner.id],
+                ['contact', 'invoice'])
+            res.update(data)
+        return res
+
     def get_currency_id(self, cursor, user, picking):
         if picking.purchase_id:
             return picking.purchase_id.pricelist_id.currency_id.id
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index f7c5d81ae57..573f019274c 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -43,6 +43,19 @@ class stock_picking(osv.osv):
         'sale_id': False
     }
 
+    def _get_address_invoice(self, cr, uid, picking):
+        """ Gets invoice address of a partner
+        @return {'contact': address, 'invoice': address} for invoice
+        """
+        res = super(stock_picking, self)._get_address_invoice(cr, uid, picking)
+        if picking.sale_id:
+            partner_obj = self.pool.get('res.partner')
+            partner = (picking.sale_id and picking.sale_id.partner_id) or picking.address_id.partner_id
+            data = partner_obj.address_get(cr, uid, [partner.id],
+                ['contact', 'invoice'])
+            res.update(data)
+        return res
+
     def get_currency_id(self, cursor, user, picking):
         if picking.sale_id:
             return picking.sale_id.pricelist_id.currency_id.id
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 97d5f9a0270..3e24886cf69 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -874,8 +874,7 @@ class stock_picking(osv.osv):
         @return {'contact': address, 'invoice': address} for invoice
         """
         partner_obj = self.pool.get('res.partner')
-        partner = (picking.purchase_id and picking.purchase_id.partner_id) or (picking.sale_id and picking.sale_id.partner_id) or picking.address_id.partner_id
-
+        partner = picking.address_id.partner_id
         return partner_obj.address_get(cr, uid, [partner.id],
                 ['contact', 'invoice'])
 
@@ -970,6 +969,7 @@ class stock_picking(osv.osv):
 
         invoice_obj = self.pool.get('account.invoice')
         invoice_line_obj = self.pool.get('account.invoice.line')
+        address_obj = self.pool.get('res.partner.address')
         invoices_group = {}
         res = {}
         inv_type = type
@@ -993,6 +993,7 @@ class stock_picking(osv.osv):
 
             address_contact_id, address_invoice_id = \
                     self._get_address_invoice(cr, uid, picking).values()
+            partner_id = address_obj.browse(cr, uid, address_contact_id)
 
             comment = self._get_comment_invoice(cr, uid, picking)
             if group and partner.id in invoices_group:
@@ -1012,7 +1013,7 @@ class stock_picking(osv.osv):
                     'origin': (picking.name or '') + (picking.origin and (':' + picking.origin) or ''),
                     'type': inv_type,
                     'account_id': account_id,
-                    'partner_id': partner.id,
+                    'partner_id': partner_id.partner_id.id,
                     'address_invoice_id': address_invoice_id,
                     'address_contact_id': address_contact_id,
                     'comment': comment,

From a84d9c09a1725e595ebb6b7a6df8ff7835e17db2 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 4 Jan 2011 16:18:55 +0530
Subject: [PATCH 14/61] [ADD]: Added missing files

bzr revid: ron@tinyerp.com-20110104104855-8acdvut29m2x61tm
---
 .../report/account_voucher_sales_receipt.py   | 134 +++++
 .../account_voucher_sales_receipt_view.xml    | 115 ++++
 addons/base_action_rule/i18n/el.po            | 498 ++++++++++++++++++
 addons/share/i18n/es.po                       | 487 +++++++++++++++++
 4 files changed, 1234 insertions(+)
 create mode 100755 addons/account_voucher/report/account_voucher_sales_receipt.py
 create mode 100755 addons/account_voucher/report/account_voucher_sales_receipt_view.xml
 create mode 100644 addons/base_action_rule/i18n/el.po
 create mode 100644 addons/share/i18n/es.po

diff --git a/addons/account_voucher/report/account_voucher_sales_receipt.py b/addons/account_voucher/report/account_voucher_sales_receipt.py
new file mode 100755
index 00000000000..cef854aa953
--- /dev/null
+++ b/addons/account_voucher/report/account_voucher_sales_receipt.py
@@ -0,0 +1,134 @@
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+
+from osv import fields, osv
+import pooler
+from tools import config
+import tools
+
+class sale_receipt_report(osv.osv):
+    _name = "sale.receipt.report"
+    _description = "Sales Receipt Statistics"
+    _auto = False
+    _rec_name = 'date'
+    _columns = {
+        'date': fields.date('Date', readonly=True),
+        'year': fields.char('Year', size=4, readonly=True),
+        'day': fields.char('Day', size=128, readonly=True),
+        'month': fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
+            ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
+            ('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True),
+        'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
+        'journal_id': fields.many2one('account.journal', 'Journal', readonly=True),
+        'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
+        'company_id': fields.many2one('res.company', 'Company', readonly=True),
+        'user_id': fields.many2one('res.users', 'Salesman', readonly=True),
+        'price_total': fields.float('Total Without Tax', readonly=True),
+        'price_total_tax': fields.float('Total With Tax', readonly=True),
+        'nbr':fields.integer('# of Voucher Lines', readonly=True),
+        'type': fields.selection([
+            ('sale','Sale'),
+            ('purchase','Purchase'),
+            ('payment','Payment'),
+            ('receipt','Receipt'),
+            ],'Type', readonly=True),
+        'state': fields.selection([
+            ('draft','Draft'),
+             ('proforma','Pro-forma'),
+             ('posted','Posted'),
+             ('cancel','Cancelled')
+            ], 'Voucher State', readonly=True),
+        'pay_now':fields.selection([
+            ('pay_now','Pay Directly'),
+            ('pay_later','Pay Later or Group Funds'),
+        ],'Payment', readonly=True),
+        'date_due': fields.date('Due Date', readonly=True),
+        'account_id': fields.many2one('account.account', 'Account',readonly=True),
+        'delay_to_pay': fields.float('Avg. Delay To Pay', readonly=True, group_operator="avg"),
+        'due_delay': fields.float('Avg. Due Delay', readonly=True, group_operator="avg")
+    }
+    _order = 'date desc'
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'sale_receipt_report')
+        cr.execute("""
+            create or replace view sale_receipt_report as (
+                select min(avl.id) as id,
+                    av.date as date,
+                    to_char(av.date, 'YYYY') as year,
+                    to_char(av.date, 'MM') as month,
+                    to_char(av.date, 'YYYY-MM-DD') as day,
+                    av.partner_id as partner_id,
+                    av.currency_id as currency_id,
+                    av.journal_id as journal_id,
+                    rp.user_id as user_id,
+                    av.company_id as company_id,
+                    count(avl.*) as nbr,
+                    av.type as type,
+                    av.state,
+                    av.pay_now,
+                    av.date_due as date_due,
+                    av.account_id as account_id,
+                    sum(av.amount-av.tax_amount)/(select count(l.id) from account_voucher_line as l
+                            left join account_voucher as a ON (a.id=l.voucher_id)
+                            where a.id=av.id) as price_total,
+                    sum(av.amount)/(select count(l.id) from account_voucher_line as l
+                            left join account_voucher as a ON (a.id=l.voucher_id)
+                            where a.id=av.id) as price_total_tax,
+                    sum((select extract(epoch from avg(date_trunc('day',aml.date_created)-date_trunc('day',l.create_date)))/(24*60*60)::decimal(16,2)
+                        from account_move_line as aml
+                        left join account_voucher as a ON (a.move_id=aml.move_id)
+                        left join account_voucher_line as l ON (a.id=l.voucher_id)
+                        where a.id=av.id)) as delay_to_pay,
+                    sum((select extract(epoch from avg(date_trunc('day',a.date_due)-date_trunc('day',a.date)))/(24*60*60)::decimal(16,2)
+                        from account_move_line as aml
+                        left join account_voucher as a ON (a.move_id=aml.move_id)
+                        left join account_voucher_line as l ON (a.id=l.voucher_id)
+                        where a.id=av.id)) as due_delay
+                from account_voucher_line as avl
+                left join account_voucher as av on (av.id=avl.voucher_id)
+                left join res_partner as rp ON (rp.id=av.partner_id)
+                left join account_journal as aj ON (aj.id=av.journal_id)
+                where av.type='sale' and aj.type in ('sale','sale_refund')
+                group by
+                    av.date,
+                    av.id,
+                    to_char(av.date, 'YYYY'),
+                    to_char(av.date, 'MM'),
+                    to_char(av.date, 'YYYY-MM-DD'),
+                    av.partner_id,
+                    av.currency_id,
+                    av.journal_id,
+                    rp.user_id,
+                    av.company_id,
+                    av.type,
+                    av.state,
+                    av.date_due,
+                    av.account_id,
+                    av.tax_amount,
+                    av.amount,
+                    av.tax_amount,
+                    av.pay_now
+            )
+        """)
+
+sale_receipt_report()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
new file mode 100755
index 00000000000..ad32978ddd8
--- /dev/null
+++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data> 
+   
+   <record id="view_sale_receipt_report_tree" model="ir.ui.view">
+        <field name="name">sale.receipt.report.tree</field>
+        <field name="model">sale.receipt.report</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree colors="blue:state in ('draft');gray:state in ('cancel','paid');black:state in ('proforma','proforma2')"  string="Sales Receipt Analysis">
+                <field name="date" invisible="1"/>
+                <field name="user_id" invisible="1"/>
+                <field name="year" invisible="1"/>
+                <field name="day" invisible="1"/>
+                <field name="month" invisible="1"/>
+                <field name="type" invisible="1"/>
+                <field name="company_id" invisible="1"/>
+                <field name="partner_id" invisible="1"/>
+                <field name="state" invisible="1"/>
+                <field name="currency_id" invisible="1"/>
+                <field name="journal_id" invisible="1"/>
+                <field name="date_due" invisible="1"/>
+                <field name="account_id" invisible="1"/>
+                <field name="nbr" sum="# of Voucher Lines"/>
+                <field name="price_total" sum="Total Without Tax"/>
+                <field name="price_total_tax" sum="Total With Tax"/>
+                <field name="due_delay"  sum="Avg. Due Delay"/>
+                <field name="delay_to_pay"  sum="Avg. Delay To Pay"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_sale_receipt_report_graph" model="ir.ui.view">
+         <field name="name">sale.receipt.report.graph</field>
+         <field name="model">sale.receipt.report</field>
+         <field name="type">graph</field>
+         <field name="arch" type="xml">
+             <graph string="Sales Receipt Analysis" type="bar">
+                 <field name="account_id"/>
+                 <field name="price_total"/>
+             </graph>
+         </field>
+    </record>
+
+    <record id="view_sale_receipt_report_search" model="ir.ui.view">
+        <field name="name">sale.receipt.report.search</field>
+        <field name="model">sale.receipt.report</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Sales Receipt Analysis">
+              <group col="10" colspan="12">
+                    <filter string="Draft"
+                           icon="terp-document-new"
+                           domain="[('state','=','draft')]"
+                           help = "Draft Vouchers"/>
+                    <filter string="Pro-forma"
+                           icon="terp-gtk-media-pause"
+                           domain="[('state','=','proforma')]"
+                           help = "Pro-forma Vouchers"/>
+                    <filter string="Posted"
+                           name="current"
+                           icon="terp-check"
+                           domain="[('state','not in', ('draft','cancel'))]"
+                           help = "Validated Vouchers"/>
+                   <separator orientation="vertical"/>
+                   <field name="partner_id"/>
+                   <field name="date" string="Voucher Date"/>
+                </group>
+                <newline/>
+                <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                    <field name="journal_id" widget="selection"/>
+                    <field name="pay_now"/>
+                    <field name="account_id"/>
+                    <separator orientation="vertical"/>
+                    <field name="date_due"/>
+                    <separator orientation="vertical" groups="base.group_multi_company"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                </group>
+                <newline/>
+                <group expand="1" string="Group By...">
+                    <filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
+                    <filter string="Salesman" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Due Date" icon="terp-go-today" context="{'group_by':'date_due'}"/>
+                    <separator orientation="vertical" groups="base.group_multi_company"/>
+                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Day" name="day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by Invoice Date"/>
+                    <filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Invoice Date"/>
+                    <filter string="Year" name="year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Invoice Date"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="action_sale_receipt_report_all" model="ir.actions.act_window">
+        <field name="name">Sales Receipt Analysis</field>
+        <field name="res_model">sale.receipt.report</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,graph</field>
+        <field name="context">{'search_default_current':1, 'search_default_partner':1, 'search_default_customer':1, 'search_default_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1,}</field>
+        <field name="search_view_id" ref="view_sale_receipt_report_search"/>
+        <field name="help">From this report, you can have an overview of the amount invoiced to your customer as well as payment delays. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs.</field>
+
+    </record>
+
+    <menuitem action="action_sale_receipt_report_all" id="menu_action_sale_receipt_report_all" parent="account.menu_finance_statistic_report_statement" sequence="3"/>
+       
+   </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/base_action_rule/i18n/el.po b/addons/base_action_rule/i18n/el.po
new file mode 100644
index 00000000000..363e527652c
--- /dev/null
+++ b/addons/base_action_rule/i18n/el.po
@@ -0,0 +1,498 @@
+# Greek translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-21 19:43+0000\n"
+"PO-Revision-Date: 2010-12-29 09:54+0000\n"
+"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
+"Language-Team: Greek <el@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_to_user:0
+msgid ""
+"Check this if you want the rule to send an email to the responsible person."
+msgstr ""
+"Τσέκαε αυτό εάν θέλετε αυτός ο κανόνας να στέλνει email στον/στην υπεύθυνο."
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_partner:0
+msgid "Remind Partner"
+msgstr "Υπενθύμιση Συνεργάτη"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_categ_id:0
+msgid "Partner Category"
+msgstr "Κατηγορία Συνεργάτη"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_watchers:0
+msgid "Mail to Watchers (CC)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_state_to:0
+msgid "Button Pressed"
+msgstr "Το Κουμπί Πατήθηκε"
+
+#. module: base_action_rule
+#: field:base.action.rule,model_id:0
+msgid "Object"
+msgstr "Αντικείμενο"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_email:0
+msgid "Mail to these Emails"
+msgstr "Αποστολή σε αυτά τα Emails"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_state:0
+msgid "Set State to"
+msgstr "Θέσε την κατάσταση σε"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_from:0
+msgid "Email From"
+msgstr "Email Από"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Body"
+msgstr "Σώμα Email"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Days"
+msgstr "Ημέρες"
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:0
+#, python-format
+msgid "Error!"
+msgstr "Σφάλμα!"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_reply_to:0
+msgid "Reply-To"
+msgstr "Απάντηση-Σε"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_cc:0
+msgid ""
+"These people will receive a copy of the future communication between partner "
+"and users by email"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Minutes"
+msgstr "Λεπτά"
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Όνομα Κανόνα"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_partner:0
+msgid ""
+"Check this if you want the rule to send a reminder by email to the partner."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.actions.act_window,help:base_action_rule.base_action_rule_act
+msgid ""
+"Create actions automatically triggered based on a user activity in the "
+"system.E.g.: an opportunity created by a specific user can be automatically "
+"maintained with a specific sales team, or an opportunity which still has "
+"status pending after 14 days triggers an automatic reminder email."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Partner"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Deadline"
+msgstr "Προσθεσμία"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_id:0
+msgid "Partner"
+msgstr "Συνεργάτης"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_subject)s = Object subject"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Reminders"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Special Keywords to Be Used in The Body"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_state_from:0
+msgid "State"
+msgstr "Κατάσταση"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_to_email:0
+msgid "Email-id of the persons whom mail is to be sent"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+#: model:ir.module.module,shortdesc:base_action_rule.module_meta_information
+msgid "Action Rule"
+msgstr "Κανόνας Ενέργειας"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Fields to Change"
+msgstr "Πεδία προς Αλλαγή"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Creation Date"
+msgstr "Ημερομηνία Δημιουργίας"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Last Action Date"
+msgstr "Τελευταία Ημερομηνία Ενέργειας"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Hours"
+msgstr "Ώρες"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_id)s = Object ID"
+msgstr "%(object_id)s = Object ID"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Delay After Trigger Date"
+msgstr "Καθυστέρηση Μετά την Ημερομηνία Εναύσματος"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_attach:0
+msgid "Remind with Attachment"
+msgstr "Υπενθύμιση με Συννημένο"
+
+#. module: base_action_rule
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr "Μη έγκυρες παράμετροι"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible to"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "None"
+msgstr "Κανένας"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_to:0
+msgid ""
+"Use a python expression to specify the right field on which one than we will "
+"use for the 'To' field of the header"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_phone)s = Responsible phone"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid ""
+"The rule uses the AND operator. The model must match all non-empty fields so "
+"that the rule executes the action described in the 'Actions' tab."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range_type:0
+msgid "Delay type"
+msgstr "Τύπος καθυστέρησης"
+
+#. module: base_action_rule
+#: help:base.action.rule,regex_name:0
+msgid ""
+"Regular expression for matching name of the resource\n"
+"e.g.: 'urgent.*' will search for records having name starting with the "
+"string 'urgent'\n"
+"Note: This is case sensitive search."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_method:0
+msgid "Call Object Method"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_to:0
+msgid "Email To"
+msgstr "Email Σε"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_to_watchers:0
+msgid ""
+"Check this if you want the rule to mark CC(mail to any other person defined "
+"in actions)."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner)s = Partner name"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Note"
+msgstr "Σημείωση"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_from:0
+msgid ""
+"Use a python expression to specify the right field on which one than we will "
+"use for the 'From' field of the header"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range:0
+msgid "Delay after trigger date"
+msgstr "Καθυστέρηση μετά την ημερομηνίας εναύσματος"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions"
+msgstr "Συνθήκες"
+
+#. module: base_action_rule
+#: help:base.action.rule,trg_date_range:0
+msgid ""
+"Delay After Trigger Date,specifies you can put a negative number. If you "
+"need a delay before the trigger date, like sending a reminder 15 minutes "
+"before a meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,active:0
+msgid "Active"
+msgstr "Ενεργό"
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:0
+#, python-format
+msgid "No E-Mail ID Found for your Company address!"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_user:0
+msgid "Remind Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.module.module,description:base_action_rule.module_meta_information
+msgid "This module allows to implement action rules for any object."
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,sequence:0
+msgid "Gives the sequence order when displaying a list of rules."
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Μήνες"
+
+#. module: base_action_rule
+#: field:base.action.rule,filter_id:0
+msgid "Filter"
+msgstr "Φίλτρο"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Date"
+msgstr "Ημερομηνία"
+
+#. module: base_action_rule
+#: help:base.action.rule,server_action_id:0
+msgid ""
+"Describes the action name.\n"
+"eg:on which object which action to be taken on basis of which condition"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_ir_cron
+msgid "ir.cron"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_description)s = Object description"
+msgstr ""
+
+#. module: base_action_rule
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr "Σφάλμα:Το email δεν είναι σωστά διαμορφωμένο"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Actions"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Information"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule
+msgid "Action Rules"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_body:0
+msgid "Content of mail"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_user_id:0
+msgid "Responsible"
+msgstr "Υπεύθυνος"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner_email)s = Partner Email"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_date)s = Creation date"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_email)s = Responsible Email"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_body:0
+msgid "Mail body"
+msgstr "Σώμα Mail"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_user:0
+msgid ""
+"Check this if you want the rule to send a reminder by email to the user."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Server Action to be Triggered"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_user:0
+msgid "Mail to Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_cc:0
+msgid "Add Watchers (Cc)"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Fields"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
+#: model:ir.ui.menu,name:base_action_rule.menu_base_action_rule_form
+msgid "Automated Actions"
+msgstr "Αυτοματοποιημένες ενέργειες"
+
+#. module: base_action_rule
+#: field:base.action.rule,server_action_id:0
+msgid "Server Action"
+msgstr "Ενέργεια Διακομιστή"
+
+#. module: base_action_rule
+#: field:base.action.rule,regex_name:0
+msgid "Regex on Resource Name"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_attach:0
+msgid ""
+"Check this if you want that all documents attached to the object be attached "
+"to the reminder email sent."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Timing"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,sequence:0
+msgid "Sequence"
+msgstr "Ακολουθία"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Actions"
+msgstr "Ενέργειες"
+
+#. module: base_action_rule
+#: help:base.action.rule,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the rule "
+"without removing it."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user)s = Responsible name"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,create_date:0
+msgid "Create Date"
+msgstr "Ημερομηνία Δημιουργίας"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on States"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_type:0
+msgid "Trigger Date"
+msgstr "Ημερομηνία Εναύσματος"
diff --git a/addons/share/i18n/es.po b/addons/share/i18n/es.po
new file mode 100644
index 00000000000..c39a61bb906
--- /dev/null
+++ b/addons/share/i18n/es.po
@@ -0,0 +1,487 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-21 19:45+0000\n"
+"PO-Revision-Date: 2010-12-31 09:19+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: share
+#: code:addons/share/web/editors.py:0
+#, python-format
+msgid "Sharing"
+msgstr "Compartir"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid ""
+"This additional data has been automatically added to your current access.\n"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Existing External Users"
+msgstr "Usuarios externos existentes"
+
+#. module: share
+#: help:res.groups,share:0
+msgid "Group created to set access rights for sharing data with some users."
+msgstr ""
+
+#. module: share
+#: model:ir.module.module,shortdesc:share.module_meta_information
+msgid "Share Management"
+msgstr "Gestión de comparticiones"
+
+#. module: share
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "¡No puede tener dos usuarios con el mismo identificador de usuario!"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Sharing Wizard - Step 1"
+msgstr "Asistente compartición - Paso 1"
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
+msgid "Share Access Rules"
+msgstr "Reglas de acceso a comparticiones"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid ""
+"Dear,\n"
+"\n"
+msgstr ""
+"Querido,\n"
+"\n"
+
+#. module: share
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"La compañía seleccionada no está en las compañías permitidas para este "
+"usuario"
+
+#. module: share
+#: model:ir.model,name:share.model_res_users
+msgid "res.users"
+msgstr "res.usuarios"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Next"
+msgstr "Siguiente"
+
+#. module: share
+#: help:share.wizard,action_id:0
+msgid ""
+"The action that opens the screen containing the data you wish to share."
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Please specify \"share_root_url\" in context"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Congratulations, you have successfully setup a new shared access!"
+msgstr ""
+"Felicidades, ¡acaba de configurar correctamente un nuevo acceso compartido!"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "(Copy for sharing)"
+msgstr "(Copia para compartir)"
+
+#. module: share
+#: field:share.wizard.result.line,newly_created:0
+msgid "Newly created"
+msgstr "Recién creado"
+
+#. module: share
+#: field:share.wizard,share_root_url:0
+msgid "Generic Share Access URL"
+msgstr "URL genérica de acceso compartido"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid ""
+"You may use the following login and password to get access to this protected "
+"area:"
+msgstr ""
+"Puede usar el siguiente usuario y contraseña para acceder a esta área "
+"protegida:"
+
+#. module: share
+#: view:res.groups:0
+msgid "Regular groups only (no share groups"
+msgstr "Sólo grupos regulares (no grupos de compartición"
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Read & Write"
+msgstr "Lectura y escritura"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 2"
+msgstr "Asistente compartición: paso 2"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 0"
+msgstr "Asistente compartición: paso 0"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 1"
+msgstr "Asistente compartición: paso 1"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#: field:share.wizard.result.line,login:0
+#, python-format
+msgid "Username"
+msgstr "Nombre de usuario"
+
+#. module: share
+#: field:res.users,share:0
+msgid "Share User"
+msgstr "Compartir usuario"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "%s has shared OpenERP %s information with you"
+msgstr "%s a compartido la información %s de OpenERP contigo"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Finish"
+msgstr "Terminar"
+
+#. module: share
+#: field:share.wizard,user_ids:0
+#: field:share.wizard.user,user_id:0
+msgid "Users"
+msgstr "Usuarios"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid ""
+"This username (%s) already exists, perhaps data has already been shared with "
+"this person.\n"
+"You may want to try selecting existing shared users instead."
+msgstr ""
+
+#. module: share
+#: field:share.wizard,new_users:0
+msgid "New users"
+msgstr "Nuevos usuarios"
+
+#. module: share
+#: model:ir.model,name:share.model_res_groups
+msgid "res.groups"
+msgstr "res.grupos"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "%s (Shared)"
+msgstr "%s (Compartido)"
+
+#. module: share
+#: sql_constraint:res.groups:0
+msgid "The name of the group must be unique !"
+msgstr "¡El nombre del grupo debe ser único"
+
+#. module: share
+#: selection:share.wizard,user_type:0
+msgid "New users (emails required)"
+msgstr "Nuevos usuarios (direcciones de correo electrónico requeridas)"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Sharing filter created by user %s (%s) for group %s"
+msgstr ""
+"Filtro de compartición creada por el usuario %s (%s) para el grupo %s"
+
+#. module: share
+#: view:res.groups:0
+msgid "Groups"
+msgstr "Grupos"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Select the desired shared access mode:"
+msgstr "Seleccione el modo de acceso compartido deseado:"
+
+#. module: share
+#: field:res.groups,share:0
+msgid "Share Group"
+msgstr "Grupo compartición"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#: field:share.wizard.result.line,password:0
+#, python-format
+msgid "Password"
+msgstr "Contraseña"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Who would you want to share this data with?"
+msgstr "¿Con quién desearía compartir estos datos?"
+
+#. module: share
+#: model:ir.module.module,description:share.module_meta_information
+msgid ""
+"The goal is to implement a generic sharing mechanism, where user of OpenERP\n"
+"can share data from OpenERP to their colleagues, customers, or friends.\n"
+"The system will work by creating new users and groups on the fly, and by\n"
+"combining the appropriate access rights and ir.rules to ensure that the "
+"/shared\n"
+"users/ will only have access to the correct data.\n"
+"    "
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "User already exists"
+msgstr "El usuario ya existe"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Send Email Notification(s)"
+msgstr "Enviar notificaciones por correo electrónico"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid ""
+"You may use your existing login and password to view it. As a reminder, your "
+"login is %s.\n"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Database"
+msgstr "Base de datos"
+
+#. module: share
+#: model:ir.model,name:share.model_share_wizard_user
+msgid "share.wizard.user"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Please select the action that opens the screen containing the data you want "
+"to share."
+msgstr ""
+
+#. module: share
+#: selection:share.wizard,user_type:0
+msgid "Existing external users"
+msgstr "Usuarios externos existentes"
+
+#. module: share
+#: view:share.wizard:0
+#: field:share.wizard,result_line_ids:0
+msgid "Summary"
+msgstr "Resumen"
+
+#. module: share
+#: field:share.wizard,user_type:0
+msgid "Users to share with"
+msgstr "Usuarios con los que compartir"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Indirect sharing filter created by user %s (%s) for group %s"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Email required"
+msgstr "Correo electrónico requerido"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Copied access for sharing"
+msgstr "Acceso copiado para compartición"
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Optionally, you may specify an additional domain restriction that will be "
+"applied to the shared data."
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "New Users (please provide one e-mail address per line below)"
+msgstr ""
+"Nuevos usuarios (por favor, proveea a continuación una dirección de correo "
+"electrónico por línea)"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid ""
+"The current user must have an email address configured in User Preferences "
+"to be able to send outgoing emails."
+msgstr ""
+
+#. module: share
+#: view:res.users:0
+msgid "Regular users only (no share user)"
+msgstr "Sólo usuarios regulares (no usuarios de compartición)"
+
+#. module: share
+#: field:share.wizard.result.line,share_url:0
+msgid "Share URL"
+msgstr "Compartir URL"
+
+#. module: share
+#: field:share.wizard,domain:0
+msgid "Domain"
+msgstr "Dominio"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid ""
+"Sorry, the current screen and filter you are trying to share are not "
+"supported at the moment.\n"
+"You may want to try a simpler filter."
+msgstr ""
+
+#. module: share
+#: field:share.wizard,access_mode:0
+msgid "Access Mode"
+msgstr "Modo de acceso"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Access info"
+msgstr "Información acceso"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid ""
+"To access it, you can go to the following URL:\n"
+"    %s"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,action_id:0
+msgid "Action to share"
+msgstr "Acción a compartir"
+
+#. module: share
+#: code:addons/share/web/editors.py:0
+#, python-format
+msgid "Share"
+msgstr "Compartir"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Sharing Wizard - Step 2"
+msgstr "Asistente de compartición - Paso 2"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Here is a summary of the access points you have just created:"
+msgstr ""
+"Aquí se muestra un resumen de los puntos de acceso que acaba de crear:"
+
+#. module: share
+#: model:ir.model,name:share.model_share_wizard_result_line
+msgid "share.wizard.result.line"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Sharing access could not be setup"
+msgstr "No se pudo configurar el acceso compartido"
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard_step1
+#: model:ir.model,name:share.model_share_wizard
+#: field:share.wizard.result.line,share_wizard_id:0
+#: field:share.wizard.user,share_wizard_id:0
+msgid "Share Wizard"
+msgstr "Asistente de compartición"
+
+#. module: share
+#: help:share.wizard,user_type:0
+msgid "Select the type of user(s) you would like to share data with."
+msgstr ""
+"Seleccione el tipo de usuarios con los que le gustaría compartir datos."
+
+#. module: share
+#: view:share.wizard:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: share
+#: help:res.users,share:0
+msgid ""
+"External user with limited access, created only for the purpose of sharing "
+"data."
+msgstr ""
+"Usuario externo con acceso limitado, creado sólo con el propósito de "
+"compartir datos."
+
+#. module: share
+#: help:share.wizard,domain:0
+msgid "Optional domain for further data filtering"
+msgstr "Dominio opcional para filtrado avanzado de datos"
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Read-only"
+msgstr "Sólo lectura"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "*usual password*"
+msgstr ""

From d69f7470a3b6bc9658d83d7265c5763bba3f012d Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 4 Jan 2011 17:21:38 +0530
Subject: [PATCH 15/61] [FIX]stock:Unicode encoding problem on stock module

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

bzr revid: ron@tinyerp.com-20110104115138-w9u4790u5uownb4q
---
 addons/stock/stock.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 97d5f9a0270..52645f05233 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1775,7 +1775,7 @@ class stock_move(osv.osv):
         picking_obj = self.pool.get('stock.picking')
         pick_id= picking_obj.create(cr, uid, {
                                 'name': pick_name,
-                                'origin': str(picking.origin or ''),
+                                'origin': tools.ustr(picking.origin or ''),
                                 'type': ptype,
                                 'note': picking.note,
                                 'move_type': picking.move_type,

From 2d49fce8c016bcbe218433f88ae9a72e21c21653 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 5 Jan 2011 12:17:56 +0530
Subject: [PATCH 16/61] [FIX]report_intrastat:Belgium not defined as an
 Intrastat member by default:

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

bzr revid: ron@tinyerp.com-20110105064756-1jbnvmpa24fc1oxc
---
 addons/report_intrastat/report_intrastat_data.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/report_intrastat/report_intrastat_data.xml b/addons/report_intrastat/report_intrastat_data.xml
index f3c465c1549..006151915e2 100644
--- a/addons/report_intrastat/report_intrastat_data.xml
+++ b/addons/report_intrastat/report_intrastat_data.xml
@@ -4,6 +4,9 @@
         <record id="base.de" model="res.country">
             <field eval="True" name="intrastat"/>
         </record>
+        <record id="base.be" model="res.country">
+            <field eval="True" name="intrastat"/>
+        </record>
         <record id="base.at" model="res.country">
             <field eval="True" name="intrastat"/>
         </record>

From 283feb89fe5dad00878573caf3b562ecc3500a64 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 5 Jan 2011 12:19:55 +0530
Subject: [PATCH 17/61] [FIX]: procurement: Fixed buidbot error

bzr revid: rpa@tinyerp.com-20110105064955-ii292r4kpbp68vbj
---
 addons/procurement/procurement.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 66856663733..3257f0a5694 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -370,10 +370,9 @@ class procurement_order(osv.osv):
                 if not res and not ok:
                      message = _("Not enough stock and no minimum orderpoint rule defined.")
                 elif not res:
-                    message = _("No minimum orderpoint rule defined for '%s'.") % \
-                            (procurement.move_id.product_id.name,)
+                    message = _("No minimum orderpoint rule defined.")
                 elif not ok:
-                    message = _("Not enough stock for '%s'.") % (procurement.move_id.product_id.name,)
+                    message = _("Not enough stock.")
 
                 if message:
                     self.log(cr, uid, procurement.id, _("Procurement '%s' is in exception: ") % (procurement.name) + message)

From b59deb4743a40f45ca7fefe57e24a3b21072327b Mon Sep 17 00:00:00 2001
From: "rha@tinyerp.com" <>
Date: Wed, 5 Jan 2011 15:18:05 +0530
Subject: [PATCH 18/61] [Fix] Stock: wizard_partial_picking Average price
 computation doesnt work as expected

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

bzr revid: rha@tinyerp.com-20110105094805-81s66oet81tgtfqf
---
 addons/stock/stock.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 97d5f9a0270..eede42d3d70 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1169,6 +1169,7 @@ class stock_picking(osv.osv):
             complete, too_many, too_few = [], [], []
             move_product_qty = {}
             prodlot_ids = {}
+            product_avail = {}
             for move in pick.move_lines:
                 if move.state in ('done', 'cancel'):
                     continue
@@ -1194,6 +1195,12 @@ class stock_picking(osv.osv):
                     move_currency_id = move.company_id.currency_id.id
                     context['currency_id'] = move_currency_id
                     qty = uom_obj._compute_qty(cr, uid, product_uom, product_qty, product.uom_id.id)
+
+                    if product.id in product_avail:
+                        product_avail[product.id] += qty
+                    else:
+                        product_avail[product.id] = product.qty_available
+
                     if qty > 0:
                         new_price = currency_obj.compute(cr, uid, product_currency,
                                 move_currency_id, product_price)
@@ -1204,9 +1211,8 @@ class stock_picking(osv.osv):
                         else:
                             # Get the standard price
                             amount_unit = product.price_get('standard_price', context)[product.id]
-                            new_std_price = ((amount_unit * product.qty_available)\
-                                + (new_price * qty))/(product.qty_available + qty)
-
+                            new_std_price = ((amount_unit * product_avail[product.id])\
+                                + (new_price * qty))/(product_avail[product.id] + qty)
                         # Write the field according to price type field
                         product_obj.write(cr, uid, [product.id], {'standard_price': new_std_price})
 

From 53bff2650575d091d976696b3e28acc51812714d Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 6 Jan 2011 11:07:27 +0530
Subject: [PATCH 19/61] [FIX]: purchase: Fixed pricelist of PO as purchase
 pricelist instead of Public pricelist

bzr revid: rpa@tinyerp.com-20110106053727-srr35ji3wnd56vhn
---
 addons/purchase/purchase_demo.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/purchase_demo.xml b/addons/purchase/purchase_demo.xml
index c4d69699d5e..60a59cacb88 100644
--- a/addons/purchase/purchase_demo.xml
+++ b/addons/purchase/purchase_demo.xml
@@ -10,14 +10,14 @@
 
         <record id="order_purchase1" model="purchase.order">
             <field name="location_id" ref="stock.stock_location_stock"/>
-            <field model="product.pricelist" name="pricelist_id" search="[]"/>
+            <field name="pricelist_id" ref="purchase.list0"/>
             <field name="partner_id" ref="base.res_partner_asus"/>
             <field name="partner_address_id" ref="base.res_partner_address_tang"/>
         </record>
 
         <record id="order_purchase2" model="purchase.order">
             <field name="location_id" ref="stock.stock_location_stock"/>
-            <field model="product.pricelist" name="pricelist_id" search="[]"/>
+            <field name="pricelist_id" ref="purchase.list0"/>
             <field name="partner_id" ref="base.res_partner_3"/>
             <field name="partner_address_id" ref="base.res_partner_address_zen"/>
         </record>

From da41829774898d6d2da7a8a48b589fb72381b2e6 Mon Sep 17 00:00:00 2001
From: Yogesh Sakhreliya <ysa@tinyerp.com>
Date: Thu, 6 Jan 2011 17:12:38 +0530
Subject: [PATCH 20/61] [FIX] base_module_record :- osv_memory object pass with
 out crate_data or write_data domain. all data export of osv_memory object.

bzr revid: ysa@tinyerp.com-20110106114238-1zu7qo8f1njf92l7
---
 addons/base_module_record/wizard/base_module_record_data.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/base_module_record/wizard/base_module_record_data.py b/addons/base_module_record/wizard/base_module_record_data.py
index fa9c8a6826e..d8554e0cbdb 100644
--- a/addons/base_module_record/wizard/base_module_record_data.py
+++ b/addons/base_module_record/wizard/base_module_record_data.py
@@ -96,6 +96,8 @@ def _record_objects(self, cr, uid, data, context):
               if '_auto' in dir(obj_pool):
                   if not obj_pool._auto:
                       continue
+        elif '_log_access' not in dir(obj_pool):
+             search_condition = []
         search_ids=obj_pool.search(cr,uid,search_condition)
         for s_id in search_ids:
              args=(cr.dbname,uid,obj_name,'copy',s_id,{},context)

From 50360307630d8fc4c555d6b2ff2f292c78e96f26 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Thu, 6 Jan 2011 17:47:55 +0530
Subject: [PATCH 21/61] [FIX] stock:ON Cancel Inventory cancel account move

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

bzr revid: aag@tinyerp.co.in-20110106121755-a86ls9pynldwwg79
---
 addons/stock/stock.py       | 18 +++++++++---------
 addons/stock/stock_view.xml |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 656f3e0c1b9..3cc75fe5c2d 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2559,33 +2559,33 @@ class stock_inventory(osv.osv):
             self.write(cr, uid, [inv.id], {'state': 'confirm', 'move_ids': [(6, 0, move_ids)]})
         return True
 
-    def action_cancel(self, cr, uid, ids, context=None):
-        """ Cancels the stock move and change inventory state to draft.
+    def action_cancel_inventary(self, cr, uid, ids, context=None):
+        """ Cancels both stock move and inventory
         @return: True
         """
         move_obj = self.pool.get('stock.move')
         account_move_obj = self.pool.get('account.move')
         for inv in self.browse(cr, uid, ids, context=context):
-            move_obj.action_cancel(cr, uid, [x.id for x in inv.move_ids], context)
+            move_obj.action_cancel(cr, uid, [x.id for x in inv.move_ids],context=context)
             for move in inv.move_ids:
                  account_move_ids = account_move_obj.search(cr, uid, [('name','=',move.name)])
                  if account_move_ids:
-                     account_move_data_l = account_move_obj.read(cr, uid, account_move_ids, ['state'])
+                     account_move_data_l = account_move_obj.read(cr, uid, account_move_ids, ['state'],context=context)
                      for account_move in account_move_data_l:
                          if account_move['state'] == 'posted':
                              raise osv.except_osv(_('UserError'),
                                                   _('You can not cancel inventory which has any account move with posted state.'))
-                         account_move_obj.unlink(cr, uid, [account_move['id']])
-            self.write(cr, uid, [inv.id], {'state': 'draft'})
+                         account_move_obj.unlink(cr, uid, [account_move['id']],context=context)
+            self.write(cr, uid, [inv.id], {'state': 'cancel'},context=context)
         return True
 
-    def action_cancel_inventary(self, cr, uid, ids, context=None):
-        """ Cancels both stock move and inventory
+    def action_cancel_draft(self, cr, uid, ids, context=None):
+        """ Cancels the stock move and change inventory state to draft.
         @return: True
         """
         for inv in self.browse(cr, uid, ids, context=context):
             self.pool.get('stock.move').action_cancel(cr, uid, [x.id for x in inv.move_ids], context)
-            self.write(cr, uid, [inv.id], {'state':'cancel'})
+            self.write(cr, uid, [inv.id], {'state':'draft'})
         return True
 
 stock_inventory()
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 9e1ff3e67f0..85c1231b75a 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -174,7 +174,7 @@
                         <button name="action_cancel_inventary" states="draft,confirm,done" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
                         <button name="action_confirm" states="draft" string="Confirm Inventory" type="object" icon="gtk-apply"/>
                         <button name="action_done" states="confirm" string="Validate Inventory" type="object" icon="gtk-jump-to"/>
-                        <button name="action_cancel" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
+                        <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                     </group>
                 </form>
             </field>

From bc8fe779879b79ff5d07e4b33b707b91a49262a3 Mon Sep 17 00:00:00 2001
From: "rha@tinyerp.com" <>
Date: Fri, 7 Jan 2011 10:12:30 +0530
Subject: [PATCH 22/61] [Fix]: Invoice from Picking not updating the status of
 the Purchase Order

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

bzr revid: rha@tinyerp.com-20110107044230-dje9lzmt83ueksah
---
 addons/purchase/purchase.py                   | 16 +++++++
 addons/purchase/purchase_view.xml             | 24 +++++-----
 .../stock/wizard/stock_invoice_onshipping.py  | 48 ++++++++++---------
 .../wizard/stock_invoice_onshipping_view.xml  |  2 +-
 4 files changed, 55 insertions(+), 35 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 6adb726b97a..b2127cf4214 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -817,4 +817,20 @@ class procurement_order(osv.osv):
 
 procurement_order()
 
+class stock_invoice_onshipping(osv.osv_memory):
+    _inherit = "stock.invoice.onshipping"
+
+    def create_invoice(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        purchase_obj = self.pool.get('purchase.order')
+        picking_obj = self.pool.get('stock.picking')
+        res = super(stock_invoice_onshipping,self).create_invoice(cr, uid, ids, context=context)
+        purchase_id =  picking_obj.browse(cr, uid, res.keys()[0]).purchase_id.id
+        purchase_obj.write(cr, uid, [purchase_id], {
+            'invoice_ids': [(4, res.values()[0])]}, context=context)
+        return res
+
+stock_invoice_onshipping()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 359810fb306..7fffad4e5c5 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -12,10 +12,10 @@
             groups="group_purchase_manager"
             parent="base.menu_purchase_root" sequence="100"/>
 
-        <menuitem 
+        <menuitem
             id="menu_purchase_config_pricelist" name="Pricelists"
             parent="menu_purchase_config_purchase" sequence="50"/>
-            
+
         <menuitem
             action="product.product_pricelist_action" id="menu_product_pricelist_action_purhase"
             parent="menu_purchase_config_pricelist" sequence="20"/>
@@ -29,22 +29,22 @@
             parent="menu_purchase_config_pricelist" sequence="2"
             groups="base.group_extended"/>
 
-        <menuitem 
+        <menuitem
             id="menu_product_in_config_purchase" name="Product"
             parent="menu_purchase_config_purchase" sequence="30"/>
-          
+
         <menuitem
             action="product.product_category_action_form" id="menu_product_category_config_purchase"
             parent="purchase.menu_product_in_config_purchase" sequence="10"/>
-          
-        <menuitem 
+
+        <menuitem
             id="menu_purchase_unit_measure_purchase" name="Units of Measure"
             parent="purchase.menu_product_in_config_purchase"  sequence="20"/>
-            
+
         <menuitem
              action="product.product_uom_categ_form_action" id="menu_purchase_uom_categ_form_action"
              parent="menu_purchase_unit_measure_purchase" sequence="30"/>
-             
+
         <menuitem
               action="product.product_uom_form_action" id="menu_purchase_uom_form_action"
               parent="menu_purchase_unit_measure_purchase" sequence="30"/>
@@ -113,10 +113,10 @@
       <!--product menu-->
       <menuitem id="menu_procurement_management_product" name="Products"
           parent="base.menu_purchase_root" sequence="8"/>
-          
+
       <menuitem name="Products by Category" id="menu_product_by_category_purchase_form" action="product.product_category_action"
            parent="menu_procurement_management_product" sequence="10"/>
-          
+
       <menuitem name="Products" id="menu_procurement_partner_contact_form" action="product.product_normal_action_puchased"
           parent="menu_procurement_management_product"/>
 
@@ -292,7 +292,7 @@
             <field name="search_view_id" ref="view_purchase_order_filter"/>
             <field name="help">You can create a request for quotation when you want to buy products to a supplier but the purchase is not confirmed yet. Use also this menu to review requests for quotation created automatically based on your logistic rules (minimum stock, MTO, etc). You can convert the request for quotation into a purchase order once the order is confirmed. If you use the extended interface (from user's preferences), you can select the way to control your supplier invoices: based on the order, based on the receptions or manual encoding.</field>
         </record>
-        <menuitem action="purchase_rfq" id="menu_purchase_rfq" 
+        <menuitem action="purchase_rfq" id="menu_purchase_rfq"
             parent="menu_procurement_management"
             sequence="6"/>
 
@@ -458,7 +458,7 @@
             <field name="name">Purchase Lines Not Invoiced</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order.line</field>
-            <field name="domain">[('state','in',('confirmed','done')), ('invoiced', '=', False)]</field>
+            <field name="domain">[('order_id.invoice_method','&lt;&gt;','picking'), ('state','in',('confirmed','done')), ('invoiced', '=', False)]</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="purchase_order_line_search"/>
diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py
index 091049b5689..c7eab1eef4d 100644
--- a/addons/stock/wizard/stock_invoice_onshipping.py
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@@ -85,34 +85,18 @@ class stock_invoice_onshipping(osv.osv_memory):
             raise osv.except_osv(_('Warning !'), _('None of these picking lists require invoicing.'))
         return res
 
-
-
-    def create_invoice(self, cr, uid, ids, context=None):
+    def open_invoice(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        picking_pool = self.pool.get('stock.picking')
-        data_pool = self.pool.get('ir.model.data')
-        onshipdata_obj = self.read(cr, uid, ids[0], ['journal_id', 'group', 'invoice_date'])
-        if context.get('new_picking', False):
-            onshipdata_obj['id'] = onshipdata_obj.new_picking
-            onshipdata_obj[ids] = onshipdata_obj.new_picking
-
-        context['date_inv'] = onshipdata_obj['invoice_date']
         invoice_ids = []
-        active_ids = context.get('active_ids', [])
-        active_picking = picking_pool.browse(cr, uid, context.get('active_id',False), context=context)
-        inv_type = picking_pool._get_invoice_type(active_picking)
-
-        res = picking_pool.action_invoice_create(cr, uid, active_ids,
-              journal_id = onshipdata_obj['journal_id'],
-              group = onshipdata_obj['group'],
-              type = None,
-              context=context)
+        data_pool = self.pool.get('ir.model.data')
+        res = self.create_invoice(cr, uid, ids, context=context)
         invoice_ids += res.values()
-        if not invoice_ids:
-            raise osv.except_osv(_('Error'), _('No Invoices were created'))
+        inv_type = context.get('inv_type', False)
         action_model = False
         action = {}
+        if not invoice_ids:
+            raise osv.except_osv(_('Error'), _('No Invoices were created'))
         if inv_type == "out_invoice":
             action_model,action_id = data_pool.get_object_reference(cr, uid, 'account', "action_invoice_tree1")
         elif inv_type == "in_invoice":
@@ -127,6 +111,26 @@ class stock_invoice_onshipping(osv.osv_memory):
             action['domain'] = "[('id','in', ["+','.join(map(str,invoice_ids))+"])]"
         return action
 
+    def create_invoice(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        picking_pool = self.pool.get('stock.picking')
+        onshipdata_obj = self.read(cr, uid, ids, ['journal_id', 'group', 'invoice_date'])
+        if context.get('new_picking', False):
+            onshipdata_obj['id'] = onshipdata_obj.new_picking
+            onshipdata_obj[ids] = onshipdata_obj.new_picking
+        context['date_inv'] = onshipdata_obj[0]['invoice_date']
+        active_ids = context.get('active_ids', [])
+        active_picking = picking_pool.browse(cr, uid, context.get('active_id',False), context=context)
+        inv_type = picking_pool._get_invoice_type(active_picking)
+        context['inv_type'] = inv_type
+        res = picking_pool.action_invoice_create(cr, uid, active_ids,
+              journal_id = onshipdata_obj[0]['journal_id'],
+              group = onshipdata_obj[0]['group'],
+              type = None,
+              context=context)
+        return res
+
 stock_invoice_onshipping()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml
index 6a4cfec5fca..06d93f49ea1 100644
--- a/addons/stock/wizard/stock_invoice_onshipping_view.xml
+++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml
@@ -15,7 +15,7 @@
                     <field name="invoice_date" />
                     <separator string="" colspan="4" />
                     <button special="cancel" string="_Cancel" icon='gtk-cancel'/>
-                    <button name="create_invoice" string="Create" type="object" icon="terp-gtk-go-back-rtl"/>
+                    <button name="open_invoice" string="Create" type="object" icon="terp-gtk-go-back-rtl"/>
              </form>
             </field>
         </record>

From e9f7a90ac82d9b5e2a84bcba94d989f098c044c4 Mon Sep 17 00:00:00 2001
From: "rha@tinyerp.com" <>
Date: Fri, 7 Jan 2011 14:41:58 +0530
Subject: [PATCH 23/61] [Fix]: production orders waiting raw materials can not
 be cancelled

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

bzr revid: rha@tinyerp.com-20110107091158-1qrugqztsw5ulktr
---
 addons/mrp/mrp.py       | 14 ++++++++++----
 addons/mrp/mrp_view.xml |  3 ++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index a57b76bf2ce..c5ac35ce0df 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -444,7 +444,7 @@ class mrp_production(osv.osv):
         'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)]),
         'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', help="The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production plannification."),
 
-        'picking_id': fields.many2one('stock.picking', 'Picking list', readonly=True,
+        'picking_id': fields.many2one('stock.picking', 'Picking list', readonly=True, ondelete="restrict",
             help="This is the internal picking list that brings the finished product to the production plan"),
         'move_prod_id': fields.many2one('stock.move', 'Move product', readonly=True),
         'move_lines': fields.many2many('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Products to Consume', domain=[('state','not in', ('done', 'cancel'))], states={'done':[('readonly',True)]}),
@@ -602,12 +602,18 @@ class mrp_production(osv.osv):
                 workcenter_line_obj.create(cr, uid, line)
         return len(results)
 
-    def action_cancel(self, cr, uid, ids):
+    def action_cancel(self, cr, uid, ids, context=None):
         """ Cancels the production order and related stock moves.
         @return: True
         """
+        if context is None:
+            context = {}
         move_obj = self.pool.get('stock.move')
-        for production in self.browse(cr, uid, ids):
+        for production in self.browse(cr, uid, ids, context=context):
+            if production.picking_id.state not in ('draft', 'cancel'):
+                raise osv.except_osv(
+                    _('Could not cancel manufacturing order !'),
+                    _('You must first cancel related picking attached to this manufacturing order.'))
             if production.move_created_ids:
                 move_obj.action_cancel(cr, uid, [x.id for x in production.move_created_ids])
             move_obj.action_cancel(cr, uid, [x.id for x in production.move_lines])
@@ -664,7 +670,7 @@ class mrp_production(osv.osv):
         """
         stock_mov_obj = self.pool.get('stock.move')
         production = self.browse(cr, uid, production_id, context=context)
-        
+
         final_product_todo = []
 
         produced_qty = 0
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 000ae6cbcf2..f6b7fb78b88 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -630,7 +630,8 @@
                             <separator colspan="4"/>
                             <group col="9" colspan="4">
                                 <field name="state"/>
-                                <button name="button_cancel" states="draft,ready,confirmed,in_production,picking_except" string="Cancel" icon="gtk-stop"/>
+                                <button name="button_cancel" states="draft,ready,in_production,picking_except" string="Cancel" icon="gtk-stop"/>
+                                <button name="action_cancel" type="object" states="confirmed" string="Cancel" icon="gtk-stop"/>
                                 <button name="button_confirm" states="draft" string="Confirm Production" icon="gtk-apply"/>
                                 <button name="button_produce" states="ready" string="Start Production" icon="terp-gtk-jump-to-ltr"/>
                                 <button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" icon="gtk-ok" type="action"/>

From db0f75705c99e2fa2f61ca125b6e3a891bb14203 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 7 Jan 2011 17:45:07 +0530
Subject: [PATCH 24/61] [ADD] purchase_double_validation:Add yml for Double
 validation

bzr revid: aag@tinyerp.co.in-20110107121507-yqcn0cusopw2fu57
---
 .../purchase_double_validation/__openerp__.py |   3 +
 .../test/purchase_double_validation_test.yml  | 117 ++++++++++++++++++
 2 files changed, 120 insertions(+)
 create mode 100644 addons/purchase_double_validation/test/purchase_double_validation_test.yml

diff --git a/addons/purchase_double_validation/__openerp__.py b/addons/purchase_double_validation/__openerp__.py
index ca21dfc6077..18f5b4a80b9 100644
--- a/addons/purchase_double_validation/__openerp__.py
+++ b/addons/purchase_double_validation/__openerp__.py
@@ -35,6 +35,9 @@
 	   'purchase_double_validation_installer.xml'
 	    ],
     'demo_xml': [],
+    'test': [
+        'test/purchase_double_validation_test.yml',
+         ],
     'installable': True,
     'active': False,
 
diff --git a/addons/purchase_double_validation/test/purchase_double_validation_test.yml b/addons/purchase_double_validation/test/purchase_double_validation_test.yml
new file mode 100644
index 00000000000..ecc8d08a493
--- /dev/null
+++ b/addons/purchase_double_validation/test/purchase_double_validation_test.yml
@@ -0,0 +1,117 @@
+-
+  I Create new limit amount from  Configure Limit Amount for Purchase wizard.
+- 
+  !record {model: purchase.double.validation.installer, id: purchase_double_validation_installer_1}:
+    limit_amount: 3000
+- 
+  Then I set the Limit Amount
+- 
+  !python {model: purchase.double.validation.installer}: |
+    self.execute(cr, uid, [ref("purchase_double_validation_installer_1")])
+-
+  In order to test the purchase double validation flow,I start by creating a new product 'MOB1'
+-
+ !record {model: product.product, id: product_product_mob1}:
+    categ_id: 'product.product_category_3'
+    cost_method: standard
+    mes_type: fixed
+    name: MOB1
+    price_margin: 2.0
+    procure_method: make_to_stock
+    property_stock_inventory: stock.location_inventory
+    property_stock_procurement: stock.location_procurement
+    property_stock_production: stock.location_production
+    seller_delay: '1'
+    standard_price: 2000.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    volume: 0.0
+    warranty: 0.0
+    weight: 0.0
+    weight_net: 0.0
+-
+  In order to test the purchase double validation flow,I create a new record where "invoice_method" is From Order.
+-
+  Test for purchase double validation in which Total > = Limit Amount.
+- 
+  I create purchase order for MOB1 for 3 quantity.
+- 
+  !record {model: purchase.order, id: purchase_order_po11}:
+    company_id: base.main_company
+    date_order: '2011-01-1'
+    invoice_method: order
+    location_id: stock.stock_location_stock
+    order_line:
+      - date_planned: '2011-01-11'
+        name: MOB1
+        price_unit: 2000.0
+        product_id: 'product_product_mob1'
+        product_qty: 3.0
+        product_uom: product.product_uom_unit
+        state: draft
+    partner_address_id: base.res_partner_address_7
+    partner_id: base.res_partner_4
+    pricelist_id: purchase.list0
+- 
+  Initially purchase order is in the draft state.
+-
+  !assert {model: purchase.order, id: purchase_order_po11}:
+    - state == 'draft'  
+-
+  I confirm the purchase order for MOB1.
+-
+  !workflow {model: purchase.order, action: purchase_confirm, ref: purchase_order_po11}
+-  
+  I check that the order which was initially in the draft state has transmit to confirm state for double validation.
+-
+  !assert {model: purchase.order, id: purchase_order_po11}:
+    - state == 'confirmed'
+-
+  I Approved purchase order by Supplier for MOB1.
+-
+  !workflow {model: purchase.order, action: purchase_approve, ref: purchase_order_po11}
+-  
+  I check that the order which was initially in the confirmed state has transmit to approved state.
+-
+  !assert {model: purchase.order, id: purchase_order_po11}:
+    - state == 'approved' 
+-
+  Test for purchase double validation in which Total < Limit Amount.
+- 
+  I create purchase order for MOB1 for 1 quantity.
+- 
+  !record {model: purchase.order, id: purchase_order_po12}:
+    company_id: base.main_company
+    date_order: '2011-01-02'
+    invoice_method: order
+    location_id: stock.stock_location_stock
+    order_line:
+      - date_planned: '2011-01-12'
+        name: MOB1
+        price_unit: 2000.0
+        product_id: 'product_product_mob1'
+        product_qty: 1.0
+        product_uom: product.product_uom_unit
+        state: draft
+    partner_address_id: base.res_partner_address_7
+    partner_id: base.res_partner_4
+    pricelist_id: purchase.list0
+- 
+  Initially purchase order is in the draft state.
+-
+  !assert {model: purchase.order, id: purchase_order_po12}:
+    - state == 'draft'  
+-
+  I confirm the purchase order for MOB1.
+-
+  !workflow {model: purchase.order, action: purchase_confirm, ref: purchase_order_po12}
+-  
+  I check that the order which was initially in the draft state has transmit to approved state.
+-
+  !assert {model: purchase.order, id: purchase_order_po12}:
+    - state == 'approved'
+
+
+   
\ No newline at end of file

From 48211d0c83f8775c4f53df1f1cd23e46c5b84403 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 7 Jan 2011 18:32:46 +0530
Subject: [PATCH 25/61] [MERGE]: Merge with
 lp:~openerp-commiter/openobject-addons/dev-addons2-rha1

bzr revid: rpa@tinyerp.com-20110107130246-ve4c015v6w3nr20d
---
 addons/purchase/purchase.py                   | 17 +++++++
 addons/purchase/purchase_view.xml             | 14 +++---
 addons/stock/stock.py                         | 12 +++--
 .../stock/wizard/stock_invoice_onshipping.py  | 48 ++++++++++---------
 .../wizard/stock_invoice_onshipping_view.xml  |  2 +-
 addons/stock/wizard/stock_partial_picking.py  | 46 +++++++++---------
 6 files changed, 83 insertions(+), 56 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 0de19189fc3..d0d281c1392 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -455,6 +455,7 @@ class purchase_order(osv.osv):
                         'state': 'draft',
                         'purchase_line_id': order_line.id,
                         'company_id': order.company_id.id,
+                        'price_unit': order_line.price_unit
                     })
                     if order_line.move_dest_id:
                         self.pool.get('stock.move').write(cr, uid, [order_line.move_dest_id.id], {'location_id':order.location_id.id})
@@ -816,4 +817,20 @@ class procurement_order(osv.osv):
 
 procurement_order()
 
+class stock_invoice_onshipping(osv.osv_memory):
+    _inherit = "stock.invoice.onshipping"
+
+    def create_invoice(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        purchase_obj = self.pool.get('purchase.order')
+        picking_obj = self.pool.get('stock.picking')
+        res = super(stock_invoice_onshipping,self).create_invoice(cr, uid, ids, context=context)
+        purchase_id =  picking_obj.browse(cr, uid, res.keys()[0]).purchase_id.id
+        purchase_obj.write(cr, uid, [purchase_id], {
+            'invoice_ids': [(4, res.values()[0])]}, context=context)
+        return res
+
+stock_invoice_onshipping()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 359810fb306..0312e0d5968 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -15,7 +15,7 @@
         <menuitem 
             id="menu_purchase_config_pricelist" name="Pricelists"
             parent="menu_purchase_config_purchase" sequence="50"/>
-            
+
         <menuitem
             action="product.product_pricelist_action" id="menu_product_pricelist_action_purhase"
             parent="menu_purchase_config_pricelist" sequence="20"/>
@@ -32,7 +32,7 @@
         <menuitem 
             id="menu_product_in_config_purchase" name="Product"
             parent="menu_purchase_config_purchase" sequence="30"/>
-          
+
         <menuitem
             action="product.product_category_action_form" id="menu_product_category_config_purchase"
             parent="purchase.menu_product_in_config_purchase" sequence="10"/>
@@ -40,7 +40,7 @@
         <menuitem 
             id="menu_purchase_unit_measure_purchase" name="Units of Measure"
             parent="purchase.menu_product_in_config_purchase"  sequence="20"/>
-            
+
         <menuitem
              action="product.product_uom_categ_form_action" id="menu_purchase_uom_categ_form_action"
              parent="menu_purchase_unit_measure_purchase" sequence="30"/>
@@ -113,10 +113,10 @@
       <!--product menu-->
       <menuitem id="menu_procurement_management_product" name="Products"
           parent="base.menu_purchase_root" sequence="8"/>
-          
+
       <menuitem name="Products by Category" id="menu_product_by_category_purchase_form" action="product.product_category_action"
            parent="menu_procurement_management_product" sequence="10"/>
-          
+
       <menuitem name="Products" id="menu_procurement_partner_contact_form" action="product.product_normal_action_puchased"
           parent="menu_procurement_management_product"/>
 
@@ -292,7 +292,7 @@
             <field name="search_view_id" ref="view_purchase_order_filter"/>
             <field name="help">You can create a request for quotation when you want to buy products to a supplier but the purchase is not confirmed yet. Use also this menu to review requests for quotation created automatically based on your logistic rules (minimum stock, MTO, etc). You can convert the request for quotation into a purchase order once the order is confirmed. If you use the extended interface (from user's preferences), you can select the way to control your supplier invoices: based on the order, based on the receptions or manual encoding.</field>
         </record>
-        <menuitem action="purchase_rfq" id="menu_purchase_rfq" 
+        <menuitem action="purchase_rfq" id="menu_purchase_rfq"
             parent="menu_procurement_management"
             sequence="6"/>
 
@@ -458,7 +458,7 @@
             <field name="name">Purchase Lines Not Invoiced</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order.line</field>
-            <field name="domain">[('state','in',('confirmed','done')), ('invoiced', '=', False)]</field>
+            <field name="domain">[('order_id.invoice_method','&lt;&gt;','picking'), ('state','in',('confirmed','done')), ('invoiced', '=', False)]</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="purchase_order_line_search"/>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 7503674f7fe..4dea848c190 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1170,6 +1170,7 @@ class stock_picking(osv.osv):
             complete, too_many, too_few = [], [], []
             move_product_qty = {}
             prodlot_ids = {}
+            product_avail = {}
             for move in pick.move_lines:
                 if move.state in ('done', 'cancel'):
                     continue
@@ -1195,6 +1196,12 @@ class stock_picking(osv.osv):
                     move_currency_id = move.company_id.currency_id.id
                     context['currency_id'] = move_currency_id
                     qty = uom_obj._compute_qty(cr, uid, product_uom, product_qty, product.uom_id.id)
+
+                    if product.id in product_avail:
+                        product_avail[product.id] += qty
+                    else:
+                        product_avail[product.id] = product.qty_available
+
                     if qty > 0:
                         new_price = currency_obj.compute(cr, uid, product_currency,
                                 move_currency_id, product_price)
@@ -1205,9 +1212,8 @@ class stock_picking(osv.osv):
                         else:
                             # Get the standard price
                             amount_unit = product.price_get('standard_price', context)[product.id]
-                            new_std_price = ((amount_unit * product.qty_available)\
-                                + (new_price * qty))/(product.qty_available + qty)
-
+                            new_std_price = ((amount_unit * product_avail[product.id])\
+                                + (new_price * qty))/(product_avail[product.id] + qty)
                         # Write the field according to price type field
                         product_obj.write(cr, uid, [product.id], {'standard_price': new_std_price})
 
diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py
index 091049b5689..c7eab1eef4d 100644
--- a/addons/stock/wizard/stock_invoice_onshipping.py
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@@ -85,34 +85,18 @@ class stock_invoice_onshipping(osv.osv_memory):
             raise osv.except_osv(_('Warning !'), _('None of these picking lists require invoicing.'))
         return res
 
-
-
-    def create_invoice(self, cr, uid, ids, context=None):
+    def open_invoice(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        picking_pool = self.pool.get('stock.picking')
-        data_pool = self.pool.get('ir.model.data')
-        onshipdata_obj = self.read(cr, uid, ids[0], ['journal_id', 'group', 'invoice_date'])
-        if context.get('new_picking', False):
-            onshipdata_obj['id'] = onshipdata_obj.new_picking
-            onshipdata_obj[ids] = onshipdata_obj.new_picking
-
-        context['date_inv'] = onshipdata_obj['invoice_date']
         invoice_ids = []
-        active_ids = context.get('active_ids', [])
-        active_picking = picking_pool.browse(cr, uid, context.get('active_id',False), context=context)
-        inv_type = picking_pool._get_invoice_type(active_picking)
-
-        res = picking_pool.action_invoice_create(cr, uid, active_ids,
-              journal_id = onshipdata_obj['journal_id'],
-              group = onshipdata_obj['group'],
-              type = None,
-              context=context)
+        data_pool = self.pool.get('ir.model.data')
+        res = self.create_invoice(cr, uid, ids, context=context)
         invoice_ids += res.values()
-        if not invoice_ids:
-            raise osv.except_osv(_('Error'), _('No Invoices were created'))
+        inv_type = context.get('inv_type', False)
         action_model = False
         action = {}
+        if not invoice_ids:
+            raise osv.except_osv(_('Error'), _('No Invoices were created'))
         if inv_type == "out_invoice":
             action_model,action_id = data_pool.get_object_reference(cr, uid, 'account', "action_invoice_tree1")
         elif inv_type == "in_invoice":
@@ -127,6 +111,26 @@ class stock_invoice_onshipping(osv.osv_memory):
             action['domain'] = "[('id','in', ["+','.join(map(str,invoice_ids))+"])]"
         return action
 
+    def create_invoice(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        picking_pool = self.pool.get('stock.picking')
+        onshipdata_obj = self.read(cr, uid, ids, ['journal_id', 'group', 'invoice_date'])
+        if context.get('new_picking', False):
+            onshipdata_obj['id'] = onshipdata_obj.new_picking
+            onshipdata_obj[ids] = onshipdata_obj.new_picking
+        context['date_inv'] = onshipdata_obj[0]['invoice_date']
+        active_ids = context.get('active_ids', [])
+        active_picking = picking_pool.browse(cr, uid, context.get('active_id',False), context=context)
+        inv_type = picking_pool._get_invoice_type(active_picking)
+        context['inv_type'] = inv_type
+        res = picking_pool.action_invoice_create(cr, uid, active_ids,
+              journal_id = onshipdata_obj[0]['journal_id'],
+              group = onshipdata_obj[0]['group'],
+              type = None,
+              context=context)
+        return res
+
 stock_invoice_onshipping()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml
index 6a4cfec5fca..06d93f49ea1 100644
--- a/addons/stock/wizard/stock_invoice_onshipping_view.xml
+++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml
@@ -15,7 +15,7 @@
                     <field name="invoice_date" />
                     <separator string="" colspan="4" />
                     <button special="cancel" string="_Cancel" icon='gtk-cancel'/>
-                    <button name="create_invoice" string="Create" type="object" icon="terp-gtk-go-back-rtl"/>
+                    <button name="open_invoice" string="Create" type="object" icon="terp-gtk-go-back-rtl"/>
              </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index b657e6639f5..76a77d80bf6 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -32,24 +32,24 @@ class stock_partial_picking(osv.osv_memory):
         'product_moves_out' : fields.one2many('stock.move.memory.out', 'wizard_id', 'Moves'),
         'product_moves_in' : fields.one2many('stock.move.memory.in', 'wizard_id', 'Moves'),
      }
-    
+
     def __is_in(self,cr, uid, pick_ids):
         """
             @return: True if one of the moves has as picking type 'in'
         """
         if not pick_ids:
             return False
-       
+
         pick_obj = self.pool.get('stock.picking')
         pick_ids = pick_obj.search(cr, uid, [('id','in',pick_ids)])
-        
-       
+
+
         for pick in pick_obj.browse(cr, uid, pick_ids):
             for move in pick.move_lines:
                 if pick.type == 'in' and move.product_id.cost_method == 'average':
                     return True
         return False
-    
+
     def __get_picking_type(self, cr, uid, pick_ids):
         if self.__is_in(cr, uid, pick_ids):
             return "product_moves_in"
@@ -62,11 +62,11 @@ class stock_partial_picking(osv.osv_memory):
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
         result = super(stock_partial_picking, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)
-       
-        
+
+
         picking_ids = context.get('active_ids', False)
         picking_type = self.__get_picking_type(cr, uid, picking_ids)
-        
+
         _moves_arch_lst = """<form string="%s">
                         <field name="date" invisible="1"/>
                         <separator colspan="4" string="%s"/>
@@ -77,7 +77,7 @@ class stock_partial_picking(osv.osv_memory):
                             'product_moves_in' : {'relation': 'stock.move.memory.in', 'type' : 'one2many', 'string' : 'Product Moves'},
                             'product_moves_out' : {'relation': 'stock.move.memory.out', 'type' : 'one2many', 'string' : 'Product Moves'}
                             })
-            
+
         _moves_arch_lst += """
                 <separator string="" colspan="4" />
                 <label string="" colspan="2"/>
@@ -100,10 +100,10 @@ class stock_partial_picking(osv.osv_memory):
             'prodlot_id' : picking.prodlot_id.id,
             'move_id' : picking.id,
         }
-    
+
         if is_in:
             move_memory.update({
-                'cost' : picking.product_id.standard_price,
+                'cost' : picking.price_unit,
                 'currency' : picking.product_id.company_id.currency_id.id,
             })
         return move_memory
@@ -112,23 +112,23 @@ class stock_partial_picking(osv.osv_memory):
         pick_obj = self.pool.get('stock.picking')
         if not context:
             context = {}
-               
+
         res = []
         for pick in pick_obj.browse(cr, uid, context.get('active_ids', []), context):
             need_product_cost = (pick.type == 'in')
             for m in pick.move_lines:
                 if m.state in ('done', 'cancel'):
-                    continue           
+                    continue
                 res.append(self.__create_partial_picking_memory(m, need_product_cost))
-            
+
         return res
-    
+
     _defaults = {
         'product_moves_in' : __get_active_stock_pickings,
         'product_moves_out' : __get_active_stock_pickings,
         'date' : lambda *a : time.strftime('%Y-%m-%d %H:%M:%S'),
     }
-    
+
 
     def do_partial(self, cr, uid, ids, context=None):
         """ Makes partial moves and pickings done.
@@ -152,22 +152,22 @@ class stock_partial_picking(osv.osv_memory):
             p_moves = {}
             for product_move in moves_list:
                 p_moves[product_move.move_id.id] = product_move
-            
-            
+
+
             for move in pick.move_lines:
                 if move.state in ('done', 'cancel'):
                     continue
                 if not p_moves.get(move.id):
                     continue
-                
+
                 partial_datas['move%s' % (move.id)] = {
                     'product_id' : p_moves[move.id].id,
                     'product_qty' : p_moves[move.id].quantity,
                     'product_uom' :p_moves[move.id].product_uom.id,
                     'prodlot_id' : p_moves[move.id].prodlot_id.id,
                 }
-            
-               
+
+
                 if (move.picking_id.type == 'in') and (move.product_id.cost_method == 'average'):
                     partial_datas['move%s' % (move.id)].update({
                                                     'product_price' : p_moves[move.id].cost,
@@ -176,8 +176,8 @@ class stock_partial_picking(osv.osv_memory):
         pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
-        
-   
+
+
 
 stock_partial_picking()
 

From 43cba5ee71faa5303b76f28059aa89d74a74f885 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Mon, 10 Jan 2011 14:57:13 +0530
Subject: [PATCH 26/61] [FIX]:Custom Reports do not display any values

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

bzr revid: ksa@tinyerp.co.in-20110110092713-ni6bjztuw45nmmfh
---
 .../base_report_creator.py                    | 115 +++++++++---------
 1 file changed, 60 insertions(+), 55 deletions(-)

diff --git a/addons/base_report_creator/base_report_creator.py b/addons/base_report_creator/base_report_creator.py
index 773458fe3cb..5727646f01c 100644
--- a/addons/base_report_creator/base_report_creator.py
+++ b/addons/base_report_creator/base_report_creator.py
@@ -23,33 +23,16 @@ from osv import fields, osv
 from tools.translate import _
 from tools import ustr
 
-class report_creator(osv.osv):
+class report_result(osv.osv):
     """
     Report Creator
     """
-    _name = "base_report_creator.report"
+    _name = "base_report_creator_report.result"
     _description = "Report"
     model_set_id = False
     #
     # Should request only used fields
     #
-    def export_data(self, cr, uid, ids, fields_to_export, context=None):
-        if context is None:
-            context = {}
-        data_l = self.read(cr, uid, ids, ['sql_query'], context=context)
-        final_datas = []
-        #start Loop
-        for record in data_l:
-            datas = []
-            for key in fields_to_export:
-                value = record.get(key,'')
-                if isinstance(value, tuple):
-                    datas.append(ustr(value[1]))
-                else:
-                    datas.append(ustr(value))
-            final_datas += [datas]
-            #End Loop
-        return {'datas': final_datas}
 
     def fields_get(self, cr, user, fields=None, context=None):
         """
@@ -64,9 +47,9 @@ class report_creator(osv.osv):
 
         data = context and context.get('report_id', False) or False
         if (not context) or 'report_id' not in context:
-            return super(report_creator, self).fields_get(cr, user, fields, context)
+            return super(report_result, self).fields_get(cr, user, fields, context)
         if data:
-            report = self.browse(cr, user, data)
+            report = self.pool.get('base_report_creator.report').browse(cr, user, data,context=context)
             models = {}
         #Start Loop
             for model in report.model_ids:
@@ -80,12 +63,8 @@ class report_creator(osv.osv):
                     i += 1
                 else:
                     fields['column_count'] = {'readonly': True, 'type': 'integer', 'string': 'Count', 'size': 64, 'name': 'column_count'}
-
             return fields
 
-    #
-    # Should Call self.fields_get !
-    #
     def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         """
         Overrides orm field_view_get.
@@ -98,8 +77,8 @@ class report_creator(osv.osv):
 
         data = context and context.get('report_id', False) or False
         if (not context) or 'report_id' not in context:
-            return super(report_creator, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
-        report = self.browse(cr, user, data)
+            return super(report_result, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
+        report = self.pool.get('base_report_creator.report').browse(cr, user, context.get('report_id'), context=context)
         models = {}
         for model in report.model_ids:
             models[model.model] = self.pool.get(model.model).fields_get(cr, user, context=context)
@@ -192,31 +171,24 @@ class report_creator(osv.osv):
         """
         if context is None:
             context = {}
-        data = context.get('report_id', False)
-        res = super(report_creator, self).read(cr, user, ids, fields, context, load)
-        if (not context) or 'report_id' not in context:
-            return res
-        wp = ''
-        for data in res:
-            if not data.get('sql_query'):
-                return res
-            if self.model_set_id:
-                wp = [self._id_get(cr, user, data, context) + (' in (%s)' % (','.join(map(lambda x: "'" + str(x) + "'", ids))))]
-            cr.execute(data['sql_query'])
-            res = cr.dictfetchall()
-            fields_get = self.fields_get(cr, user, None, context)
-            for r in res:
-                for k in r:
-                    r[k] = r[k] or False
-                    field_dict = fields_get.get(k)
-                    field_type = field_dict and field_dict.get('type', False) or False
-                    if field_type and field_type == 'many2one':
-                        if r[k] == False:
-                            continue
-                        related_name = self.pool.get(field_dict.get('relation')).name_get(cr, user, [r[k]], context)[0]
+        report_id = context.get('active_id', False)
+        report = self.pool.get('base_report_creator.report').browse(cr, user, context.get('report_id'), context=context)
+        sql_qry = report.sql_query
+        cr.execute(sql_qry)
+        result = cr.dictfetchall()
+        fields_get = self.fields_get(cr, user, None, context)
+        for r in result:
+            for k in r:
+                r[k] = r[k] or False
+                field_dict = fields_get.get(k)
+                field_type = field_dict and field_dict.get('type', False) or False
+                if field_type and field_type == 'many2one':
+                    if r[k] == False:
+                        continue
+                    if r[k]:
+                        related_name = self.pool.get(field_dict.get('relation')).name_get(cr, user, [r[k]], context)
                         r[k] = related_name
-
-        return res
+        return result
 
     def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
         """
@@ -231,9 +203,9 @@ class report_creator(osv.osv):
         context_id = context.get('report_id', False)
 
         if (not context) or 'report_id' not in context:
-            return super(report_creator, self).search(cr, user, args, offset, limit, order, context, count)
+            return {}
         if context_id:
-            report = self.browse(cr, user, context_id)
+            report = self.pool.get('base_report_creator.report').browse(cr, user, context_id, context=context)
             i = 0
             fields = {}
             for f in report.field_ids:
@@ -254,10 +226,42 @@ class report_creator(osv.osv):
             ctx = context or {}
             ctx['getid'] = True
             sql_query = report.sql_query
-            cr.execute(sql_query, newargs2)
+            cr.execute(sql_query) # TODO: FILTER
             result = cr.fetchall()
             return map(lambda x: x[0], result)
 
+report_result()
+
+
+class report_creator(osv.osv):
+    """
+    Report Creator
+    """
+    _name = "base_report_creator.report"
+    _description = "Report"
+    model_set_id = False
+    #
+    # Should request only used fields
+    #
+    def export_data(self, cr, uid, ids, fields_to_export, context=None):
+        if context is None:
+            context = {}
+        data_l = self.read(cr, uid, ids, ['sql_query'], context=context)
+        final_datas = []
+        #start Loop
+        for record in data_l:
+            datas = []
+            for key in fields_to_export:
+                value = record.get(key,'')
+                if isinstance(value, tuple):
+                    datas.append(ustr(value[1]))
+                else:
+                    datas.append(ustr(value))
+            final_datas += [datas]
+            #End Loop
+        return {'datas': final_datas}
+
+
     def _path_get(self, cr, uid, models, filter_ids=[]):
         """
         @param cr: the current row, from the database cursor,
@@ -465,7 +469,7 @@ class report_creator(osv.osv):
             'name': rep.name,
             'view_type': 'form',
             'view_mode': view_mode,
-            'res_model': 'base_report_creator.report',
+            'res_model': 'base_report_creator_report.result',
             'type': 'ir.actions.act_window',
             'context': "{'report_id':%d}" % (rep.id,),
             'nodestroy': True,
@@ -596,3 +600,4 @@ class report_creator_filter(osv.osv):
     }
 report_creator_filter()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

From 0bffe9bf6996c8e363a9db7dd80a560797d26678 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 10 Jan 2011 17:25:25 +0530
Subject: [PATCH 27/61] [FIX]stock:Backorder Cannot be create on Incoming
 Shipment

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

bzr revid: ron@tinyerp.com-20110110115525-ctcfqhgisj14abvo
---
 addons/stock/wizard/stock_partial_picking.py | 172 +++++++++----------
 1 file changed, 77 insertions(+), 95 deletions(-)

diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index ad75c142a96..45a12208101 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -28,54 +28,71 @@ class stock_partial_picking(osv.osv_memory):
     _name = "stock.partial.picking"
     _description = "Partial Picking"
     _columns = {
-        'date': fields.datetime('Date', required=True),
-        'product_moves_out' : fields.one2many('stock.move.memory.out', 'wizard_id', 'Moves'),
-        'product_moves_in' : fields.one2many('stock.move.memory.in', 'wizard_id', 'Moves'),
+        'date': fields.datetime('Date', required=True), 
+        'product_moves_out' : fields.one2many('stock.move.memory.out', 'wizard_id', 'Moves'), 
+        'product_moves_in' : fields.one2many('stock.move.memory.in', 'wizard_id', 'Moves'), 
      }
     
-    def __is_in(self,cr, uid, pick_ids):
+    def get_picking_type(self, cr, uid, picking, context=None):
+        picking_type = picking.type
+        for move in picking.move_lines:
+            if picking.type == 'in' and move.product_id.cost_method == 'average':
+                picking_type = 'in'
+        return picking_type
+    
+    def default_get(self, cr, uid, fields, context=None):
+        """ To get default values for the object.
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param fields: List of fields for which we want default values
+         @param context: A standard dictionary
+         @return: A dictionary which of fields with values.
         """
-            @return: True if one of the moves has as picking type 'in'
-        """
-        if not pick_ids:
-            return False
+        if context is None:
+            context = {}
+            
+        pick_obj = self.pool.get('stock.picking')
+        res = super(stock_partial_picking, self).default_get(cr, uid, fields, context=context)
+        picking_ids = context.get('active_ids', [])
+        if not picking_ids:
+            return res
+
+        result = []
+        for pick in pick_obj.browse(cr, uid, picking_ids, context=context):
+            pick_type = self.get_picking_type(cr, uid, pick, context=context)
+            for m in pick.move_lines:
+                if m.state in ('done', 'cancel'):
+                    continue
+                result.append(self.__create_partial_picking_memory(m, pick_type))
+
+        if 'product_moves_in' in fields:
+            res.update({'product_moves_in': result})
+        if 'product_moves_out' in fields:
+            res.update({'product_moves_out': result})
+        if 'date' in fields:
+            res.update({'date': time.strftime('%Y-%m-%d %H:%M:%S')})
+        return res
+    
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        result = super(stock_partial_picking, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
        
         pick_obj = self.pool.get('stock.picking')
-        pick_ids = pick_obj.search(cr, uid, [('id','in',pick_ids)])
-        
-       
-        for pick in pick_obj.browse(cr, uid, pick_ids):
-            for move in pick.move_lines:
-                if pick.type == 'in' and move.product_id.cost_method == 'average':
-                    return True
-        return False
-    
-    def __get_picking_type(self, cr, uid, pick_ids):
-        if self.__is_in(cr, uid, pick_ids):
-            return "product_moves_in"
-        else:
-            return "product_moves_out"
-
-    def view_init(self, cr, uid, fields_list, context=None):
-        res = super(stock_partial_picking, self).view_init(cr, uid, fields_list, context=context)
-        return res
-
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
-        result = super(stock_partial_picking, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)
-       
-        
         picking_ids = context.get('active_ids', False)
-        picking_type = self.__get_picking_type(cr, uid, picking_ids)
+
+        for pick in pick_obj.browse(cr, uid, picking_ids, context=context):
+            picking_type = self.get_picking_type(cr, uid, pick, context=context)
         
         _moves_arch_lst = """<form string="%s">
                         <field name="date" invisible="1"/>
                         <separator colspan="4" string="%s"/>
                         <field name="%s" colspan="4" nolabel="1" mode="tree,form" width="550" height="200" ></field>
-                        """ % (_('Process Document'), _('Products'), picking_type)
+                        """ % (_('Process Document'), _('Products'), "product_moves_" + picking_type)
         _moves_fields = result['fields']
+
+        # add field related to picking type only
         _moves_fields.update({
-                            'product_moves_in' : {'relation': 'stock.move.memory.in', 'type' : 'one2many', 'string' : 'Product Moves'},
-                            'product_moves_out' : {'relation': 'stock.move.memory.out', 'type' : 'one2many', 'string' : 'Product Moves'}
+                            'product_moves_' + picking_type: {'relation': 'stock.move.memory.'+picking_type, 'type' : 'one2many', 'string' : 'Product Moves'}, 
                             })
             
         _moves_arch_lst += """
@@ -92,44 +109,22 @@ class stock_partial_picking(osv.osv_memory):
         result['fields'] = _moves_fields
         return result
 
-    def __create_partial_picking_memory(self, picking, is_in):
+    def __create_partial_picking_memory(self, picking, pick_type):
         move_memory = {
-            'product_id' : picking.product_id.id,
-            'quantity' : picking.product_qty,
-            'product_uom' : picking.product_uom.id,
-            'prodlot_id' : picking.prodlot_id.id,
-            'move_id' : picking.id,
+            'product_id' : picking.product_id.id, 
+            'quantity' : picking.product_qty, 
+            'product_uom' : picking.product_uom.id, 
+            'prodlot_id' : picking.prodlot_id.id, 
+            'move_id' : picking.id, 
         }
     
-        if is_in:
+        if pick_type == 'in':
             move_memory.update({
-                'cost' : picking.product_id.standard_price,
-                'currency' : picking.product_id.company_id.currency_id.id,
+                'cost' : picking.product_id.standard_price, 
+                'currency' : picking.product_id.company_id.currency_id.id, 
             })
         return move_memory
 
-    def __get_active_stock_pickings(self, cr, uid, context=None):
-        pick_obj = self.pool.get('stock.picking')
-        if not context:
-            context = {}
-               
-        res = []
-        for pick in pick_obj.browse(cr, uid, context.get('active_ids', []), context):
-            need_product_cost = (pick.type == 'in')
-            for m in pick.move_lines:
-                if m.state in ('done', 'cancel'):
-                    continue           
-                res.append(self.__create_partial_picking_memory(m, need_product_cost))
-            
-        return res
-    
-    _defaults = {
-        'product_moves_in' : __get_active_stock_pickings,
-        'product_moves_out' : __get_active_stock_pickings,
-        'date' : lambda *a : time.strftime('%Y-%m-%d %H:%M:%S'),
-    }
-    
-
     def do_partial(self, cr, uid, ids, context=None):
         """ Makes partial moves and pickings done.
         @param self: The object pointer.
@@ -140,6 +135,9 @@ class stock_partial_picking(osv.osv_memory):
         @return: A dictionary which of fields with values.
         """
         pick_obj = self.pool.get('stock.picking')
+        move_obj = self.pool.get('stock.move')
+        location_obj = self.pool.get('stock.location')
+        
         picking_ids = context.get('active_ids', False)
         partial = self.browse(cr, uid, ids[0], context=context)
         partial_datas = {
@@ -147,40 +145,24 @@ class stock_partial_picking(osv.osv_memory):
         }
 
         for pick in pick_obj.browse(cr, uid, picking_ids, context=context):
-            need_product_cost = (pick.type == 'in')
-            moves_list = need_product_cost and partial.product_moves_in  or partial.product_moves_out
-            p_moves = {}
-            for product_move in moves_list:
-                p_moves[product_move.move_id.id] = product_move
-            
-            
-            for move in pick.move_lines:
-                if move.state in ('done', 'cancel'):
-                    continue
-                if not p_moves.get(move.id):
-                    continue
-                
-                partial_datas['move%s' % (move.id)] = {
-                    'product_id' : p_moves[move.id].id,
-                    'product_qty' : p_moves[move.id].quantity,
-                    'product_uom' :p_moves[move.id].product_uom.id,
-                    'prodlot_id' : p_moves[move.id].prodlot_id.id,
+            picking_type = self.get_picking_type(cr, uid, pick, context=context)
+            moves_list = picking_type == 'in' and partial.product_moves_in or partial.product_moves_out
+
+            for move in moves_list:
+                partial_datas['move%s' % (move.move_id.id)] = {
+                    'product_id': move.id, 
+                    'product_qty': move.quantity, 
+                    'product_uom': move.product_uom.id, 
+                    'prodlot_id': move.prodlot_id.id, 
                 }
-            
-               
-                if (move.picking_id.type == 'in') and (move.product_id.cost_method == 'average'):
+                if (picking_type == 'in') and (move.product_id.cost_method == 'average'):
                     partial_datas['move%s' % (move.id)].update({
-                                                    'product_price' : p_moves[move.id].cost,
-                                                    'product_currency': p_moves[move.id].currency.id,
+                                                    'product_price' : move.cost, 
+                                                    'product_currency': move.currency.id, 
                                                     })
         pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)
         return {}
 
-        
-   
-
 stock_partial_picking()
 
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From 34647454eff877d2b9d98eed0572f275ead96d91 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 10 Jan 2011 17:38:27 +0530
Subject: [PATCH 28/61] [FIX]: sale/purchase: Fixed creation of invoice from
 picking

bzr revid: rpa@tinyerp.com-20110110120827-1elewfhopjaxvqi7
---
 addons/purchase/purchase.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index d0d281c1392..ec307882300 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -823,12 +823,14 @@ class stock_invoice_onshipping(osv.osv_memory):
     def create_invoice(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
+        res = super(stock_invoice_onshipping,self).create_invoice(cr, uid, ids, context=context)
         purchase_obj = self.pool.get('purchase.order')
         picking_obj = self.pool.get('stock.picking')
-        res = super(stock_invoice_onshipping,self).create_invoice(cr, uid, ids, context=context)
-        purchase_id =  picking_obj.browse(cr, uid, res.keys()[0]).purchase_id.id
-        purchase_obj.write(cr, uid, [purchase_id], {
-            'invoice_ids': [(4, res.values()[0])]}, context=context)
+        for pick_id in res:
+            pick = picking_obj.browse(cr, uid, pick_id, context=context)
+            if pick.purchase_id:
+                purchase_obj.write(cr, uid, [pick.purchase_id.id], {
+                    'invoice_ids': [(4, res[pick_id])]}, context=context)
         return res
 
 stock_invoice_onshipping()

From cf0da1b7b0988cbd2553fc04ec0aa9c345302506 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Mon, 10 Jan 2011 17:54:31 +0530
Subject: [PATCH 29/61] [FIX]:add access group on button used to update stock
 on product

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

bzr revid: ksa@tinyerp.co.in-20110110122431-cf9yex2fw11fy6lp
---
 addons/stock/product_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index dca180baeec..587c0c84031 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -106,7 +106,7 @@
                         <separator string="Stocks" colspan="4"/>
                         <field name="qty_available"/>
                         <button name="%(action_view_change_product_quantity)d" string="Update" attrs="{'invisible': [('type', '=', 'service')]}"
-                            type="action" icon="gtk-execute" groups = "stock.group_stock_manager,base.group_sale_manager,purchase.group_purchase_manager,stock.group_stock_manager,mrp.group_mrp_manager"/>
+                            type="action" icon="gtk-execute" groups = "stock.group_stock_manager,group_stock_user"/>
                         <newline/>
                         <field name="virtual_available"/>
                     </group>

From deda381068000bc2421ad14e893af9aa6cdfb45d Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 10 Jan 2011 18:27:47 +0530
Subject: [PATCH 30/61] [IMP]: mrp: Added reverted changes for production view

bzr revid: rpa@tinyerp.com-20110110125747-jixt2pdn6upk9dij
---
 addons/mrp/mrp_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 000ae6cbcf2..a2249ca4925 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -680,7 +680,7 @@
                             <button name="action_compute" states="draft"
                                 string="Compute Data" type="object"
                                 icon="terp-stock_format-scientific"
-                                colspan="4" />
+                                colspan="2" />
                             <field colspan="4" name="workcenter_lines" nolabel="1">
                                 <form string="Production Work Centers">
                                     <field colspan="4" name="name"/>
@@ -702,7 +702,7 @@
                             <button name="action_compute" states="draft"
                                 string="Compute Data" type="object"
                                 icon="terp-stock_format-scientific"
-                                colspan="4" />
+                                colspan="2" />
                             <field colspan="4" name="product_lines" nolabel="1" widget="one2many_list"/>
                         </page>
                         <page string="Extra Information">

From 54970584f1b8372ffaf5cdddade1c7f7ad6c8c59 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 11 Jan 2011 10:11:17 +0530
Subject: [PATCH 31/61] [ADD]purchase:Add Yml file which has product price
 Costing Method is Average Price

bzr revid: ron@tinyerp.com-20110111044117-sn2y9gwqskqpqgml
---
 addons/purchase/__openerp__.py                |   2 +-
 .../test/purchase_on_average_price.yml        | 107 ++++++++++++++++++
 2 files changed, 108 insertions(+), 1 deletion(-)
 create mode 100644 addons/purchase/test/purchase_on_average_price.yml

diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 58b049e130e..643ba4fc212 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -54,7 +54,7 @@
         'report/purchase_report_view.xml',
         'board_purchase_view.xml',
     ],
-    'test': [
+    'test': ['test/purchase_on_average_price.yml',
              'test/purchase_from_order.yml',
              'test/purchase_from_manual.yml',
              'test/purchase_from_picking.yml',
diff --git a/addons/purchase/test/purchase_on_average_price.yml b/addons/purchase/test/purchase_on_average_price.yml
new file mode 100644
index 00000000000..42e5e369840
--- /dev/null
+++ b/addons/purchase/test/purchase_on_average_price.yml
@@ -0,0 +1,107 @@
+-
+  In order to test Checking of Cost price of product if the product price "Costing Method" 
+  is "Average Price" and we change value of product on incoming shipment
+  
+-        
+  I create  product.
+-
+  !record {model: product.product, id: product_product_pen0 }:
+    categ_id: product.product_category_3
+    cost_method: average
+    name: Pen drive
+    procure_method: make_to_stock
+    supply_method: buy
+    type: product
+    standard_price: 1500.0
+    list_price: 1500.0
+    supply_method: buy
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    volume: 0.0
+    warranty: 0.0
+    weight: 0.0
+
+-
+  Update Starting Real Stock And Virtual Stock threw Wizard
+-
+  !record {model: stock.change.product.qty , id: stock_change_product_id }:
+    product_id: product_product_pen0 
+    new_quantity: 2.0
+    location_id: stock.stock_location_stock
+-
+  Then, Click on "Update Price" button of this wizard.
+-
+  !python {model: stock.change.product.qty }: |
+    self.change_product_qty(cr, uid, [ref('stock_change_product_id')], {'active_id': ref('product_product_pen0')})
+-
+  I create purchase order for Pen drive.
+- 
+  !record {model: purchase.order, id: purchase_order_po11}:
+    company_id: base.main_company
+    date_order: '2010-05-11'
+    invoice_method: order
+    location_id: stock.stock_location_stock
+    order_line:
+      - date_planned: '2010-05-13'
+        name: Pen drive
+        price_unit: 1500.0
+        product_id: 'product_product_pen0'
+        product_qty: 2.0
+        product_uom: product.product_uom_unit
+        state: draft
+    partner_address_id: base.res_partner_address_7
+    partner_id: base.res_partner_4
+    pricelist_id: purchase.list0
+-
+  PO Initially in Draft State .
+-
+  !assert {model: purchase.order, id: purchase_order_po11}:
+    - state == 'draft'  
+-  
+  PO Going to Draft To Confirm State
+-
+  !workflow {model: purchase.order, action: purchase_confirm, ref: purchase_order_po11}
+-
+  I check that the Order has transit from draft state to confirm state.
+-
+  !assert {model: purchase.order, id: purchase_order_po11}:
+    - state == 'approved'  
+-   
+  I receive the order of the supplier the Incoming Shipments menu.
+-   
+  !python {model: stock.picking }: |
+    import time
+    procurement_obj = self.pool.get('procurement.order')
+    proc_ids = procurement_obj.browse(cr, uid, [ref('purchase_order_po11')])[0]
+    picking_ids = self.search(cr, uid, [('purchase_id', '=', proc_ids.id),('type','=','in')])
+    pickings = self.browse(cr, uid, picking_ids)
+    for picking in pickings:
+       move = picking.move_lines[0]
+       partial_datas = {
+            'partner_id': picking.address_id.partner_id.id,
+            'address_id': picking.address_id.id,
+            'delivery_date' : time.strftime('%Y-%m-%d')
+           }
+       partial_datas['move%s'%(move.id)]= {
+           'product_id': move.product_id,
+           'product_qty': move.product_qty,
+           'product_uom': move.product_uom.id,
+           'product_price' : 1000.0,
+       } 
+       self.do_partial(cr, uid, [picking.id], partial_datas)
+-
+  I confirm the Reservation.
+-
+  !python {model: stock.move }: |
+    procurement_obj = self.pool.get('procurement.order')
+    picking_obj = self.pool.get('stock.picking')
+    proc_ids = procurement_obj.browse(cr, uid, [ref('purchase_order_po11')])[0]
+    picking_ids = picking_obj.search(cr, uid, [('purchase_id', '=', proc_ids.id),('type','=','in')])
+    move_ids = self.search(cr, uid, [('picking_id', '=', picking_ids)])
+    self.action_done(cr,uid,move_ids)
+-
+  Compare With Avarage Price Has Been Updated that is Correct
+-
+  !assert {model: product.product, id: product_product_pen0 ,string: Updated Avarage Price Has not been Correct}:
+    - standard_price == 1250  
+

From d74281c300ac097aa24dd13f97fd1d3f2a755d3b Mon Sep 17 00:00:00 2001
From: Yogesh Sakhreliya <ysa@tinyerp.com>
Date: Tue, 11 Jan 2011 14:37:20 +0530
Subject: [PATCH 32/61] FIX] shortcuts remove in view file and create data in
 separate file and set noupdate='1'.

bzr revid: ysa@tinyerp.com-20110111090720-d65ynsn07d52fobg
---
 addons/crm/__openerp__.py                |  9 +++++----
 addons/crm/crm_meeting_menu.xml          |  6 ------
 addons/crm/crm_meeting_shortcut_data.xml | 13 +++++++++++++
 addons/product/__openerp__.py            |  1 +
 addons/product/product_shortcut_data.xml | 13 +++++++++++++
 addons/product/product_view.xml          | 10 ++--------
 6 files changed, 34 insertions(+), 18 deletions(-)
 create mode 100644 addons/crm/crm_meeting_shortcut_data.xml
 create mode 100644 addons/product/product_shortcut_data.xml

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 74eb1a95b23..af2b53d1c93 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -41,7 +41,7 @@ appropriate staff, and make sure all future correspondence gets to the right
 place.
 
 The CRM module has a email gateway for the synchronisation interface
-between mails and OpenERP. 
+between mails and OpenERP.
 Create dashboard for CRM that includes:
     * My Leads (list)
     * Leads by Stage (graph)
@@ -95,6 +95,7 @@ Create dashboard for CRM that includes:
 
         'crm_meeting_view.xml',
         'crm_meeting_menu.xml',
+        'crm_meeting_shortcut_data.xml',
 
         'crm_phonecall_view.xml',
         'crm_phonecall_menu.xml',
@@ -106,12 +107,12 @@ Create dashboard for CRM that includes:
         'report/crm_phonecall_report_view.xml',
 
         'process/crm_configuration_process.xml',
-        'crm_installer_view.xml', 
-        
+        'crm_installer_view.xml',
+
         'res_partner_view.xml',
         'board_crm_view.xml',
         'board_crm_statistical_view.xml',
-       
+
     ],
     'demo_xml': [
         'crm_demo.xml',
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index a75528810e0..35ff86cb5b8 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -92,12 +92,6 @@
         action="crm_case_categ_meet" parent="menu_meeting_sale"
         sequence="1" />
 
-    <record id="ir_ui_view_sc_calendar0" model="ir.ui.view_sc">
-        <field name="name">Meetings</field>
-        <field name="resource">ir.ui.menu</field>
-        <field name="user_id" ref="base.user_root"/>
-        <field name="res_id" ref="crm.menu_crm_case_categ_meet"/>
-    </record>
     <record id="action_view_attendee_form" model="ir.actions.act_window">
          <field name="name">Meeting Invitations</field>
          <field name="type">ir.actions.act_window</field>
diff --git a/addons/crm/crm_meeting_shortcut_data.xml b/addons/crm/crm_meeting_shortcut_data.xml
new file mode 100644
index 00000000000..fcba36f7a61
--- /dev/null
+++ b/addons/crm/crm_meeting_shortcut_data.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+
+	    <record id="ir_ui_view_sc_calendar0" model="ir.ui.view_sc">
+	        <field name="name">Meetings</field>
+	        <field name="resource">ir.ui.menu</field>
+	        <field name="user_id" ref="base.user_root"/>
+	        <field name="res_id" ref="crm.menu_crm_case_categ_meet"/>
+	    </record>
+
+    </data>
+</openerp>
diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py
index 851031e0424..712e17aebc3 100644
--- a/addons/product/__openerp__.py
+++ b/addons/product/__openerp__.py
@@ -53,6 +53,7 @@
         'product_data.xml',
         'product_report.xml',
         'product_view.xml',
+        'product_shortcut_data.xml',
         'pricelist_view.xml',
         'partner_view.xml',
         'process/product_process.xml'
diff --git a/addons/product/product_shortcut_data.xml b/addons/product/product_shortcut_data.xml
new file mode 100644
index 00000000000..4f48445a197
--- /dev/null
+++ b/addons/product/product_shortcut_data.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+        <record id="ir_ui_view_sc_product0" model="ir.ui.view_sc">
+            <field name="name">Products</field>
+            <field name="resource">ir.ui.menu</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="res_id" ref="product.menu_products"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 642ef43caf9..59623a5204e 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -9,7 +9,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Product">
-                   <filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>                   
+                   <filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>
                    <filter string="Stockable" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]"/>
                    <separator orientation="vertical"/>
                    <filter string="To Sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
@@ -30,7 +30,7 @@
                        <separator orientation="vertical"/>
                        <filter string='Type' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'type'}" />
                    </group>
-                   
+
                 </search>
             </field>
         </record>
@@ -635,12 +635,6 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="product_template_tree_view"/>
         </record>
-        <record id="ir_ui_view_sc_product0" model="ir.ui.view_sc">
-            <field name="name">Products</field>
-            <field name="resource">ir.ui.menu</field>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="res_id" ref="product.menu_products"/>
-        </record>
 
     </data>
 </openerp>

From 6dde01f003b5845bdfca633a22a55ce3041288e5 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 11 Jan 2011 16:37:29 +0530
Subject: [PATCH 33/61] [FIX] purchase_requisition:Permissions on procurement

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

bzr revid: aag@tinyerp.co.in-20110111110729-m0h3yqcvalxkbxwt
---
 addons/purchase_requisition/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase_requisition/security/ir.model.access.csv b/addons/purchase_requisition/security/ir.model.access.csv
index 4e14688ecc5..d990afcb536 100644
--- a/addons/purchase_requisition/security/ir.model.access.csv
+++ b/addons/purchase_requisition/security/ir.model.access.csv
@@ -3,5 +3,5 @@
 "access_purchase_requisition_line","purchase.requisition.line","model_purchase_requisition_line","purchase.group_purchase_user",1,1,1,1
 "access_purchase_requisition_manager","purchase.requisition manager","model_purchase_requisition","purchase.group_purchase_manager",1,0,0,0
 "access_purchase_requisition_line_manager","purchase.requisition.line manager","model_purchase_requisition_line","purchase.group_purchase_manager",1,0,0,0
-"access_purchase_requisition","purchase.requisition","model_purchase_requisition","stock.group_stock_manager",1,0,1,0
+"access_purchase_requisition_stock_manager","purchase.requisition","model_purchase_requisition","stock.group_stock_manager",1,0,1,0
 "access_purchase_requisition_line","purchase.requisition.line","model_purchase_requisition_line","stock.group_stock_manager",1,0,1,0

From 9fee3471ca8f72b2a8938f8c9a83234da1f5ae6d Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Tue, 11 Jan 2011 17:23:17 +0530
Subject: [PATCH 34/61] [FIX]:Duplication of product should not duplicate its
 BOM if the product is component

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

bzr revid: ksa@tinyerp.co.in-20110111115317-bmo3nbip63575s92
---
 addons/mrp/mrp.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index a57b76bf2ce..03b04478524 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -342,7 +342,7 @@ class mrp_bom(osv.osv):
         if context is None:
             context = {}
         bom_data = self.read(cr, uid, id, [], context=context)
-        default.update({'name': bom_data['name'] + ' ' + _('Copy')})
+        default.update({'name': bom_data['name'] + ' ' + _('Copy'),'bom_id':False})
         return super(mrp_bom, self).copy_data(cr, uid, id, default, context=context)
 
 mrp_bom()
@@ -664,7 +664,7 @@ class mrp_production(osv.osv):
         """
         stock_mov_obj = self.pool.get('stock.move')
         production = self.browse(cr, uid, production_id, context=context)
-        
+
         final_product_todo = []
 
         produced_qty = 0

From c1190d6289252ee8469c24b2d98b521f251f92dd Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Wed, 12 Jan 2011 16:16:53 +0530
Subject: [PATCH 35/61] [FIX] STOCK:Create invoice button is visible when
 picking is set to be invoiced

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

bzr revid: aag@tinyerp.co.in-20110112104653-kdpk3hs5j8875f53
---
 addons/stock/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 85c1231b75a..550aab9b1c7 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1189,7 +1189,7 @@
                                 <group colspan="1" states="done">
                                     <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
                                 </group>
-                                    <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl"/>
+                                    <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice"  attrs="{'invisible': ['|',('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" icon="terp-gtk-go-back-rtl" />
                             </group>
                         </page>
                         <page string="Additional Info" groups="base.group_extended,base.group_multi_company">

From 6ae2d39defd6552f8d46c54fd4618e3c76849867 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 12 Jan 2011 18:53:38 +0530
Subject: [PATCH 36/61] [REVERT]: stock: Reverted fix for bug#613286:
 revision-id: rha@tinyerp.com-20101229131420-k97xl7mrx9htvchi

bzr revid: rpa@tinyerp.com-20110112132338-yxa9erhkppt8yfno
---
 addons/sale/sale.py                         |  1 -
 addons/stock/stock.py                       |  3 ---
 addons/stock/wizard/stock_return_picking.py | 20 +++++---------------
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 60c5a1e263f..04068b5bd7e 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -705,7 +705,6 @@ class sale_order(osv.osv):
                         #'state': 'waiting',
                         'note': line.notes,
                         'company_id': order.company_id.id,
-                        'returned_price': line.price_unit,
                     })
 
                 if line.product_id:
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 4dea848c190..0c2a739761a 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1223,8 +1223,6 @@ class stock_picking(osv.osv):
                                 {'price_unit': product_price,
                                  'price_currency_id': product_currency})
 
-                        if not move.returned_price:
-                            move_obj.write(cr, uid, [move.id], {'returned_price': move.price_unit})
 
             for move in too_few:
                 product_qty = move_product_qty[move.id]
@@ -1545,7 +1543,6 @@ class stock_move(osv.osv):
 
         # used for colors in tree views:
         'scrapped': fields.related('location_dest_id','scrap_location',type='boolean',relation='stock.location',string='Scrapped', readonly=True),
-        'returned_price': fields.float('Returned product price', digits_compute= dp.get_precision('Sale Price')),
     }
     _constraints = [
         (_check_tracking,
diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index d71e6361b32..918c519a1e4 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -53,10 +53,8 @@ class stock_return_picking(osv.osv_memory):
                     res['invoice_state'] = 'none'
             for line in pick.move_lines:
                 return_id = 'return%s'%(line.id)
-                return_price = 'return_price%s'%(line.id)
                 if return_id in fields:
                     res[return_id] = line.product_qty
-                    res[return_price]=line.price_unit
         return res
 
     def view_init(self, cr, uid, fields_list, context=None):
@@ -88,11 +86,8 @@ class stock_return_picking(osv.osv_memory):
                         valid_lines += 1
                         if 'return%s'%(m.id) not in self._columns:
                             self._columns['return%s'%(m.id)] = fields.float(string=m.name, required=True)
-                        if 'return_price%s'%(m.id) not in self._columns:
-                            self._columns['return_price%s'%(m.id)] = fields.float(string=m.name, required=True)
                         if 'invoice_state' not in self._columns:
                             self._columns['invoice_state'] = fields.selection([('2binvoiced', 'To be refunded/invoiced'), ('none', 'No invoicing')], string='Invoicing', required=True)
-
             if not valid_lines:
                 raise osv.except_osv(_('Warning !'), _("There are no products to return (only lines in Done state and not fully returned yet can be returned)!"))
         return res
@@ -126,10 +121,6 @@ class stock_return_picking(osv.osv_memory):
                 if m.state=='done' and quantity > return_history[m.id]:
                     arch_lst.append('<field name="return%s"/>\n<newline/>' % (m.id,))
                     res['fields']['return%s' % m.id]={'string':m.name, 'type':'float', 'required':True}
-
-                    if m.product_id.cost_method == 'average' and pick.type == 'in':
-                        arch_lst.append('<field name="return_price%s"/>\n<newline/>' % (m.id,))
-                        res['fields']['return_price%s' % m.id]={'string':'Price', 'type':'float', 'required':True}
                     res.setdefault('returns', []).append(m.id)
             arch_lst.append('<field name="invoice_state"/>\n<newline/>')
             res['fields']['invoice_state']={'string':_('Invoicing'), 'type':'selection','required':True, 'selection':[('2binvoiced', _('To be refunded/invoiced')), ('none', _('No invoicing'))]}
@@ -142,7 +133,7 @@ class stock_return_picking(osv.osv_memory):
         return res
 
     def create_returns(self, cr, uid, ids, context=None):
-        """
+        """ 
          Creates return picking.
          @param self: The object pointer.
          @param cr: A database cursor
@@ -152,13 +143,13 @@ class stock_return_picking(osv.osv_memory):
          @return: A dictionary which of fields with values.
         """
         if context is None:
-            context = {}
+            context = {} 
         record_id = context and context.get('active_id', False) or False
         move_obj = self.pool.get('stock.move')
         pick_obj = self.pool.get('stock.picking')
         uom_obj = self.pool.get('product.uom')
         wf_service = netsvc.LocalService("workflow")
-
+    
         pick = pick_obj.browse(cr, uid, record_id, context=context)
         data = self.read(cr, uid, ids[0])
         new_picking = None
@@ -180,7 +171,6 @@ class stock_return_picking(osv.osv_memory):
             new_location=move.location_dest_id.id
             if move.state=='done':
                 new_qty = data['return%s' % move.id]
-                price_unit = data['return_price%s' % move.id]
                 returned_qty = move.product_qty
 
                 for rec in move.move_history_ids2:
@@ -188,6 +178,7 @@ class stock_return_picking(osv.osv_memory):
 
                 if returned_qty != new_qty:
                     set_invoice_state_to_none = False
+
                 if new_qty:
                     returned_lines += 1
                     new_move=move_obj.copy(cr, uid, move.id, {
@@ -196,8 +187,7 @@ class stock_return_picking(osv.osv_memory):
                             new_qty, move.product_uos.id),
                         'picking_id':new_picking, 'state':'draft',
                         'location_id':new_location, 'location_dest_id':move.location_id.id,
-                        'date':date_cur,
-                        'price_unit':price_unit})
+                        'date':date_cur,})
                     move_obj.write(cr, uid, [move.id], {'move_history_ids2':[(4,new_move)]})
 
         if not returned_lines:

From 024f0ff0181ead189bac6c0bcdf6cb86fd2b3f3d Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Wed, 12 Jan 2011 16:28:42 +0100
Subject: [PATCH 37/61] [IMP] purchase: useability improved

bzr revid: qdp-launchpad@tinyerp.com-20110112152842-h1810xpth45pax3i
---
 addons/purchase/purchase.py       | 2 +-
 addons/purchase/purchase_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index ec307882300..f2353dbf09d 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -148,7 +148,7 @@ class purchase_order(osv.osv):
     STATE_SELECTION = [
         ('draft', 'Request for Quotation'),
         ('wait', 'Waiting'),
-        ('confirmed', 'Waiting Supplier Ack'),
+        ('confirmed', 'Waiting Approval'),
         ('approved', 'Approved'),
         ('except_picking', 'Shipping Exception'),
         ('except_invoice', 'Invoice Exception'),
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 0312e0d5968..7ee96dca850 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -194,7 +194,7 @@
                                 <button name="invoice_ok" states="except_invoice" string="Manually Corrected" icon="gtk-convert"/>
                                 <button name="purchase_confirm" states="draft" string="Convert to Purchase Order" icon="gtk-go-forward"/>
                                 <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/>
-                                <button name="purchase_approve" states="confirmed" string="Approved by Supplier" icon="gtk-go-forward"/>
+                                <button name="purchase_approve" states="confirmed" string="Approved" icon="gtk-go-forward"/>
                                 <button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
                             </group>
                         </page>

From 37aa11b083de7f8c89ca497978c54a6c04df76a8 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Wed, 12 Jan 2011 17:21:01 +0100
Subject: [PATCH 38/61] [FIX] sale: put back the property_ids field in extra
 info tab of sale.order

bzr revid: qdp-launchpad@tinyerp.com-20110112162101-b9jfuz558s1dcd8l
---
 addons/sale/sale_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 3d1a14edd53..15bf57bff9a 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -172,6 +172,7 @@
                                         <page groups="base.group_extended" string="Extra Info">
                                             <field name="th_weight"/>
                                             <field name="address_allotment_id"/>
+                                            <field name="property_ids" colspan="4"/>
                                         </page>
                                         <page string="Notes">
                                             <field colspan="4" name="notes" nolabel="1"/>

From e6b1d532fd1864758389e463c91403ba8cc0063b Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Wed, 12 Jan 2011 17:26:29 +0100
Subject: [PATCH 39/61] [IMP] mrp: usability improvements

bzr revid: qdp-launchpad@tinyerp.com-20110112162629-wncrn33fporm75la
---
 addons/mrp/mrp_view.xml | 73 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 71 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 26a8c643573..ec9bf58061c 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -343,6 +343,54 @@
                                     <field name="date_start"/>
                                     <field name="date_stop"/>
                                 </tree>
+                                <form string="Bill of Material">
+                                    <group colspan="4" col="6">
+                                    <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
+                                    <field name="name" select="1"/>
+                                    <field name="code" select="1" string="Reference" groups="base.group_extended"/>
+                                    <newline/>
+                                    <field name="product_qty"/>
+                                    <field name="product_uom"/>
+                                    <field name="routing_id"  groups="base.group_extended"/>
+                                    <newline/>
+                                    <field name="product_uos_qty" groups="product.group_uos" />
+                                    <field name="product_uos"  groups="product.group_uos"/>
+                                    <newline/>
+                                    <field name="type" groups="base.group_extended"/>
+                                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                                </group>
+                                <group groups="base.group_extended">
+                                <notebook colspan="4">
+                                    <page string="Components">
+                                        <field colspan="4" name="bom_lines" nolabel="1" widget="one2many_list">
+                                            <tree string="Components" editable="bottom">
+                                                <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
+                                                <field name="product_qty"/>
+                                                <field name="product_uom"/>
+                                                <field name="name" invisible="1"/>
+                                                <field name="date_start"/>
+                                                <field name="date_stop"/>
+                                            </tree>
+                                        </field>
+                                    </page>
+                                    <page string="Revisions" groups="base.group_extended" attrs="{'invisible': [('bom_id','!=',False)]}">
+                                        <field colspan="4" name="revision_ids" nolabel="1" widget="one2many_list"/>
+                                    </page>
+                                    <page string="Properties" groups="base.group_extended">
+                                        <field name="position"/>
+                                        <field name="active"/>
+                                        <field name="sequence"/>
+                                        <field name="bom_id"/>
+
+                                        <field name="date_start"/>
+                                        <field name="date_stop"/>
+                                        <field name="product_rounding"/>
+                                        <field name="product_efficiency" groups="base.group_extended"/>
+                                        <field colspan="4" name="property_ids" nolabel="2" groups="base.group_extended"/>
+                                    </page>
+                                </notebook>
+                                </group>
+                            </form>
                             </field>
                         </page>
                         <page string="Revisions" groups="base.group_extended" attrs="{'invisible': [('bom_id','!=',False)]}">
@@ -412,6 +460,28 @@
                 </tree>
             </field>
         </record>
+       <record id="mrp_bom_component_tree_view" model="ir.ui.view">
+            <field name="name">mrp.bom.component.tree</field>
+            <field name="model">mrp.bom</field>
+            <field name="type">tree</field>
+            <field name="field_parent">child_complete_ids</field>
+            <field name="arch" type="xml">
+                <tree string="BoM Structure" colors="blue:method">
+                    <field name="sequence" invisible="1"/>
+                    <field name="name" string="Component Name"/>
+                    <field name="code"/>
+                    <field name="product_id" string="Component Product"/>
+                    <field name="bom_id"/>
+                    <field name="product_qty"/>
+                    <field name="product_uom"/>
+                    <field name="type"/>
+                    <field name="method" groups="base.group_extended"/>
+                    <field name="routing_id" groups="base.group_extended"/>
+                    <field name="date_start" groups="base.group_extended"/>
+                    <field name="date_stop" groups="base.group_extended"/>
+                </tree>
+            </field>
+        </record>
         <record id="mrp_bom_form_action" model="ir.actions.act_window">
             <field name="name">Bill of Materials</field>
             <field name="type">ir.actions.act_window</field>
@@ -426,6 +496,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.bom</field>
             <field name="view_type">form</field>
+            <field name="view_id" ref="mrp_bom_component_tree_view"/>
             <field name="domain">[('bom_id','!=',False)]</field>
             <field name="help">Bills of materials components are components and sub-products used to create master bills of materials. Use this menu to search in which BoM a specific component is used.</field>
         </record>
@@ -616,7 +687,6 @@
                                        <field name="product_id" readonly="1"/>
                                        <field name="product_qty" readonly="1" string="Qty"/>
                                        <field name="product_uom" readonly="1" string="UOM"/>
-                                       <field name="location_dest_id"  readonly="1" string="Destination Loc."/>
                                        <field name="prodlot_id" context="{'product_id': product_id}"/>
                                        <field name="state" invisible="1"/>
                                        <field name="scrapped" invisible="1"/>
@@ -646,7 +716,6 @@
                                     <field name="product_id" />
                                     <field name="product_qty"  string="Qty"/>
                                     <field name="product_uom"  string="UOM"/>
-                                    <field name="location_id"  string="Source Loc." />
                                     <field name="state" invisible="1"/>
                                     <button name="%(stock.action_partial_move)d"
                                         string="Partial"

From f5aff3a7cf84eaad8bd8c65fca381440406e59b7 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Wed, 12 Jan 2011 17:44:40 +0100
Subject: [PATCH 40/61] [FIX] mrp, stock: Production orders ignored chained
 location

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

bzr revid: qdp-launchpad@tinyerp.com-20110112164440-17aob5yuhxihnnlm
---
 addons/mrp/mrp.py     |  4 +-
 addons/mrp/stock.py   |  5 +++
 addons/stock/stock.py | 88 +++++++++++++++++++++++--------------------
 3 files changed, 55 insertions(+), 42 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 1f06815078e..a260efc8e36 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -714,9 +714,9 @@ class mrp_production(osv.osv):
         if production_mode == 'consume_produce':
             # To produce remaining qty of final product
             vals = {'state':'confirmed'}
-            final_product_todo = [x.id for x in production.move_created_ids]
+            #final_product_todo = [x.id for x in production.move_created_ids]
             #stock_mov_obj.write(cr, uid, final_product_todo, vals)
-            stock_mov_obj.action_confirm(cr, uid, final_product_todo, context)
+            #stock_mov_obj.action_confirm(cr, uid, final_product_todo, context)
             produced_products = {}
             for produced_product in production.move_created_ids2:
                 if produced_product.scrapped:
diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index 8758bc09cd5..5ccb7c8ba7a 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -30,6 +30,11 @@ class StockMove(osv.osv):
     _columns = {
         'production_id': fields.many2one('mrp.production', 'Production', select=True),
     }
+
+    def create_chained_picking(self, cr, uid, moves, context=None):
+        new_moves = super(StockMove, self).create_chained_picking(cr, uid, moves, context=context)
+        self.write(cr, uid, [x.id for x in new_moves], {'production_id': False}, context=context)
+        return new_moves
     
     def _action_explode(self, cr, uid, move, context=None):
         """ Explodes pickings.
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 0c2a739761a..68b6edb5f8d 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1791,6 +1791,51 @@ class stock_move(osv.osv):
                                 'date': picking.date,
                             })
         return pick_id
+    def create_chained_picking(self, cr, uid, moves, context=None):
+        res_obj = self.pool.get('res.company')
+        location_obj = self.pool.get('stock.location')
+        move_obj = self.pool.get('stock.move')
+        wf_service = netsvc.LocalService("workflow")
+        new_moves = []
+        if context is None:
+            context = {}
+        seq_obj = self.pool.get('ir.sequence')
+        for picking, todo in self._chain_compute(cr, uid, moves, context=context).items():
+            ptype = todo[0][1][5] and todo[0][1][5] or location_obj.picking_type_get(cr, uid, todo[0][0].location_dest_id, todo[0][1][0])
+            if picking:
+                # name of new picking according to its type
+                new_pick_name = seq_obj.get(cr, uid, 'stock.picking.' + ptype)
+                pickid = self._create_chained_picking(cr, uid, new_pick_name, picking, ptype, todo, context=context)
+                # Need to check name of old picking because it always considers picking as "OUT" when created from Sale Order
+                old_ptype = location_obj.picking_type_get(cr, uid, picking.move_lines[0].location_id, picking.move_lines[0].location_dest_id)
+                if old_ptype != picking.type:
+                    old_pick_name = seq_obj.get(cr, uid, 'stock.picking.' + old_ptype)
+                    self.pool.get('stock.picking').write(cr, uid, picking.id, {'name': old_pick_name}, context=context)
+            else:
+                pickid = False
+            for move, (loc, dummy, delay, dummy, company_id, ptype) in todo:
+                new_id = move_obj.copy(cr, uid, move.id, {
+                    'location_id': move.location_dest_id.id,
+                    'location_dest_id': loc.id,
+                    'date_moved': time.strftime('%Y-%m-%d'),
+                    'picking_id': pickid,
+                    'state': 'waiting',
+                    'company_id': company_id or res_obj._company_default_get(cr, uid, 'stock.company', context=context)  ,
+                    'move_history_ids': [],
+                    'date': (datetime.strptime(move.date, '%Y-%m-%d %H:%M:%S') + relativedelta(days=delay or 0)).strftime('%Y-%m-%d'),
+                    'move_history_ids2': []}
+                )
+                move_obj.write(cr, uid, [move.id], {
+                    'move_dest_id': new_id,
+                    'move_history_ids': [(4, new_id)]
+                })
+                new_moves.append(self.browse(cr, uid, [new_id])[0])
+            if pickid:
+                wf_service.trg_validate(uid, 'stock.picking', pickid, 'button_confirm', cr)
+        if new_moves:
+            new_moves += self.create_chained_picking(cr, uid, new_moves, context)
+        return new_moves
+
     def action_confirm(self, cr, uid, ids, context=None):
         """ Confirms stock move.
         @return: List of ids.
@@ -1802,46 +1847,7 @@ class stock_move(osv.osv):
         move_obj = self.pool.get('stock.move')
         wf_service = netsvc.LocalService("workflow")
 
-        def create_chained_picking(self, cr, uid, moves, context=None):
-            new_moves = []
-            if context is None:
-                context = {}
-            seq_obj = self.pool.get('ir.sequence')
-            for picking, todo in self._chain_compute(cr, uid, moves, context=context).items():
-                ptype = todo[0][1][5] and todo[0][1][5] or location_obj.picking_type_get(cr, uid, todo[0][0].location_dest_id, todo[0][1][0])
-                if picking:
-                    # name of new picking according to its type
-                    new_pick_name = seq_obj.get(cr, uid, 'stock.picking.' + ptype)
-                    pickid = self._create_chained_picking(cr, uid, new_pick_name, picking, ptype, todo, context=context)
-                    # Need to check name of old picking because it always considers picking as "OUT" when created from Sale Order
-                    old_ptype = location_obj.picking_type_get(cr, uid, picking.move_lines[0].location_id, picking.move_lines[0].location_dest_id)
-                    if old_ptype != picking.type:
-                        old_pick_name = seq_obj.get(cr, uid, 'stock.picking.' + old_ptype)
-                        self.pool.get('stock.picking').write(cr, uid, picking.id, {'name': old_pick_name}, context=context)
-                else:
-                    pickid = False
-                for move, (loc, dummy, delay, dummy, company_id, ptype) in todo:
-                    new_id = move_obj.copy(cr, uid, move.id, {
-                        'location_id': move.location_dest_id.id,
-                        'location_dest_id': loc.id,
-                        'date_moved': time.strftime('%Y-%m-%d'),
-                        'picking_id': pickid,
-                        'state': 'waiting',
-                        'company_id': company_id or res_obj._company_default_get(cr, uid, 'stock.company', context=context)  ,
-                        'move_history_ids': [],
-                        'date': (datetime.strptime(move.date, '%Y-%m-%d %H:%M:%S') + relativedelta(days=delay or 0)).strftime('%Y-%m-%d'),
-                        'move_history_ids2': []}
-                    )
-                    move_obj.write(cr, uid, [move.id], {
-                        'move_dest_id': new_id,
-                        'move_history_ids': [(4, new_id)]
-                    })
-                    new_moves.append(self.browse(cr, uid, [new_id])[0])
-                if pickid:
-                    wf_service.trg_validate(uid, 'stock.picking', pickid, 'button_confirm', cr)
-            if new_moves:
-                create_chained_picking(self, cr, uid, new_moves, context)
-        create_chained_picking(self, cr, uid, moves, context)
+        self.create_chained_picking(cr, uid, moves, context)
         return []
 
     def action_assign(self, cr, uid, ids, *args):
@@ -2109,6 +2115,8 @@ class stock_move(osv.osv):
             prodlot_id = partial_datas and partial_datas.get('move%s_prodlot_id' % (move.id), False)
             if prodlot_id:
                 self.write(cr, uid, [move.id], {'prodlot_id': prodlot_id}, context=context)
+            if move.state not in ('confirmed','done'):
+                self.action_confirm(cr, uid, move_ids, context=context)
 
         self.write(cr, uid, move_ids, {'state': 'done', 'date_planned': time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
         for id in move_ids:

From 5a046d9510d6cd2ed182a2d52bd4197cd05848a7 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Thu, 13 Jan 2011 14:55:51 +0530
Subject: [PATCH 41/61] [FIX] STOCK:Create invoice button is visible in 
 picking (ALL 3) is set to be invoiced

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

bzr revid: aag@tinyerp.co.in-20110113092551-ds3n0gne3xouq7lq
---
 addons/purchase_requisition/security/ir.model.access.csv | 4 ++--
 addons/stock/stock_view.xml                              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/purchase_requisition/security/ir.model.access.csv b/addons/purchase_requisition/security/ir.model.access.csv
index d990afcb536..ec8c031f88b 100644
--- a/addons/purchase_requisition/security/ir.model.access.csv
+++ b/addons/purchase_requisition/security/ir.model.access.csv
@@ -1,7 +1,7 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_purchase_requisition","purchase.requisition","model_purchase_requisition","purchase.group_purchase_user",1,1,1,1
-"access_purchase_requisition_line","purchase.requisition.line","model_purchase_requisition_line","purchase.group_purchase_user",1,1,1,1
+"access_purchase_requisition_line_purchase_user","purchase.requisition.line","model_purchase_requisition_line","purchase.group_purchase_user",1,1,1,1
 "access_purchase_requisition_manager","purchase.requisition manager","model_purchase_requisition","purchase.group_purchase_manager",1,0,0,0
 "access_purchase_requisition_line_manager","purchase.requisition.line manager","model_purchase_requisition_line","purchase.group_purchase_manager",1,0,0,0
 "access_purchase_requisition_stock_manager","purchase.requisition","model_purchase_requisition","stock.group_stock_manager",1,0,1,0
-"access_purchase_requisition_line","purchase.requisition.line","model_purchase_requisition_line","stock.group_stock_manager",1,0,1,0
+"access_purchase_requisition_line_stock_manager","purchase.requisition.line","model_purchase_requisition_line","stock.group_stock_manager",1,0,1,0
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 550aab9b1c7..2bde13b6771 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -773,7 +773,7 @@
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                 <button name="action_process" states="assigned" string="Process"  groups="stock.group_stock_user" type="object" icon="gtk-go-forward"/>
-                                <button states="done" name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" />
+                                <button states="done" name="%(action_stock_invoice_onshipping)d"  string="Create Invoice"  attrs="{'invisible': ['|',('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" icon="terp-gtk-go-back-rtl" />
                             </group>
                         </page>
                         <page string="Additional info" groups="base.group_extended,base.group_multi_company">
@@ -967,7 +967,7 @@
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                 <button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
                                 <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
-                                <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" states="done" type="action" icon="terp-gtk-go-back-rtl"/>
+                                <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" states="done"  attrs="{'invisible': ['|',('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" icon="terp-gtk-go-back-rtl"/>
                             </group>
                         </page>
                         <page string="Additional info" groups="base.group_extended,base.group_multi_company">

From 4dc24a074d63c6359d6ab0d36a9e8beeaf1f05af Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Thu, 13 Jan 2011 16:11:00 +0530
Subject: [PATCH 42/61] [FIX]stock:Update button at product form Stock update
 without production lot possible Tracking production lot wanted

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

bzr revid: ron@tinyerp.com-20110113104100-0ho06wvhf8z0a0fj
---
 addons/stock/wizard/stock_change_product_qty.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/addons/stock/wizard/stock_change_product_qty.py b/addons/stock/wizard/stock_change_product_qty.py
index 897d5cd0e98..3dd794c4630 100644
--- a/addons/stock/wizard/stock_change_product_qty.py
+++ b/addons/stock/wizard/stock_change_product_qty.py
@@ -28,10 +28,23 @@ class stock_change_product_qty(osv.osv_memory):
     _columns = {
         'product_id' : fields.many2one('product.product', 'Product'),
         'new_quantity': fields.float('Quantity', required=True, help='This quantity is expressed in the Default UoM of the product.'),
-        'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot', domain="[('product_id','=',product_id)]"),
+        'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot', required=True,domain="[('product_id','=',product_id)]"),
         'location_id': fields.many2one('stock.location', 'Location', required=True, domain="[('usage', '=', 'internal')]"),
     }
 
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        result = super(stock_change_product_qty, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
+        product_id = context and context.get('active_id', False) or False
+        prod_obj = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+
+        if (context.get('active_model') == 'product.product') and prod_obj:
+            fields=result.get('fields',{})
+            if fields and (prod_obj.track_production == True) and (fields.get('prodlot_id')):
+                result['fields']['prodlot_id']['required'] =  True
+            else:
+                result['fields']['prodlot_id']['required'] =  False
+        return result
+
     def default_get(self, cr, uid, fields, context):
         """ To get default values for the object.
          @param self: The object pointer.

From 0fab39cc6d416047ee2603456adf6bfb3245f24c Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Thu, 13 Jan 2011 17:07:35 +0530
Subject: [PATCH 43/61] [FIX] Product:delete a product category if it contained
 products previously

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

bzr revid: aag@tinyerp.co.in-20110113113735-ed412zqg9dc1ve0c
---
 addons/product/product.py | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index eabd9494908..0529c217dbe 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -302,7 +302,17 @@ class product_template(osv.osv):
         'loc_case': fields.char('Case', size=16),
         'company_id': fields.many2one('res.company', 'Company',select=1),
     }
-
+    
+    def unlink(self, cr, uid, ids, context=None):
+       temp = self.read(cr, uid, ids,context=context)
+       unlink_ids = []
+       for t in temp:
+           unlink_ids.append(t['id'])
+       osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
+       return True
+    
+    
+  
     def _get_uom_id(self, cr, uid, *args):
         cr.execute('select id from product_uom order by id limit 1')
         res = cr.fetchone()
@@ -482,6 +492,19 @@ class product_product(osv.osv):
         'pricelist_id': fields.dummy(string='Pricelist', relation='product.pricelist', type='many2one'),
         'name_template': fields.related('product_tmpl_id', 'name', string="Name", type='char', size=128, store=True),
     }
+    
+    def unlink(self, cr, uid, ids, context=None):
+        unlink_ids = []
+        unlink_product_tmpl_ids = []
+        for product in self.browse(cr, uid, ids, context=context):
+            tmpl_id = product.product_tmpl_id.id
+            # Check if the product is last product of this template
+            other_product_ids = self.search(cr, uid, [('product_tmpl_id', '=', tmpl_id), ('id', '!=', product.id)], context=context)
+            if not other_product_ids:
+                 unlink_product_tmpl_ids.append(tmpl_id)
+            unlink_ids.append(product.id)
+        self.pool.get('product.template').unlink(cr, uid, unlink_product_tmpl_ids, context=context)
+        return super(product_product, self).unlink(cr, uid, unlink_ids, context=context)
 
     def onchange_uom(self, cursor, user, ids, uom_id,uom_po_id):
         if uom_id and uom_po_id:

From 0d842d2fa276e27d3ce4b76e3223f1bc2cae8145 Mon Sep 17 00:00:00 2001
From: "Alberto Luengo Cabanillas (Pexego)" <>
Date: Thu, 13 Jan 2011 17:19:09 +0530
Subject: [PATCH 44/61] [FIX] hr_timesheet:print reports having employee
 name/surname with accents

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

bzr revid: mtr@mtr-20110113114909-q19c08vax7dxgy1v
---
 addons/hr_timesheet/report/user_timesheet.py  | 4 ++++
 addons/hr_timesheet/report/users_timesheet.py | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/addons/hr_timesheet/report/user_timesheet.py b/addons/hr_timesheet/report/user_timesheet.py
index 4d1d5f428cf..ee324fd3f41 100755
--- a/addons/hr_timesheet/report/user_timesheet.py
+++ b/addons/hr_timesheet/report/user_timesheet.py
@@ -27,6 +27,7 @@ from tools.translate import _
 import time
 import pooler
 from report import report_sxw
+import unicodedata
 
 def lengthmonth(year, month):
     if month == 2 and ((year % 4 == 0) and ((year % 100 != 0) or (year % 400 == 0))):
@@ -49,6 +50,9 @@ class report_custom(report_rml):
         emp_obj = pooler.get_pool(cr.dbname).get('hr.employee')
         user_id = emp_obj.browse(cr, uid, emp_id).user_id.id
         empl_name = emp_obj.browse(cr, uid, emp_id).name
+        if isinstance(empl_name,unicode):
+            empl_name = (unicodedata.normalize('NFKD', unicode(empl_name)).encode('ASCII', 'ignore'))
+
  
         # Computing the dates (start of month: som, and end of month: eom)
         som = datetime.date(data['form']['year'], data['form']['month'], 1)
diff --git a/addons/hr_timesheet/report/users_timesheet.py b/addons/hr_timesheet/report/users_timesheet.py
index e6b366d627a..2ba1c8f314f 100755
--- a/addons/hr_timesheet/report/users_timesheet.py
+++ b/addons/hr_timesheet/report/users_timesheet.py
@@ -26,6 +26,7 @@ import time
 import pooler
 from tools.translate import _
 from report import report_sxw
+import unicodedata
 
 
 def lengthmonth(year, month):
@@ -91,6 +92,9 @@ class report_custom(report_rml):
         for id in data['form']['employee_ids']:
             user = emp_obj.browse(cr, uid, id).user_id.id
             empl_name = emp_obj.browse(cr, uid, id).name
+            if isinstance(empl_name,unicode):
+                empl_name = (unicodedata.normalize('NFKD', unicode(empl_name)).encode('ASCII', 'ignore'))
+
             if user:
                 emp_xml += emp_create_xml(cr, user, som, eom, empl_name)
         # Computing the xml

From 1f9ea3352d637a4acc94a74d49f606024835613e Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Thu, 13 Jan 2011 17:35:50 +0530
Subject: [PATCH 45/61] [FIX]product account: Typo Weigths to weights

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

bzr revid: ron@tinyerp.com-20110113120550-cv0mqjtozy2wcgnm
---
 addons/account/i18n/tr.po       | 2 +-
 addons/product/i18n/ar.po       | 2 +-
 addons/product/i18n/bg.po       | 2 +-
 addons/product/i18n/bs.po       | 2 +-
 addons/product/i18n/ca.po       | 2 +-
 addons/product/i18n/cs.po       | 2 +-
 addons/product/i18n/de.po       | 2 +-
 addons/product/i18n/el.po       | 2 +-
 addons/product/i18n/es.po       | 2 +-
 addons/product/i18n/es_AR.po    | 2 +-
 addons/product/i18n/es_EC.po    | 2 +-
 addons/product/i18n/et.po       | 2 +-
 addons/product/i18n/eu.po       | 2 +-
 addons/product/i18n/fi.po       | 2 +-
 addons/product/i18n/fr.po       | 2 +-
 addons/product/i18n/gl.po       | 2 +-
 addons/product/i18n/hr.po       | 2 +-
 addons/product/i18n/hu.po       | 2 +-
 addons/product/i18n/id.po       | 2 +-
 addons/product/i18n/it.po       | 2 +-
 addons/product/i18n/ko.po       | 2 +-
 addons/product/i18n/lt.po       | 2 +-
 addons/product/i18n/lv.po       | 2 +-
 addons/product/i18n/mn.po       | 2 +-
 addons/product/i18n/nb.po       | 2 +-
 addons/product/i18n/nb_NB.po    | 2 +-
 addons/product/i18n/nl.po       | 2 +-
 addons/product/i18n/nl_BE.po    | 2 +-
 addons/product/i18n/pl.po       | 2 +-
 addons/product/i18n/pt.po       | 2 +-
 addons/product/i18n/pt_BR.po    | 2 +-
 addons/product/i18n/ro.po       | 2 +-
 addons/product/i18n/ru.po       | 2 +-
 addons/product/i18n/sk.po       | 2 +-
 addons/product/i18n/sl.po       | 2 +-
 addons/product/i18n/sq.po       | 2 +-
 addons/product/i18n/sr.po       | 2 +-
 addons/product/i18n/sr@latin.po | 2 +-
 addons/product/i18n/sv.po       | 2 +-
 addons/product/i18n/tlh.po      | 2 +-
 addons/product/i18n/tr.po       | 2 +-
 addons/product/i18n/uk.po       | 2 +-
 addons/product/i18n/vi.po       | 2 +-
 addons/product/i18n/zh_CN.po    | 2 +-
 addons/product/i18n/zh_TW.po    | 2 +-
 addons/product/product_view.xml | 4 ++--
 46 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index 7b23f64bda4..2cb3bca3e12 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@@ -14286,7 +14286,7 @@ msgstr ""
 #~ msgid "Sales Application Configuration"
 #~ msgstr "Sales Application Configuration"
 
-#~ msgid "Weigths"
+#~ msgid "weights"
 #~ msgstr "Ağırlık Bilgisi"
 
 #~ msgid ""
diff --git a/addons/product/i18n/ar.po b/addons/product/i18n/ar.po
index fa4bcafc842..25099c7ab2b 100644
--- a/addons/product/i18n/ar.po
+++ b/addons/product/i18n/ar.po
@@ -1966,7 +1966,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "الأوزان"
 
 #. module: product
diff --git a/addons/product/i18n/bg.po b/addons/product/i18n/bg.po
index 851aba310e0..e6868d020b6 100644
--- a/addons/product/i18n/bg.po
+++ b/addons/product/i18n/bg.po
@@ -1965,7 +1965,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/bs.po b/addons/product/i18n/bs.po
index 307cd6a98fa..fe6cd57bcf4 100644
--- a/addons/product/i18n/bs.po
+++ b/addons/product/i18n/bs.po
@@ -1994,7 +1994,7 @@ msgstr "Kompletan PC sa periferijama"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "Težina"
 
 #. module: product
diff --git a/addons/product/i18n/ca.po b/addons/product/i18n/ca.po
index 90a638bdfe7..e36423d1b6f 100644
--- a/addons/product/i18n/ca.po
+++ b/addons/product/i18n/ca.po
@@ -1997,7 +1997,7 @@ msgstr "PC complert amb perifèrics"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "Pesos"
 
 #. module: product
diff --git a/addons/product/i18n/cs.po b/addons/product/i18n/cs.po
index 8cefdd0b285..aa77bee12a4 100644
--- a/addons/product/i18n/cs.po
+++ b/addons/product/i18n/cs.po
@@ -1965,7 +1965,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/de.po b/addons/product/i18n/de.po
index a692bca6614..c7cfab6e9d3 100644
--- a/addons/product/i18n/de.po
+++ b/addons/product/i18n/de.po
@@ -2127,7 +2127,7 @@ msgstr "Complete PC With Peripherals"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "Gewichte"
 
 #. module: product
diff --git a/addons/product/i18n/el.po b/addons/product/i18n/el.po
index a6cd1f13b25..d938d946b99 100644
--- a/addons/product/i18n/el.po
+++ b/addons/product/i18n/el.po
@@ -2022,7 +2022,7 @@ msgstr "Ολοκληρωμένος Η/Υ με Περιφερειακά"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "Βάρη"
 
 #. module: product
diff --git a/addons/product/i18n/es.po b/addons/product/i18n/es.po
index d7b2a42bfd9..a05ac7004f9 100644
--- a/addons/product/i18n/es.po
+++ b/addons/product/i18n/es.po
@@ -2106,7 +2106,7 @@ msgstr "PC completo con periféricos"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "Pesos"
 
 #. module: product
diff --git a/addons/product/i18n/es_AR.po b/addons/product/i18n/es_AR.po
index c112b20f1c8..cf710ece72c 100644
--- a/addons/product/i18n/es_AR.po
+++ b/addons/product/i18n/es_AR.po
@@ -2000,7 +2000,7 @@ msgstr "PC completo con periféricos"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "Pesos"
 
 #. module: product
diff --git a/addons/product/i18n/es_EC.po b/addons/product/i18n/es_EC.po
index cdc36be8bf2..d416980f361 100644
--- a/addons/product/i18n/es_EC.po
+++ b/addons/product/i18n/es_EC.po
@@ -2002,7 +2002,7 @@ msgstr "PC completo con periféricos"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "Pesos"
 
 #. module: product
diff --git a/addons/product/i18n/et.po b/addons/product/i18n/et.po
index aa0ce0d4f1c..39b7d9a1309 100644
--- a/addons/product/i18n/et.po
+++ b/addons/product/i18n/et.po
@@ -1991,7 +1991,7 @@ msgstr "Täielik PC koos välisseadmetega"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "Kaalud"
 
 #. module: product
diff --git a/addons/product/i18n/eu.po b/addons/product/i18n/eu.po
index d6661b8f15f..7618387412d 100644
--- a/addons/product/i18n/eu.po
+++ b/addons/product/i18n/eu.po
@@ -1968,7 +1968,7 @@ msgstr "PC Osoa Periferikoekin"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "Pisuak"
 
 #. module: product
diff --git a/addons/product/i18n/fi.po b/addons/product/i18n/fi.po
index 26966644b46..5b4264267e0 100644
--- a/addons/product/i18n/fi.po
+++ b/addons/product/i18n/fi.po
@@ -1994,7 +1994,7 @@ msgstr "Kokonainen PC lisälaitteineen"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "Painot"
 
 #. module: product
diff --git a/addons/product/i18n/fr.po b/addons/product/i18n/fr.po
index f273b219b55..0720e537402 100644
--- a/addons/product/i18n/fr.po
+++ b/addons/product/i18n/fr.po
@@ -2068,7 +2068,7 @@ msgstr "PC complet avec périphériques"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "Poids"
 
 #. module: product
diff --git a/addons/product/i18n/gl.po b/addons/product/i18n/gl.po
index 58b24a16c84..4a7487037f2 100644
--- a/addons/product/i18n/gl.po
+++ b/addons/product/i18n/gl.po
@@ -1966,7 +1966,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/hr.po b/addons/product/i18n/hr.po
index e4ef11d4916..23be0ca0462 100644
--- a/addons/product/i18n/hr.po
+++ b/addons/product/i18n/hr.po
@@ -1994,7 +1994,7 @@ msgstr "Računalo s periferijama"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "Težine"
 
 #. module: product
diff --git a/addons/product/i18n/hu.po b/addons/product/i18n/hu.po
index 1700eefeba5..f18485f2d2b 100644
--- a/addons/product/i18n/hu.po
+++ b/addons/product/i18n/hu.po
@@ -1974,7 +1974,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "Súlyok"
 
 #. module: product
diff --git a/addons/product/i18n/id.po b/addons/product/i18n/id.po
index 0bdfd9875ba..fb1eec4292d 100644
--- a/addons/product/i18n/id.po
+++ b/addons/product/i18n/id.po
@@ -1965,7 +1965,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/it.po b/addons/product/i18n/it.po
index d8da0530fed..73c3bb8b0de 100644
--- a/addons/product/i18n/it.po
+++ b/addons/product/i18n/it.po
@@ -2115,7 +2115,7 @@ msgstr "PC Completo con Periferiche"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "Pesi"
 
 #. module: product
diff --git a/addons/product/i18n/ko.po b/addons/product/i18n/ko.po
index e5dd7adcc1b..37f5fd73b1d 100644
--- a/addons/product/i18n/ko.po
+++ b/addons/product/i18n/ko.po
@@ -1970,7 +1970,7 @@ msgstr "주변기기를 갖춘 완전한 PC 세트"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "중량"
 
 #. module: product
diff --git a/addons/product/i18n/lt.po b/addons/product/i18n/lt.po
index 3824ea0fa72..5fef5bc4b5f 100644
--- a/addons/product/i18n/lt.po
+++ b/addons/product/i18n/lt.po
@@ -1991,7 +1991,7 @@ msgstr "Pilnas PK su papildoma įranga"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "Gabenimo matai"
 
 #. module: product
diff --git a/addons/product/i18n/lv.po b/addons/product/i18n/lv.po
index f19d933e2c6..d8f10dafce6 100644
--- a/addons/product/i18n/lv.po
+++ b/addons/product/i18n/lv.po
@@ -1966,7 +1966,7 @@ msgstr "Complete PC With Peripherals"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "Svari"
 
 #. module: product
diff --git a/addons/product/i18n/mn.po b/addons/product/i18n/mn.po
index 646e29a92c5..5236dd35388 100644
--- a/addons/product/i18n/mn.po
+++ b/addons/product/i18n/mn.po
@@ -2024,7 +2024,7 @@ msgstr "Иж бүрэн PC"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "Жин"
 
 #. module: product
diff --git a/addons/product/i18n/nb.po b/addons/product/i18n/nb.po
index 95f072956e3..cc489f171da 100644
--- a/addons/product/i18n/nb.po
+++ b/addons/product/i18n/nb.po
@@ -1968,7 +1968,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "Vekt"
 
 #. module: product
diff --git a/addons/product/i18n/nb_NB.po b/addons/product/i18n/nb_NB.po
index 74e08e40d52..1dff55fcec8 100644
--- a/addons/product/i18n/nb_NB.po
+++ b/addons/product/i18n/nb_NB.po
@@ -235,7 +235,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "Vekt"
 
 #. module: product
diff --git a/addons/product/i18n/nl.po b/addons/product/i18n/nl.po
index a852a92464a..8ff481dc865 100644
--- a/addons/product/i18n/nl.po
+++ b/addons/product/i18n/nl.po
@@ -1998,7 +1998,7 @@ msgstr "Complete PC met randapparatuur"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "Gewichten"
 
 #. module: product
diff --git a/addons/product/i18n/nl_BE.po b/addons/product/i18n/nl_BE.po
index 65823c49f04..0ea237875db 100644
--- a/addons/product/i18n/nl_BE.po
+++ b/addons/product/i18n/nl_BE.po
@@ -1966,7 +1966,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/pl.po b/addons/product/i18n/pl.po
index ba9f04069a3..cc73af55f5d 100644
--- a/addons/product/i18n/pl.po
+++ b/addons/product/i18n/pl.po
@@ -2010,7 +2010,7 @@ msgstr "Kompletny PC z urządzeniami zewnętrznymi"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "Wagi"
 
 #. module: product
diff --git a/addons/product/i18n/pt.po b/addons/product/i18n/pt.po
index cf5395ea460..318fd3fc60a 100644
--- a/addons/product/i18n/pt.po
+++ b/addons/product/i18n/pt.po
@@ -1996,7 +1996,7 @@ msgstr "PC Completo Com Periféricos"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "Pesos"
 
 #. module: product
diff --git a/addons/product/i18n/pt_BR.po b/addons/product/i18n/pt_BR.po
index 028c9788ca1..cc3518b8763 100644
--- a/addons/product/i18n/pt_BR.po
+++ b/addons/product/i18n/pt_BR.po
@@ -2115,7 +2115,7 @@ msgstr "PC Complet com periféricos"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "Pesos"
 
 #. module: product
diff --git a/addons/product/i18n/ro.po b/addons/product/i18n/ro.po
index 5656e6c8395..d4dc22b7c23 100644
--- a/addons/product/i18n/ro.po
+++ b/addons/product/i18n/ro.po
@@ -1967,7 +1967,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/ru.po b/addons/product/i18n/ru.po
index e3c9f452ff8..fd50f3ca905 100644
--- a/addons/product/i18n/ru.po
+++ b/addons/product/i18n/ru.po
@@ -2026,7 +2026,7 @@ msgstr "Комплектовать ПК периферией"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "Вес"
 
 #. module: product
diff --git a/addons/product/i18n/sk.po b/addons/product/i18n/sk.po
index 5470bcdea6d..0979928cd54 100644
--- a/addons/product/i18n/sk.po
+++ b/addons/product/i18n/sk.po
@@ -1999,7 +1999,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "Miery"
 
 #. module: product
diff --git a/addons/product/i18n/sl.po b/addons/product/i18n/sl.po
index f5ca43ab94b..d08de9bb94a 100644
--- a/addons/product/i18n/sl.po
+++ b/addons/product/i18n/sl.po
@@ -1977,7 +1977,7 @@ msgstr "Kompleten PC s perifernimi enotami"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "Teže"
 
 #. module: product
diff --git a/addons/product/i18n/sq.po b/addons/product/i18n/sq.po
index 936f30a13b3..2999a79090a 100644
--- a/addons/product/i18n/sq.po
+++ b/addons/product/i18n/sq.po
@@ -1966,7 +1966,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/sr.po b/addons/product/i18n/sr.po
index afd817dc0a9..92dddfadad7 100644
--- a/addons/product/i18n/sr.po
+++ b/addons/product/i18n/sr.po
@@ -2033,7 +2033,7 @@ msgstr "Kompletan PC sa periferijama"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "Težina"
 
 #. module: product
diff --git a/addons/product/i18n/sr@latin.po b/addons/product/i18n/sr@latin.po
index 8a599fa7a33..c83149948e2 100644
--- a/addons/product/i18n/sr@latin.po
+++ b/addons/product/i18n/sr@latin.po
@@ -2033,7 +2033,7 @@ msgstr "Kompletan PC sa periferijama"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "Težina"
 
 #. module: product
diff --git a/addons/product/i18n/sv.po b/addons/product/i18n/sv.po
index 771b163d24c..1151d77ff35 100644
--- a/addons/product/i18n/sv.po
+++ b/addons/product/i18n/sv.po
@@ -2016,7 +2016,7 @@ msgstr "Komplett dator med periferiutrustning"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "Mått"
 
 #. module: product
diff --git a/addons/product/i18n/tlh.po b/addons/product/i18n/tlh.po
index d2b07d66b6a..99af3825c35 100644
--- a/addons/product/i18n/tlh.po
+++ b/addons/product/i18n/tlh.po
@@ -1965,7 +1965,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/tr.po b/addons/product/i18n/tr.po
index 64e7e16605d..d99566cb87f 100644
--- a/addons/product/i18n/tr.po
+++ b/addons/product/i18n/tr.po
@@ -1985,7 +1985,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "Ağırlık Bilgisi"
 
 #. module: product
diff --git a/addons/product/i18n/uk.po b/addons/product/i18n/uk.po
index c170491f374..99615ba4ad2 100644
--- a/addons/product/i18n/uk.po
+++ b/addons/product/i18n/uk.po
@@ -1970,7 +1970,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/vi.po b/addons/product/i18n/vi.po
index 902f2efcb60..1340e40cccb 100644
--- a/addons/product/i18n/vi.po
+++ b/addons/product/i18n/vi.po
@@ -1996,7 +1996,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "Khối lượng"
 
 #. module: product
diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po
index d217bbc9302..5deed6f5563 100644
--- a/addons/product/i18n/zh_CN.po
+++ b/addons/product/i18n/zh_CN.po
@@ -1971,7 +1971,7 @@ msgstr "完整的电脑外设"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr "重量"
 
 #. module: product
diff --git a/addons/product/i18n/zh_TW.po b/addons/product/i18n/zh_TW.po
index 446e21a58a8..706692ca313 100644
--- a/addons/product/i18n/zh_TW.po
+++ b/addons/product/i18n/zh_TW.po
@@ -1965,7 +1965,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "weights"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 59623a5204e..c663a7305b9 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -101,7 +101,7 @@
                             </group>
 
                             <group colspan="2" col="2" groups="base.group_extended">
-                                <separator string="Weigths" colspan="2"/>
+                                <separator string="weights" colspan="2"/>
                                 <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
                                 <field digits="(14, 3)" name="weight" attrs="{'readonly':[('type','=','service')]}"/>
                                 <field digits="(14, 3)" name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
@@ -567,7 +567,7 @@
                             </group>
 
                             <group colspan="2" col="2" groups="base.group_extended">
-                                <separator string="Weigths" colspan="2"/>
+                                <separator string="weights" colspan="2"/>
                                 <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
                                 <field digits="(14, 3)" name="weight" attrs="{'readonly':[('type','=','service')]}"/>
                                 <field digits="(14, 3)" name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>

From a93a4887452e91fe213a920864769a083fff068f Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Thu, 13 Jan 2011 17:55:32 +0530
Subject: [PATCH 46/61] [IMP]product account: Typo Weigths to Weights:702198

bzr revid: ron@tinyerp.com-20110113122532-wk0otdg48hfoypb1
---
 addons/account/i18n/tr.po       | 2 +-
 addons/product/i18n/ar.po       | 2 +-
 addons/product/i18n/bg.po       | 2 +-
 addons/product/i18n/bs.po       | 2 +-
 addons/product/i18n/ca.po       | 2 +-
 addons/product/i18n/cs.po       | 2 +-
 addons/product/i18n/de.po       | 2 +-
 addons/product/i18n/el.po       | 2 +-
 addons/product/i18n/es.po       | 2 +-
 addons/product/i18n/es_AR.po    | 2 +-
 addons/product/i18n/es_EC.po    | 2 +-
 addons/product/i18n/et.po       | 2 +-
 addons/product/i18n/eu.po       | 2 +-
 addons/product/i18n/fi.po       | 2 +-
 addons/product/i18n/fr.po       | 2 +-
 addons/product/i18n/gl.po       | 2 +-
 addons/product/i18n/hr.po       | 2 +-
 addons/product/i18n/hu.po       | 2 +-
 addons/product/i18n/id.po       | 2 +-
 addons/product/i18n/it.po       | 2 +-
 addons/product/i18n/ko.po       | 2 +-
 addons/product/i18n/lt.po       | 2 +-
 addons/product/i18n/lv.po       | 2 +-
 addons/product/i18n/mn.po       | 2 +-
 addons/product/i18n/nb.po       | 2 +-
 addons/product/i18n/nb_NB.po    | 2 +-
 addons/product/i18n/nl.po       | 2 +-
 addons/product/i18n/nl_BE.po    | 2 +-
 addons/product/i18n/pl.po       | 2 +-
 addons/product/i18n/pt.po       | 2 +-
 addons/product/i18n/pt_BR.po    | 2 +-
 addons/product/i18n/ro.po       | 2 +-
 addons/product/i18n/ru.po       | 2 +-
 addons/product/i18n/sk.po       | 2 +-
 addons/product/i18n/sl.po       | 2 +-
 addons/product/i18n/sq.po       | 2 +-
 addons/product/i18n/sr.po       | 2 +-
 addons/product/i18n/sr@latin.po | 2 +-
 addons/product/i18n/sv.po       | 2 +-
 addons/product/i18n/tlh.po      | 2 +-
 addons/product/i18n/tr.po       | 2 +-
 addons/product/i18n/uk.po       | 2 +-
 addons/product/i18n/vi.po       | 2 +-
 addons/product/i18n/zh_CN.po    | 2 +-
 addons/product/i18n/zh_TW.po    | 2 +-
 addons/product/product_view.xml | 4 ++--
 46 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index 2cb3bca3e12..661c19c991a 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@@ -14286,7 +14286,7 @@ msgstr ""
 #~ msgid "Sales Application Configuration"
 #~ msgstr "Sales Application Configuration"
 
-#~ msgid "weights"
+#~ msgid "Weights"
 #~ msgstr "Ağırlık Bilgisi"
 
 #~ msgid ""
diff --git a/addons/product/i18n/ar.po b/addons/product/i18n/ar.po
index 25099c7ab2b..0b9773650e1 100644
--- a/addons/product/i18n/ar.po
+++ b/addons/product/i18n/ar.po
@@ -1966,7 +1966,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "الأوزان"
 
 #. module: product
diff --git a/addons/product/i18n/bg.po b/addons/product/i18n/bg.po
index e6868d020b6..8cb73c30237 100644
--- a/addons/product/i18n/bg.po
+++ b/addons/product/i18n/bg.po
@@ -1965,7 +1965,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/bs.po b/addons/product/i18n/bs.po
index fe6cd57bcf4..fc91f6699eb 100644
--- a/addons/product/i18n/bs.po
+++ b/addons/product/i18n/bs.po
@@ -1994,7 +1994,7 @@ msgstr "Kompletan PC sa periferijama"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "Težina"
 
 #. module: product
diff --git a/addons/product/i18n/ca.po b/addons/product/i18n/ca.po
index e36423d1b6f..f667ff14c8b 100644
--- a/addons/product/i18n/ca.po
+++ b/addons/product/i18n/ca.po
@@ -1997,7 +1997,7 @@ msgstr "PC complert amb perifèrics"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "Pesos"
 
 #. module: product
diff --git a/addons/product/i18n/cs.po b/addons/product/i18n/cs.po
index aa77bee12a4..affc497d898 100644
--- a/addons/product/i18n/cs.po
+++ b/addons/product/i18n/cs.po
@@ -1965,7 +1965,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/de.po b/addons/product/i18n/de.po
index c7cfab6e9d3..b76b368ee7d 100644
--- a/addons/product/i18n/de.po
+++ b/addons/product/i18n/de.po
@@ -2127,7 +2127,7 @@ msgstr "Complete PC With Peripherals"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "Gewichte"
 
 #. module: product
diff --git a/addons/product/i18n/el.po b/addons/product/i18n/el.po
index d938d946b99..c1be9c0fecf 100644
--- a/addons/product/i18n/el.po
+++ b/addons/product/i18n/el.po
@@ -2022,7 +2022,7 @@ msgstr "Ολοκληρωμένος Η/Υ με Περιφερειακά"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "Βάρη"
 
 #. module: product
diff --git a/addons/product/i18n/es.po b/addons/product/i18n/es.po
index a05ac7004f9..6de2e56166c 100644
--- a/addons/product/i18n/es.po
+++ b/addons/product/i18n/es.po
@@ -2106,7 +2106,7 @@ msgstr "PC completo con periféricos"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "Pesos"
 
 #. module: product
diff --git a/addons/product/i18n/es_AR.po b/addons/product/i18n/es_AR.po
index cf710ece72c..c2f0307c7f9 100644
--- a/addons/product/i18n/es_AR.po
+++ b/addons/product/i18n/es_AR.po
@@ -2000,7 +2000,7 @@ msgstr "PC completo con periféricos"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "Pesos"
 
 #. module: product
diff --git a/addons/product/i18n/es_EC.po b/addons/product/i18n/es_EC.po
index d416980f361..569303bf317 100644
--- a/addons/product/i18n/es_EC.po
+++ b/addons/product/i18n/es_EC.po
@@ -2002,7 +2002,7 @@ msgstr "PC completo con periféricos"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "Pesos"
 
 #. module: product
diff --git a/addons/product/i18n/et.po b/addons/product/i18n/et.po
index 39b7d9a1309..77203acb95b 100644
--- a/addons/product/i18n/et.po
+++ b/addons/product/i18n/et.po
@@ -1991,7 +1991,7 @@ msgstr "Täielik PC koos välisseadmetega"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "Kaalud"
 
 #. module: product
diff --git a/addons/product/i18n/eu.po b/addons/product/i18n/eu.po
index 7618387412d..9bc0dc31e35 100644
--- a/addons/product/i18n/eu.po
+++ b/addons/product/i18n/eu.po
@@ -1968,7 +1968,7 @@ msgstr "PC Osoa Periferikoekin"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "Pisuak"
 
 #. module: product
diff --git a/addons/product/i18n/fi.po b/addons/product/i18n/fi.po
index 5b4264267e0..1b020a1fbef 100644
--- a/addons/product/i18n/fi.po
+++ b/addons/product/i18n/fi.po
@@ -1994,7 +1994,7 @@ msgstr "Kokonainen PC lisälaitteineen"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "Painot"
 
 #. module: product
diff --git a/addons/product/i18n/fr.po b/addons/product/i18n/fr.po
index 0720e537402..d7ab330377a 100644
--- a/addons/product/i18n/fr.po
+++ b/addons/product/i18n/fr.po
@@ -2068,7 +2068,7 @@ msgstr "PC complet avec périphériques"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "Poids"
 
 #. module: product
diff --git a/addons/product/i18n/gl.po b/addons/product/i18n/gl.po
index 4a7487037f2..e4bc8c92c7e 100644
--- a/addons/product/i18n/gl.po
+++ b/addons/product/i18n/gl.po
@@ -1966,7 +1966,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/hr.po b/addons/product/i18n/hr.po
index 23be0ca0462..93548a11257 100644
--- a/addons/product/i18n/hr.po
+++ b/addons/product/i18n/hr.po
@@ -1994,7 +1994,7 @@ msgstr "Računalo s periferijama"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "Težine"
 
 #. module: product
diff --git a/addons/product/i18n/hu.po b/addons/product/i18n/hu.po
index f18485f2d2b..d819fbfd872 100644
--- a/addons/product/i18n/hu.po
+++ b/addons/product/i18n/hu.po
@@ -1974,7 +1974,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "Súlyok"
 
 #. module: product
diff --git a/addons/product/i18n/id.po b/addons/product/i18n/id.po
index fb1eec4292d..1237ab5f569 100644
--- a/addons/product/i18n/id.po
+++ b/addons/product/i18n/id.po
@@ -1965,7 +1965,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/it.po b/addons/product/i18n/it.po
index 73c3bb8b0de..4d9499b25f4 100644
--- a/addons/product/i18n/it.po
+++ b/addons/product/i18n/it.po
@@ -2115,7 +2115,7 @@ msgstr "PC Completo con Periferiche"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "Pesi"
 
 #. module: product
diff --git a/addons/product/i18n/ko.po b/addons/product/i18n/ko.po
index 37f5fd73b1d..280de9fdb62 100644
--- a/addons/product/i18n/ko.po
+++ b/addons/product/i18n/ko.po
@@ -1970,7 +1970,7 @@ msgstr "주변기기를 갖춘 완전한 PC 세트"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "중량"
 
 #. module: product
diff --git a/addons/product/i18n/lt.po b/addons/product/i18n/lt.po
index 5fef5bc4b5f..35bd7e16ca3 100644
--- a/addons/product/i18n/lt.po
+++ b/addons/product/i18n/lt.po
@@ -1991,7 +1991,7 @@ msgstr "Pilnas PK su papildoma įranga"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "Gabenimo matai"
 
 #. module: product
diff --git a/addons/product/i18n/lv.po b/addons/product/i18n/lv.po
index d8f10dafce6..453b59eaba8 100644
--- a/addons/product/i18n/lv.po
+++ b/addons/product/i18n/lv.po
@@ -1966,7 +1966,7 @@ msgstr "Complete PC With Peripherals"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "Svari"
 
 #. module: product
diff --git a/addons/product/i18n/mn.po b/addons/product/i18n/mn.po
index 5236dd35388..472cbaf64c6 100644
--- a/addons/product/i18n/mn.po
+++ b/addons/product/i18n/mn.po
@@ -2024,7 +2024,7 @@ msgstr "Иж бүрэн PC"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "Жин"
 
 #. module: product
diff --git a/addons/product/i18n/nb.po b/addons/product/i18n/nb.po
index cc489f171da..e18d7fb092f 100644
--- a/addons/product/i18n/nb.po
+++ b/addons/product/i18n/nb.po
@@ -1968,7 +1968,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "Vekt"
 
 #. module: product
diff --git a/addons/product/i18n/nb_NB.po b/addons/product/i18n/nb_NB.po
index 1dff55fcec8..1622d88f5af 100644
--- a/addons/product/i18n/nb_NB.po
+++ b/addons/product/i18n/nb_NB.po
@@ -235,7 +235,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "Vekt"
 
 #. module: product
diff --git a/addons/product/i18n/nl.po b/addons/product/i18n/nl.po
index 8ff481dc865..1943000b7ee 100644
--- a/addons/product/i18n/nl.po
+++ b/addons/product/i18n/nl.po
@@ -1998,7 +1998,7 @@ msgstr "Complete PC met randapparatuur"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "Gewichten"
 
 #. module: product
diff --git a/addons/product/i18n/nl_BE.po b/addons/product/i18n/nl_BE.po
index 0ea237875db..4d47852cf7b 100644
--- a/addons/product/i18n/nl_BE.po
+++ b/addons/product/i18n/nl_BE.po
@@ -1966,7 +1966,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/pl.po b/addons/product/i18n/pl.po
index cc73af55f5d..36d7426d103 100644
--- a/addons/product/i18n/pl.po
+++ b/addons/product/i18n/pl.po
@@ -2010,7 +2010,7 @@ msgstr "Kompletny PC z urządzeniami zewnętrznymi"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "Wagi"
 
 #. module: product
diff --git a/addons/product/i18n/pt.po b/addons/product/i18n/pt.po
index 318fd3fc60a..06621b2cc9a 100644
--- a/addons/product/i18n/pt.po
+++ b/addons/product/i18n/pt.po
@@ -1996,7 +1996,7 @@ msgstr "PC Completo Com Periféricos"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "Pesos"
 
 #. module: product
diff --git a/addons/product/i18n/pt_BR.po b/addons/product/i18n/pt_BR.po
index cc3518b8763..4353f869c91 100644
--- a/addons/product/i18n/pt_BR.po
+++ b/addons/product/i18n/pt_BR.po
@@ -2115,7 +2115,7 @@ msgstr "PC Complet com periféricos"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "Pesos"
 
 #. module: product
diff --git a/addons/product/i18n/ro.po b/addons/product/i18n/ro.po
index d4dc22b7c23..78b6ba37a73 100644
--- a/addons/product/i18n/ro.po
+++ b/addons/product/i18n/ro.po
@@ -1967,7 +1967,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/ru.po b/addons/product/i18n/ru.po
index fd50f3ca905..12c7f25fdc2 100644
--- a/addons/product/i18n/ru.po
+++ b/addons/product/i18n/ru.po
@@ -2026,7 +2026,7 @@ msgstr "Комплектовать ПК периферией"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "Вес"
 
 #. module: product
diff --git a/addons/product/i18n/sk.po b/addons/product/i18n/sk.po
index 0979928cd54..ac280c6757a 100644
--- a/addons/product/i18n/sk.po
+++ b/addons/product/i18n/sk.po
@@ -1999,7 +1999,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "Miery"
 
 #. module: product
diff --git a/addons/product/i18n/sl.po b/addons/product/i18n/sl.po
index d08de9bb94a..80df5ef764f 100644
--- a/addons/product/i18n/sl.po
+++ b/addons/product/i18n/sl.po
@@ -1977,7 +1977,7 @@ msgstr "Kompleten PC s perifernimi enotami"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "Teže"
 
 #. module: product
diff --git a/addons/product/i18n/sq.po b/addons/product/i18n/sq.po
index 2999a79090a..9403edd8594 100644
--- a/addons/product/i18n/sq.po
+++ b/addons/product/i18n/sq.po
@@ -1966,7 +1966,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/sr.po b/addons/product/i18n/sr.po
index 92dddfadad7..15978e226bf 100644
--- a/addons/product/i18n/sr.po
+++ b/addons/product/i18n/sr.po
@@ -2033,7 +2033,7 @@ msgstr "Kompletan PC sa periferijama"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "Težina"
 
 #. module: product
diff --git a/addons/product/i18n/sr@latin.po b/addons/product/i18n/sr@latin.po
index c83149948e2..65c76fa6aa7 100644
--- a/addons/product/i18n/sr@latin.po
+++ b/addons/product/i18n/sr@latin.po
@@ -2033,7 +2033,7 @@ msgstr "Kompletan PC sa periferijama"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "Težina"
 
 #. module: product
diff --git a/addons/product/i18n/sv.po b/addons/product/i18n/sv.po
index 1151d77ff35..dea3f6fea1a 100644
--- a/addons/product/i18n/sv.po
+++ b/addons/product/i18n/sv.po
@@ -2016,7 +2016,7 @@ msgstr "Komplett dator med periferiutrustning"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "Mått"
 
 #. module: product
diff --git a/addons/product/i18n/tlh.po b/addons/product/i18n/tlh.po
index 99af3825c35..356ba8d3854 100644
--- a/addons/product/i18n/tlh.po
+++ b/addons/product/i18n/tlh.po
@@ -1965,7 +1965,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/tr.po b/addons/product/i18n/tr.po
index d99566cb87f..30677eb03f1 100644
--- a/addons/product/i18n/tr.po
+++ b/addons/product/i18n/tr.po
@@ -1985,7 +1985,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "Ağırlık Bilgisi"
 
 #. module: product
diff --git a/addons/product/i18n/uk.po b/addons/product/i18n/uk.po
index 99615ba4ad2..1de1af31f22 100644
--- a/addons/product/i18n/uk.po
+++ b/addons/product/i18n/uk.po
@@ -1970,7 +1970,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/vi.po b/addons/product/i18n/vi.po
index 1340e40cccb..6250a5cccc4 100644
--- a/addons/product/i18n/vi.po
+++ b/addons/product/i18n/vi.po
@@ -1996,7 +1996,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "Khối lượng"
 
 #. module: product
diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po
index 5deed6f5563..db170ba2bb4 100644
--- a/addons/product/i18n/zh_CN.po
+++ b/addons/product/i18n/zh_CN.po
@@ -1971,7 +1971,7 @@ msgstr "完整的电脑外设"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr "重量"
 
 #. module: product
diff --git a/addons/product/i18n/zh_TW.po b/addons/product/i18n/zh_TW.po
index 706692ca313..a9cb86c1d1c 100644
--- a/addons/product/i18n/zh_TW.po
+++ b/addons/product/i18n/zh_TW.po
@@ -1965,7 +1965,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "weights"
+msgid "Weights"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index c663a7305b9..83240716715 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -101,7 +101,7 @@
                             </group>
 
                             <group colspan="2" col="2" groups="base.group_extended">
-                                <separator string="weights" colspan="2"/>
+                                <separator string="Weights" colspan="2"/>
                                 <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
                                 <field digits="(14, 3)" name="weight" attrs="{'readonly':[('type','=','service')]}"/>
                                 <field digits="(14, 3)" name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
@@ -567,7 +567,7 @@
                             </group>
 
                             <group colspan="2" col="2" groups="base.group_extended">
-                                <separator string="weights" colspan="2"/>
+                                <separator string="Weights" colspan="2"/>
                                 <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
                                 <field digits="(14, 3)" name="weight" attrs="{'readonly':[('type','=','service')]}"/>
                                 <field digits="(14, 3)" name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>

From 2d17e1ee573449f2dc452b271fa49a8e0bcf0412 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 13 Jan 2011 18:44:33 +0530
Subject: [PATCH 47/61] [IMP]: stock: when scrapping some stock move, if the
 source location is virtual, and if the destination isn't, take the
 destination location instead of the source as source for the scrapped move

bzr revid: rpa@tinyerp.com-20110113131433-ya5q5ldwrx3jgnra
---
 addons/stock/stock.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 68b6edb5f8d..62e24a3f80a 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2221,6 +2221,8 @@ class stock_move(osv.osv):
                 'tracking_id': move.tracking_id.id,
                 'prodlot_id': move.prodlot_id.id,
             }
+            if move.location_id.usage <> 'internal':
+                default_val.update({'location_id': move.location_dest_id.id})
             new_move = self.copy(cr, uid, move.id, default_val)
 
             res += [new_move]

From d24d1f6a4512cacaae28be4e87a27ae6321764c0 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Mon, 17 Jan 2011 10:43:37 +0530
Subject: [PATCH 48/61] [IMP] hr_timesheet: uncommit the changes made for Bug
 #695960

bzr revid: mtr@mtr-20110117051337-9ge2j1n6waoodvqm
---
 addons/hr_timesheet/report/user_timesheet.py  | 3 ---
 addons/hr_timesheet/report/users_timesheet.py | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/addons/hr_timesheet/report/user_timesheet.py b/addons/hr_timesheet/report/user_timesheet.py
index ee324fd3f41..fe1d4d3ded5 100755
--- a/addons/hr_timesheet/report/user_timesheet.py
+++ b/addons/hr_timesheet/report/user_timesheet.py
@@ -27,7 +27,6 @@ from tools.translate import _
 import time
 import pooler
 from report import report_sxw
-import unicodedata
 
 def lengthmonth(year, month):
     if month == 2 and ((year % 4 == 0) and ((year % 100 != 0) or (year % 400 == 0))):
@@ -50,8 +49,6 @@ class report_custom(report_rml):
         emp_obj = pooler.get_pool(cr.dbname).get('hr.employee')
         user_id = emp_obj.browse(cr, uid, emp_id).user_id.id
         empl_name = emp_obj.browse(cr, uid, emp_id).name
-        if isinstance(empl_name,unicode):
-            empl_name = (unicodedata.normalize('NFKD', unicode(empl_name)).encode('ASCII', 'ignore'))
 
  
         # Computing the dates (start of month: som, and end of month: eom)
diff --git a/addons/hr_timesheet/report/users_timesheet.py b/addons/hr_timesheet/report/users_timesheet.py
index 2ba1c8f314f..2e0082e05df 100755
--- a/addons/hr_timesheet/report/users_timesheet.py
+++ b/addons/hr_timesheet/report/users_timesheet.py
@@ -26,7 +26,6 @@ import time
 import pooler
 from tools.translate import _
 from report import report_sxw
-import unicodedata
 
 
 def lengthmonth(year, month):
@@ -92,8 +91,6 @@ class report_custom(report_rml):
         for id in data['form']['employee_ids']:
             user = emp_obj.browse(cr, uid, id).user_id.id
             empl_name = emp_obj.browse(cr, uid, id).name
-            if isinstance(empl_name,unicode):
-                empl_name = (unicodedata.normalize('NFKD', unicode(empl_name)).encode('ASCII', 'ignore'))
 
             if user:
                 emp_xml += emp_create_xml(cr, user, som, eom, empl_name)

From 028530f9eb56f01f4e2e932a09f777656802aa97 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Mon, 17 Jan 2011 14:15:37 +0530
Subject: [PATCH 49/61] [FIX] hr_attendance,hr_expense,hr_holidays: added
 'ir.rule' for group 'Employee'

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

bzr revid: mtr@mtr-20110117084537-jrsy3wg68io8z8e8
---
 addons/hr_attendance/security/ir_rule.xml | 6 ++++++
 addons/hr_expense/security/ir_rule.xml    | 6 ++++++
 addons/hr_holidays/security/ir_rule.xml   | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/addons/hr_attendance/security/ir_rule.xml b/addons/hr_attendance/security/ir_rule.xml
index 5f93aa2a4fd..92534da7dc0 100755
--- a/addons/hr_attendance/security/ir_rule.xml
+++ b/addons/hr_attendance/security/ir_rule.xml
@@ -14,6 +14,12 @@
             <field name="domain_force">[(1,'=',1)]</field>
             <field name="groups" eval="[(4,ref('base.group_hr_manager'))]"/>
         </record>
+        <record id="property_rule_attendace_employee" model="ir.rule">
+            <field name="name">Employee Attendance</field>
+            <field model="ir.model" name="model_id" ref="model_hr_attendance"/>
+            <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
+            <field name="groups" eval="[(4,ref('base.group_user'))]"/>
+        </record>
 
 
     </data>
diff --git a/addons/hr_expense/security/ir_rule.xml b/addons/hr_expense/security/ir_rule.xml
index 4807cf38465..292db38bf5e 100755
--- a/addons/hr_expense/security/ir_rule.xml
+++ b/addons/hr_expense/security/ir_rule.xml
@@ -14,6 +14,12 @@
             <field name="domain_force">[(1,'=',1)]</field>
             <field name="groups" eval="[(4,ref('base.group_hr_manager'))]"/>
         </record>
+        <record id="property_rule_expense_employee" model="ir.rule">
+            <field name="name">Employee Expense</field>
+            <field model="ir.model" name="model_id" ref="model_hr_expense_expense"/>
+            <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
+            <field name="groups" eval="[(4,ref('base.group_user'))]"/>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/hr_holidays/security/ir_rule.xml b/addons/hr_holidays/security/ir_rule.xml
index cbb425fa103..9a56336dcdc 100755
--- a/addons/hr_holidays/security/ir_rule.xml
+++ b/addons/hr_holidays/security/ir_rule.xml
@@ -14,6 +14,12 @@
         <field name="domain_force">[(1,'=',1)]</field>
         <field name="groups" eval="[(6,0,[ref('base.group_hr_manager')])]"/>
     </record>
+    <record id="property_rule_holidays_employee" model="ir.rule">
+        <field name="name">Employee Holidays</field>
+        <field model="ir.model" name="model_id" ref="model_hr_holidays"/>
+        <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
+        <field name="groups" eval="[(4,ref('base.group_user'))]"/>
+    </record>
 
   </data>
 </openerp>

From de9b76381c10a832eec8c0a34251013d7feafc4e Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Mon, 17 Jan 2011 14:29:02 +0530
Subject: [PATCH 50/61] [FIX] account_analytic_analysis: Installing
 account_analytic_analysis you have a maximu of 2147 analytic accounts

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

bzr revid: psi@tinyerp.co.in-20110117085902-olq2k7950948uetd
---
 addons/account_analytic_analysis/account_analytic_analysis.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 01c34459289..8c35b9924e5 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -628,7 +628,7 @@ class account_analytic_account_summary_month(osv.osv):
         tools.sql.drop_view_if_exists(cr, 'account_analytic_analysis_summary_month')
         cr.execute('CREATE VIEW account_analytic_analysis_summary_month AS (' \
                 'SELECT ' \
-                    '(TO_NUMBER(TO_CHAR(d.month, \'YYYYMM\'), \'999999\') + (d.account_id  * 1000000))::integer AS id, ' \
+                    '(TO_NUMBER(TO_CHAR(d.month, \'YYYYMM\'), \'999999\') + (d.account_id  * 1000000::bigint))::bigint AS id, ' \
                     'd.account_id AS account_id, ' \
                     'TO_CHAR(d.month, \'Mon YYYY\') AS month, ' \
                     'TO_NUMBER(TO_CHAR(d.month, \'YYYYMM\'), \'999999\') AS month_id, ' \

From 60acda996519419e176f7ff18380a8f4de6e6b42 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Mon, 17 Jan 2011 14:56:04 +0530
Subject: [PATCH 51/61] [IMP] hr_timesheet: removed the extra space

bzr revid: mtr@mtr-20110117092604-sy4hkiugo3prx3pe
---
 addons/hr_timesheet/report/user_timesheet.py  | 1 -
 addons/hr_timesheet/report/users_timesheet.py | 1 -
 2 files changed, 2 deletions(-)

diff --git a/addons/hr_timesheet/report/user_timesheet.py b/addons/hr_timesheet/report/user_timesheet.py
index fe1d4d3ded5..25a389639e6 100755
--- a/addons/hr_timesheet/report/user_timesheet.py
+++ b/addons/hr_timesheet/report/user_timesheet.py
@@ -50,7 +50,6 @@ class report_custom(report_rml):
         user_id = emp_obj.browse(cr, uid, emp_id).user_id.id
         empl_name = emp_obj.browse(cr, uid, emp_id).name
 
- 
         # Computing the dates (start of month: som, and end of month: eom)
         som = datetime.date(data['form']['year'], data['form']['month'], 1)
         eom = som + datetime.timedelta(lengthmonth(som.year, som.month))
diff --git a/addons/hr_timesheet/report/users_timesheet.py b/addons/hr_timesheet/report/users_timesheet.py
index 2e0082e05df..e6b366d627a 100755
--- a/addons/hr_timesheet/report/users_timesheet.py
+++ b/addons/hr_timesheet/report/users_timesheet.py
@@ -91,7 +91,6 @@ class report_custom(report_rml):
         for id in data['form']['employee_ids']:
             user = emp_obj.browse(cr, uid, id).user_id.id
             empl_name = emp_obj.browse(cr, uid, id).name
-
             if user:
                 emp_xml += emp_create_xml(cr, user, som, eom, empl_name)
         # Computing the xml

From 00683a79af4c0dce838f47b7d5ac7ba05f3bb5d6 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Mon, 17 Jan 2011 15:06:44 +0530
Subject: [PATCH 52/61] [IMP] hr_timesheet:again removed extra space

bzr revid: mtr@mtr-20110117093644-692ixf9oxk0jkn4i
---
 addons/hr_timesheet/report/user_timesheet.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/hr_timesheet/report/user_timesheet.py b/addons/hr_timesheet/report/user_timesheet.py
index 25a389639e6..e177fc189cc 100755
--- a/addons/hr_timesheet/report/user_timesheet.py
+++ b/addons/hr_timesheet/report/user_timesheet.py
@@ -49,7 +49,6 @@ class report_custom(report_rml):
         emp_obj = pooler.get_pool(cr.dbname).get('hr.employee')
         user_id = emp_obj.browse(cr, uid, emp_id).user_id.id
         empl_name = emp_obj.browse(cr, uid, emp_id).name
-
         # Computing the dates (start of month: som, and end of month: eom)
         som = datetime.date(data['form']['year'], data['form']['month'], 1)
         eom = som + datetime.timedelta(lengthmonth(som.year, som.month))

From bfea6901f16f1203f7bf6ac168d74a2037cf2869 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Mon, 17 Jan 2011 15:13:53 +0530
Subject: [PATCH 53/61] [IMP] hr_timesheet:added space(Enter)

bzr revid: mtr@mtr-20110117094353-1eaz08p2ckgmjquo
---
 addons/hr_timesheet/report/user_timesheet.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr_timesheet/report/user_timesheet.py b/addons/hr_timesheet/report/user_timesheet.py
index e177fc189cc..25a389639e6 100755
--- a/addons/hr_timesheet/report/user_timesheet.py
+++ b/addons/hr_timesheet/report/user_timesheet.py
@@ -49,6 +49,7 @@ class report_custom(report_rml):
         emp_obj = pooler.get_pool(cr.dbname).get('hr.employee')
         user_id = emp_obj.browse(cr, uid, emp_id).user_id.id
         empl_name = emp_obj.browse(cr, uid, emp_id).name
+
         # Computing the dates (start of month: som, and end of month: eom)
         som = datetime.date(data['form']['year'], data['form']['month'], 1)
         eom = som + datetime.timedelta(lengthmonth(som.year, som.month))

From 814c4af299192cb34ae6aec81aad8fc963ba8d44 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <xrg@hellug.gr>
Date: Mon, 17 Jan 2011 10:47:50 +0100
Subject: [PATCH 54/61] [FIX] osv: _constraints can be inherited by redefining
 a constraint with the same name

Indeed, when we define an expression like

class bar(osv.osv):
  _inherit = 'bar.bar'

  def _check_foo(self, cr, uid, ids, context):
      return True

  _constraints = [ (_check_foo, "Foo failed!", ['foo']) ]

... it means that _check_foo will be passed as an *object* to the model's
structure of _constraints. Therefore, it would be unequal and just append
the list of any existing constraints. So, an older (_check_foo, , ['foo'])
would always remain active using the previous code. This has to do with
the _check_foo being an unbound (ie. not inheritable) function.

Now, we check the /string name/ of the function, too. We say that if the
inherited class's constraint function has the same name "_check_foo", the
old ones shall be replaced.

Note: this MAY introduce unpredictable results, if several modules try
to override the same inherited constraint. There is no guaranteed order
of inheritance. Please avoid using this feature unless necessary.

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

bzr revid: odo@openerp.com-20110117094750-4lyzx165f1z1zgl4
---
 bin/osv/osv.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bin/osv/osv.py b/bin/osv/osv.py
index 5a798e7dcaf..138e8c8daab 100644
--- a/bin/osv/osv.py
+++ b/bin/osv/osv.py
@@ -340,7 +340,12 @@ class osv(osv_base, orm.orm):
                                 exist = False
                                 for c2 in range(len(new)):
                                      #For _constraints, we should check field and methods as well
-                                     if new[c2][2]==c[2] and new[c2][0]==c[0]:
+                                     if new[c2][2]==c[2] and (new[c2][0] == c[0] \
+                                            or getattr(new[c2][0],'__name__', True) == \
+                                                getattr(c[0],'__name__', False)):
+                                        # If new class defines a constraint with
+                                        # same function name, we let it override
+                                        # the old one.
                                         new[c2] = c
                                         exist = True
                                         break

From f2784aecc5f60d3e06df8826747434db66bead52 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Mon, 17 Jan 2011 10:58:36 +0100
Subject: [PATCH 55/61] [FIX] stock: removed required=True on prodlot field of
 update stock wizard, in its definition in the .py file

bzr revid: qdp-launchpad@tinyerp.com-20110117095836-518n6w73qodqrl8o
---
 addons/stock/wizard/stock_change_product_qty.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/wizard/stock_change_product_qty.py b/addons/stock/wizard/stock_change_product_qty.py
index d2b9a2a5eb8..c22ade231be 100644
--- a/addons/stock/wizard/stock_change_product_qty.py
+++ b/addons/stock/wizard/stock_change_product_qty.py
@@ -28,7 +28,7 @@ class stock_change_product_qty(osv.osv_memory):
     _columns = {
         'product_id' : fields.many2one('product.product', 'Product'),
         'new_quantity': fields.float('Quantity', required=True, help='This quantity is expressed in the Default UoM of the product.'),
-        'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot', required=True,domain="[('product_id','=',product_id)]"),
+        'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot', domain="[('product_id','=',product_id)]"),
         'location_id': fields.many2one('stock.location', 'Location', required=True, domain="[('usage', '=', 'internal')]"),
     }
 

From f28ed0026421ca5293f1dc867266a9596dc41bc8 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Mon, 17 Jan 2011 11:01:22 +0100
Subject: [PATCH 56/61] [REF] mrp_repair, stock: small code refactoring

bzr revid: qdp-launchpad@tinyerp.com-20110117100122-gson7kged6atppnb
---
 addons/mrp_repair/mrp_repair.py              |  2 +-
 addons/stock/stock.py                        | 18 +++++++++---------
 addons/stock/wizard/stock_partial_picking.py |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 7bc2de4b285..bedaa22b433 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -330,7 +330,7 @@ class mrp_repair(osv.osv):
                 for line in o.operations:
                     if line.product_id.track_production and not line.prodlot_id:
                         raise osv.except_osv(_('Warning'), _("Production lot is required for opration line with product '%s'") % (line.product_id.name))
-                    mrp_line_obj.write(cr, uid, [line.id], {'state': 'confirmed'})
+                mrp_line_obj.write(cr, uid, [l.id for l in o.operations], {'state': 'confirmed'})
         return True
 
     def action_cancel(self, cr, uid, ids, context=None):
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 248a32a5fb7..ffafaf90d0c 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2582,6 +2582,15 @@ class stock_inventory(osv.osv):
             self.write(cr, uid, [inv.id], {'state': 'confirm', 'move_ids': [(6, 0, move_ids)]})
         return True
 
+    def action_cancel_draft(self, cr, uid, ids, context=None):
+        """ Cancels the stock move and change inventory state to draft.
+        @return: True
+        """
+        for inv in self.browse(cr, uid, ids, context=context):
+            self.pool.get('stock.move').action_cancel(cr, uid, [x.id for x in inv.move_ids], context=context)
+            self.write(cr, uid, [inv.id], {'state':'draft'}, context=context)
+        return True
+
     def action_cancel_inventary(self, cr, uid, ids, context=None):
         """ Cancels both stock move and inventory
         @return: True
@@ -2602,15 +2611,6 @@ class stock_inventory(osv.osv):
             self.write(cr, uid, [inv.id], {'state': 'cancel'}, context=context)
         return True
 
-    def action_cancel_draft(self, cr, uid, ids, context=None):
-        """ Cancels the stock move and change inventory state to draft.
-        @return: True
-        """
-        for inv in self.browse(cr, uid, ids, context=context):
-            self.pool.get('stock.move').action_cancel(cr, uid, [x.id for x in inv.move_ids], context=context)
-            self.write(cr, uid, [inv.id], {'state':'draft'}, context=context)
-        return True
-
 stock_inventory()
 
 class stock_inventory_line(osv.osv):
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 52c923a931c..5d15b3715bd 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -28,9 +28,9 @@ class stock_partial_picking(osv.osv_memory):
     _name = "stock.partial.picking"
     _description = "Partial Picking"
     _columns = {
-        'date': fields.datetime('Date', required=True), 
-        'product_moves_out' : fields.one2many('stock.move.memory.out', 'wizard_id', 'Moves'), 
-        'product_moves_in' : fields.one2many('stock.move.memory.in', 'wizard_id', 'Moves'), 
+        'date': fields.datetime('Date', required=True),
+        'product_moves_out' : fields.one2many('stock.move.memory.out', 'wizard_id', 'Moves'),
+        'product_moves_in' : fields.one2many('stock.move.memory.in', 'wizard_id', 'Moves'),
      }
     
     def get_picking_type(self, cr, uid, picking, context=None):

From 5b2e2371ca3b72c451d8d7aeb441147d768c616d Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 17 Jan 2011 11:04:48 +0100
Subject: [PATCH 57/61] [FIX] res.partner: reverted incorrect patch for
 Addresses action, until a proper fix is done

Reverted revision: 3152.1.1  fde@openerp.com-20101222154236-vpuqk0ou0svugwkg

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

bzr revid: odo@openerp.com-20110117100448-eba1mhz3gt45mu69
---
 bin/addons/base/res/partner/partner_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 8c949a7f410..cf1d36cbaec 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -108,7 +108,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.partner.address</field>
             <field name="view_type">form</field>
-            <field name="context">{"search_default_customer":1,"search_default_partner_id":self}</field>
+            <field name="context">{"search_default_customer":1}</field>
             <field name="search_view_id" ref="view_res_partner_address_filter"/>
             <field name="help">Customers (also called Partners in other areas of the system) helps you manage your address book of companies whether they are prospects, customers and/or suppliers. The partner form allows you to track and record all the necessary information to interact with your partners from the company address to their contacts as well as pricelists, and much more. If you installed the CRM, with the history tab, you can track all the interactions with a partner such as opportunities, emails, or sales orders issued.</field>
         </record>

From f422e1be8a7cb16c12de7f4477c9ff709d60f488 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Mon, 17 Jan 2011 16:36:45 +0530
Subject: [PATCH 58/61] [FIX] hr: added domain on 'Home Address' of Employee

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

bzr revid: mtr@mtr-20110117110645-d8n0jg3gp45wle9v
---
 addons/hr/hr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index e2b9a7089f3..9f75082ab8c 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -146,7 +146,7 @@ class hr_employee(osv.osv):
         'marital': fields.many2one('hr.employee.marital.status', 'Marital Status'),
         'department_id':fields.many2one('hr.department', 'Department'),
         'address_id': fields.many2one('res.partner.address', 'Working Address'),
-        'address_home_id': fields.many2one('res.partner.address', 'Home Address'),
+        'address_home_id': fields.many2one('res.partner.address', 'Home Address', domain="[('partner_id', '!=', False)]"),
         'partner_id': fields.related('address_home_id', 'partner_id', type='many2one', relation='res.partner', readonly=True, help="Partner that is related to the current employee. Accounting transaction will be written on this partner belongs to employee."),
         'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account', domain="[('partner_id','=',partner_id)]", help="Employee bank salary account"),
         'work_phone': fields.char('Work Phone', size=32, readonly=False),

From ec8823d2d3dc248bbaabca002a78b4dfa014b86d Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Mon, 17 Jan 2011 16:50:56 +0530
Subject: [PATCH 59/61] [FIX] account, account_*, hr_*, point_of_sale, sale:
 performance issues - account_move_lines and others

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

bzr revid: psi@tinyerp.co.in-20110117112056-ryw0wyjltqzeuhzt
---
 addons/account/account.py                     |  2 +-
 addons/account/account_move_line.py           |  6 ++---
 addons/account/invoice.py                     |  4 ++--
 addons/account_followup/account_followup.py   |  2 +-
 addons/account_voucher/account_voucher.py     |  4 ++--
 addons/analytic/analytic.py                   | 14 +++++------
 addons/hr_evaluation/hr_evaluation.py         |  4 ++--
 addons/hr_expense/hr_expense.py               |  6 ++---
 addons/hr_recruitment/hr_recruitment.py       |  6 ++---
 .../hr_timesheet_sheet/hr_timesheet_sheet.py  |  2 +-
 addons/point_of_sale/point_of_sale.py         | 24 +++++++++----------
 addons/sale/sale.py                           |  8 +++----
 12 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 166d475fcba..ba53475bb30 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1130,7 +1130,7 @@ class account_move(osv.osv):
         'to_check': fields.boolean('To Review', help='Check this box if you are unsure of that journal entry and if you want to note it as \'to be reviewed\' by an accounting expert.'),
         'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner", store=True),
         'amount': fields.function(_amount_compute, method=True, string='Amount', digits_compute=dp.get_precision('Account'), type='float', fnct_search=_search_amount),
-        'date': fields.date('Date', required=True, states={'posted':[('readonly',True)]}),
+        'date': fields.date('Date', required=True, states={'posted':[('readonly',True)]}, select=True),
         'narration':fields.text('Narration'),
         'company_id': fields.related('journal_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True),
     }
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index e232be457f0..645cacd6994 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -494,12 +494,12 @@ class account_move_line(osv.osv):
         'journal_id': fields.many2one('account.journal', 'Journal', required=True, select=1),
         'blocked': fields.boolean('Litigation', help="You can check this box to mark this journal item as a litigation with the associated partner"),
         'partner_id': fields.many2one('res.partner', 'Partner', select=1, ondelete='restrict'),
-        'date_maturity': fields.date('Due date', help="This field is used for payable and receivable journal entries. You can put the limit date for the payment of this line."),
-        'date': fields.related('move_id','date', string='Effective date', type='date', required=True,
+        'date_maturity': fields.date('Due date', select=True ,help="This field is used for payable and receivable journal entries. You can put the limit date for the payment of this line."),
+        'date': fields.related('move_id','date', string='Effective date', type='date', required=True, select=True,
                                 store = {
                                     'account.move': (_get_move_lines, ['date'], 20)
                                 }),
-        'date_created': fields.date('Creation date'),
+        'date_created': fields.date('Creation date', select=True),
         'analytic_lines': fields.one2many('account.analytic.line', 'move_id', 'Analytic lines'),
         'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation')], 'Centralisation', size=6),
         'balance': fields.function(_balance, fnct_search=_balance_search, method=True, string='Balance'),
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 78b3322bbf4..4ca3d094593 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -211,8 +211,8 @@ class account_invoice(osv.osv):
             \n* The \'Open\' state is used when user create invoice,a invoice number is generated.Its in open state till user does not pay invoice. \
             \n* The \'Paid\' state is set automatically when invoice is paid.\
             \n* The \'Cancelled\' state is used when user cancel invoice.'),
-        'date_invoice': fields.date('Invoice Date', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'close':[('readonly',True)]}, help="Keep empty to use the current date"),
-        'date_due': fields.date('Due Date', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'close':[('readonly',True)]},
+        'date_invoice': fields.date('Invoice Date', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'close':[('readonly',True)]}, select=True, help="Keep empty to use the current date", select=True),
+        'date_due': fields.date('Due Date', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'close':[('readonly',True)]}, select=True,
             help="If you use payment terms, the due date will be computed automatically at the generation "\
                 "of accounting entries. If you keep the payment term and the due date empty, it means direct payment. The payment term may compute several due dates, for example 50% now, 50% in one month."),
         'partner_id': fields.many2one('res.partner', 'Partner', change_default=True, readonly=True, required=True, states={'draft':[('readonly',False)]}),
diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index 5bbfe80cc24..c798c703f37 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -54,7 +54,7 @@ class account_move_line(osv.osv):
     _inherit = 'account.move.line'
     _columns = {
         'followup_line_id': fields.many2one('account_followup.followup.line', 'Follow-up Level'),
-        'followup_date': fields.date('Latest Follow-up'),
+        'followup_date': fields.date('Latest Follow-up', select=True),
                 }
 
 account_move_line()
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 66be989b22c..6c6f2865ceb 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -181,7 +181,7 @@ class account_voucher(osv.osv):
             ('receipt','Receipt'),
         ],'Default Type', readonly=True, states={'draft':[('readonly',False)]}),
         'name':fields.char('Memo', size=256, readonly=True, states={'draft':[('readonly',False)]}),
-        'date':fields.date('Date', readonly=True, states={'draft':[('readonly',False)]}, help="Effective date for accounting entries"),
+        'date':fields.date('Date', readonly=True, select=True, states={'draft':[('readonly',False)]}, help="Effective date for accounting entries"),
         'journal_id':fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'account_id':fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'line_ids':fields.one2many('account.voucher.line','voucher_id','Voucher Lines', readonly=True, states={'draft':[('readonly',False)]}),
@@ -218,7 +218,7 @@ class account_voucher(osv.osv):
         ],'Payment', select=True, readonly=True, states={'draft':[('readonly',False)]}),
         'tax_id':fields.many2one('account.tax', 'Tax', readonly=True, states={'draft':[('readonly',False)]}),
         'pre_line':fields.boolean('Previous Payments ?', required=False),
-        'date_due': fields.date('Due Date', readonly=True, states={'draft':[('readonly',False)]}),
+        'date_due': fields.date('Due Date', readonly=True, select=True, states={'draft':[('readonly',False)]}),
         'payment_option':fields.selection([
                                            ('without_writeoff', 'Keep Open'),
                                            ('with_writeoff', 'Reconcile with Write-Off'),
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 03e9a9608cd..a353ca92177 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -60,7 +60,7 @@ class account_analytic_account(osv.osv):
             return res
 
         where_date = ''
-        where_clause_args = [tuple(child_ids)]  
+        where_clause_args = [tuple(child_ids)]
         if context.get('from_date', False):
             where_date += " AND l.date >= %s"
             where_clause_args  += [context['from_date']]
@@ -71,20 +71,20 @@ class account_analytic_account(osv.osv):
               SELECT a.id,
                      sum(
                          CASE WHEN l.amount > 0
-                         THEN l.amount 
+                         THEN l.amount
                          ELSE 0.0
                          END
                           ) as debit,
                      sum(
                          CASE WHEN l.amount < 0
                          THEN -l.amount
-                         ELSE 0.0 
+                         ELSE 0.0
                          END
                           ) as credit,
                      COALESCE(SUM(l.amount),0) AS balance,
                      COALESCE(SUM(l.unit_amount),0) AS quantity
-              FROM account_analytic_account a 
-                  LEFT JOIN account_analytic_line l ON (a.id = l.account_id) 
+              FROM account_analytic_account a
+                  LEFT JOIN account_analytic_line l ON (a.id = l.account_id)
               WHERE a.id IN %s
               """ + where_date + """
               GROUP BY a.id""", where_clause_args)
@@ -128,7 +128,7 @@ class account_analytic_account(osv.osv):
         'contact_id': fields.many2one('res.partner.address', 'Contact'),
         'user_id': fields.many2one('res.users', 'Account Manager'),
         'date_start': fields.date('Date Start'),
-        'date': fields.date('Date End'),
+        'date': fields.date('Date End', select=True),
         'company_id': fields.many2one('res.company', 'Company', required=False), #not required because we want to allow different companies to use the same chart of account, except for leaf accounts.
         'state': fields.selection([('draft','Draft'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Closed'),('template', 'Template')], 'State', required=True,
                                   help='* When an account is created its in \'Draft\' state.\
@@ -230,7 +230,7 @@ class account_analytic_line(osv.osv):
 
     _columns = {
         'name': fields.char('Description', size=256, required=True),
-        'date': fields.date('Date', required=True, select=1),
+        'date': fields.date('Date', required=True, select=True),
         'amount': fields.float('Amount', required=True, help='Calculated by multiplying the quantity and the price given in the Product\'s cost price. Always expressed in the company main currency.', digits_compute=dp.get_precision('Account')),
         'unit_amount': fields.float('Quantity', help='Specifies the amount of quantity to count.'),
         'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, ondelete='cascade', select=True, domain=[('type','<>','view')]),
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index b04bef02e17..4a9a46920f5 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -143,7 +143,7 @@ class hr_evaluation(osv.osv):
     _description = "Employee Evaluation"
     _rec_name = 'employee_id'
     _columns = {
-        'date': fields.date("Evaluation Deadline", required=True),
+        'date': fields.date("Evaluation Deadline", required=True, select=True),
         'employee_id': fields.many2one('hr.employee', "Employee", required=True),
         'note_summary': fields.text('Evaluation Summary'),
         'note_action': fields.text('Action Plan',
@@ -165,7 +165,7 @@ class hr_evaluation(osv.osv):
             ('done','Done'),
             ('cancel','Cancelled'),
         ], 'State', required=True, readonly=True),
-        'date_close': fields.date('Ending Date'),
+        'date_close': fields.date('Ending Date', select=True),
         'progress': fields.float("Progress"),
     }
     _defaults = {
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index e7fd63eadb4..9cb53f81dce 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -60,12 +60,12 @@ class hr_expense_expense(osv.osv):
         'name': fields.char('Description', size=128, required=True),
         'id': fields.integer('Sheet ID', readonly=True),
         'ref': fields.char('Reference', size=32),
-        'date': fields.date('Date'),
+        'date': fields.date('Date', select=True),
         'journal_id': fields.many2one('account.journal', 'Force Journal', help = "The journal used when the expense is invoiced"),
         'employee_id': fields.many2one('hr.employee', "Employee", required=True),
         'user_id': fields.many2one('res.users', 'User', required=True),
-        'date_confirm': fields.date('Confirmation Date', help = "Date of the confirmation of the sheet expense. It's filled when the button Confirm is pressed."),
-        'date_valid': fields.date('Validation Date', help = "Date of the acceptation of the sheet expense. It's filled when the button Accept is pressed."),
+        'date_confirm': fields.date('Confirmation Date', select=True, help = "Date of the confirmation of the sheet expense. It's filled when the button Confirm is pressed."),
+        'date_valid': fields.date('Validation Date', select=True, help = "Date of the acceptation of the sheet expense. It's filled when the button Accept is pressed."),
         'user_valid': fields.many2one('res.users', 'Validation User'),
         'account_move_id': fields.many2one('account.move', 'Ledger Posting'),
         'line_ids': fields.one2many('hr.expense.line', 'expense_id', 'Expense Lines', readonly=True, states={'draft':[('readonly',False)]} ),
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 7aebc3ef268..02643a3e90e 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -126,7 +126,7 @@ class hr_applicant(crm.crm_case, osv.osv):
         'partner_id': fields.many2one('res.partner', 'Partner'),
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
                                  domain="[('partner_id','=',partner_id)]"),
-        'create_date': fields.datetime('Creation Date', readonly=True),
+        'create_date': fields.datetime('Creation Date', readonly=True, select=True),
         'write_date': fields.datetime('Update Date', readonly=True),
         'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage'),
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True,
@@ -137,8 +137,8 @@ class hr_applicant(crm.crm_case, osv.osv):
         'company_id': fields.many2one('res.company', 'Company'),
         'user_id': fields.many2one('res.users', 'Responsible'),
         # Applicant Columns
-        'date_closed': fields.datetime('Closed', readonly=True),
-        'date_open': fields.datetime('Opened', readonly=True),
+        'date_closed': fields.datetime('Closed', readonly=True, select=True),
+        'date_open': fields.datetime('Opened', readonly=True, select=True),
         'date': fields.datetime('Date'),
         'date_action': fields.date('Next Action Date'),
         'title_action': fields.char('Next Action', size=64),
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 85795b352f1..3a4c4e5e29d 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -262,7 +262,7 @@ class hr_timesheet_sheet(osv.osv):
         'user_id': fields.related('employee_id', 'user_id', type="many2one", relation="res.users", store=True, string="User", required=False, readonly=True),#fields.many2one('res.users', 'User', required=True, select=1, states={'confirm':[('readonly', True)], 'done':[('readonly', True)]}),
         'date_from': fields.date('Date from', required=True, select=1, readonly=True, states={'new':[('readonly', False)]}),
         'date_to': fields.date('Date to', required=True, select=1, readonly=True, states={'new':[('readonly', False)]}),
-        'date_current': fields.date('Current date', required=True),
+        'date_current': fields.date('Current date', required=True, select=1),
         'timesheet_ids' : one2many_mod('hr.analytic.timesheet', 'sheet_id',
             'Timesheet lines', domain=[('date', '=', time.strftime('%Y-%m-%d'))],
             readonly=True, states={
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index f359b8208d7..1db9ebbe26b 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -33,7 +33,7 @@ class pos_config_journal(osv.osv):
     """ Point of Sale journal configuration"""
     _name = 'pos.config.journal'
     _description = "Journal Configuration"
-    
+
     _columns = {
         'name': fields.char('Description', size=64),
         'code': fields.char('Code', size=64),
@@ -46,7 +46,7 @@ pos_config_journal()
 class pos_company_discount(osv.osv):
     """ Company Discount and Cashboxes """
     _inherit = 'res.company'
-    
+
     _columns = {
         'company_discount': fields.float('Max Discount(%)', digits_compute=dp.get_precision('Point Of Sale')),
         'max_diff': fields.float('Max Difference for Cashboxes', digits_compute=dp.get_precision('Point Of Sale Discount')),
@@ -247,14 +247,14 @@ class pos_order(osv.osv):
         'num_sale': fields.char('Internal Note', size=64),
         'shop_id': fields.many2one('sale.shop', 'Shop', required=True,
             states={'draft': [('readonly', False)]}, readonly=True),
-        'date_order': fields.datetime('Date Ordered', readonly=True),
+        'date_order': fields.datetime('Date Ordered', readonly=True, select=True),
         'date_validation': fields.function(_get_date_payment,
                                            method=True,
                                            string='Validation Date',
-                                           type='date', store=True),
+                                           type='date', select=True, store=True),
         'date_payment': fields.function(_get_date_payment2, method=True,
                                         string='Payment Date',
-                                        type='date', store=True),
+                                        type='date', select=True, store=True),
         'date_validity': fields.date('Validity Date', required=True),
         'user_id': fields.many2one('res.users', 'Connected Salesman', help="Person who uses the the cash register. It could be a reliever, a student or an interim employee."),
         'user_salesman_id': fields.many2one('res.users', 'Cashier', required=True, help="User who is logged into the system."),
@@ -329,7 +329,7 @@ class pos_order(osv.osv):
 
 
     def test_order_lines(self, cr, uid, order, context=None):
-        """ Test order line is created or not for the order 
+        """ Test order line is created or not for the order
         @param name: Names of fields.
         @return: True
         """
@@ -570,9 +570,9 @@ class pos_order(osv.osv):
         return statement_id
 
     def add_product(self, cr, uid, order_id, product_id, qty, context=None):
-        
+
         """Create a new order line the order"""
-        
+
         line_obj = self.pool.get('pos.order.line')
         values = self.read(cr, uid, order_id, ['partner_id', 'pricelist_id'])
 
@@ -593,9 +593,9 @@ class pos_order(osv.osv):
         return order_line_id, price
 
     def refund(self, cr, uid, ids, context=None):
-        
+
         """Create a copy of order  for refund order"""
-        
+
         clone_list = []
         line_obj = self.pool.get('pos.order.line')
 
@@ -620,9 +620,9 @@ class pos_order(osv.osv):
         return clone_list
 
     def action_invoice(self, cr, uid, ids, context=None):
-        
+
         """Create a invoice of order  """
-        
+
         inv_ref = self.pool.get('account.invoice')
         inv_line_ref = self.pool.get('account.invoice.line')
         product_obj = self.pool.get('product.product')
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 3ed49f44b74..b0c7e1484b2 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -185,7 +185,7 @@ class sale_order(osv.osv):
         for line in self.pool.get('sale.order.line').browse(cr, uid, ids, context=context):
             result[line.order_id.id] = True
         return result.keys()
-    
+
     _columns = {
         'name': fields.char('Order Reference', size=64, required=True,
             readonly=True, states={'draft': [('readonly', False)]}, select=True),
@@ -202,9 +202,9 @@ class sale_order(osv.osv):
             ('done', 'Done'),
             ('cancel', 'Cancelled')
             ], 'Order State', readonly=True, help="Gives the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the date 'Ordered Date'.", select=True),
-        'date_order': fields.date('Ordered Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
-        'create_date': fields.date('Creation Date', readonly=True, help="Date on which sales order is created."),
-        'date_confirm': fields.date('Confirmation Date', readonly=True, help="Date on which sales order is confirmed."),
+        'date_order': fields.date('Ordered Date', required=True, readonly=True, select=True, states={'draft': [('readonly', False)]}),
+        'create_date': fields.date('Creation Date', readonly=True, select=True, help="Date on which sales order is created."),
+        'date_confirm': fields.date('Confirmation Date', readonly=True, select=True, help="Date on which sales order is confirmed."),
         'user_id': fields.many2one('res.users', 'Salesman', states={'draft': [('readonly', False)]}, select=True),
         'partner_id': fields.many2one('res.partner', 'Customer', readonly=True, states={'draft': [('readonly', False)]}, required=True, change_default=True, select=True),
         'partner_invoice_id': fields.many2one('res.partner.address', 'Invoice Address', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Invoice address for current sales order."),

From 1bf802b5c46e81c2137cb24442308a9aac89d8df Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Mon, 17 Jan 2011 17:27:17 +0530
Subject: [PATCH 60/61] [FIX] account, account_*, hr_*, point_of_sale, sale:
 performance issues - account_move_lines and others(Modification in last
 commit)

bzr revid: psi@tinyerp.co.in-20110117115717-79et9vg0idyc9k57
---
 addons/account/invoice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 4ca3d094593..3298ef3c843 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -211,7 +211,7 @@ class account_invoice(osv.osv):
             \n* The \'Open\' state is used when user create invoice,a invoice number is generated.Its in open state till user does not pay invoice. \
             \n* The \'Paid\' state is set automatically when invoice is paid.\
             \n* The \'Cancelled\' state is used when user cancel invoice.'),
-        'date_invoice': fields.date('Invoice Date', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'close':[('readonly',True)]}, select=True, help="Keep empty to use the current date", select=True),
+        'date_invoice': fields.date('Invoice Date', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'close':[('readonly',True)]}, select=True, help="Keep empty to use the current date"),
         'date_due': fields.date('Due Date', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'close':[('readonly',True)]}, select=True,
             help="If you use payment terms, the due date will be computed automatically at the generation "\
                 "of accounting entries. If you keep the payment term and the due date empty, it means direct payment. The payment term may compute several due dates, for example 50% now, 50% in one month."),

From 29110b6487d5ca4d75c4dcd69d6c2e86ea8ae9e3 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 17 Jan 2011 17:51:13 +0530
Subject: [PATCH 61/61] [FIX] hr_expense: hr_expense not working when Employee
 is not assigned user_id

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

bzr revid: mra@mra-laptop-20110117122113-blnbg42tr0oxh5ny
---
 addons/hr_expense/hr_expense.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index e7fd63eadb4..b137b78a789 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -251,13 +251,17 @@ class hr_expense_line(osv.osv):
             product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
             res['name'] = product.name
             # Compute based on pricetype of employee company
-            ctx['currency_id'] = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context).user_id.company_id.currency_id.id
-            amount_unit = product.price_get('standard_price', ctx)[product.id]
-            res['unit_amount'] = amount_unit
+            employee = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context)
+            if employee.user_id:
+                ctx['currency_id'] = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context).user_id.company_id.currency_id.id
+                amount_unit = product.price_get('standard_price', ctx)[product.id]
+                res['unit_amount'] = amount_unit
+            else:
+                res['unit_amount'] = product.standard_price
             if not uom_id:
                 res['uom_id'] = product.uom_id.id
         return {'value': res}
 
 hr_expense_line()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file