From d07e43933180eddde1232c133425bb7c49a094de Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 18 Jun 2010 11:54:39 +0530
Subject: [PATCH 01/40] [Fix] Stock: Fix the problem of key error orgin for
 outgoing picking

bzr revid: sbh@tinyerp.com-20100618062439-91tah2gr61jqgdvq
---
 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 06f3fa44e55..ff9318739e3 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -559,7 +559,7 @@ class stock_picking(osv.osv):
         }
         new_id = super(stock_picking, self).create(cr, user, vals, context)
         if not vals.get('auto_picking', False):
-            message = type_list.get(vals.get('type', False), _('Picking')) + " '" + (vals['name'] or "n/a") + _(" with origin")+" '" + (vals['origin'] or "n/a") + "' "+ _("is created.")
+            message = type_list.get(vals.get('type', False), _('Picking')) + " '" + (vals['name'] or "n/a") + _(" with origin")+" '" + (vals.get('origin') or "n/a") + "' "+ _("is created.")
             self.log(cr, user, new_id, message)
         return new_id
 

From bbb857400073fcc2983ffca0349a10846c66deb7 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 18 Jun 2010 12:16:26 +0530
Subject: [PATCH 02/40] [Fix] Stock: Fix the name of picking action

bzr revid: sbh@tinyerp.com-20100618064626-7oh625i6bj1f454i
---
 addons/stock/stock_workflow.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock_workflow.xml b/addons/stock/stock_workflow.xml
index 3d51b11025e..1c82eac49c3 100644
--- a/addons/stock/stock_workflow.xml
+++ b/addons/stock/stock_workflow.xml
@@ -41,7 +41,7 @@
             <field name="name">cancel</field>
             <field name="flow_stop">True</field>
             <field name="kind">function</field>
-            <field name="action">action_cancel_inventary()</field>
+            <field name="action">action_cancel()</field>
         </record>
         
         <record id="act_cancel" model="workflow.activity">

From 3e7f590e31aeb7b5930ee2af8a0ea5e9c3ad1624 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 18 Jun 2010 12:33:39 +0530
Subject: [PATCH 03/40] [Fix] stock: Remove the duplicate action for report and
 put error if move line is not create

bzr revid: sbh@tinyerp.com-20100618070339-q14dg8p56w02p394
---
 addons/stock/stock.py         | 3 +++
 addons/stock/stock_report.xml | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index ff9318739e3..a96efe2b5fa 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -639,6 +639,9 @@ class stock_picking(osv.osv):
         self.write(cr, uid, ids, {'state': 'confirmed'})
         todo = []
         for picking in self.browse(cr, uid, ids, context=context):
+            if not picking.move_lines:
+                raise osv.except_osv(_('Error !'),_('You can not confirm Picking without Move Lines.'))
+            
             for r in picking.move_lines:
                 if r.state == 'draft':
                     todo.append(r.id)
diff --git a/addons/stock/stock_report.xml b/addons/stock/stock_report.xml
index 547ed785cd1..3084e8527a7 100644
--- a/addons/stock/stock_report.xml
+++ b/addons/stock/stock_report.xml
@@ -3,7 +3,6 @@
     <data>
         <report auto="False" id="report_product_history" model="product.product" name="stock.product.history" string="Future Stock Forecast"/>
         <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Picking list" rml="stock/report/picking.rml"/>
-        <report id="report_packing_list" model="stock.picking" name="stock.packing.list" string="Packing list" rml="stock/report/packing.rml"/>
         <report id="report_move_labels" model="stock.move" name="stock.move.label" string="Item Labels" xml="stock/report/lot_move_label.xml" xsl="stock/report/lot_move_label.xsl"/>
         <report auto="False"  id="report_location_overview" model="stock.location" name="lot.stock.overview" string="Location Overview" rml="stock/report/lot_overview.rml" groups="base.group_extended"/>
         <report auto="False" id="report_lot_location" model="stock.location" name="lot.location" rml="stock/report/lot_location.rml" string="Lots by location"/>

From 3a76c0baaf38af354695e7327d469a1dcfeff3c5 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 18 Jun 2010 12:42:06 +0530
Subject: [PATCH 04/40] [Fix] stock: Check the field is exist then
 qty_available display in report

bzr revid: sbh@tinyerp.com-20100618071206-poxwm1ovzdk6s083
---
 addons/stock/product.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index 9a19d3e84c3..a4ba6f633d0 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -349,7 +349,8 @@ class product_product(osv.osv):
                 if location_info.usage == 'inventory':
                     if fields.get('virtual_available'):
                         res['fields']['virtual_available']['string'] = _('Future P&L')
-                    res['fields']['qty_available']['string'] = _('P&L Qty')
+                    if fields.get('qty_available'):                        
+                        res['fields']['qty_available']['string'] = _('P&L Qty')
 
                 if location_info.usage == 'procurement':
                     if fields.get('virtual_available'):

From 56e877f5ab679222d4f483ad3c30d040da778190 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 18 Jun 2010 14:38:58 +0530
Subject: [PATCH 05/40] [Fix] stock: Set partner_id field store=True

bzr revid: sbh@tinyerp.com-20100618090858-z03wq1pa3meeu6hy
---
 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 15e1fc8c0f2..7ad6bb49469 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1388,7 +1388,7 @@ class stock_move(osv.osv):
         'price_unit': fields.float('Unit Price',
             digits_compute= dp.get_precision('Account')),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=1),
-        'partner_id': fields.related('picking_id','address_id','partner_id',type='many2one', relation="res.partner", string="Partner"),
+        'partner_id': fields.related('picking_id','address_id','partner_id',type='many2one', relation="res.partner", string="Partner", store=True),
         'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Order"),
         'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Origin"),
         'scraped': fields.related('location_dest_id','scrap_location',type='boolean',relation='stock.location',string='Scraped'),

From d206e9e29cfdc7269319f18fa30f5b67ac548f0f Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 18 Jun 2010 15:05:39 +0530
Subject: [PATCH 06/40] [Fix] stock: Set orgin field store=True

bzr revid: sbh@tinyerp.com-20100618093539-r53igbnbw2oc9bpe
---
 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 7ad6bb49469..f4e49d73edb 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1390,7 +1390,7 @@ class stock_move(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', required=True, select=1),
         'partner_id': fields.related('picking_id','address_id','partner_id',type='many2one', relation="res.partner", string="Partner", store=True),
         'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Order"),
-        'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Origin"),
+        'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Origin",store=True),
         'scraped': fields.related('location_dest_id','scrap_location',type='boolean',relation='stock.location',string='Scraped'),
     }
     _constraints = [

From 77fc796e7f50b245eee03d59571118913429c80c Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 18 Jun 2010 15:11:42 +0530
Subject: [PATCH 07/40] [Fix] stock: Check if picking_id is exist in move then
 it done the picking

bzr revid: sbh@tinyerp.com-20100618094142-6d9sl41790hmr3fj
---
 addons/stock/stock.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index f4e49d73edb..a3d077fbed9 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2194,17 +2194,17 @@ class stock_move(osv.osv):
 
         for move in complete:
             self.action_done(cr, uid, [move.id], context)
-
-            # TOCHECK : Done picking if all moves are done
-            cr.execute("""
-                SELECT move.id FROM stock_picking pick
-                RIGHT JOIN stock_move move ON move.picking_id = pick.id AND move.state = %s
-                WHERE pick.id = %s""",
-                        ('done', move.picking_id.id))
-            res = cr.fetchall()
-            if len(res) == len(move.picking_id.move_lines):
-                picking_obj.action_move(cr, uid, [move.picking_id.id])
-                wf_service.trg_validate(uid, 'stock.picking', move.picking_id.id, 'button_done', cr)
+            if  move.picking_id.id :
+                # TOCHECK : Done picking if all moves are done
+                cr.execute("""
+                    SELECT move.id FROM stock_picking pick
+                    RIGHT JOIN stock_move move ON move.picking_id = pick.id AND move.state = %s
+                    WHERE pick.id = %s""",
+                            ('done', move.picking_id.id))
+                res = cr.fetchall()
+                if len(res) == len(move.picking_id.move_lines):
+                    picking_obj.action_move(cr, uid, [move.picking_id.id])
+                    wf_service.trg_validate(uid, 'stock.picking', move.picking_id.id, 'button_done', cr)
 
         ref = {}
         done_move_ids = []

From 446c9873772b04c9722155e6aba062001753c0aa Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 18 Jun 2010 15:23:21 +0530
Subject: [PATCH 08/40] [Fix] stock: stock_move wizard check if active find in
 context then set the default value

bzr revid: sbh@tinyerp.com-20100618095321-5w8gf82phwtl0or7
---
 addons/stock/wizard/stock_move.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index d66972fd36b..0666413e0f9 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -176,15 +176,16 @@ class split_in_production_lot(osv.osv_memory):
         """
 
         res = super(split_in_production_lot, self).default_get(cr, uid, fields, context=context)
-        move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
-        if 'product_id' in fields:
-            res.update({'product_id': move.product_id.id})
-        if 'product_uom' in fields:
-            res.update({'product_uom': move.product_uom.id})
-        if 'qty' in fields:
-            res.update({'qty': move.product_qty})
-        if 'use_exist' in fields:
-            res.update({'use_exist': (move.picking_id and move.picking_id.type=='out' and True) or False})
+        if context.get('active_id'):
+            move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
+            if 'product_id' in fields:
+                res.update({'product_id': move.product_id.id})
+            if 'product_uom' in fields:
+                res.update({'product_uom': move.product_uom.id})
+            if 'qty' in fields:
+                res.update({'qty': move.product_qty})
+            if 'use_exist' in fields:
+                res.update({'use_exist': (move.picking_id and move.picking_id.type=='out' and True) or False})
         return res
 
     _columns = {

From e1379636fd0dcf7ccda1e51919cedc42d472b5ae Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 18 Jun 2010 15:43:01 +0530
Subject: [PATCH 09/40] [IMP] stock: Improve the view of stock and
 stock_inventory_merge

bzr revid: sbh@tinyerp.com-20100618101301-jc2csyxcp5y9tmmh
---
 addons/stock/stock_view.xml                        |  5 +----
 addons/stock/wizard/stock_inventory_merge_view.xml | 13 ++++++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index e8ffe0a577a..8995d67fb33 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1254,12 +1254,9 @@
                                     </notebook>
                                 </form>
                             </field>
-                            <group col="7" colspan="4">
-                                <label colspan="5"/>
-                                <button name="%(act_stock_picking_move_wizard)d" string="Unreceived Products" type="action" states="draft" icon="gtk-redo"/>
-                            </group>
                             <group col="10" colspan="4">
                                 <field name="state" readonly="1"/>
+                                 <button name="%(act_stock_picking_move_wizard)d" string="Unreceived Products" type="action" states="draft" icon="gtk-redo"/>
                                 <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
diff --git a/addons/stock/wizard/stock_inventory_merge_view.xml b/addons/stock/wizard/stock_inventory_merge_view.xml
index e8af34c0c71..5ae2987b59a 100644
--- a/addons/stock/wizard/stock_inventory_merge_view.xml
+++ b/addons/stock/wizard/stock_inventory_merge_view.xml
@@ -7,11 +7,14 @@
 		        <field name="model">stock.inventory.merge</field>
 		        <field name="type">form</field>
 		        <field name="arch" type="xml">
-		              <form string="Merge inventories">
-				    <separator colspan="4" string="Merge inventories" />
-				    <label string="Do you want to merge theses inventories ?"/>
-				<button special="cancel" string="Cancel" icon='gtk-cancel'/>
-				<button name="do_merge" string="Yes" type="object" icon="gtk-apply"/>				
+					<form string="Merge inventories">
+				    	<separator colspan="4" string="Merge inventories" />
+				    	<label string="Do you want to merge theses inventories ?"/>
+				 <separator colspan="4"/>
+    				<group colspan="4" col="6">
+					<button special="cancel" string="Cancel" icon='gtk-cancel'/>
+					<button name="do_merge" string="Yes" type="object" icon="gtk-apply"/>
+					</group>			
 				</form>
 			</field>
 		</record>

From 5362a33a035dc9cab2f31e2ef65b59e67f8632e8 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 18 Jun 2010 16:15:17 +0530
Subject: [PATCH 10/40] [IMP] stock: Improve the view of stock_partial_picking

bzr revid: sbh@tinyerp.com-20100618104517-r2f733ke2mtu3hp1
---
 addons/stock/wizard/stock_partial_picking.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index c81e8bbf2eb..40bffae7654 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -62,7 +62,8 @@ class stock_partial_picking(osv.osv_memory):
         picking_ids = context.get('active_ids', False) 
         _moves_arch_lst = """<form string="Deliver Products">
                         <separator colspan="4" string="Delivery Information"/>
-                    	<field name="date" colspan="4" />
+                    	<field name="date" />
+                    	<separator colspan="4"/>
                         <separator colspan="4" string="Move Detail"/>
                     	"""
         _moves_fields = result['fields']

From fcca93731aad0d3d343a81fa686ad37f358e66e1 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 18 Jun 2010 16:39:52 +0530
Subject: [PATCH 11/40] [IMP] stock: Improve the view of stock_partial_picking

bzr revid: sbh@tinyerp.com-20100618110952-kp3stk2uyod3ngd9
---
 addons/stock/wizard/stock_partial_move.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index 8f283ebee62..7f65017810d 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -66,7 +66,8 @@ class stock_partial_move(osv.osv_memory):
         move_ids = move_obj.search(cr, uid, [('id','in',move_ids)])
         _moves_arch_lst = """<form string="Deliver Products">
                         <separator colspan="4" string="Delivery Information"/>
-                    	<field name="date" colspan="4" />
+                    	<field name="date"  />
+                    	<separator colspan="4">
                      <group colspan="4" attrs="{'invisible':[('type','=','in')]}">
                     	<field name="partner_id"  attrs="{'required':[('type','!=','in')]}" />
                     	<field name="address_id"  attrs="{'required':[('type','!=','in')]}"/>

From c10374dced597d27aa4c60eccd682d01cd57e86e Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 18 Jun 2010 16:49:59 +0530
Subject: [PATCH 12/40] [Fix] stock_planning: set deafault rounding value=1 and
 fix the name

bzr revid: sbh@tinyerp.com-20100618111959-a0wlza1r8z6bmy46
---
 addons/stock_planning/stock_planning.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/stock_planning/stock_planning.py b/addons/stock_planning/stock_planning.py
index 0c957d8b72e..ef9fa7e65dd 100644
--- a/addons/stock_planning/stock_planning.py
+++ b/addons/stock_planning/stock_planning.py
@@ -346,12 +346,13 @@ class stock_sale_forecast(osv.osv):
 
     def product_amt_change(self, cr, uid, ids, product_amt = 0.0, product_uom=False):
         ret={}
+        round_value = 1
         if product_amt:
             coeff_def2uom = 1
             val1 = self.browse(cr, uid, ids)
             val = val1[0]
             if (product_uom != val.product_id.uom_id.id):
-                coeff_def2uom, rounding = self._from_default_uom_factor( cr, uid, val, product_uom, {})
+                coeff_def2uom, round_value = self._from_default_uom_factor( cr, uid, val, product_uom, {})
             ret['product_qty'] = rounding(coeff_def2uom * product_amt/(val.product_id.product_tmpl_id.list_price), round_value)
         res = {'value': ret}
         return res

From e31861bef519544f9ab2db6753255ef417b01291 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 18 Jun 2010 17:19:28 +0530
Subject: [PATCH 13/40] [Fix] stock_planning: Improve the search view

bzr revid: sbh@tinyerp.com-20100618114928-4zld9xnkq2gw0i3t
---
 addons/stock_planning/stock_planning_view.xml | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index a575f677661..2bf2c7a16ed 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -209,11 +209,13 @@
             <field name="arch" type="xml">
                 <tree string="Stock and Sales Forecasts" editable="bottom">
                     <field name="warehouse_id"/>
+                    <field name ="company_id"/>
                     <field name="user_id"/>
                     <field name="period_id"/>
                     <field name="product_id" on_change="product_id_change(product_id)" />
                     <field name="product_qty"/>
                     <field name="product_uom" />
+                    
                 </tree>
             </field>
         </record>
@@ -238,14 +240,20 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Stock and Sales Forecast">
-                 <group col='10' colspan='4'>
                     <filter icon="terp-camera_test" string="Validated" domain="[('state','=','validated')]" separator="1"/>
-                    <field name="company_id" widget="selection"/>
-                    <field name="warehouse_id" widget="selection"/>
-                    <field name="period_id" widget="selection"/>
+                    <field name="company_id"/>
+                    <field name="warehouse_id" />
+                    <field name="period_id" />
                     <field name="product_id"/>
                     <field name="create_uid"/>
-                </group>
+                    <newline/>
+                    <group expand="0" string="Group By..." colspan="4" col="8">
+                        <filter string="Company" icon="terp-personal" domain="[]" context="{'group_by':'company_id'}"/>
+                        <filter string="Warehouse " icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'warehouse_id'}"/>
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'product_id'}"/>
+                       <separator orientation="vertical"/>
+                       <filter string='Default UOM' icon="terp-mrp" domain="[]" context="{'group_by' : 'product_uom'}" />
+                    </group>
               </search>
             </field>
         </record>
@@ -382,14 +390,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Stock Planning">
-                 <group col='10' colspan='4'>
-<!--  Doesn't work !       <filter icon="terp-purchase" string="Current" domain="[('line_time','=','Future')]" separator="1"/>  -->
                     <filter icon="terp-purchase" string="No Requisition" domain="[('history','=',False)]" separator="1"/>
                     <field name="company_id" widget="selection"/>
                     <field name="warehouse_id" widget="selection"/>
                     <field name="period_id" widget="selection"/>
                     <field name="product_id"/>
-                 </group>
+                    <newline/>
+                    <group expand="0" string="Group By..." colspan="4" col="8">
+                        <filter string="Company" icon="terp-personal" domain="[]" context="{'group_by':'company_id'}"/>
+                        <filter string="Warehouse " icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'warehouse_id'}"/>
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'product_id'}"/>
+                       <separator orientation="vertical"/>
+                    </group>                 
               </search>
             </field>
         </record>

From 2596a9756f93810a91bfdf46b1c8dee1f4ab4118 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 18 Jun 2010 17:26:48 +0530
Subject: [PATCH 14/40] [Fix] stock_planning: Add the icon on button

bzr revid: sbh@tinyerp.com-20100618115648-ascnn1qq0z1yjwyj
---
 addons/stock_planning/stock_planning_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 2bf2c7a16ed..e4200cb3d7b 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -105,7 +105,7 @@
                     <separator colspan ="4" string="Forecast lines creation"/>
                     <label  colspan ="4" string="Creates forecast lines for selected warehouse and period. Doesn't duplicate existing lines created by you."/>
                     <group colspan="4">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-cancel"  special="cancel" string="Cancel"/>
                         <button icon="gtk-execute" name="create_forecast" string="Create Forecasts" type="object" />
                     </group>
                 </form>
@@ -152,7 +152,7 @@
                             <field name="product_amt" on_change="product_amt_change( product_amt, product_uom)" />
                             <field name="product_qty"  />
                             <field name="state"/>
-                            <button name="action_validate" string="Validate" states="draft" type="object" colspan = "2"/>
+                            <button name="action_validate" icon="gtk-apply" string="Validate" states="draft" type="object" colspan = "2"/>
                 </group>
                     </group>
                     <separator colspan ="4" string="Sales history"/>
@@ -359,7 +359,7 @@
                             <field name="to_procure"/>
                             <field name="incoming"/>
                             <field name="incoming_left"/>
-                            <button name="calculate_planning" string="Calculate Planning" type="object" colspan="2"/>
+                            <button name="calculate_planning" string="Calculate Planning" type="object" icon="gtk-execute" colspan="2"/>
                             <field name="stock_only"/>
                         </group>
                         <group colspan ="2" col="2">
@@ -370,10 +370,10 @@
                             <field name="outgoing_before"/>
                             <field name="incoming_before"/>
                             <field name="stock_simulation"/>
-                            <button name="procure_incomming_left" string="Procure Incoming Left" type="object" colspan="2"/>
+                            <button name="procure_incomming_left" icon="gtk-convert" string="Procure Incoming Left" type="object" colspan="2"/>
                             <field name="procure_to_stock"/>
                             <separator colspan ="2" string = "Internal Supply"/>
-                            <button name="internal_supply" string="Supply from Another Warehouse" type="object" colspan="2"/>
+                            <button name="internal_supply" string="Supply from Another Warehouse" icon="gtk-convert"  type="object" colspan="2"/>
                             <field name="supply_warehouse_id" domain = "[('company_id','=',company_id)] "/>
                             <field name="stock_supply_location"/>
                         </group>

From cae8860346af6b4598b807f36782ed61c41ffbaf Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 18 Jun 2010 17:42:03 +0530
Subject: [PATCH 15/40] [Fix] stock_location: Fix the problme of  company id

bzr revid: sbh@tinyerp.com-20100618121203-vvz0sg1z7xsqj2yw
---
 addons/stock_location/mrp_pull.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/stock_location/mrp_pull.py b/addons/stock_location/mrp_pull.py
index a8a5026bf4c..3df96407bd7 100644
--- a/addons/stock_location/mrp_pull.py
+++ b/addons/stock_location/mrp_pull.py
@@ -58,7 +58,7 @@ class procurement_order(osv.osv):
         move_obj = self.pool.get('stock.move')
         location_obj = self.pool.get('stock.location')
         wf_service = netsvc.LocalService("workflow")
-
+        res_user=self.pool.get('res.users').browse(cr,uid,uid)
         for proc in proc_obj.browse(cr, uid, ids, context=context):
             line = None
             for line in proc.product_id.flow_pull_ids:
@@ -68,7 +68,7 @@ class procurement_order(osv.osv):
             origin = (proc.origin or proc.name or '').split(':')[0] +':'+line.name
             picking_id = self.pool.get('stock.picking').create(cr, uid, {
                 'origin': origin,
-                'company_id': line.company_id and line.company_id.id or False,
+                'company_id': res_user.company_id and res_user.company_id.id or False,
                 'type': line.picking_type,
                 'stock_journal_id': line.journal_id and line.journal_id.id or False,
                 'move_type': 'one',
@@ -79,7 +79,7 @@ class procurement_order(osv.osv):
             move_id = self.pool.get('stock.move').create(cr, uid, {
                 'name': line.name,
                 'picking_id': picking_id,
-                'company_id': line.company_id and line.company_id.id or False,
+                'company_id':  res_user.company_id and res_user.company_id.id or False,
                 'product_id': proc.product_id.id,
                 'date_planned': proc.date_planned,
                 'product_qty': proc.product_qty,
@@ -104,7 +104,7 @@ class procurement_order(osv.osv):
             proc_id = self.pool.get('procurement.order').create(cr, uid, {
                 'name': line.name,
                 'origin': origin,
-                'company_id': line.company_id and line.company_id.id or False,
+                'company_id':  res_user.company_id and res_user.company_id.id or False,
                 'date_planned': proc.date_planned,
                 'product_id': proc.product_id.id,
                 'product_qty': proc.product_qty,

From a7eb57bb43f273f010105d62f48d9e3974f29b22 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Fri, 18 Jun 2010 17:51:59 +0530
Subject: [PATCH 16/40] [IMP] Project_long_term : Unnecessary menuitem
 commented

bzr revid: jvo@tinyerp.com-20100618122159-uqtxo53sac349l9n
---
 addons/project_long_term/project_long_term_wizard.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_long_term/project_long_term_wizard.xml b/addons/project_long_term/project_long_term_wizard.xml
index fa546b9e86f..ea43762653c 100644
--- a/addons/project_long_term/project_long_term_wizard.xml
+++ b/addons/project_long_term/project_long_term_wizard.xml
@@ -6,7 +6,7 @@
         <!--<wizard id="wizard_schedule_task" menu="False" model="project.phase" name="phase.schedule.tasks" string="Schedule Tasks"/>-->
         <!--<wizard id="wizard_compute_task" model="project.task" menu="False" name="wizard.compute.tasks" string="Compute Task Scheduling"/>-->
 
-		<menuitem icon="terp-project" id="base.menu_main" name="Project Management" sequence="1"/>
+<!--		<menuitem icon="terp-project" id="base.menu_main" name="Project Management" sequence="1"/>-->
 		<!--<menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main" sequence="3"/>-->
 	<!--	<menuitem
             action="wizard_compute_phase"

From 89eb07e8b4b6d3b713d2047315ab903032f822b0 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 18 Jun 2010 17:57:41 +0530
Subject: [PATCH 17/40] [Fix] stock: Small change

bzr revid: sbh@tinyerp.com-20100618122741-17a18f2xj9n1rs3r
---
 addons/stock/wizard/stock_partial_move.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index 7f65017810d..1a1fc6bf059 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -67,7 +67,7 @@ class stock_partial_move(osv.osv_memory):
         _moves_arch_lst = """<form string="Deliver Products">
                         <separator colspan="4" string="Delivery Information"/>
                     	<field name="date"  />
-                    	<separator colspan="4">
+                    	<separator colspan="4"/>
                      <group colspan="4" attrs="{'invisible':[('type','=','in')]}">
                     	<field name="partner_id"  attrs="{'required':[('type','!=','in')]}" />
                     	<field name="address_id"  attrs="{'required':[('type','!=','in')]}"/>

From b0a6289174eb7aea08acc88fd219999f141c831f Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Fri, 18 Jun 2010 18:10:25 +0530
Subject: [PATCH 18/40] [MOD] point of sale : modification in pos report, menu
 change in email gateway

bzr revid: vir@tinyerp.com-20100618124025-nps509alfp6g1gl3
---
 .../email_template_account_view.xml           |  2 ++
 .../point_of_sale/report/report_pos_order.py  | 19 ++++++++++--
 .../report/report_pos_order_view.xml          | 31 ++++++++++++-------
 3 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/addons/email_template/email_template_account_view.xml b/addons/email_template/email_template_account_view.xml
index 65973fea9f7..4a35134bb41 100644
--- a/addons/email_template/email_template_account_view.xml
+++ b/addons/email_template/email_template_account_view.xml
@@ -96,6 +96,8 @@
             <field name="search_view_id" ref="view_email_template_account_search"/>
         </record>
 
+        <menuitem name="Configuration" parent="base.menu_tools"
+         id="base.menu_lunch_survey_root" sequence="20"/>
         <menuitem name="Emails" id="menu_email_template_configuration" parent="base.menu_lunch_survey_root" />
 
         <menuitem name="Email Accounts" id="menu_email_template_account_all" parent="menu_email_template_configuration" action="action_email_template_account_tree_all"/>
diff --git a/addons/point_of_sale/report/report_pos_order.py b/addons/point_of_sale/report/report_pos_order.py
index 082ff3f434e..42b2f3e9efb 100644
--- a/addons/point_of_sale/report/report_pos_order.py
+++ b/addons/point_of_sale/report/report_pos_order.py
@@ -41,13 +41,20 @@ class report_pos_order(osv.osv):
                                     ('advance','Advance'),
                                    ('paid', 'Paid'), ('done', 'Done'), ('invoiced', 'Invoiced'), ('cancel', 'Cancel')],
                                   'State'),
+        'state_2': fields.function([('to_verify', 'To Verify'), ('accepted', 'Accepted'),
+            ('refused', 'Refused')], string='State'),
         'user_id':fields.many2one('res.users', 'Salesman', readonly=True),
         'price_total':fields.float('Total Price', readonly=True),
+        'total_discount':fields.float('Total Discount', readonly=True),
+        'average_price': fields.float('Average Price', readonly=True,group_operator="avg"),
         'shop_id':fields.many2one('sale.shop', 'Shop', readonly=True),
         'company_id':fields.many2one('res.company', 'Company', readonly=True),
         'nbr':fields.integer('# of Lines', readonly=True),
         'product_qty':fields.float('# of Qty', readonly=True),
         'journal_id': fields.many2one('account.journal', 'Journal'),
+        'statement_journal_id': fields.many2one('account.journal','Cash Register'),
+        'delay_validation': fields.integer('Delay Validation'),
+        'delay_payment': fields.integer('Delay Payment'),
     }
     _order = 'date desc'
     def init(self, cr):
@@ -63,26 +70,32 @@ class report_pos_order(osv.osv):
                     to_char(po.date_order, 'YYYY') as year,
                     to_char(po.date_order, 'MM') as month,
                     to_char(po.date_order, 'YYYY-MM-DD') as day,
+                    (date(po.date_order)-date(po.date_validation)) as delay_validation,
+                    (date(po.date_order)-date(po.date_payment)) as delay_payment,
                     po.partner_id as partner_id,
                     po.state as state,
+                    po.state_2 as state_2,
                     po.user_id as user_id,
                     po.shop_id as shop_id,
                     po.company_id as company_id,
-                    po.sale_journal as journal_id
+                    po.sale_journal as journal_id,
+                    aj.id as statement_journal_id
 
                 from
-                    pos_order as po,
+                    pos_order as po,account_bank_statement_line absl,account_journal as aj,
                     ( select pl.id as id,
                         pl.product_id as product_id,
                         pl.qty as product_qty,
                         sum(pl.qty * pl.price_unit)- sum(pl.qty * pl.price_ded) as price_total,
+                        sum(pl.qty * pl.price_ded) as total_discount,
+                        ((sum(pl.qty * pl.price_unit)-sum(pl.qty * pl.price_ded))/sum(pl.qty)*count(pl.qty))::decimal(16,2) as average_price,
                         pl.order_id
                     from
                         pos_order_line as pl
                         left join product_template pt on (pt.id=pl.product_id)
                     group by
                         pl.id,pl.order_id, pl.qty,pl.product_id)  el
-                where po.id = el.order_id
+                where po.id = el.order_id and absl.pos_statement_id = po.id and aj.name = absl.journal_id
                 )
             """)
 
diff --git a/addons/point_of_sale/report/report_pos_order_view.xml b/addons/point_of_sale/report/report_pos_order_view.xml
index 3efe9548c70..401ce6f8720 100644
--- a/addons/point_of_sale/report/report_pos_order_view.xml
+++ b/addons/point_of_sale/report/report_pos_order_view.xml
@@ -7,7 +7,7 @@
 	        <field name="type">tree</field>
 	        <field name="arch" type="xml">
 	            <tree string="Point of Sale Analysis">
-	                <field name="date" />
+	                <field name="date" invisible="1"/>
 	                <field name="date_validation" invisible="1"/>
 	                <field name="date_payment" invisible="1"/>
 	                <field name="user_id" invisible="1"/>
@@ -18,10 +18,15 @@
                     <field name="product_id" invisible="1"/>
 	                <field name="shop_id" invisible="1"/>
 	                <field name="journal_id" invisible="1"/>
+	                <field name="statement_journal_id" invisible="1"/>
                     <field name="company_id" invisible="1" groups="base.group_multi_company"/>
 	                <field name="nbr" sum="# of Lines"/>
 	                <field name="product_qty" sum="# of Qty"/>
 	                <field name="price_total" sum="Total Price"/>
+	                <field name="total_discount" sum="Total Discount"/>
+	                <field name="average_price" avg="Average Price"/>
+	                <field name="delay_validation"/>
+	                <field name="delay_payment"/>
 	                <field name="state" invisible="1"/>
 	            </tree>
 	        </field>
@@ -45,6 +50,7 @@
 	                         separator="1"
 	                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
 	                         help="POS ordered created last 7 days"/>
+	                    <separator orientation="vertical"/>
 	                    <filter icon="terp-go-today"
                              string="    Today    "
                              name="today"
@@ -52,15 +58,15 @@
                              domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d'))]"
                              help="POS ordered created by today"/>
 	                    <separator orientation="vertical"/>
-	                    <filter icon="terp-document-new"
-	                        string="Draft"
-	                        domain="[('state','=','draft')]"/>
+	                    <filter icon="terp-dolar"
+                            string="Accepted"
+                            domain="[('state_2','=',('to_verify'))]" groups="base.group_extended"/>
+                        <filter icon="terp-dolar"
+                            string="Invoiced"
+                            domain="[('state','=',('invoiced'))]"/>
 	                    <filter icon="terp-dolar"
 	                        string="Paid"
 	                        domain="[('state','=',('paid'))]"/>
-	                    <filter icon="terp-dolar"
-                            string="Invoiced"
-                            domain="[('state','=',('invoiced'))]"/>
                     <separator orientation="vertical"/>
                     <field name="partner_id"/>
                     <field name="user_id" widget="selection">
@@ -73,14 +79,15 @@
 	                <newline/>
 	                <group expand="0" string="Group By..." colspan="10" col="12">
 	                    <filter string="Salesman" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
-	                    <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
+	                    <filter string="Customer" icon="terp-personal" context="{'group_by':'partner_id'}"/>
 	                    <separator orientation="vertical"/>
+	                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+	                    <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Cash Register" icon="terp-folder-orange" context="{'group_by':'statement_journal_id'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
 	                    <separator orientation="vertical"/>
-	                    <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
-	                    <filter string="Shop" icon="terp-go-home" context="{'group_by':'shop_id'}"/>
-                        <filter string="Company" icon="terp-go-home" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>

From a3ed9b34d4df6ff21c06c5f17447504d5b989eae Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 18 Jun 2010 18:18:34 +0530
Subject: [PATCH 19/40] [Fix] product_marign: fix the problem of paid state

bzr revid: sbh@tinyerp.com-20100618124834-dqnn0vgufy9qlrvo
---
 addons/product_margin/product_margin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product_margin/product_margin.py b/addons/product_margin/product_margin.py
index b70733ee992..b5421d3798c 100644
--- a/addons/product_margin/product_margin.py
+++ b/addons/product_margin/product_margin.py
@@ -42,7 +42,7 @@ class product_product(osv.osv):
             invoice_types=()
             states=()
             if invoice_state=='paid':
-                states=('paid')
+                states=('paid',)
             elif invoice_state=='open_paid':
                 states=('open','paid')
             elif invoice_state=='draft_open_paid':

From 1f5c37ee327989ca148f5c870f8551048eaa8698 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 18 Jun 2010 18:30:16 +0530
Subject: [PATCH 20/40] [Fix] point_of_sale: Fix the probelm of pos_invoice
 report

bzr revid: sbh@tinyerp.com-20100618130016-1ju5vaswv3awc7oh
---
 addons/point_of_sale/report/pos_invoice.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/point_of_sale/report/pos_invoice.py b/addons/point_of_sale/report/pos_invoice.py
index ee905ed74bf..eb59548758c 100644
--- a/addons/point_of_sale/report/pos_invoice.py
+++ b/addons/point_of_sale/report/pos_invoice.py
@@ -35,19 +35,19 @@ class pos_invoice(report_sxw.rml_parse):
         })
         
 
-    def set_context(self, objects, data, ids, report_type=None):
-        super(pos_invoice, self).set_context(objects, data, ids, report_type)
+    def set_context(self, order, data, ids, report_type=None):
+        super(pos_invoice, self).set_context(order, data, ids, report_type)
         iids = []
         nids = []
 
-        for order in objects:
-            order.write({'nb_print': order.nb_print + 1})
 
-            if order.invoice_id and order.invoice_id not in iids:
-                if not order.invoice_id:
-                    raise osv.except_osv(_('Error !'), _('Please create an invoice for this sale.'))
-                iids.append(order.invoice_id)
-                nids.append(order.invoice_id.id)
+        order.write({'nb_print': order.nb_print + 1})
+
+        if order.invoice_id and order.invoice_id not in iids:
+            if not order.invoice_id:
+                raise osv.except_osv(_('Error !'), _('Please create an invoice for this sale.'))
+            iids.append(order.invoice_id)
+            nids.append(order.invoice_id.id)
         self.cr.commit()
         data['ids'] = nids
         self.datas = data

From b7ae8a26df7c9656fb6d9b8b973a770977ce8c9c Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 18 Jun 2010 18:38:43 +0530
Subject: [PATCH 21/40] clean

bzr revid: mra@mra-laptop-20100618130843-q2qwhmklf1dyxlpt
---
 .../sale_analytic_plans.py                    | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/addons/sale_analytic_plans/sale_analytic_plans.py b/addons/sale_analytic_plans/sale_analytic_plans.py
index df9eee3e316..b55ca670e07 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans.py
+++ b/addons/sale_analytic_plans/sale_analytic_plans.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,14 +15,15 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 import time
+from mx import DateTime
+
 import netsvc
 from osv import fields, osv
 import ir
-from mx import DateTime
 from tools import config
 
 class sale_order_line(osv.osv):
@@ -31,13 +32,15 @@ class sale_order_line(osv.osv):
     _columns = {
         'analytics_id':fields.many2one('account.analytic.plan.instance','Analytic Distribution'),
     }
-    def invoice_line_create(self, cr, uid, ids, context={}):
-        create_ids=super(sale_order_line,self).invoice_line_create(cr, uid, ids, context)
-        i=0
+    def invoice_line_create(self, cr, uid, ids, context=None):
+        line_obj = self.pool.get('account.invoice.line')
+        create_ids = super(sale_order_line,self).invoice_line_create(cr, uid, ids, context=context)
+        i = 0
         for line in self.browse(cr, uid, ids, context):
-            self.pool.get('account.invoice.line').write(cr,uid,[create_ids[i]],{'analytics_id':line.analytics_id.id})
-            i=i+1
+            line_obj.write(cr, uid, [create_ids[i]], {'analytics_id':line.analytics_id.id})
+            i = i+1
         return create_ids
-sale_order_line()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
+sale_order_line()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From d1b2f438c89dec03d6b688e05d245c25219dc71a Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 18 Jun 2010 18:39:34 +0530
Subject: [PATCH 22/40] clean

bzr revid: mra@mra-laptop-20100618130934-r8zvtq6w6683gwoh
---
 addons/sale_crm/sale_crm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py
index 14c1a07e336..6efb7f68c8e 100644
--- a/addons/sale_crm/sale_crm.py
+++ b/addons/sale_crm/sale_crm.py
@@ -27,7 +27,7 @@ class sale_order(osv.osv):
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
     }
 
-    def _get_section(self, cr, uid, context):
+    def _get_section(self, cr, uid, context=None):
        return context.get('context_section_id',False)
 
     _defaults = {

From e40b7312d8156b498434e0ba2adb0c0794726ea8 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 18 Jun 2010 18:46:51 +0530
Subject: [PATCH 23/40] clean

bzr revid: mra@mra-laptop-20100618131651-507dye32t6srxo3x
---
 addons/sale_delivery_report/report/shipping.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/sale_delivery_report/report/shipping.py b/addons/sale_delivery_report/report/shipping.py
index d9fe87a7006..3fc36256326 100644
--- a/addons/sale_delivery_report/report/shipping.py
+++ b/addons/sale_delivery_report/report/shipping.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,11 +15,12 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 import time
+
 from report import report_sxw
 from osv import osv
 import pooler
@@ -71,4 +72,5 @@ class shipping(report_sxw.rml_parse):
 #        return True
 
 report_sxw.report_sxw('report.sale.shipping','stock.picking','addons/sale_delivery_report/report/shipping.rml',parser=shipping)
-# 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 0e11a146ce45c7ad02d852ab40fcbfda4b8ddc28 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 18 Jun 2010 18:51:24 +0530
Subject: [PATCH 24/40] [IMP] point_of_sale:Add the icon on button and improve
 the view

bzr revid: sbh@tinyerp.com-20100618132124-pi1ozk6pot87zlk5
---
 addons/point_of_sale/pos.py             |  1 +
 addons/point_of_sale/pos_view.xml       |  8 ++++----
 addons/point_of_sale/statement_view.xml | 27 +++++++++++++------------
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index a83d1c148c7..7cde281c17a 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -238,6 +238,7 @@ class pos_order(osv.osv):
             'invoice_id': False,
             'account_move': False,
             'picking_id': False,
+            'statement_ids':[],
             'nb_print': 0,
             'pickings': []
         })
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 8ab8ced00fe..be55b33db2c 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -47,8 +47,8 @@
                             <group colspan="4" col="7">
                                 <field name="amount_tax"/>
                                 <field name="amount_total"/>
-                                <button name="%(action_pos_discount)d" string="D_iscount" type="action" states="draft"/>
-                                <button name="dummy_button" string="Compute" type="object" />
+                                <button name="%(action_pos_discount)d" string="D_iscount" icon="gtk-execute" type="action" states="draft"/>
+                                <button name="dummy_button" string="Compute" icon="gtk-execute" type="object" />
                             </group>
 
                             <group colspan="4" col="9" groups="base.group_extended">
@@ -95,8 +95,8 @@
                                 <field name="sale_journal" domain="[('type','=','sale'),('company_id','=',company_id)]"/>
                                 <field name="pricelist_id" domain="[('type','=','sale')]"/>
                                 <field name="invoice_id"/>
-                                <group colspan="2" col="3">
-                                    <button name="invoice" string="Create _Invoice" states="paid"/>
+                                <group colspan="2" col="4">
+                                    <button name="invoice" icon="gtk-execute" string="Create _Invoice" states="paid"/>
                                 </group>
                             </group>
 
diff --git a/addons/point_of_sale/statement_view.xml b/addons/point_of_sale/statement_view.xml
index 65b5fb419d6..cb9a7a9ce03 100644
--- a/addons/point_of_sale/statement_view.xml
+++ b/addons/point_of_sale/statement_view.xml
@@ -34,7 +34,7 @@
                     <field name="balance_end"/>
                     <field name="user_id"/>
                     <field name="state"/>
-                    <button type="object" string="Open" name="button_open" states="draft" icon="terp-camera_test"/>
+                    <button type="object" string="Open" name="button_open"  states="draft" icon="terp-camera_test"/>
                     <button type="object" string="Confirm" name="button_confirm" states="open" icon="terp-gtk-go-back-rtl"/>
                     <button type="object" string="Cancel" name="button_cancel" states="confirm" icon="terp-gtk-stop"/>
                 </tree>
@@ -109,10 +109,10 @@
                         <field name="total_entry_encoding"/>
                         </group>
                         <group colspan="4">
-                        <button name="button_dummy" states="draft" string="Compute"/>
-                        <button name="button_confirm" states="open" string="Close CashBox" type="object"/>
-                        <button name="button_open" states="draft" string="Open CashBox" type="object"/>
-                        <button name="button_cancel" states="confirm" string="Cancel" type="object" groups="base.group_extended"/>
+                        <button name="button_dummy" states="draft" icon="gtk-execute" string="Compute"/>
+                        <button name="button_confirm" states="open" icon="terp-gtk-go-back-rtl" string="Close CashBox" type="object"/>
+                        <button name="button_open" states="draft"  icon="terp-camera_test" string="Open CashBox" type="object"/>
+                        <button name="button_cancel" states="confirm" string="Cancel" type="object"  icon="gtk-cancel" groups="base.group_extended"/>
                     </group>
                 </form>
             </field>
@@ -172,10 +172,10 @@
                         <field name="total_entry_encoding"/>
                         </group>
                         <group colspan="4">
-                        <button name="button_dummy" states="draft" string="Compute"/>
-                        <button name="button_confirm" states="open" string="Close CashBox" type="object"/>
-                        <button name="button_open" states="draft" string="Open CashBox" type="object"/>
-                        <button name="button_cancel" states="confirm" string="Cancel" type="object" groups="base.group_extended"/>
+                        <button name="button_dummy" states="draft" icon="gtk-execute" string="Compute"/>
+                        <button name="button_confirm" states="open" icon="terp-gtk-go-back-rtl" string="Close CashBox" type="object"/>
+                        <button name="button_open" states="draft" icon="terp-camera_test" string="Open CashBox" type="object"/>
+                        <button name="button_cancel" states="confirm"  icon="gtk-cancel" string="Cancel" type="object" groups="base.group_extended"/>
                     </group>
                 </form>
             </field>
@@ -301,10 +301,11 @@
                         <field name="total_entry_encoding"/>
                       </group>
                       <group colspan="4">
-                        <button name="button_dummy" states="draft" string="Compute"/>
-                        <button name="button_open" states="draft" string="Open CashBox" type="object" />
-                        <button name="button_confirm" states="open" string="Confirm" type="object" />
-                        <button name="button_cancel" states="confirm" string="Cancel" type="object" groups="base.group_extended"/>
+                        <button name="button_dummy" states="draft" icon="gtk-execute" string="Compute"/>
+                        <button name="button_confirm" states="open" icon="terp-gtk-go-back-rtl" string="Close CashBox" type="object"/>
+                        <button name="button_open" states="draft" icon="terp-camera_test" string="Open CashBox" type="object"/>
+                        <button name="button_cancel" states="confirm"  icon="gtk-cancel" string="Cancel" type="object" groups="base.group_extended"/>
+                        
                     </group>
                 </form>
             </field>

From 8e199aadc8873531f2c2b571f02c7f78e2a782b8 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Fri, 18 Jun 2010 15:55:20 +0200
Subject: [PATCH 25/40] [IMP] account, hr_attendance, hr_timesheet: typo,
 remove empty lines [FIX] account_coda: remove wrong comment

bzr revid: qdp-launchpad@tinyerp.com-20100618135520-b1k3la6hsfxs7xuh
---
 addons/account/account.py                           | 13 ++++++-------
 addons/account/company.py                           |  2 +-
 addons/account/installer.py                         |  1 -
 addons/account/invoice.py                           |  4 ++--
 addons/account/partner.py                           |  2 +-
 addons/account/product.py                           |  1 -
 addons/account/wizard/account_move_line_select.py   |  1 -
 .../account_reconcile_partner_process_view.xml      |  4 ++--
 addons/account_coda/wizard/coda_import.py           |  2 +-
 .../wizard/hr_attendance_sign_in_out.py             |  1 -
 .../wizard/hr_timesheet_invoice_create.py           |  1 -
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py     |  3 ---
 12 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index f946723e350..06060f59e28 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -616,17 +616,17 @@ class account_journal(osv.osv):
         'type_control_ids': fields.many2many('account.account.type', 'account_journal_type_rel', 'journal_id','type_id', 'Type Controls', domain=[('code','<>','view'), ('code', '<>', 'closed')]),
         'account_control_ids': fields.many2many('account.account', 'account_account_type_rel', 'journal_id','account_id', 'Account', domain=[('type','<>','view'), ('type', '<>', 'closed')]),
         'view_id': fields.many2one('account.journal.view', 'Display Mode', required=True, help="Gives the view used when writing or browsing entries in this journal. The view tells Open ERP which fields should be visible, required or readonly and in which order. You can create your own view for a faster encoding in each journal."),
-        'default_credit_account_id': fields.many2one('account.account', 'Default Credit Account', domain="[('type','!=','view')]",help="It acts as a default account for credit amount"),
-        'default_debit_account_id': fields.many2one('account.account', 'Default Debit Account', domain="[('type','!=','view')]",help="It acts as a default account for debit amount"),
+        'default_credit_account_id': fields.many2one('account.account', 'Default Credit Account', domain="[('type','!=','view')]", help="It acts as a default account for credit amount"),
+        'default_debit_account_id': fields.many2one('account.account', 'Default Debit Account', domain="[('type','!=','view')]", help="It acts as a default account for debit amount"),
         'centralisation': fields.boolean('Centralised counterpart', help="Check this box to determine that each entry of this journal won't create a new counterpart but will share the same counterpart. This is used in fiscal year closing."),
-        'update_posted': fields.boolean('Allow Cancelling Entries',help="Check this box if you want to cancel the entries related to this journal or want to cancel the invoice related to this journal"),
+        'update_posted': fields.boolean('Allow Cancelling Entries', help="Check this box if you want to allow the cancellation the entries related to this journal or of the invoice related to this journal"),
         'group_invoice_lines': fields.boolean('Group invoice lines', help="If this box is checked, the system will try to group the accounting lines when generating them from invoices."),
         'sequence_id': fields.many2one('ir.sequence', 'Entry Sequence', help="The sequence gives the display order for a list of journals", required=True),
         'user_id': fields.many2one('res.users', 'User', help="The user responsible for this journal"),
         'groups_id': fields.many2many('res.groups', 'account_journal_group_rel', 'journal_id', 'group_id', 'Groups'),
         'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'),
         'entry_posted': fields.boolean('Skip \'Draft\' State for Created Entries', help='Check this box if you don\'t want new account moves to pass through the \'draft\' state and instead goes directly to the \'posted state\' without any manual validation.'),
-        'company_id': fields.many2one('res.company', 'Company', required=True,select=1,help="Company associated with a journal"),
+        'company_id': fields.many2one('res.company', 'Company', required=True, select=1, help="Company related to this journal"),
         'invoice_sequence_id': fields.many2one('ir.sequence', 'Invoice Sequence', \
             help="The sequence used for invoice numbers in this journal."),
         'allow_date':fields.boolean('Check Date not in the Period', help= 'If set to True then do not accept the entry if the entry date is not into the period dates'),
@@ -678,7 +678,6 @@ class account_journal(osv.osv):
                   res= {'value':{'centralisation': False}}
         return res
 
-
 account_journal()
 
 class account_fiscalyear(osv.osv):
@@ -772,7 +771,7 @@ class account_period(osv.osv):
         'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True, states={'done':[('readonly',True)]}, select=True),
         'state': fields.selection([('draft','Draft'), ('done','Done')], 'State', readonly=True,
                                   help='When monthly periods are created. The state is \'Draft\'. At the end of monthly period it is in \'Done\' state.'),
-        'company_id': fields.related('fiscalyear_id','company_id',type='many2one',relation='res.company',string='Company',store=True)
+        'company_id': fields.related('fiscalyear_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True)
     }
     _defaults = {
         'state': lambda *a: 'draft',
@@ -878,7 +877,7 @@ class account_journal_period(osv.osv):
         'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'State', required=True, readonly=True,
                                   help='When journal period is created. The state is \'Draft\'. If a report is printed it comes to \'Printed\' state. When all transactions are done, it comes in \'Done\' state.'),
         'fiscalyear_id': fields.related('period_id', 'fiscalyear_id', string='Fiscal Year', type='many2one', relation='account.fiscalyear'),
-        'company_id': fields.related('journal_id','company_id',type='many2one',relation='res.company',string='Company')
+        'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company')
     }
 
     def _check(self, cr, uid, ids, context={}):
diff --git a/addons/account/company.py b/addons/account/company.py
index 8aa41dc47c6..8ea9c80f694 100644
--- a/addons/account/company.py
+++ b/addons/account/company.py
@@ -34,4 +34,4 @@ void. Do not hesitate to contact our accounting department'
     }
 res_company()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/installer.py b/addons/account/installer.py
index b1ba6221fff..45ea43040a4 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -23,7 +23,6 @@ import datetime
 from dateutil.relativedelta import relativedelta
 from os.path import join as opj
 from operator import itemgetter
-
 from tools.translate import _
 from osv import fields, osv
 import netsvc
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 3871d089db7..f478881ac7c 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -932,13 +932,13 @@ class account_invoice(osv.osv):
         account_move_obj = self.pool.get('account.move')
         invoices = self.read(cr, uid, ids, ['move_id', 'payment_ids'])
         for i in invoices:
-             if i['move_id']:
+            if i['move_id']:
                 account_move_obj.button_cancel(cr, uid, [i['move_id'][0]])
                 # delete the move this invoice was pointing to
                 # Note that the corresponding move_lines and move_reconciles
                 # will be automatically deleted too
                 account_move_obj.unlink(cr, uid, [i['move_id'][0]])
-             if i['payment_ids']:
+            if i['payment_ids']:
                 account_move_line_obj = self.pool.get('account.move.line')
                 pay_ids = account_move_line_obj.browse(cr, uid , i['payment_ids'])
                 for move_line in pay_ids:
diff --git a/addons/account/partner.py b/addons/account/partner.py
index c4faf780886..bfd74889c1c 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -187,7 +187,7 @@ class res_partner(osv.osv):
             help="This payment term will be used instead of the default one for the current partner"),
         'ref_companies': fields.one2many('res.company', 'partner_id',
             'Companies that refers to partner'),
-        'last_reconciliation_date': fields.datetime('Last Reconcilation Date', help='Date on which partner account entries reconciled last time')
+        'last_reconciliation_date': fields.datetime('Last Reconciliation Date', help='Date on which partner account entries reconciled last time')
     }
 res_partner()
 
diff --git a/addons/account/product.py b/addons/account/product.py
index 0d17b83ea58..ce91b9b0743 100644
--- a/addons/account/product.py
+++ b/addons/account/product.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 import time
-
 import netsvc
 from osv import fields, osv
 
diff --git a/addons/account/wizard/account_move_line_select.py b/addons/account/wizard/account_move_line_select.py
index 32ecf85f375..546bb08c754 100644
--- a/addons/account/wizard/account_move_line_select.py
+++ b/addons/account/wizard/account_move_line_select.py
@@ -43,7 +43,6 @@ class account_move_line_select(osv.osv_memory):
         else:
             fiscalyear_ids = [context['fiscalyear']]
 
-#        fiscalyear_ids = fiscalyear_obj.search(cr, uid, [('state', '=', 'draft')])
         fiscalyears = fiscalyear_obj.browse(cr, uid, fiscalyear_ids)
 
         period_ids = []
diff --git a/addons/account/wizard/account_reconcile_partner_process_view.xml b/addons/account/wizard/account_reconcile_partner_process_view.xml
index cd296759752..4c5bcf840ab 100644
--- a/addons/account/wizard/account_reconcile_partner_process_view.xml
+++ b/addons/account/wizard/account_reconcile_partner_process_view.xml
@@ -4,7 +4,7 @@
 
 
            <record id="account_partner_reconcile_view" model="ir.ui.view">
-             <field name="name">Account Partner Reconcile</field>
+             <field name="name">Partner Reconcilation Process</field>
              <field name="model">account.partner.reconcile.process</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
@@ -24,7 +24,7 @@
            </record>
 
         <record id="action_account_partner_reconcile" model="ir.actions.act_window">
-             <field name="name">Manual Reconciliation</field>
+             <field name="name">Reconciliation: Go to Next Partner</field>
              <field name="res_model">account.partner.reconcile.process</field>
              <field name="type">ir.actions.act_window</field>
              <field name="view_type">form</field>
diff --git a/addons/account_coda/wizard/coda_import.py b/addons/account_coda/wizard/coda_import.py
index 34054bc5009..82fc7bf877c 100644
--- a/addons/account_coda/wizard/coda_import.py
+++ b/addons/account_coda/wizard/coda_import.py
@@ -221,7 +221,7 @@ def _coda_parsing(self, cr, uid, data, context):
             bk_st_id = pool.get('account.bank.statement').create(cr,uid,{
                 'journal_id': statement['journal_id'],
                 'date':time.strftime('%Y-%m-%d',time.strptime(statement['date'],"%y/%m/%d")),
-#                'period_id':statement['period_id'],
+                'period_id':statement['period_id'],
                 'balance_start': statement["balance_start"],
                 'balance_end_real': statement["balance_end_real"],
                 'state': 'draft',
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
index f919299e583..d40829cf120 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
@@ -164,7 +164,6 @@ class hr_sign_in_out(osv.osv_memory):
         return {} # To do: Return Success message
 
     def sign_out(self, cr, uid, data, context=None):
-
         emp_id = data['emp_id']
         if 'last_time' in data:
             if data['last_time'] > time.strftime('%Y-%m-%d %H:%M:%S'):
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 1a110d21151..e619df22683 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -72,7 +72,6 @@ class hr_timesheet_invoice_create(osv.osv_memory):
         result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
         res = mod_obj.read(cr, uid, result, ['res_id'])
         data = self.read(cr, uid, ids, [], context)[0]
-
         account_ids = data['accounts']
         for account in analytic_account_obj.browse(cr, uid, account_ids, context):
             partner = account.partner_id
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 94d0e912bcf..2eb352974d7 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -151,16 +151,13 @@ class hr_timesheet_sheet(osv.osv):
         raise osv.except_osv(_('Error !'), _('You can not duplicate a timesheet !'))
 
     def button_confirm(self, cr, uid, ids, context=None):
-        
         if context is None:
             context = {}
         for sheet in self.browse(cr, uid, ids, context=context):
             di = sheet.user_id.company_id.timesheet_max_difference
-            
             if (abs(sheet.total_difference) < di) or not di:
                 wf_service = netsvc.LocalService("workflow")
                 wf_service.trg_validate(uid, 'hr_timesheet_sheet.sheet', sheet.id, 'confirm', cr)
-                
             else:
                 raise osv.except_osv(_('Warning !'), _('Please verify that the total difference of the sheet is lower than %.2f !') %(di,))
         return True

From 7406420996dd681d6caa3a8ae0c3c42e5a7d6619 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Fri, 18 Jun 2010 19:31:01 +0530
Subject: [PATCH 26/40] [FIX]: fix a problem for the accounting for the payroll

bzr revid: mga@tinyerp.com-20100618140101-5e1wuqaxjv3otkzw
---
 addons/hr_payroll/hr_payroll.py       | 122 +++++++++++++++-----------
 addons/hr_payroll/hr_payroll_view.xml |  14 ++-
 2 files changed, 82 insertions(+), 54 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 93146b565b9..abc5335023d 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -529,7 +529,7 @@ class payment_category(osv.osv):
     
     _name = 'hr.allounce.deduction.categoty'
     _description = 'Allowance Deduction Heads'
-        
+    
     _columns = {
         'name':fields.char('Categoty Name', size=64, required=True, readonly=False),
         'code':fields.char('Categoty Code', size=64, required=True, readonly=False),
@@ -538,13 +538,15 @@ class payment_category(osv.osv):
             ('deduction','Deduction'),
             ('other','Others'),
         ],'Type', select=True),
-        'base':fields.char('Based on', size=64, required=True, readonly=False, help='This will use to computer the % fields values, in general its on basic, but You can use all heads code field in small letter as a variable name i.e. hra, ma, lta, etc...., also you can use, static varible basic'),
+        'base': fields.text('Based on', required=True, readonly=False, help='This will use to computer the % fields values, in general its on basic, but You can use all heads code field in small letter as a variable name i.e. hra, ma, lta, etc...., also you can use, static varible basic'),
+        #'base':fields.char('Based on', size=64, required=True, readonly=False, help='This will use to computer the % fields values, in general its on basic, but You can use all heads code field in small letter as a variable name i.e. hra, ma, lta, etc...., also you can use, static varible basic'),
         'condition':fields.char('Condition', size=1024, required=True, readonly=False, help='Applied this head for calculation if condition is true'),
         'sequence': fields.integer('Sequence', required=True, help='Use to arrange calculation sequence'),
         'note': fields.text('Description'),    
         'user_id':fields.char('User', size=64, required=False, readonly=False),
         'state':fields.char('Label', size=64, required=False, readonly=False),
         'company_id':fields.many2one('res.company', 'Company', required=False),
+        'contribute_ids':fields.one2many('company.contribution', 'category_id', 'Company Contribution', required=False),
     }
     _defaults = {
         'condition': lambda *a: 'True',
@@ -1257,50 +1259,50 @@ class hr_payslip(osv.osv):
                         line_ids += [movel_pool.create(cr, uid, ded_cre)]
 
                 #make an entry line to contribution register
-                if line.category_id.register_id:
-                    ctr = {
-                        'register_id':line.category_id.register_id.id,
-                        'name':line.name,
-                        'code':line.code,
-                        'employee_id':slip.employee_id.id,
-                        'period_id':period_id,
-                        'emp_deduction':amount,
-                    }
-                    if line.category_id.contribute:
-                        ctr['comp_deduction'] = amount
-                    
-                    company = 0.0
-                    employee = 0.0
-                    if line.category_id.contribute and line.category_id.include_in_salary and line.category_id.amount_type == 'per':
-                        new_amount = (amount * (line.category_id.contribute_per / (1+line.category_id.contribute_per)))
-                        company = new_amount
-                        employee = amount - company
-                    
-                    elif line.category_id.contribute and line.category_id.include_in_salary and line.category_id.amount_type == 'fix':
-                        company = line.category_id.contribute_per
-                        employee = amount - company
+#                if line.category_id.register_id:
+#                    ctr = {
+#                        'register_id':line.category_id.register_id.id,
+#                        'name':line.name,
+#                        'code':line.code,
+#                        'employee_id':slip.employee_id.id,
+#                        'period_id':period_id,
+#                        'emp_deduction':amount,
+#                    }
+#                    if line.category_id.contribute:
+#                        ctr['comp_deduction'] = amount
+#                    
+#                    company = 0.0
+#                    employee = 0.0
+#                    if line.category_id.contribute and line.category_id.include_in_salary and line.category_id.amount_type == 'per':
+#                        new_amount = (amount * (line.category_id.contribute_per / (1+line.category_id.contribute_per)))
+#                        company = new_amount
+#                        employee = amount - company
+#                    
+#                    elif line.category_id.contribute and line.category_id.include_in_salary and line.category_id.amount_type == 'fix':
+#                        company = line.category_id.contribute_per
+#                        employee = amount - company
 
-                    elif line.category_id.contribute and line.category_id.include_in_salary and line.category_id.amount_type == 'func':
-                        company = self.pool.get('hr.allounce.deduction.categoty').execute_function(cr, uid, line.category_id.id, line.slip_id.basic, context)
-                        employee = amount
-                    
-                    elif line.category_id.contribute and not line.category_id.include_in_salary and line.category_id.amount_type == 'per':
-                        company = amount * line.category_id.contribute_per
-                        employee = amount
-                    
-                    elif line.category_id.contribute and not line.category_id.include_in_salary and line.category_id.amount_type == 'fix':
-                        company = line.category_id.contribute_per
-                        employee = amount
+#                    elif line.category_id.contribute and line.category_id.include_in_salary and line.category_id.amount_type == 'func':
+#                        company = self.pool.get('hr.allounce.deduction.categoty').execute_function(cr, uid, line.category_id.id, line.slip_id.basic, context)
+#                        employee = amount
+#                    
+#                    elif line.category_id.contribute and not line.category_id.include_in_salary and line.category_id.amount_type == 'per':
+#                        company = amount * line.category_id.contribute_per
+#                        employee = amount
+#                    
+#                    elif line.category_id.contribute and not line.category_id.include_in_salary and line.category_id.amount_type == 'fix':
+#                        company = line.category_id.contribute_per
+#                        employee = amount
+
+#                    elif line.category_id.contribute and not line.category_id.include_in_salary and line.category_id.amount_type == 'func':
+#                        company = self.pool.get('hr.allounce.deduction.categoty').execute_function(cr, uid, line.category_id.id, line.slip_id.basic, context)
+#                        employee = amount
+#                        
+#                    ctr['emp_deduction'] = employee
+#                    ctr['comp_deduction'] = company
+#                        
+#                    self.pool.get('hr.contibution.register.line').create(cr, uid, ctr)
 
-                    elif line.category_id.contribute and not line.category_id.include_in_salary and line.category_id.amount_type == 'func':
-                        company = self.pool.get('hr.allounce.deduction.categoty').execute_function(cr, uid, line.category_id.id, line.slip_id.basic, context)
-                        employee = amount
-                        
-                    ctr['emp_deduction'] = employee
-                    ctr['comp_deduction'] = company
-                        
-                    self.pool.get('hr.contibution.register.line').create(cr, uid, ctr)
-            
             adj_move_id = False
             if total_deduct > 0:
                 move = {
@@ -1372,6 +1374,18 @@ class hr_payslip(osv.osv):
         return True
     
     def get_contract(self, cr, uid, employee, date, context={}):
+        """
+        Compute leaves for an employee
+        
+        @param cr: cursor to database
+        @param uid: id of current user
+        @param employee: object of the hr.employee model
+        @param date: date on which pay slip is creating
+        @param context: context arguments, like lang, time zone
+        
+        @return: return a current contract from the list of contract
+        """
+        
         sql_req= '''
             SELECT c.id as id, c.wage as wage, struct_id as function
             FROM hr_contract c
@@ -1398,7 +1412,6 @@ class hr_payslip(osv.osv):
         @param slip: object of the hr.payroll.slip model
         @param employee: object of the hr.employee model
         @param context: context arguments, like lang, time zone
-        
         @return: return a result
         """
         
@@ -1516,7 +1529,7 @@ class hr_payslip(osv.osv):
                     amt = eval(base, obj)
                 except Exception, e:
                     raise osv.except_osv(_('Variable Error !'), _('Variable Error : %s ' % (e)))
-                
+
                 if sal_type in ('gross', 'net'):
                     if line.amount_type == 'per':
                         percent = line.amount
@@ -1528,7 +1541,10 @@ class hr_payslip(osv.osv):
                         
                         if value > 0:
                             percent = 0.0
-                    
+
+                        for cline in line.category_id.contribute_ids:
+                            print 'XXXXXXXXXXXXXXX : ', cline.name
+                        
                     elif line.amount_type == 'fix':
                         value = line.amount
                     
@@ -1536,12 +1552,16 @@ class hr_payslip(osv.osv):
                         value = self.pool.get('hr.payslip.line').execute_function(cr, uid, line.id, amt, context)
                         line.amount = value
                 else:
-                    if line.amount_type in ('fix', 'per'):
-                        value = line.amount
-                    elif line.amount_type == 'func':
+                    if line.amount_type == 'func':
                         value = self.pool.get('hr.payslip.line').execute_function(cr, uid, line.id, amt, context)
                         line.amount = value
-                
+                    
+#                    for cline in line.category_id.contribute_ids:
+#                        if cline.amount_type == 'fix':
+#                            contribute = cline.contribute_per
+#                        elif cline.amount_type == 'func':
+#                            contribute = func_pool.execute_function(cr, uid, cline.id, line.amount, context)
+                    
                 if line.type == 'allowance':
                     all_per += percent
                     all_fix += value
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 0be3793a234..430c548927e 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -526,14 +526,22 @@
                         <field name="name" select="1"/>
                         <field name="code" select="1"/>
                         <field name="type" select="1"/>
-                        <group col="2" colspan="4">
-                            <separator colspan="4" string="Dynamic Computation"/>
-                            <field name="base"/>
+                        
+                        <group col="4" colspan="4">
+                            <separator colspan="2" string="Based on"/>
+                            <field name="base" colspan="4" nolabel="1"/>
+                        </group>
+                        <group col="2" colspan="2">
+                            <separator colspan="2" string="Dynamic Computation"/>
                             <field name="condition"/>
                             <field name="sequence"/>
                         </group>
                     </group>
+                    
                     <notebook colspan="4">
+                        <page string="Contribution">
+                            <field name="contribute_ids" colspan="4" nolabel="1" height="300"/>
+                        </page>
                         <page string="Description">
                             <field name="note" colspan="4" nolabel="1"/>
                         </page>

From 165b90054ed66aeef5b5713c8342e4d32d9c2d1f Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Fri, 18 Jun 2010 16:22:30 +0200
Subject: [PATCH 27/40] [IMP] account: improved icon on
 account_reconcile_partner_process wizard

bzr revid: qdp-launchpad@tinyerp.com-20100618142230-jpiqb4gshtr41o4l
---
 .../account/wizard/account_reconcile_partner_process_view.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/wizard/account_reconcile_partner_process_view.xml b/addons/account/wizard/account_reconcile_partner_process_view.xml
index 4c5bcf840ab..f119243a470 100644
--- a/addons/account/wizard/account_reconcile_partner_process_view.xml
+++ b/addons/account/wizard/account_reconcile_partner_process_view.xml
@@ -17,7 +17,7 @@
                   <newline/>
                   <group colspan="4" col="4">
      	             <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                     <button name="next_partner" icon="gtk-execute" type="object" string="Go to next partner" />
+                     <button name="next_partner" icon="gtk-go-forward" type="object" string="Go to next partner" />
                   </group>
                </form>
              </field>

From f5f8c836c3a8c253bda1efa43d50db958de68de0 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Sat, 19 Jun 2010 01:59:07 +0530
Subject: [PATCH 28/40] [MOVE]: move accounting from hr_payroll to
 hr_payroll_india module. now hr_payroll is not dependant on account module,
 we can use just payroll without accounting

bzr revid: mga@tinyerp.com-20100618202907-g3s8mu8w07q4fy0q
---
 addons/hr_payroll/__openerp__.py          |   1 -
 addons/hr_payroll/hr_payroll.py           | 686 +++-------------------
 addons/hr_payroll/hr_payroll_view.xml     |  25 +-
 addons/hr_payroll/hr_payroll_workflow.xml |  31 +-
 4 files changed, 79 insertions(+), 664 deletions(-)

diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py
index 9f1c59abc4f..9a5ff2187e2 100644
--- a/addons/hr_payroll/__openerp__.py
+++ b/addons/hr_payroll/__openerp__.py
@@ -37,7 +37,6 @@
     'website':'http://www.openerp.com',
     'depends': [
         'hr',
-        'account',
         'hr_contract', 
         'hr_holidays',
         'hr_expense'
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index abc5335023d..7a39199cce6 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -788,11 +788,7 @@ class hr_payslip(osv.osv):
         'other_pay': fields.function(_calculate, method=True, store=True, multi='dc', string='Others', digits=(16, 2)),
         'total_pay': fields.function(_calculate, method=True, store=True, multi='dc', string='Total Payment', digits=(16, 2)),
         'line_ids':fields.one2many('hr.payslip.line', 'slip_id', 'Payslip Line', required=False, readonly=True, states={'draft': [('readonly', False)]}),
-        'move_ids':fields.one2many('hr.payslip.account.move', 'slip_id', 'Accounting vouchers', required=False),
-        'move_line_ids':fields.many2many('account.move.line', 'payslip_lines_rel', 'slip_id', 'line_id', 'Accounting Lines', readonly=True),
-        'move_payment_ids':fields.many2many('account.move.line', 'payslip_payment_rel', 'slip_id', 'payment_id', 'Payment Lines', readonly=True),
         'company_id':fields.many2one('res.company', 'Company', required=False),
-        'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], help="Keep empty to use the period of the validation(Payslip) date."),
         'holiday_days': fields.integer('No of Leaves', readonly=True),
         'worked_days': fields.integer('Worked Day', readonly=True),
         'working_days': fields.integer('Working Days', readonly=True),
@@ -826,185 +822,16 @@ class hr_payslip(osv.osv):
         res_id = super(hr_payslip, self).copy(cr, uid, id, default, context)
         return res_id
     
-    def create_voucher(self, cr, uid, ids, name, voucher, sequence=5):
-        slip_move = self.pool.get('hr.payslip.account.move')
-        for slip in ids:
-            res = {
-                'slip_id':slip,
-                'move_id':voucher,
-                'sequence':sequence,
-                'name':name
-            }
-            slip_move.create(cr, uid, res)
-            
     def set_to_draft(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state':'draft'})
         return True
     
     def cancel_sheet(self, cr, uid, ids, context={}):
-        move_pool = self.pool.get('account.move')
-
-        for slip in self.browse(cr, uid, ids, context):
-            if slip.move_id:
-                if slip.move_id.state == 'posted':
-                    move_pool.button_cancel(cr, uid [slip.move_id.id], context)
-                move_pool.unlink(cr, uid, [slip.move_id.id])
-            
-            if slip.adj_move_id:
-                if slip.adj_move_id.state == 'posted':
-                    move_pool.button_cancel(cr, uid [slip.adj_move_id.id], context)
-                move_pool.unlink(cr, uid, [slip.adj_move_id.id])
-                
-            if slip.other_move_id:
-                if slip.other_move_id.state == 'posted':
-                    move_pool.button_cancel(cr, uid [slip.other_move_id.id], context)
-                move_pool.unlink(cr, uid, [slip.other_move_id.id])
-            
         self.write(cr, uid, ids, {'state':'cancel'})
         return True
     
     def process_sheet(self, cr, uid, ids, context={}):
-        move_pool = self.pool.get('account.move')
-        movel_pool = self.pool.get('account.move.line')
-        invoice_pool = self.pool.get('account.invoice')
-        
-        for slip in self.browse(cr,uid,ids):    
-            line_ids = []
-            partner = False
-            partner_id = False
-            exp_ids = []
-            
-            partner = slip.employee_id.address_home_id.partner_id
-            partner_id = partner.id
-            
-            fiscal_year_ids = self.pool.get('account.fiscalyear').search(cr, uid, [])
-            if not fiscal_year_ids:
-                raise osv.except_osv(_('Warning !'), _('Please define fiscal year for perticular contract'))
-            fiscal_year_objs = self.pool.get('account.fiscalyear').read(cr, uid, fiscal_year_ids, ['date_start','date_stop'])
-            year_exist = False
-            for fiscal_year in fiscal_year_objs:
-                if ((fiscal_year['date_start'] <= slip.date) and (fiscal_year['date_stop'] >= slip.date)):
-                    year_exist = True
-            if not year_exist:
-                raise osv.except_osv(_('Warning !'), _('Fiscal Year is not defined for slip date %s'%slip.date))
-            search_period = self.pool.get('account.period').search(cr,uid,[('date_start','<=',slip.date),('date_stop','>=',slip.date)])
-            if not search_period:
-                raise osv.except_osv(_('Warning !'), _('Period is not defined for slip date %s'%slip.date))
-            period_id = search_period[0]
-            name = 'Payment of Salary to %s' % (slip.employee_id.name)
-            move = {
-                'journal_id': slip.bank_journal_id.id,
-                'period_id': period_id, 
-                'date': slip.date,
-                'type':'bank_pay_voucher',
-                'ref':slip.number,
-                'narration': name
-            }
-            move_id = move_pool.create(cr, uid, move)
-            self.create_voucher(cr, uid, [slip.id], name, move_id)
-            
-            name = "To %s account" % (slip.employee_id.name)
-            ded_rec = {
-                'move_id':move_id,
-                'name': name,
-                #'partner_id': partner_id,
-                'date': slip.date, 
-                'account_id': slip.employee_id.property_bank_account.id, 
-                'debit': 0.0,
-                'credit' : slip.total_pay,
-                'journal_id' : slip.journal_id.id,
-                'period_id' :period_id,
-                'ref':slip.number
-            }
-            line_ids += [movel_pool.create(cr, uid, ded_rec)]
-            name = "By %s account" % (slip.employee_id.property_bank_account.name)
-            cre_rec = {
-                'move_id':move_id,
-                'name': name,
-                'partner_id': partner_id,
-                'date': slip.date,
-                'account_id': partner.property_account_payable.id,
-                'debit':  slip.total_pay,
-                'credit' : 0.0,
-                'journal_id' : slip.journal_id.id,
-                'period_id' :period_id,
-                'ref':slip.number
-            }
-            line_ids += [movel_pool.create(cr, uid, cre_rec)]
-            
-            other_pay = slip.other_pay
-            #Process all Reambuse Entries
-            for line in slip.line_ids:
-                if line.type == 'otherpay' and line.expanse_id.invoice_id:
-                    if not line.expanse_id.invoice_id.move_id:
-                        raise osv.except_osv(_('Warning !'), _('Please Confirm all Expanse Invoice appear for Reimbursement'))
-                    invids = [line.expanse_id.invoice_id.id]
-                    amount = line.total
-                    acc_id = slip.bank_journal_id.default_credit_account_id and slip.bank_journal_id.default_credit_account_id.id
-                    period_id = slip.period_id.id
-                    journal_id = slip.bank_journal_id.id
-                    name = '[%s]-%s' % (slip.number, line.name)
-                    invoice_pool.pay_and_reconcile(cr, uid, invids, amount, acc_id, period_id, journal_id, False, period_id, False, context, name)
-                    other_pay -= amount
-                    #TODO: link this account entries to the Payment Lines also Expanse Entries to Account Lines
-                    l_ids = movel_pool.search(cr, uid, [('name','=',name)])
-                    line_ids += l_ids
-                    
-                    l_ids = movel_pool.search(cr, uid, [('invoice','=',line.expanse_id.invoice_id.id)])
-                    exp_ids += l_ids
-            
-            #Process for Other payment if any
-            other_move_id = False
-            if slip.other_pay > 0:
-                narration = 'Payment of Other Payeble amounts to %s' % (slip.employee_id.name)
-                move = {
-                    'journal_id': slip.bank_journal_id.id,
-                    'period_id': period_id, 
-                    'date': slip.date,
-                    'type':'bank_pay_voucher',
-                    'ref':slip.number,
-                    'narration': narration
-                }
-                other_move_id = move_pool.create(cr, uid, move)
-                self.create_voucher(cr, uid, [slip.id], narration, move_id)
-                
-                name = "To %s account" % (slip.employee_id.name)
-                ded_rec = {
-                    'move_id':other_move_id,
-                    'name':name,
-                    'date':slip.date, 
-                    'account_id':slip.employee_id.property_bank_account.id, 
-                    'debit': 0.0,
-                    'credit': other_pay,
-                    'journal_id':slip.journal_id.id,
-                    'period_id':period_id,
-                    'ref':slip.number
-                }
-                line_ids += [movel_pool.create(cr, uid, ded_rec)]
-                name = "By %s account" % (slip.employee_id.property_bank_account.name)
-                cre_rec = {
-                    'move_id':other_move_id,
-                    'name':name,
-                    'partner_id':partner_id,
-                    'date':slip.date,
-                    'account_id':partner.property_account_payable.id,
-                    'debit': other_pay,
-                    'credit':0.0,
-                    'journal_id':slip.journal_id.id,
-                    'period_id':period_id,
-                    'ref':slip.number
-                }
-                line_ids += [movel_pool.create(cr, uid, cre_rec)]
-            
-            rec = {
-                'state':'done',
-                'move_payment_ids':[(6, 0, line_ids)],
-                'paid':True
-            }
-            self.write(cr, uid, [slip.id], rec)
-            for exp_id in exp_ids:
-                self.write(cr, uid, [slip.id], {'move_line_ids':[(4, exp_id)]})
-                
+        self.write(cr, uid, ids, {'state':'done'})
         return True
     
     def account_check_sheet(self, cr, uid, ids, context={}):
@@ -1016,361 +843,7 @@ class hr_payslip(osv.osv):
         return True
     
     def verify_sheet(self, cr, uid, ids, context={}):
-        
-        move_pool = self.pool.get('account.move')
-        movel_pool = self.pool.get('account.move.line')
-        exp_pool = self.pool.get('hr.expense.expense')
-        
-        for slip in self.browse(cr,uid,ids):
-            total_deduct = 0.0
-            
-            line_ids = []
-            partner = False
-            partner_id = False
-            
-            if not slip.employee_id.address_home_id:
-                raise osv.except_osv(_('Integrity Error !'), _('Please defined the Employee Home Address Along with Partners !!'))
-            
-            if not slip.employee_id.address_home_id.partner_id:
-                raise osv.except_osv(_('Integrity Error !'), _('Please defined the Partner in Home Address !!'))
-            
-            partner = slip.employee_id.address_home_id.partner_id
-            partner_id = slip.employee_id.address_home_id.partner_id.id
-            
-            period_id = False
-            
-            if slip.period_id:
-                period_id = slip.period_id.id
-            else:
-                fiscal_year_ids = self.pool.get('account.fiscalyear').search(cr, uid, [])
-                if not fiscal_year_ids:
-                    raise osv.except_osv(_('Warning !'), _('Please define fiscal year for perticular contract'))
-                fiscal_year_objs = self.pool.get('account.fiscalyear').read(cr, uid, fiscal_year_ids, ['date_start','date_stop'])
-                year_exist = False
-                for fiscal_year in fiscal_year_objs:
-                    if ((fiscal_year['date_start'] <= slip.date) and (fiscal_year['date_stop'] >= slip.date)):
-                        year_exist = True
-                if not year_exist:
-                    raise osv.except_osv(_('Warning !'), _('Fiscal Year is not defined for slip date %s'%slip.date))
-                search_period = self.pool.get('account.period').search(cr,uid,[('date_start','<=',slip.date),('date_stop','>=',slip.date)])
-                if not search_period:
-                    raise osv.except_osv(_('Warning !'), _('Period is not defined for slip date %s'%slip.date))
-                period_id = search_period[0]
-            
-            move = {
-                #'name': slip.name, 
-                'journal_id': slip.journal_id.id,
-                'period_id': period_id, 
-                'date': slip.date,
-                'ref':slip.number,
-                'narration': slip.name
-            }
-            move_id = move_pool.create(cr, uid, move)
-            self.create_voucher(cr, uid, [slip.id], slip.name, move_id)
-            
-            line = {
-                'move_id':move_id,
-                'name': "By Basic Salary / " + slip.employee_id.name,
-                'date': slip.date,
-                'account_id': slip.employee_id.salary_account.id, 
-                'debit': slip.basic,
-                'credit': 0.0,
-                'quantity':slip.working_days,
-                'journal_id': slip.journal_id.id,
-                'period_id': period_id,
-                'analytic_account_id': False,
-                'ref':slip.number
-            }
-            
-            #Setting Analysis Account for Basic Salary
-            if slip.employee_id.analytic_account:
-                line['analytic_account_id'] = slip.employee_id.analytic_account.id
-            
-            move_line_id = movel_pool.create(cr, uid, line)
-            line_ids += [move_line_id]
-            
-            line = {
-                'move_id':move_id,
-                'name': "To Basic Paysble Salary / " + slip.employee_id.name,
-                'partner_id': partner_id,
-                'date': slip.date, 
-                'account_id': slip.employee_id.employee_account.id, 
-                'debit': 0.0,
-                'quantity':slip.working_days,
-                'credit': slip.basic,
-                'journal_id': slip.journal_id.id,
-                'period_id': period_id,
-                'ref':slip.number
-            }
-            line_ids += [movel_pool.create(cr, uid, line)]
-            
-            for line in slip.line_ids:
-                name = "[%s] - %s / %s" % (line.code, line.name, slip.employee_id.name)
-                amount = line.total
-                
-                if line.type == 'leaves':
-                    continue
-                
-                rec = {
-                    'move_id':move_id,
-                    'name': name,
-                    'date': slip.date, 
-                    'account_id': line.account_id.id, 
-                    'debit': 0.0,
-                    'credit' : 0.0,
-                    'journal_id' : slip.journal_id.id,
-                    'period_id' :period_id,
-                    'analytic_account_id':False,
-                    'ref':slip.number,
-                    'quantity':1
-                }
-                
-                #Setting Analysis Account for Salary Slip Lines
-                if line.analytic_account_id:
-                    rec['analytic_account_id'] = line.analytic_account_id.id
-                else: 
-                    rec['analytic_account_id'] = slip.deg_id.account_id.id
-                    
-                if line.type == 'allounce' or line.type == 'otherpay':
-                    rec['debit'] = amount
-                    if not partner.property_account_payable:
-                        raise osv.except_osv(_('Integrity Error !'), _('Please Configure Partners Payable Account!!'))
-                    ded_rec = {
-                        'move_id':move_id,
-                        'name': name,
-                        'partner_id': partner_id,
-                        'date': slip.date, 
-                        'account_id': partner.property_account_payable.id, 
-                        'debit': 0.0,
-                        'quantity':1,
-                        'credit' : amount,
-                        'journal_id' : slip.journal_id.id,
-                        'period_id' :period_id,
-                        'ref':slip.number
-                    }
-                    line_ids += [movel_pool.create(cr, uid, ded_rec)]
-                elif line.type == 'deduction' or line.type == 'otherdeduct':
-                    if not partner.property_account_receivable:
-                        raise osv.except_osv(_('Integrity Error !'), _('Please Configure Partners Receivable Account!!'))
-                    rec['credit'] = amount
-                    total_deduct += amount
-                    ded_rec = {
-                        'move_id':move_id,
-                        'name': name,
-                        'partner_id': partner_id,
-                        'date': slip.date, 
-                        'quantity':1,
-                        'account_id': partner.property_account_receivable.id, 
-                        'debit': amount,
-                        'credit' : 0.0,
-                        'journal_id' : slip.journal_id.id,
-                        'period_id' :period_id,
-                        'ref':slip.number
-                    }
-                    line_ids += [movel_pool.create(cr, uid, ded_rec)]
-                
-                line_ids += [movel_pool.create(cr, uid, rec)]
-                
-                if line.company_contrib > 0:
-                    company_contrib = line.company_contrib
-#                    if line.category_id.amount_type == 'per':
-#                        company_contrib = (amount * line.category_id.contribute_per)
-
-                    narration = """Company Contribution of %s Encode same as a Company Expanse @ %s""" % (line.name, company_contrib)
-                    move = {
-                        #'name': slip.name, 
-                        'journal_id': slip.journal_id.id,
-                        'period_id': period_id, 
-                        'date': slip.date,
-                        'ref':slip.number,
-                        'narration': narration
-                    }
-                    company_contrib_move_id = move_pool.create(cr, uid, move)
-                    name = "[%s] - %s / %s - Company Contribution" % (line.code, line.name, slip.employee_id.name)
-                    self.create_voucher(cr, uid, [slip.id], name, company_contrib_move_id)
-                    
-                    ded_deb = {
-                        'move_id':company_contrib_move_id,
-                        'name': name,
-                        'date': slip.date, 
-                        'quantity':1,
-                        'account_id': line.category_id.account_id.id,
-                        'debit': company_contrib,
-                        'credit' : 0.0,
-                        'journal_id': slip.journal_id.id,
-                        'period_id': period_id,
-                        'ref':slip.number
-                    }
-                    line_ids += [movel_pool.create(cr, uid, ded_deb)]
-                    ded_cre = {
-                        'move_id':company_contrib_move_id,
-                        'name': name,
-                        'date': slip.date, 
-                        'quantity':1,
-                        'account_id': line.category_id.register_id.account_id.id,
-                        'debit': 0.0,
-                        'credit' : company_contrib,
-                        'journal_id': slip.journal_id.id,
-                        'period_id': period_id,
-                        'ref':slip.number
-                    }
-                    line_ids += [movel_pool.create(cr, uid, ded_cre)]
-                    
-                    if line.category_id.include_in_salary:
-                        narration = """Company Contribution of %s Deducted from Employee %s""" % (line.name, company_contrib)
-                        move = {
-                            #'name': slip.name, 
-                            'journal_id': slip.journal_id.id,
-                            'period_id': period_id, 
-                            'date': slip.date,
-                            'ref':slip.number,
-                            'narration': narration
-                        }
-                        include_in_salary_move_id = move_pool.create(cr, uid, move)
-                        self.create_voucher(cr, uid, [slip.id], narration, include_in_salary_move_id)
-                        
-                        total_deduct += company_contrib
-                        ded_deb = {
-                            'move_id':include_in_salary_move_id,
-                            'name': name,
-                            'partner_id': partner_id,
-                            'date': slip.date, 
-                            'quantity':1,
-                            'account_id': partner.property_account_receivable.id,
-                            'debit': company_contrib,
-                            'credit' : 0.0,
-                            'journal_id': slip.journal_id.id,
-                            'period_id': period_id,
-                            'ref':slip.number
-                        }
-                        line_ids += [movel_pool.create(cr, uid, ded_deb)]
-                        ded_cre = {
-                            'move_id':include_in_salary_move_id,
-                            'name': name,
-                            'date': slip.date, 
-                            'quantity':1,
-                            'account_id': line.category_id.account_id.id,
-                            'debit': 0.0,
-                            'credit' : company_contrib,
-                            'journal_id': slip.journal_id.id,
-                            'period_id': period_id,
-                            'ref':slip.number
-                        }
-                        line_ids += [movel_pool.create(cr, uid, ded_cre)]
-
-                #make an entry line to contribution register
-#                if line.category_id.register_id:
-#                    ctr = {
-#                        'register_id':line.category_id.register_id.id,
-#                        'name':line.name,
-#                        'code':line.code,
-#                        'employee_id':slip.employee_id.id,
-#                        'period_id':period_id,
-#                        'emp_deduction':amount,
-#                    }
-#                    if line.category_id.contribute:
-#                        ctr['comp_deduction'] = amount
-#                    
-#                    company = 0.0
-#                    employee = 0.0
-#                    if line.category_id.contribute and line.category_id.include_in_salary and line.category_id.amount_type == 'per':
-#                        new_amount = (amount * (line.category_id.contribute_per / (1+line.category_id.contribute_per)))
-#                        company = new_amount
-#                        employee = amount - company
-#                    
-#                    elif line.category_id.contribute and line.category_id.include_in_salary and line.category_id.amount_type == 'fix':
-#                        company = line.category_id.contribute_per
-#                        employee = amount - company
-
-#                    elif line.category_id.contribute and line.category_id.include_in_salary and line.category_id.amount_type == 'func':
-#                        company = self.pool.get('hr.allounce.deduction.categoty').execute_function(cr, uid, line.category_id.id, line.slip_id.basic, context)
-#                        employee = amount
-#                    
-#                    elif line.category_id.contribute and not line.category_id.include_in_salary and line.category_id.amount_type == 'per':
-#                        company = amount * line.category_id.contribute_per
-#                        employee = amount
-#                    
-#                    elif line.category_id.contribute and not line.category_id.include_in_salary and line.category_id.amount_type == 'fix':
-#                        company = line.category_id.contribute_per
-#                        employee = amount
-
-#                    elif line.category_id.contribute and not line.category_id.include_in_salary and line.category_id.amount_type == 'func':
-#                        company = self.pool.get('hr.allounce.deduction.categoty').execute_function(cr, uid, line.category_id.id, line.slip_id.basic, context)
-#                        employee = amount
-#                        
-#                    ctr['emp_deduction'] = employee
-#                    ctr['comp_deduction'] = company
-#                        
-#                    self.pool.get('hr.contibution.register.line').create(cr, uid, ctr)
-
-            adj_move_id = False
-            if total_deduct > 0:
-                move = {
-                    'journal_id': slip.journal_id.id,
-                    'period_id': period_id,
-                    'date': slip.date,
-                    'ref':slip.number,
-                    'narration': 'Adjustment : %s' % (slip.name)
-                }
-                adj_move_id = move_pool.create(cr, uid, move)
-                name = "Adjustment Entry - %s" % (slip.employee_id.name)
-                self.create_voucher(cr, uid, [slip.id], name, adj_move_id)
-                
-                ded_rec = {
-                    'move_id':adj_move_id,
-                    'name': name,
-                    'partner_id': partner_id,
-                    'date': slip.date, 
-                    'account_id': partner.property_account_receivable.id, 
-                    'debit': 0.0,
-                    'quantity':1,
-                    'credit' : total_deduct,
-                    'journal_id' : slip.journal_id.id,
-                    'period_id' :period_id,
-                    'ref':slip.number
-                }
-                line_ids += [movel_pool.create(cr, uid, ded_rec)]
-                cre_rec = {
-                    'move_id':adj_move_id,
-                    'name': name,
-                    'partner_id': partner_id,
-                    'date': slip.date,
-                    'account_id': partner.property_account_payable.id, 
-                    'debit': total_deduct,
-                    'quantity':1,
-                    'credit' : 0.0,
-                    'journal_id' : slip.journal_id.id,
-                    'period_id' :period_id,
-                    'ref':slip.number
-                }
-                line_ids += [movel_pool.create(cr, uid, cre_rec)]
-
-            rec = {
-                'state':'confirm',
-                'move_line_ids':[(6, 0,line_ids)],
-            }
-            if not slip.period_id:
-                rec['period_id'] = period_id
-            
-            dates = prev_bounds(slip.date)
-            exp_ids = exp_pool.search(cr, uid, [('date_valid','>=',dates[0]), ('date_valid','<=',dates[1]), ('state','=','invoiced')])
-            if exp_ids:
-                acc = self.pool.get('ir.property').get(cr, uid, 'property_account_expense_categ', 'product.category')
-                for exp in exp_pool.browse(cr, uid, exp_ids):
-                    exp_res = {
-                        'name':exp.name,
-                        'amount_type':'fix',
-                        'type':'otherpay',
-                        'category_id':exp.category_id.id,
-                        'amount':exp.amount,
-                        'slip_id':slip.id,
-                        'expanse_id':exp.id,
-                        'account_id':acc
-                    }
-                    self.pool.get('hr.payslip.line').create(cr, uid, exp_res)
-            
-            self.write(cr, uid, [slip.id], rec)
-            
+        self.write(cr, uid, ids, {'state':'confirm'})
         return True
     
     def get_contract(self, cr, uid, employee, date, context={}):
@@ -1447,12 +920,17 @@ class hr_payslip(osv.osv):
                 if datetime.date(year, month, day).weekday() == calc_day:
                     count += 1
             return count
-        
+
+        basic = 0.0
+        contract = False
         for slip in self.browse(cr, uid, ids):
+            basic = 0.0
+            
             contracts = self.get_contract(cr, uid, slip.employee_id, date, context)
             
-            if contracts.get('id', False) == False:
+            if not contracts or contracts.get('id', False) == False:
                 continue
+                
             
             contract = self.pool.get('hr.contract').browse(cr, uid, contracts.get('id'))
             sal_type = contract.wage_type_id.type
@@ -1543,7 +1021,7 @@ class hr_payslip(osv.osv):
                             percent = 0.0
 
                         for cline in line.category_id.contribute_ids:
-                            print 'XXXXXXXXXXXXXXX : ', cline.name
+                            pass
                         
                     elif line.amount_type == 'fix':
                         value = line.amount
@@ -1577,7 +1055,7 @@ class hr_payslip(osv.osv):
                     'base':base
                 }
                 slip_line_pool.copy(cr, uid, line.id, vals, {})
-
+            
             if sal_type in ('gross', 'net'):
                 sal = contract.wage
                 if sal_type == 'net':
@@ -1609,94 +1087,80 @@ class hr_payslip(osv.osv):
             })
             self.write(cr, uid, [slip.id], update)
         
-        
-        for slip in self.browse(cr, uid, ids):
-            basic_before_leaves = basic
+        if contract:
+            for slip in self.browse(cr, uid, ids):
+                basic_before_leaves = basic
 
-            working_day = 0
-            off_days = 0
-            dates = prev_bounds(slip.date)
-            
-            days_arr = [0, 1, 2, 3, 4, 5, 6]
-            for dy in range(contract.working_days_per_week, 7):
-                off_days += get_days(1, dates[1].day, dates[1].month, dates[1].year, days_arr[dy])
-        
-            total_off = off_days
-            working_day = dates[1].day - total_off
-            perday = slip.net / working_day
-            
-            total = 0.0
-            leave = 0.0
-            
-            leave_ids = self._get_leaves(cr, uid, slip, slip.employee_id, context)
-            
-            total_leave = 0.0
-            paid_leave = 0.0
-            for hday in holiday_pool.browse(cr, uid, leave_ids):
-                res = {
-                    'slip_id':slip.id,
-                    'name':hday.holiday_status_id.name + '-%s' % (hday.number_of_days),
-                    'code':hday.holiday_status_id.code,
-                    'amount_type':'fix',
-                    'category_id':hday.holiday_status_id.head_id.id,
-                    'account_id':hday.holiday_status_id.account_id.id,
-                    'analytic_account_id':hday.holiday_status_id.analytic_account_id.id
-                }
+                working_day = 0
+                off_days = 0
+                dates = prev_bounds(slip.date)
                 
-                days = hday.number_of_days
-                if hday.number_of_days < 0:
-                    days = hday.number_of_days * -1
+                days_arr = [0, 1, 2, 3, 4, 5, 6]
+                for dy in range(contract.working_days_per_week, 7):
+                    off_days += get_days(1, dates[1].day, dates[1].month, dates[1].year, days_arr[dy])
+            
+                total_off = off_days
+                working_day = dates[1].day - total_off
+                perday = slip.net / working_day
                 
-                total_leave += days
-                if hday.holiday_status_id.type == 'paid':
-                    paid_leave += days
-                    continue
+                total = 0.0
+                leave = 0.0
+                
+                leave_ids = self._get_leaves(cr, uid, slip, slip.employee_id, context)
+                
+                total_leave = 0.0
+                paid_leave = 0.0
+                for hday in holiday_pool.browse(cr, uid, leave_ids):
+                    res = {
+                        'slip_id':slip.id,
+                        'name':hday.holiday_status_id.name + '-%s' % (hday.number_of_days),
+                        'code':hday.holiday_status_id.code,
+                        'amount_type':'fix',
+                        'category_id':hday.holiday_status_id.head_id.id,
+                        'account_id':hday.holiday_status_id.account_id.id,
+                        'analytic_account_id':hday.holiday_status_id.analytic_account_id.id
+                    }
                     
-                elif hday.holiday_status_id.type == 'halfpaid':
-                    paid_leave += (days / 2)
-                    res['name'] = hday.holiday_status_id.name + '-%s/2' % (days)
-                    res['amount'] = perday * (days/2)
-                    total += perday * (days/2)
-                    leave += days / 2
-                    res['type'] = 'deduction'
-                else:
-                    res['name'] = hday.holiday_status_id.name + '-%s' % (days)
-                    res['amount'] = perday * days
-                    res['type'] = 'deduction'
-                    leave += days
-                    total += perday * days
-                
-                slip_line_pool.create(cr, uid, res)
-            basic = basic - total
-            leaves = total
+                    days = hday.number_of_days
+                    if hday.number_of_days < 0:
+                        days = hday.number_of_days * -1
+                    
+                    total_leave += days
+                    if hday.holiday_status_id.type == 'paid':
+                        paid_leave += days
+                        continue
+                        
+                    elif hday.holiday_status_id.type == 'halfpaid':
+                        paid_leave += (days / 2)
+                        res['name'] = hday.holiday_status_id.name + '-%s/2' % (days)
+                        res['amount'] = perday * (days/2)
+                        total += perday * (days/2)
+                        leave += days / 2
+                        res['type'] = 'deduction'
+                    else:
+                        res['name'] = hday.holiday_status_id.name + '-%s' % (days)
+                        res['amount'] = perday * days
+                        res['type'] = 'deduction'
+                        leave += days
+                        total += perday * days
+                    
+                    slip_line_pool.create(cr, uid, res)
+                basic = basic - total
+                leaves = total
 
-            update.update({
-                'basic_before_leaves': round(basic_before_leaves),
-                'leaves':total,
-                'holiday_days':leave,
-                'worked_days':working_day - leave,
-                'working_days':working_day,
-            })
-            self.write(cr, uid, [slip.id], update)
+                update.update({
+                    'basic_before_leaves': round(basic_before_leaves),
+                    'leaves':total,
+                    'holiday_days':leave,
+                    'worked_days':working_day - leave,
+                    'working_days':working_day,
+                })
+                self.write(cr, uid, [slip.id], update)
             
         return True
         
 hr_payslip()
 
-class account_move_link_slip(osv.osv):
-    '''
-    Account Move Link to Pay Slip
-    '''
-    _name = 'hr.payslip.account.move'
-    _description = 'Account Move Link to Pay Slip'
-    _columns = {
-        'name':fields.char('Name', size=256, required=True, readonly=False),
-        'move_id':fields.many2one('account.move', 'Expanse Entries', required=False, readonly=True),
-        'slip_id':fields.many2one('hr.payslip', 'Pay Slip', required=False),
-        'sequence': fields.integer('Sequence'),
-    }
-account_move_link_slip()
-
 class line_condition(osv.osv):
     '''
     Line Condition
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 430c548927e..46b4cef8e04 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -458,23 +458,8 @@
                             </group>
                         </page>
                         <page string="Accounting Details">
-                            <group col="2" colspan="3">
-                                <separator colspan="4" string="Accounting Informations"/>
-                                <field name="move_ids" colspan="2" nolabel="1" readonly="1">
-                                    <tree string="Accounting Vouchers">
-                                        <field name="sequence"/>
-                                        <field name="name"/>
-                                        <field name="move_id"/>
-                                    </tree>
-                                    <form string="Accounting Vouchers">
-                                        <field name="sequence"/>
-                                        <field name="name"/>
-                                        <field name="move_id"/>
-                                    </form>
-                                </field>
-                            </group>
-                            <group col="2" colspan="1">
-                                <separator colspan="4" string="Other Informations"/>
+                            <group col="2" colspan="2">
+                                <separator colspan="2" string="Other Informations"/>
                                 <field name="paid" readonly="1"/>
                                 <field name="company_id"/>
                                 <field name="register_id"/>
@@ -484,12 +469,6 @@
                             <separator colspan="4" string="Description"/>
                             <field name="note" colspan="4" nolabel="1"/>
                         </page>
-                        <page string="Account Lines">
-                            <field name="move_line_ids" colspan="4" nolabel="1"/>
-                        </page>
-                        <page string="Payment Lines">
-                            <field name="move_payment_ids" colspan="4" nolabel="1"/>
-                        </page>
                     </notebook>
                     <group col="9" colspan="4">
                         <field name="state"/>
diff --git a/addons/hr_payroll/hr_payroll_workflow.xml b/addons/hr_payroll/hr_payroll_workflow.xml
index 0e5ccfe091f..f494975a1b1 100644
--- a/addons/hr_payroll/hr_payroll_workflow.xml
+++ b/addons/hr_payroll/hr_payroll_workflow.xml
@@ -28,13 +28,6 @@
             <field name="kind">function</field>
         </record>
         
-        <record id="act_account_check" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="name">account_check</field>
-            <field name="action">account_check_sheet()</field>
-            <field name="kind">function</field>
-        </record>
-        
         <record id="act_confirm" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">confirm</field>
@@ -66,27 +59,13 @@
         <record id="t2" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_hr_check"/>
-            <field name="condition">basic&gt;=10000</field>
-            <field name="signal">verify_sheet</field>
-        </record>
-        
-        <record id="t3" model="workflow.transition">
-            <field name="act_from" ref="act_hr_check"/>
-            <field name="act_to" ref="act_account_check"/>
-            <field name="signal">verify_twice_sheet</field>
-        </record>
-        
-        <record id="t4" model="workflow.transition">
-            <field name="act_from" ref="act_draft"/>
-            <field name="act_to" ref="act_account_check"/>
-            <field name="condition">basic&lt;10000</field>
             <field name="signal">verify_sheet</field>
         </record>
         
         <record id="t5" model="workflow.transition">
-            <field name="act_from" ref="act_account_check"/>
+            <field name="act_from" ref="act_hr_check"/>
             <field name="act_to" ref="act_confirm"/>
-            <field name="signal">final_verify_sheet</field>
+            <field name="signal">verify_twice_sheet</field>
         </record>
         
          <record id="t6" model="workflow.transition">
@@ -107,12 +86,6 @@
             <field name="signal">cancel_sheet</field>
         </record>
         
-        <record id="t9" model="workflow.transition">
-            <field name="act_from" ref="act_account_check"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">cancel_sheet</field>
-        </record>
-        
         <record id="t10" model="workflow.transition">
             <field name="act_from" ref="act_confirm"/>
             <field name="act_to" ref="act_cancel"/>

From bbbf3a272ca0d9250f88dfd71663bf2ec8191729 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Sat, 19 Jun 2010 02:00:58 +0530
Subject: [PATCH 29/40] [ADD]: a special module that will manage accounting
 entries for the hr_payroll

bzr revid: mga@tinyerp.com-20100618203058-hvvcssp0iqdpqmla
---
 addons/hr_payroll_account/__init__.py         |  23 +
 addons/hr_payroll_account/__openerp__.py      |  47 ++
 .../hr_payroll_account/hr_payroll_account.py  | 618 ++++++++++++++++++
 .../hr_payroll_account_view.xml               |  61 ++
 .../hr_payroll_account_workflow.xml           |  39 ++
 5 files changed, 788 insertions(+)
 create mode 100644 addons/hr_payroll_account/__init__.py
 create mode 100644 addons/hr_payroll_account/__openerp__.py
 create mode 100644 addons/hr_payroll_account/hr_payroll_account.py
 create mode 100644 addons/hr_payroll_account/hr_payroll_account_view.xml
 create mode 100644 addons/hr_payroll_account/hr_payroll_account_workflow.xml

diff --git a/addons/hr_payroll_account/__init__.py b/addons/hr_payroll_account/__init__.py
new file mode 100644
index 00000000000..81979b0ae58
--- /dev/null
+++ b/addons/hr_payroll_account/__init__.py
@@ -0,0 +1,23 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution    
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    d$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import hr_payroll_account
diff --git a/addons/hr_payroll_account/__openerp__.py b/addons/hr_payroll_account/__openerp__.py
new file mode 100644
index 00000000000..c3c75f6ec8d
--- /dev/null
+++ b/addons/hr_payroll_account/__openerp__.py
@@ -0,0 +1,47 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution    
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    d$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    'name': 'Human Resource Payroll Accounting',
+    'version': '1.0',
+    'category': 'Generic Modules/Human Resources',
+    'description': """Generic Payroll system Integrated with Accountings
+    * Expanse Encoding
+    * Payment Encoding
+    * Comany Contribution Managemet
+    """,
+    'author':'Tiny/Axelor',
+    'website':'http://www.openerp.com',
+    'depends': [
+        'hr_payroll',
+        'account',
+    ],
+    'init_xml': [
+    ],
+    'update_xml': [
+        "hr_payroll_account_view.xml",
+        "hr_payroll_account_workflow.xml"
+    ],
+    'demo_xml': [
+    ],
+    'installable': True,
+    'active': False,
+}
diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
new file mode 100644
index 00000000000..6bbcf8e296e
--- /dev/null
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -0,0 +1,618 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution    
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    d$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+import netsvc
+from osv import osv
+from osv import fields
+from tools import config
+from tools.translate import _
+
+from datetime import date
+from datetime import datetime
+from datetime import timedelta
+
+def prev_bounds(cdate=False):
+    when = date.fromtimestamp(time.mktime(time.strptime(cdate,"%Y-%m-%d")))
+    this_first = date(when.year, when.month, 1)
+    month = when.month + 1
+    year = when.year
+    if month > 12:
+        month = 1
+        year += 1
+    next_month = date(year, month, 1)
+    prev_end = next_month - timedelta(days=1)
+    return this_first, prev_end
+
+class hr_payslip(osv.osv):
+    '''
+    Pay Slip
+    '''
+    _inherit = 'hr.payslip'
+    _description = 'Pay Slip'
+    
+    _columns = {
+        'move_ids':fields.one2many('hr.payslip.account.move', 'slip_id', 'Accounting vouchers', required=False),
+        'move_line_ids':fields.many2many('account.move.line', 'payslip_lines_rel', 'slip_id', 'line_id', 'Accounting Lines', readonly=True),
+        'move_payment_ids':fields.many2many('account.move.line', 'payslip_payment_rel', 'slip_id', 'payment_id', 'Payment Lines', readonly=True),
+        'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], help="Keep empty to use the period of the validation(Payslip) date."),
+    }
+    
+    def create_voucher(self, cr, uid, ids, name, voucher, sequence=5):
+        slip_move = self.pool.get('hr.payslip.account.move')
+        for slip in ids:
+            res = {
+                'slip_id':slip,
+                'move_id':voucher,
+                'sequence':sequence,
+                'name':name
+            }
+            slip_move.create(cr, uid, res)
+    
+    def cancel_sheet(self, cr, uid, ids, context={}):
+        move_pool = self.pool.get('account.move')
+
+        for slip in self.browse(cr, uid, ids, context):
+            if slip.move_id:
+                if slip.move_id.state == 'posted':
+                    move_pool.button_cancel(cr, uid [slip.move_id.id], context)
+                move_pool.unlink(cr, uid, [slip.move_id.id])
+            
+            if slip.adj_move_id:
+                if slip.adj_move_id.state == 'posted':
+                    move_pool.button_cancel(cr, uid [slip.adj_move_id.id], context)
+                move_pool.unlink(cr, uid, [slip.adj_move_id.id])
+                
+            if slip.other_move_id:
+                if slip.other_move_id.state == 'posted':
+                    move_pool.button_cancel(cr, uid [slip.other_move_id.id], context)
+                move_pool.unlink(cr, uid, [slip.other_move_id.id])
+            
+        self.write(cr, uid, ids, {'state':'cancel'})
+        return True
+    
+    def process_sheet(self, cr, uid, ids, context={}):
+        move_pool = self.pool.get('account.move')
+        movel_pool = self.pool.get('account.move.line')
+        invoice_pool = self.pool.get('account.invoice')
+        
+        for slip in self.browse(cr,uid,ids):    
+            line_ids = []
+            partner = False
+            partner_id = False
+            exp_ids = []
+            
+            partner = slip.employee_id.address_home_id.partner_id
+            partner_id = partner.id
+            
+            fiscal_year_ids = self.pool.get('account.fiscalyear').search(cr, uid, [])
+            if not fiscal_year_ids:
+                raise osv.except_osv(_('Warning !'), _('Please define fiscal year for perticular contract'))
+            fiscal_year_objs = self.pool.get('account.fiscalyear').read(cr, uid, fiscal_year_ids, ['date_start','date_stop'])
+            year_exist = False
+            for fiscal_year in fiscal_year_objs:
+                if ((fiscal_year['date_start'] <= slip.date) and (fiscal_year['date_stop'] >= slip.date)):
+                    year_exist = True
+            if not year_exist:
+                raise osv.except_osv(_('Warning !'), _('Fiscal Year is not defined for slip date %s'%slip.date))
+            search_period = self.pool.get('account.period').search(cr,uid,[('date_start','<=',slip.date),('date_stop','>=',slip.date)])
+            if not search_period:
+                raise osv.except_osv(_('Warning !'), _('Period is not defined for slip date %s'%slip.date))
+            period_id = search_period[0]
+            name = 'Payment of Salary to %s' % (slip.employee_id.name)
+            move = {
+                'journal_id': slip.bank_journal_id.id,
+                'period_id': period_id, 
+                'date': slip.date,
+                'type':'bank_pay_voucher',
+                'ref':slip.number,
+                'narration': name
+            }
+            move_id = move_pool.create(cr, uid, move)
+            self.create_voucher(cr, uid, [slip.id], name, move_id)
+            
+            name = "To %s account" % (slip.employee_id.name)
+            ded_rec = {
+                'move_id':move_id,
+                'name': name,
+                #'partner_id': partner_id,
+                'date': slip.date, 
+                'account_id': slip.employee_id.property_bank_account.id, 
+                'debit': 0.0,
+                'credit' : slip.total_pay,
+                'journal_id' : slip.journal_id.id,
+                'period_id' :period_id,
+                'ref':slip.number
+            }
+            line_ids += [movel_pool.create(cr, uid, ded_rec)]
+            name = "By %s account" % (slip.employee_id.property_bank_account.name)
+            cre_rec = {
+                'move_id':move_id,
+                'name': name,
+                'partner_id': partner_id,
+                'date': slip.date,
+                'account_id': partner.property_account_payable.id,
+                'debit':  slip.total_pay,
+                'credit' : 0.0,
+                'journal_id' : slip.journal_id.id,
+                'period_id' :period_id,
+                'ref':slip.number
+            }
+            line_ids += [movel_pool.create(cr, uid, cre_rec)]
+            
+            other_pay = slip.other_pay
+            #Process all Reambuse Entries
+            for line in slip.line_ids:
+                if line.type == 'otherpay' and line.expanse_id.invoice_id:
+                    if not line.expanse_id.invoice_id.move_id:
+                        raise osv.except_osv(_('Warning !'), _('Please Confirm all Expanse Invoice appear for Reimbursement'))
+                    invids = [line.expanse_id.invoice_id.id]
+                    amount = line.total
+                    acc_id = slip.bank_journal_id.default_credit_account_id and slip.bank_journal_id.default_credit_account_id.id
+                    period_id = slip.period_id.id
+                    journal_id = slip.bank_journal_id.id
+                    name = '[%s]-%s' % (slip.number, line.name)
+                    invoice_pool.pay_and_reconcile(cr, uid, invids, amount, acc_id, period_id, journal_id, False, period_id, False, context, name)
+                    other_pay -= amount
+                    #TODO: link this account entries to the Payment Lines also Expanse Entries to Account Lines
+                    l_ids = movel_pool.search(cr, uid, [('name','=',name)])
+                    line_ids += l_ids
+                    
+                    l_ids = movel_pool.search(cr, uid, [('invoice','=',line.expanse_id.invoice_id.id)])
+                    exp_ids += l_ids
+            
+            #Process for Other payment if any
+            other_move_id = False
+            if slip.other_pay > 0:
+                narration = 'Payment of Other Payeble amounts to %s' % (slip.employee_id.name)
+                move = {
+                    'journal_id': slip.bank_journal_id.id,
+                    'period_id': period_id, 
+                    'date': slip.date,
+                    'type':'bank_pay_voucher',
+                    'ref':slip.number,
+                    'narration': narration
+                }
+                other_move_id = move_pool.create(cr, uid, move)
+                self.create_voucher(cr, uid, [slip.id], narration, move_id)
+                
+                name = "To %s account" % (slip.employee_id.name)
+                ded_rec = {
+                    'move_id':other_move_id,
+                    'name':name,
+                    'date':slip.date, 
+                    'account_id':slip.employee_id.property_bank_account.id, 
+                    'debit': 0.0,
+                    'credit': other_pay,
+                    'journal_id':slip.journal_id.id,
+                    'period_id':period_id,
+                    'ref':slip.number
+                }
+                line_ids += [movel_pool.create(cr, uid, ded_rec)]
+                name = "By %s account" % (slip.employee_id.property_bank_account.name)
+                cre_rec = {
+                    'move_id':other_move_id,
+                    'name':name,
+                    'partner_id':partner_id,
+                    'date':slip.date,
+                    'account_id':partner.property_account_payable.id,
+                    'debit': other_pay,
+                    'credit':0.0,
+                    'journal_id':slip.journal_id.id,
+                    'period_id':period_id,
+                    'ref':slip.number
+                }
+                line_ids += [movel_pool.create(cr, uid, cre_rec)]
+            
+            rec = {
+                'state':'done',
+                'move_payment_ids':[(6, 0, line_ids)],
+                'paid':True
+            }
+            self.write(cr, uid, [slip.id], rec)
+            for exp_id in exp_ids:
+                self.write(cr, uid, [slip.id], {'move_line_ids':[(4, exp_id)]})
+            
+        return True
+    
+    def account_check_sheet(self, cr, uid, ids, context={}):
+        self.write(cr, uid, ids, {'state':'accont_check'})
+        return True
+    
+    def hr_check_sheet(self, cr, uid, ids, context={}):
+        self.write(cr, uid, ids, {'state':'hr_check'})
+        return True
+    
+    def verify_sheet(self, cr, uid, ids, context={}):
+        
+        move_pool = self.pool.get('account.move')
+        movel_pool = self.pool.get('account.move.line')
+        exp_pool = self.pool.get('hr.expense.expense')
+        
+        for slip in self.browse(cr,uid,ids):
+            total_deduct = 0.0
+            
+            line_ids = []
+            partner = False
+            partner_id = False
+            
+            if not slip.employee_id.address_home_id:
+                raise osv.except_osv(_('Integrity Error !'), _('Please defined the Employee Home Address Along with Partners !!'))
+            
+            if not slip.employee_id.address_home_id.partner_id:
+                raise osv.except_osv(_('Integrity Error !'), _('Please defined the Partner in Home Address !!'))
+            
+            partner = slip.employee_id.address_home_id.partner_id
+            partner_id = slip.employee_id.address_home_id.partner_id.id
+            
+            period_id = False
+            
+            if slip.period_id:
+                period_id = slip.period_id.id
+            else:
+                fiscal_year_ids = self.pool.get('account.fiscalyear').search(cr, uid, [])
+                if not fiscal_year_ids:
+                    raise osv.except_osv(_('Warning !'), _('Please define fiscal year for perticular contract'))
+                fiscal_year_objs = self.pool.get('account.fiscalyear').read(cr, uid, fiscal_year_ids, ['date_start','date_stop'])
+                year_exist = False
+                for fiscal_year in fiscal_year_objs:
+                    if ((fiscal_year['date_start'] <= slip.date) and (fiscal_year['date_stop'] >= slip.date)):
+                        year_exist = True
+                if not year_exist:
+                    raise osv.except_osv(_('Warning !'), _('Fiscal Year is not defined for slip date %s'%slip.date))
+                search_period = self.pool.get('account.period').search(cr,uid,[('date_start','<=',slip.date),('date_stop','>=',slip.date)])
+                if not search_period:
+                    raise osv.except_osv(_('Warning !'), _('Period is not defined for slip date %s'%slip.date))
+                period_id = search_period[0]
+            
+            move = {
+                #'name': slip.name, 
+                'journal_id': slip.journal_id.id,
+                'period_id': period_id, 
+                'date': slip.date,
+                'ref':slip.number,
+                'narration': slip.name
+            }
+            move_id = move_pool.create(cr, uid, move)
+            self.create_voucher(cr, uid, [slip.id], slip.name, move_id)
+            
+            line = {
+                'move_id':move_id,
+                'name': "By Basic Salary / " + slip.employee_id.name,
+                'date': slip.date,
+                'account_id': slip.employee_id.salary_account.id, 
+                'debit': slip.basic,
+                'credit': 0.0,
+                'quantity':slip.working_days,
+                'journal_id': slip.journal_id.id,
+                'period_id': period_id,
+                'analytic_account_id': False,
+                'ref':slip.number
+            }
+            
+            #Setting Analysis Account for Basic Salary
+            if slip.employee_id.analytic_account:
+                line['analytic_account_id'] = slip.employee_id.analytic_account.id
+            
+            move_line_id = movel_pool.create(cr, uid, line)
+            line_ids += [move_line_id]
+            
+            line = {
+                'move_id':move_id,
+                'name': "To Basic Paysble Salary / " + slip.employee_id.name,
+                'partner_id': partner_id,
+                'date': slip.date, 
+                'account_id': slip.employee_id.employee_account.id, 
+                'debit': 0.0,
+                'quantity':slip.working_days,
+                'credit': slip.basic,
+                'journal_id': slip.journal_id.id,
+                'period_id': period_id,
+                'ref':slip.number
+            }
+            line_ids += [movel_pool.create(cr, uid, line)]
+            
+            for line in slip.line_ids:
+                name = "[%s] - %s / %s" % (line.code, line.name, slip.employee_id.name)
+                amount = line.total
+                
+                if line.type == 'leaves':
+                    continue
+                
+                rec = {
+                    'move_id':move_id,
+                    'name': name,
+                    'date': slip.date, 
+                    'account_id': line.account_id.id, 
+                    'debit': 0.0,
+                    'credit' : 0.0,
+                    'journal_id' : slip.journal_id.id,
+                    'period_id' :period_id,
+                    'analytic_account_id':False,
+                    'ref':slip.number,
+                    'quantity':1
+                }
+                
+                #Setting Analysis Account for Salary Slip Lines
+                if line.analytic_account_id:
+                    rec['analytic_account_id'] = line.analytic_account_id.id
+                else: 
+                    rec['analytic_account_id'] = slip.deg_id.account_id.id
+                    
+                if line.type == 'allounce' or line.type == 'otherpay':
+                    rec['debit'] = amount
+                    if not partner.property_account_payable:
+                        raise osv.except_osv(_('Integrity Error !'), _('Please Configure Partners Payable Account!!'))
+                    ded_rec = {
+                        'move_id':move_id,
+                        'name': name,
+                        'partner_id': partner_id,
+                        'date': slip.date, 
+                        'account_id': partner.property_account_payable.id, 
+                        'debit': 0.0,
+                        'quantity':1,
+                        'credit' : amount,
+                        'journal_id' : slip.journal_id.id,
+                        'period_id' :period_id,
+                        'ref':slip.number
+                    }
+                    line_ids += [movel_pool.create(cr, uid, ded_rec)]
+                elif line.type == 'deduction' or line.type == 'otherdeduct':
+                    if not partner.property_account_receivable:
+                        raise osv.except_osv(_('Integrity Error !'), _('Please Configure Partners Receivable Account!!'))
+                    rec['credit'] = amount
+                    total_deduct += amount
+                    ded_rec = {
+                        'move_id':move_id,
+                        'name': name,
+                        'partner_id': partner_id,
+                        'date': slip.date, 
+                        'quantity':1,
+                        'account_id': partner.property_account_receivable.id, 
+                        'debit': amount,
+                        'credit' : 0.0,
+                        'journal_id' : slip.journal_id.id,
+                        'period_id' :period_id,
+                        'ref':slip.number
+                    }
+                    line_ids += [movel_pool.create(cr, uid, ded_rec)]
+                
+                line_ids += [movel_pool.create(cr, uid, rec)]
+                
+                if line.company_contrib > 0:
+                    company_contrib = line.company_contrib
+#                    if line.category_id.amount_type == 'per':
+#                        company_contrib = (amount * line.category_id.contribute_per)
+
+                    narration = """Company Contribution of %s Encode same as a Company Expanse @ %s""" % (line.name, company_contrib)
+                    move = {
+                        #'name': slip.name, 
+                        'journal_id': slip.journal_id.id,
+                        'period_id': period_id, 
+                        'date': slip.date,
+                        'ref':slip.number,
+                        'narration': narration
+                    }
+                    company_contrib_move_id = move_pool.create(cr, uid, move)
+                    name = "[%s] - %s / %s - Company Contribution" % (line.code, line.name, slip.employee_id.name)
+                    self.create_voucher(cr, uid, [slip.id], name, company_contrib_move_id)
+                    
+                    ded_deb = {
+                        'move_id':company_contrib_move_id,
+                        'name': name,
+                        'date': slip.date, 
+                        'quantity':1,
+                        'account_id': line.category_id.account_id.id,
+                        'debit': company_contrib,
+                        'credit' : 0.0,
+                        'journal_id': slip.journal_id.id,
+                        'period_id': period_id,
+                        'ref':slip.number
+                    }
+                    line_ids += [movel_pool.create(cr, uid, ded_deb)]
+                    ded_cre = {
+                        'move_id':company_contrib_move_id,
+                        'name': name,
+                        'date': slip.date, 
+                        'quantity':1,
+                        'account_id': line.category_id.register_id.account_id.id,
+                        'debit': 0.0,
+                        'credit' : company_contrib,
+                        'journal_id': slip.journal_id.id,
+                        'period_id': period_id,
+                        'ref':slip.number
+                    }
+                    line_ids += [movel_pool.create(cr, uid, ded_cre)]
+                    
+                    if line.category_id.include_in_salary:
+                        narration = """Company Contribution of %s Deducted from Employee %s""" % (line.name, company_contrib)
+                        move = {
+                            #'name': slip.name, 
+                            'journal_id': slip.journal_id.id,
+                            'period_id': period_id, 
+                            'date': slip.date,
+                            'ref':slip.number,
+                            'narration': narration
+                        }
+                        include_in_salary_move_id = move_pool.create(cr, uid, move)
+                        self.create_voucher(cr, uid, [slip.id], narration, include_in_salary_move_id)
+                        
+                        total_deduct += company_contrib
+                        ded_deb = {
+                            'move_id':include_in_salary_move_id,
+                            'name': name,
+                            'partner_id': partner_id,
+                            'date': slip.date, 
+                            'quantity':1,
+                            'account_id': partner.property_account_receivable.id,
+                            'debit': company_contrib,
+                            'credit' : 0.0,
+                            'journal_id': slip.journal_id.id,
+                            'period_id': period_id,
+                            'ref':slip.number
+                        }
+                        line_ids += [movel_pool.create(cr, uid, ded_deb)]
+                        ded_cre = {
+                            'move_id':include_in_salary_move_id,
+                            'name': name,
+                            'date': slip.date, 
+                            'quantity':1,
+                            'account_id': line.category_id.account_id.id,
+                            'debit': 0.0,
+                            'credit' : company_contrib,
+                            'journal_id': slip.journal_id.id,
+                            'period_id': period_id,
+                            'ref':slip.number
+                        }
+                        line_ids += [movel_pool.create(cr, uid, ded_cre)]
+
+                #make an entry line to contribution register
+#                if line.category_id.register_id:
+#                    ctr = {
+#                        'register_id':line.category_id.register_id.id,
+#                        'name':line.name,
+#                        'code':line.code,
+#                        'employee_id':slip.employee_id.id,
+#                        'period_id':period_id,
+#                        'emp_deduction':amount,
+#                    }
+#                    if line.category_id.contribute:
+#                        ctr['comp_deduction'] = amount
+#                    
+#                    company = 0.0
+#                    employee = 0.0
+#                    if line.category_id.contribute and line.category_id.include_in_salary and line.category_id.amount_type == 'per':
+#                        new_amount = (amount * (line.category_id.contribute_per / (1+line.category_id.contribute_per)))
+#                        company = new_amount
+#                        employee = amount - company
+#                    
+#                    elif line.category_id.contribute and line.category_id.include_in_salary and line.category_id.amount_type == 'fix':
+#                        company = line.category_id.contribute_per
+#                        employee = amount - company
+
+#                    elif line.category_id.contribute and line.category_id.include_in_salary and line.category_id.amount_type == 'func':
+#                        company = self.pool.get('hr.allounce.deduction.categoty').execute_function(cr, uid, line.category_id.id, line.slip_id.basic, context)
+#                        employee = amount
+#                    
+#                    elif line.category_id.contribute and not line.category_id.include_in_salary and line.category_id.amount_type == 'per':
+#                        company = amount * line.category_id.contribute_per
+#                        employee = amount
+#                    
+#                    elif line.category_id.contribute and not line.category_id.include_in_salary and line.category_id.amount_type == 'fix':
+#                        company = line.category_id.contribute_per
+#                        employee = amount
+
+#                    elif line.category_id.contribute and not line.category_id.include_in_salary and line.category_id.amount_type == 'func':
+#                        company = self.pool.get('hr.allounce.deduction.categoty').execute_function(cr, uid, line.category_id.id, line.slip_id.basic, context)
+#                        employee = amount
+#                        
+#                    ctr['emp_deduction'] = employee
+#                    ctr['comp_deduction'] = company
+#                        
+#                    self.pool.get('hr.contibution.register.line').create(cr, uid, ctr)
+
+            adj_move_id = False
+            if total_deduct > 0:
+                move = {
+                    'journal_id': slip.journal_id.id,
+                    'period_id': period_id,
+                    'date': slip.date,
+                    'ref':slip.number,
+                    'narration': 'Adjustment : %s' % (slip.name)
+                }
+                adj_move_id = move_pool.create(cr, uid, move)
+                name = "Adjustment Entry - %s" % (slip.employee_id.name)
+                self.create_voucher(cr, uid, [slip.id], name, adj_move_id)
+                
+                ded_rec = {
+                    'move_id':adj_move_id,
+                    'name': name,
+                    'partner_id': partner_id,
+                    'date': slip.date, 
+                    'account_id': partner.property_account_receivable.id, 
+                    'debit': 0.0,
+                    'quantity':1,
+                    'credit' : total_deduct,
+                    'journal_id' : slip.journal_id.id,
+                    'period_id' :period_id,
+                    'ref':slip.number
+                }
+                line_ids += [movel_pool.create(cr, uid, ded_rec)]
+                cre_rec = {
+                    'move_id':adj_move_id,
+                    'name': name,
+                    'partner_id': partner_id,
+                    'date': slip.date,
+                    'account_id': partner.property_account_payable.id, 
+                    'debit': total_deduct,
+                    'quantity':1,
+                    'credit' : 0.0,
+                    'journal_id' : slip.journal_id.id,
+                    'period_id' :period_id,
+                    'ref':slip.number
+                }
+                line_ids += [movel_pool.create(cr, uid, cre_rec)]
+
+            rec = {
+                'state':'confirm',
+                'move_line_ids':[(6, 0,line_ids)],
+            }
+            if not slip.period_id:
+                rec['period_id'] = period_id
+            
+            dates = prev_bounds(slip.date)
+            exp_ids = exp_pool.search(cr, uid, [('date_valid','>=',dates[0]), ('date_valid','<=',dates[1]), ('state','=','invoiced')])
+            if exp_ids:
+                acc = self.pool.get('ir.property').get(cr, uid, 'property_account_expense_categ', 'product.category')
+                for exp in exp_pool.browse(cr, uid, exp_ids):
+                    exp_res = {
+                        'name':exp.name,
+                        'amount_type':'fix',
+                        'type':'otherpay',
+                        'category_id':exp.category_id.id,
+                        'amount':exp.amount,
+                        'slip_id':slip.id,
+                        'expanse_id':exp.id,
+                        'account_id':acc
+                    }
+                    self.pool.get('hr.payslip.line').create(cr, uid, exp_res)
+            
+            self.write(cr, uid, [slip.id], rec)
+            
+        return True
+        
+hr_payslip()
+
+class account_move_link_slip(osv.osv):
+    '''
+    Account Move Link to Pay Slip
+    '''
+    _name = 'hr.payslip.account.move'
+    _description = 'Account Move Link to Pay Slip'
+    _columns = {
+        'name':fields.char('Name', size=256, required=True, readonly=False),
+        'move_id':fields.many2one('account.move', 'Expanse Entries', required=False, readonly=True),
+        'slip_id':fields.many2one('hr.payslip', 'Pay Slip', required=False),
+        'sequence': fields.integer('Sequence'),
+    }
+account_move_link_slip()
+
diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml
new file mode 100644
index 00000000000..6ef6c812c0b
--- /dev/null
+++ b/addons/hr_payroll_account/hr_payroll_account_view.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+    
+         <record id="view_hr_payslip_form_inherit" model="ir.ui.view">
+            <field name="name">hr.payslip.form</field>
+            <field name="model">hr.payslip</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="hr_payroll.view_hr_payslip_form"/>
+            <field name="arch" type="xml">
+                <page string="Accounting Details" position="replace">
+                    <page string="Accounting Details">
+                        <group col="4" colspan="3">
+                            <separator colspan="4" string="Accounting Informations"/>
+                            <field name="move_ids" colspan="4" nolabel="1" readonly="1">
+                                <tree string="Accounting Vouchers">
+                                    <field name="sequence"/>
+                                    <field name="name"/>
+                                    <field name="move_id"/>
+                                </tree>
+                                <form string="Accounting Vouchers">
+                                    <field name="sequence"/>
+                                    <field name="name"/>
+                                    <field name="move_id"/>
+                                </form>
+                            </field>
+                        </group>
+                        <group col="2" colspan="1">
+                            <separator colspan="2" string="Other Informations"/>
+                            <field name="paid" readonly="1"/>
+                            <field name="company_id"/>
+                            <field name="register_id"/>
+                            <field name="deg_id"/>
+                            <field name="contract_id" domain="[('employee_id','=',employee_id)]"/>
+                        </group>
+                        <separator colspan="4" string="Description"/>
+                        <field name="note" colspan="4" nolabel="1"/>
+                    </page>
+                </page>
+            </field>
+        </record>
+        
+        <record id="view_hr_payslip_form_inherit1" model="ir.ui.view">
+            <field name="name">hr.payslip.form</field>
+            <field name="model">hr.payslip</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="view_hr_payslip_form_inherit"/>
+            <field name="arch" type="xml">
+                <notebook position="inside">
+                    <page string="Account Lines">
+                        <field name="move_line_ids" colspan="4" nolabel="1"/>
+                    </page>
+                    <page string="Payment Lines">
+                        <field name="move_payment_ids" colspan="4" nolabel="1"/>
+                    </page>
+                </notebook>
+            </field>
+        </record>
+        
+    </data>
+</openerp>
diff --git a/addons/hr_payroll_account/hr_payroll_account_workflow.xml b/addons/hr_payroll_account/hr_payroll_account_workflow.xml
new file mode 100644
index 00000000000..80c9848ee39
--- /dev/null
+++ b/addons/hr_payroll_account/hr_payroll_account_workflow.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <record id="act_account_check" model="workflow.activity">
+            <field name="wkf_id" ref="hr_payroll.wkf"/>
+            <field name="name">account_check</field>
+            <field name="action">account_check_sheet()</field>
+            <field name="kind">function</field>
+        </record>
+        
+        <record id="hr_payroll.t2" model="workflow.transition">
+            <field name="act_from" ref="hr_payroll.act_draft"/>
+            <field name="act_to" ref="hr_payroll.act_hr_check"/>
+            <field name="condition">True</field>
+            <field name="signal">verify_sheet</field>
+        </record>
+        
+        <record id="t3" model="workflow.transition">
+            <field name="act_from" ref="hr_payroll.act_hr_check"/>
+            <field name="act_to" ref="act_account_check"/>
+            <field name="condition">True</field>
+            <field name="signal">verify_twice_sheet</field>
+        </record>
+        
+        <record id="hr_payroll.t5" model="workflow.transition">
+            <field name="act_from" ref="act_account_check"/>
+            <field name="act_to" ref="hr_payroll.act_confirm"/>
+            <field name="signal">final_verify_sheet</field>
+        </record>
+        
+        <record id="hr_payroll.t9" model="workflow.transition">
+            <field name="act_from" ref="act_account_check"/>
+            <field name="act_to" ref="hr_payroll.act_cancel"/>
+            <field name="signal">cancel_sheet</field>
+        </record>
+        
+    </data>
+</openerp>

From 98cc2f8c559b35cd77fec0c7a72d38958659a46b Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Sat, 19 Jun 2010 20:34:13 +0530
Subject: [PATCH 30/40] [FIX]: enabled bank accout feature for employee, for
 finalcial entries through bank

bzr revid: mga@tinyerp.com-20100619150413-o8g1vdt9zb87pq0a
---
 addons/hr_payroll/hr_payroll.py               | 213 ++++++++----------
 addons/hr_payroll/hr_payroll_view.xml         |   2 +-
 .../hr_payroll_account/hr_payroll_account.py  |  14 +-
 3 files changed, 98 insertions(+), 131 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 7a39199cce6..ee24bc3cd21 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -213,66 +213,29 @@ class payroll_register(osv.osv):
     def compute_sheet(self, cr, uid, ids, context={}):
         emp_pool = self.pool.get('hr.employee')
         slip_pool = self.pool.get('hr.payslip')
-        func_pool = self.pool.get('hr.payroll.structure')
-        slip_line_pool = self.pool.get('hr.payslip.line')
         wf_service = netsvc.LocalService("workflow")
         
-        vals = self.read(cr, uid, ids)[0]
+        vals = self.browse(cr, uid, ids)[0]
         
         emp_ids = emp_pool.search(cr, uid, [])
         
         for emp in emp_pool.browse(cr, uid, emp_ids):
-            old_slips = slip_pool.search(cr, uid, [('employee_id','=',emp.id), ('date','=',vals['date'])])
+            old_slips = slip_pool.search(cr, uid, [('employee_id','=',emp.id), ('date','=',vals.date)])
             if old_slips:
                 slip_pool.write(cr, uid, old_slips, {'register_id':ids[0]})
                 for sid in old_slips:
                     wf_service.trg_validate(uid, 'hr.payslip', sid, 'compute_sheet', cr)
                 continue
-            
-            sql_req= '''
-                SELECT c.wage as wage, struct_id as function
-                FROM hr_contract c
-                  LEFT JOIN hr_employee emp on (c.employee_id=emp.id)
-                  LEFT JOIN hr_contract_wage_type cwt on (cwt.id = c.wage_type_id)
-                  LEFT JOIN hr_contract_wage_type_period p on (cwt.period_id = p.id)
-                WHERE
-                  (emp.id=%s) AND
-                  (date_start <= %s) AND
-                  (date_end IS NULL OR date_end >= %s)
-                LIMIT 1
-                '''
-            cr.execute(sql_req, (emp.id, vals['date'], vals['date']))
-            contract_info = cr.dictfetchone()
-
-            if not contract_info:
-                continue
-            
-            function = contract_info['struct_id']
-            lines = []
-            if function:
-                func = func_pool.read(cr, uid, function, ['line_ids'])
-                lines = slip_line_pool.browse(cr, uid, func['line_ids'])
-            
+                
             res = {
                 'employee_id':emp.id,
-                'basic':contract_info['wage'],
                 'register_id':ids[0],
-                'name':vals['name'],
-                'date':vals['date'],
-                'journal_id':vals['journal_id'][0],
-                'bank_journal_id':vals['bank_journal_id'][0]
+                'name':vals.name,
+                'date':vals.date,
+                'journal_id':vals.journal_id.id,
+                'bank_journal_id':vals.bank_journal_id.id
             }
             slip_id = slip_pool.create(cr, uid, res)
-
-            old_slip_id = slip_line_pool.search(cr, uid, [('slip_id','=',slip_id)])
-            slip_line_pool.unlink(cr, uid, old_slip_id)
-            
-            for line in lines:
-                slip_line_pool.copy(cr, uid, line.id, {'slip_id':slip_id, 'employee_id':False, 'function_id':False}, {})
-            
-            for line in emp.line_ids:
-                slip_line_pool.copy(cr, uid, line.id, {'slip_id':slip_id, 'employee_id':False, 'function_id':False}, {})
-                
             wf_service.trg_validate(uid, 'hr.payslip', slip_id, 'compute_sheet', cr)
         
         number = self.pool.get('ir.sequence').get(cr, uid, 'salary.register')
@@ -314,15 +277,17 @@ class payroll_register(osv.osv):
             for sid in sids:
                 wf_service.trg_validate(uid, 'hr.payslip', sid, 'final_verify_sheet', cr)
 
-        
         for reg in self.browse(cr, uid, ids):
             accs = {}
             for slip in reg.line_ids:
                 pid = False
                 if accs.get(slip.employee_id.property_bank_account.code, False) == False:
+                    company_name = self.pool.get('res.users').browse(cr, uid, uid).company_id.name
+                    bank_name = slip.employee_id.property_bank_account.name
+                    number = self.pool.get('ir.sequence').get(cr, uid, 'payment.advice')
                     advice = {
-                        'name': 'Payment Advice from %s / Bank Account %s' % (self.pool.get('res.users').browse(cr, uid, uid).company_id.name, slip.employee_id.property_bank_account.name),
-                        'number': self.pool.get('ir.sequence').get(cr, uid, 'payment.advice'),
+                        'name': 'Payment Advice from %s / Bank Account %s' % (company_name, bank_name),
+                        'number': number,
                         'register_id':reg.id,
                         'account_id':slip.employee_id.property_bank_account.id
                     }
@@ -331,16 +296,18 @@ class payroll_register(osv.osv):
                 else:
                     pid = accs[slip.employee_id.property_bank_account.code]
                 
-                pline = {
-                    'advice_id':pid,
-                    'name':slip.employee_id.otherid,
-                    'employee_id':slip.employee_id.id,
-                    'amount':slip.other_pay + slip.net,
-                    'bysal':slip.net
-                }
-                id = advice_line_pool.create(cr, uid, pline)
+                if not slip.employee_id.bank_account_id:
+                    raise osv.except_osv(_('Warning'), _("Bank Account not defined for %s !" % (slip.employee_id.name)))
+                else:
+                    pline = {
+                        'advice_id':pid,
+                        'name':slip.employee_id.bank_account_id.acc_number,
+                        'employee_id':slip.employee_id.id,
+                        'amount':slip.other_pay + slip.net,
+                        'bysal':slip.net
+                    }
+                    id = advice_line_pool.create(cr, uid, pline)
         
-        #, 'advice_ids':[(6, 0, [pid])]
         self.write(cr, uid, ids, {'state':'confirm'})
         return True
 
@@ -1087,76 +1054,76 @@ class hr_payslip(osv.osv):
             })
             self.write(cr, uid, [slip.id], update)
         
-        if contract:
-            for slip in self.browse(cr, uid, ids):
-                basic_before_leaves = basic
+            if contract:
+                for slip in self.browse(cr, uid, ids):
+                    basic_before_leaves = basic
 
-                working_day = 0
-                off_days = 0
-                dates = prev_bounds(slip.date)
-                
-                days_arr = [0, 1, 2, 3, 4, 5, 6]
-                for dy in range(contract.working_days_per_week, 7):
-                    off_days += get_days(1, dates[1].day, dates[1].month, dates[1].year, days_arr[dy])
-            
-                total_off = off_days
-                working_day = dates[1].day - total_off
-                perday = slip.net / working_day
-                
-                total = 0.0
-                leave = 0.0
-                
-                leave_ids = self._get_leaves(cr, uid, slip, slip.employee_id, context)
-                
-                total_leave = 0.0
-                paid_leave = 0.0
-                for hday in holiday_pool.browse(cr, uid, leave_ids):
-                    res = {
-                        'slip_id':slip.id,
-                        'name':hday.holiday_status_id.name + '-%s' % (hday.number_of_days),
-                        'code':hday.holiday_status_id.code,
-                        'amount_type':'fix',
-                        'category_id':hday.holiday_status_id.head_id.id,
-                        'account_id':hday.holiday_status_id.account_id.id,
-                        'analytic_account_id':hday.holiday_status_id.analytic_account_id.id
-                    }
+                    working_day = 0
+                    off_days = 0
+                    dates = prev_bounds(slip.date)
                     
-                    days = hday.number_of_days
-                    if hday.number_of_days < 0:
-                        days = hday.number_of_days * -1
+                    days_arr = [0, 1, 2, 3, 4, 5, 6]
+                    for dy in range(contract.working_days_per_week, 7):
+                        off_days += get_days(1, dates[1].day, dates[1].month, dates[1].year, days_arr[dy])
+                
+                    total_off = off_days
+                    working_day = dates[1].day - total_off
+                    perday = slip.net / working_day
                     
-                    total_leave += days
-                    if hday.holiday_status_id.type == 'paid':
-                        paid_leave += days
-                        continue
+                    total = 0.0
+                    leave = 0.0
+                    
+                    leave_ids = self._get_leaves(cr, uid, slip, slip.employee_id, context)
+                    
+                    total_leave = 0.0
+                    paid_leave = 0.0
+                    for hday in holiday_pool.browse(cr, uid, leave_ids):
+                        res = {
+                            'slip_id':slip.id,
+                            'name':hday.holiday_status_id.name + '-%s' % (hday.number_of_days),
+                            'code':hday.holiday_status_id.code,
+                            'amount_type':'fix',
+                            'category_id':hday.holiday_status_id.head_id.id,
+                            'account_id':hday.holiday_status_id.account_id.id,
+                            'analytic_account_id':hday.holiday_status_id.analytic_account_id.id
+                        }
                         
-                    elif hday.holiday_status_id.type == 'halfpaid':
-                        paid_leave += (days / 2)
-                        res['name'] = hday.holiday_status_id.name + '-%s/2' % (days)
-                        res['amount'] = perday * (days/2)
-                        total += perday * (days/2)
-                        leave += days / 2
-                        res['type'] = 'deduction'
-                    else:
-                        res['name'] = hday.holiday_status_id.name + '-%s' % (days)
-                        res['amount'] = perday * days
-                        res['type'] = 'deduction'
-                        leave += days
-                        total += perday * days
-                    
-                    slip_line_pool.create(cr, uid, res)
-                basic = basic - total
-                leaves = total
+                        days = hday.number_of_days
+                        if hday.number_of_days < 0:
+                            days = hday.number_of_days * -1
+                        
+                        total_leave += days
+                        if hday.holiday_status_id.type == 'paid':
+                            paid_leave += days
+                            continue
+                            
+                        elif hday.holiday_status_id.type == 'halfpaid':
+                            paid_leave += (days / 2)
+                            res['name'] = hday.holiday_status_id.name + '-%s/2' % (days)
+                            res['amount'] = perday * (days/2)
+                            total += perday * (days/2)
+                            leave += days / 2
+                            res['type'] = 'deduction'
+                        else:
+                            res['name'] = hday.holiday_status_id.name + '-%s' % (days)
+                            res['amount'] = perday * days
+                            res['type'] = 'deduction'
+                            leave += days
+                            total += perday * days
+                        
+                        slip_line_pool.create(cr, uid, res)
+                    basic = basic - total
+                    leaves = total
 
-                update.update({
-                    'basic_before_leaves': round(basic_before_leaves),
-                    'leaves':total,
-                    'holiday_days':leave,
-                    'worked_days':working_day - leave,
-                    'working_days':working_day,
-                })
-                self.write(cr, uid, [slip.id], update)
-            
+                    update.update({
+                        'basic_before_leaves': round(basic_before_leaves),
+                        'leaves':total,
+                        'holiday_days':leave,
+                        'worked_days':working_day - leave,
+                        'working_days':working_day,
+                    })
+                    self.write(cr, uid, [slip.id], update)
+                
         return True
         
 hr_payslip()
@@ -1318,7 +1285,7 @@ class hr_employee(osv.osv):
         'esi_account':fields.char('ESI Account', size=64, required=False, readonly=False),
         'hospital_id':fields.many2one('res.partner.address', 'ESI Hospital', required=False),
         'passport_id':fields.many2one('hr.passport', 'Passport', required=False),
-        'otherid':fields.char('Other Id', size=64, required=False),
+        'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account', required=False),
         'line_ids':fields.one2many('hr.payslip.line', 'employee_id', 'Salary Structure', required=False),
         'slip_ids':fields.one2many('hr.payslip', 'employee_id', 'Payslips', required=False, readonly=True),
         'property_bank_account': fields.property(
@@ -1331,7 +1298,7 @@ class hr_employee(osv.osv):
             help="Select Bank Account from where Salary Expanse will be Paid",
             required=True),
         'salary_account':fields.property(
-            'account.account',
+            'account.account',  
             type='many2one',
             relation='account.account',
             string="Salary Account",
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 46b4cef8e04..dcc6087ace5 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -131,7 +131,7 @@
                         <group colspan="2" col="2">
                             <separator string="Personal Info" colspan="2"/>
                             <field name="pan_no" select="1"/>
-                            <field name="bank_account"/>
+                            <field name="bank_account_id"/>
                             <field name="place_of_birth"/>
                             <field name="children"/>
                         </group>
diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
index 6bbcf8e296e..72ffaf435ca 100644
--- a/addons/hr_payroll_account/hr_payroll_account.py
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -101,7 +101,7 @@ class hr_payslip(osv.osv):
             partner_id = False
             exp_ids = []
             
-            partner = slip.employee_id.address_home_id.partner_id
+            partner = slip.employee_id.bank_account_id.partner_id
             partner_id = partner.id
             
             fiscal_year_ids = self.pool.get('account.fiscalyear').search(cr, uid, [])
@@ -255,14 +255,14 @@ class hr_payslip(osv.osv):
             partner = False
             partner_id = False
             
-            if not slip.employee_id.address_home_id:
-                raise osv.except_osv(_('Integrity Error !'), _('Please defined the Employee Home Address Along with Partners !!'))
+            if not slip.employee_id.bank_account_id:
+                raise osv.except_osv(_('Integrity Error !'), _('Please defined bank account for %s !' % (slip.employee_id.name)))
             
-            if not slip.employee_id.address_home_id.partner_id:
-                raise osv.except_osv(_('Integrity Error !'), _('Please defined the Partner in Home Address !!'))
+            if not slip.employee_id.bank_account_id.partner_id:
+                raise osv.except_osv(_('Integrity Error !'), _('Please defined partner in bank account for %s !' % (slip.employee_id.name)))
             
-            partner = slip.employee_id.address_home_id.partner_id
-            partner_id = slip.employee_id.address_home_id.partner_id.id
+            partner = slip.employee_id.bank_account_id.partner_id
+            partner_id = slip.employee_id.bank_account_id.partner_id.id
             
             period_id = False
             

From 83e86dc8e6cd80a33805bb2db45d9b4a87142888 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Mon, 21 Jun 2010 04:42:50 +0100
Subject: [PATCH 31/40] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100619035141-puifl9zhhni1ci9t
bzr revid: codehost@crowberry-20100620033445-89hed877mztohneu
bzr revid: codehost@crowberry-20100621034250-kohum7teripm1319
---
 addons/board/i18n/id.po       | 41 ++++++++++++++++++-----------------
 addons/delivery/i18n/pl.po    | 13 ++++++-----
 addons/hr_contract/i18n/hi.po | 26 +++++++++++-----------
 addons/stock/i18n/es.po       |  2 +-
 4 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/addons/board/i18n/id.po b/addons/board/i18n/id.po
index 8c3357a0c30..8a8a3b2a9e0 100644
--- a/addons/board/i18n/id.po
+++ b/addons/board/i18n/id.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 13:47+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-06-19 01:36+0000\n"
+"Last-Translator: Abdul Munif Hanafi <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-06-20 03:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
@@ -21,6 +21,7 @@ msgstr ""
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Nama Objek harus berawalan dengan x_ dan tidak mengandung karakter khusus !"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board
@@ -30,7 +31,7 @@ msgstr ""
 #. module: board
 #: field:board.note,user_id:0
 msgid "Author"
-msgstr ""
+msgstr "Pencipta"
 
 #. module: board
 #: model:ir.module.module,shortdesc:board.module_meta_information
@@ -41,22 +42,22 @@ msgstr ""
 #: view:board.note:0
 #: field:board.note,note:0
 msgid "Note"
-msgstr ""
+msgstr "Catatan"
 
 #. module: board
 #: field:board.board.line,width:0
 msgid "Width"
-msgstr ""
+msgstr "Lebar"
 
 #. module: board
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nama model tidak sah di definsi aksi"
 
 #. module: board
 #: field:board.board.line,name:0
 msgid "Title"
-msgstr ""
+msgstr "Judul"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_view_board_list_form
@@ -73,7 +74,7 @@ msgstr ""
 #. module: board
 #: wizard_view:board.board.menu.create,init:0
 msgid "Menu Information"
-msgstr ""
+msgstr "Informasi Menu"
 
 #. module: board
 #: field:board.board,line_ids:0
@@ -88,12 +89,12 @@ msgstr ""
 #. module: board
 #: field:board.note,date:0
 msgid "Date"
-msgstr ""
+msgstr "Tanggal"
 
 #. module: board
 #: model:ir.ui.menu,name:board.next_id_50
 msgid "Configuration"
-msgstr ""
+msgstr "Konfigurasi"
 
 #. module: board
 #: field:board.note.type,name:0
@@ -108,7 +109,7 @@ msgstr ""
 #. module: board
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML tidak sah untuk Menampilkan Arsitektur!"
 
 #. module: board
 #: wizard_field:board.board.menu.create,init,menu_parent_id:0
@@ -118,7 +119,7 @@ msgstr ""
 #. module: board
 #: view:board.note:0
 msgid "Notes"
-msgstr ""
+msgstr "Catatan"
 
 #. module: board
 #: model:ir.model,name:board.model_board_note_type
@@ -140,7 +141,7 @@ msgstr ""
 #. module: board
 #: field:board.board.line,position:0
 msgid "Position"
-msgstr ""
+msgstr "Posisi"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.dashboard_open
@@ -150,7 +151,7 @@ msgstr ""
 #. module: board
 #: wizard_field:board.board.menu.create,init,menu_name:0
 msgid "Menu Name"
-msgstr ""
+msgstr "Nama Menu"
 
 #. module: board
 #: field:board.note,type:0
@@ -160,7 +161,7 @@ msgstr ""
 #. module: board
 #: selection:board.board.line,position:0
 msgid "Left"
-msgstr ""
+msgstr "Kiri"
 
 #. module: board
 #: field:board.board,view_id:0
@@ -170,7 +171,7 @@ msgstr ""
 #. module: board
 #: selection:board.board.line,position:0
 msgid "Right"
-msgstr ""
+msgstr "Kanan"
 
 #. module: board
 #: field:board.board.line,sequence:0
@@ -181,7 +182,7 @@ msgstr ""
 #: view:board.board:0
 #: wizard_button:board.board.menu.create,init,create_menu:0
 msgid "Create Menu"
-msgstr ""
+msgstr "Buat Menu"
 
 #. module: board
 #: model:ir.ui.menu,name:board.dashboard_menu
@@ -191,7 +192,7 @@ msgstr ""
 #. module: board
 #: field:board.board.line,height:0
 msgid "Height"
-msgstr ""
+msgstr "Tinggi"
 
 #. module: board
 #: model:ir.actions.wizard,name:board.wizard_board_create_menu
@@ -201,7 +202,7 @@ msgstr ""
 #. module: board
 #: wizard_button:board.board.menu.create,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Batal"
 
 #. module: board
 #: view:board.board:0
diff --git a/addons/delivery/i18n/pl.po b/addons/delivery/i18n/pl.po
index d395d60a8a2..20d2799ecd9 100644
--- a/addons/delivery/i18n/pl.po
+++ b/addons/delivery/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-05-03 08:04+0000\n"
-"Last-Translator: Piotr Lipski <Unknown>\n"
+"PO-Revision-Date: 2010-06-19 13:34+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-06-20 03:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
@@ -57,7 +57,7 @@ msgstr ""
 #. module: delivery
 #: field:delivery.grid,state_ids:0
 msgid "States"
-msgstr "Stany"
+msgstr "Regiony"
 
 #. module: delivery
 #: constraint:ir.actions.act_window:0
@@ -68,6 +68,7 @@ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 #: help:res.partner,property_delivery_carrier:0
 msgid "This delivery method will be used when invoicing from packing."
 msgstr ""
+"Ta metoda dostawy będzie stosowana przy fakturowaniu z wydania zewnętrznego."
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
@@ -109,7 +110,7 @@ msgstr "Pozycja tabeli opłat za dostawy"
 #. module: delivery
 #: model:ir.ui.menu,name:delivery.menu_delivery
 msgid "Delivery"
-msgstr "Dostawa"
+msgstr "Wydanie zewnętrzne"
 
 #. module: delivery
 #: view:delivery.grid.line:0
@@ -151,7 +152,7 @@ msgstr "="
 #. module: delivery
 #: field:delivery.carrier,product_id:0
 msgid "Delivery Product"
-msgstr ""
+msgstr "Dostawa jako produkt"
 
 #. module: delivery
 #: view:delivery.grid.line:0
diff --git a/addons/hr_contract/i18n/hi.po b/addons/hr_contract/i18n/hi.po
index a80f3f55224..c3a930020a5 100644
--- a/addons/hr_contract/i18n/hi.po
+++ b/addons/hr_contract/i18n/hi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-25 07:27+0000\n"
-"Last-Translator: vir (Open ERP) <vir@tinyerp.com>\n"
+"PO-Revision-Date: 2010-06-20 20:17+0000\n"
+"Last-Translator: abhishek <Unknown>\n"
 "Language-Team: Hindi <hi@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-04-17 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-06-21 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -57,7 +57,7 @@ msgstr ""
 #. module: hr_contract
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "कार्य की परिभाषा में मॉडल का नाम अमान्य है."
 
 #. module: hr_contract
 #: field:hr.contract,employee_id:0
@@ -82,7 +82,7 @@ msgstr ""
 #. module: hr_contract
 #: field:hr.contract,function:0
 msgid "Function"
-msgstr ""
+msgstr "फंक्शन"
 
 #. module: hr_contract
 #: field:hr.employee,marital_status:0
@@ -91,7 +91,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_contract.action_hr_marital_status
 #: model:ir.ui.menu,name:hr_contract.hr_menu_marital_status
 msgid "Marital Status"
-msgstr ""
+msgstr "वैवाहिक वस्तुस्थिति"
 
 #. module: hr_contract
 #: view:hr.employee:0
@@ -108,7 +108,7 @@ msgstr ""
 #. module: hr_contract
 #: field:hr.contract.wage.type,type:0
 msgid "Type"
-msgstr ""
+msgstr "प्रकार"
 
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
@@ -150,19 +150,19 @@ msgstr ""
 #. module: hr_contract
 #: field:hr.contract,date_end:0
 msgid "End Date"
-msgstr ""
+msgstr "समाप्ति तिथि"
 
 #. module: hr_contract
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "संरचना देखने के लिए अमान्य XML!"
 
 #. module: hr_contract
 #: view:hr.contract:0
 #: field:hr.contract,notes:0
 #: view:hr.employee:0
 msgid "Notes"
-msgstr ""
+msgstr "टिप्पणियाँ"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -209,12 +209,12 @@ msgstr ""
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
 msgid "Place of Birth"
-msgstr ""
+msgstr "जन्म स्थान"
 
 #. module: hr_contract
 #: field:hr.employee,manager:0
 msgid "Manager"
-msgstr ""
+msgstr "मैनेजर"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type.period:0
@@ -239,7 +239,7 @@ msgstr ""
 #. module: hr_contract
 #: field:hr.contract,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "प्रारंभ दिनांक"
 
 #. module: hr_contract
 #: field:hr.employee.marital.status,description:0
diff --git a/addons/stock/i18n/es.po b/addons/stock/i18n/es.po
index a7e23b3e396..cb5584e3eaf 100644
--- a/addons/stock/i18n/es.po
+++ b/addons/stock/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-18 03:32+0000\n"
+"X-Launchpad-Export-Date: 2010-06-19 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock

From 1513d63e9308507182853f3445385165098229e5 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 21 Jun 2010 11:54:06 +0530
Subject: [PATCH 32/40] [IMP] stock: Remove unused field form internal move

bzr revid: sbh@tinyerp.com-20100621062406-km7vvj2ef6x4aefk
---
 addons/stock/stock_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 8995d67fb33..31579978ba8 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1351,7 +1351,6 @@
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'address_id'}"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
                         <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
                         <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>

From 27b1695a09694e86ce985e8dc2ff9fd1802204bd Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 21 Jun 2010 12:05:10 +0530
Subject: [PATCH 33/40] [IMP] Stock: Remove the print statement

bzr revid: sbh@tinyerp.com-20100621063510-lz83q1r0u7zmg3f3
---
 addons/stock_location/mrp_pull.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock_location/mrp_pull.py b/addons/stock_location/mrp_pull.py
index 3df96407bd7..cd9a7999fdb 100644
--- a/addons/stock_location/mrp_pull.py
+++ b/addons/stock_location/mrp_pull.py
@@ -32,7 +32,7 @@ class procurement_order(osv.osv):
     def check_buy(self, cr, uid, ids, context=None):
         for procurement in self.browse(cr, uid, ids):
             for line in procurement.product_id.flow_pull_ids:
-                print line.location_src_id.name, line.location_id.name, line.type_proc
+                
                 if line.location_id==procurement.location_id:
                     return line.type_proc=='buy'
         return super(procurement_order, self).check_buy(cr, uid, ids)

From bfae42475712d81623ac9a6970033f5da0475571 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 21 Jun 2010 13:40:13 +0530
Subject: [PATCH 34/40] [IMP] Stock: Give warning in stock_move if state is
 done/cancle

bzr revid: sbh@tinyerp.com-20100621081013-ovwaw9jx42xhdap7
---
 addons/stock/wizard/stock_partial_move.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index 1a1fc6bf059..d9c97a5b885 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -44,7 +44,9 @@ class stock_partial_move(osv.osv_memory):
         moveids = []
         for m in move_obj.browse(cr, uid, context.get('active_ids', [])):            
             if m.state in ('done', 'cancel'):
-                continue
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delivery products  which are already delivered !'))
+
+            
             if 'move%s_product_id'%(m.id) not in self._columns:
                 self._columns['move%s_product_id'%(m.id)] = fields.many2one('product.product',string="Product")
             if 'move%s_product_qty'%(m.id) not in self._columns:

From fff942abec18728c4f4e6a9020517b5688536067 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 21 Jun 2010 13:48:00 +0530
Subject: [PATCH 35/40] stock_location: Add the company_id in defaults

bzr revid: sbh@tinyerp.com-20100621081800-rmjpcf18bi9s63sg
---
 addons/stock_location/stock.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/stock_location/stock.py b/addons/stock_location/stock.py
index 561cdbbecda..61c9d2c77b3 100644
--- a/addons/stock_location/stock.py
+++ b/addons/stock_location/stock.py
@@ -85,6 +85,7 @@ class product_pulled_flow(osv.osv):
         'type_proc': lambda *args: 'move',
         'picking_type':lambda *args:'out',
         'invoice_state': lambda *args: 'none',
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.move', context=c),        
     }
 product_pulled_flow()
 

From 87ece39c0211d5ce2871357b64e35b790d6a52fb Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 21 Jun 2010 14:20:32 +0530
Subject: [PATCH 36/40] [MOD,ADD] subscription, idea : menu sequence changed,
 lunch : Search view added for lunch order and cashmove

bzr revid: vir@tinyerp.com-20100621085032-a3p3ywxnrnooue5r
---
 addons/idea/idea_view.xml                 |  2 +-
 addons/lunch/lunch_view.xml               | 64 ++++++++++++++++++++++-
 addons/subscription/subscription_view.xml |  5 +-
 3 files changed, 67 insertions(+), 4 deletions(-)

diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index d24ad041fee..495110236da 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -372,7 +372,7 @@
         <field name="search_view_id" ref="view_idea_vote_search"/>
     </record>
 
-    <menuitem name="Votes" parent="menu_ideas" id="menu_idea_vote" action="action_idea_vote"/>
+    <menuitem name="Votes" parent="menu_idea_reporting" id="menu_idea_vote" action="action_idea_vote"/>
 
     </data>
 </openerp>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index aec0d877c18..5eea9a13d4a 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -53,16 +53,51 @@
                     <field name="state"/>
                     <field name="descript"/>
                     <field name="price" sum="Total price"/>
+                    <button colspan="1"
+                              name="%(action_lunch_order_confirm)d"
+                              string="Confirm Order"
+                              type="action" states="draft"
+                              icon="terp-gtk-go-back-rtl" />
+                    <button colspan="1"
+                              name="%(action_lunch_order_cancel)d"
+                              string="Cancel Order"
+                              type="action" states="confirmed"
+                              icon="terp-gtk-stop" />
                 </tree>
             </field>
         </record>
 
+<!-- Lunch order Search view -->
+
+        <record id="view_lunch_order_filter" model="ir.ui.view">
+            <field name="name">lunch.order.list.select</field>
+            <field name="model">lunch.order</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Lunch Order">
+                    <filter icon="terp-check" string="To Confirm" domain="[('state','=','draft')]"/>
+                    <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=',('confirmed'))]"/>
+                    <filter icon="terp-go-today" name="Today" string="Today" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"/>
+                    <separator orientation="vertical"/>
+                    <field name="user_id"/>
+                    <field name="date"/>
+                    <newline/>
+                    <group expand="0" string="Group By..." colspan="4" col="20">
+                        <filter string="Cashbox" icon="terp-dolar" domain="[]"  context="{'group_by':'cashmove'}"/>
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'product'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
 <!-- Lunch order Action -->
 
         <record model="ir.actions.act_window" id="action_lunch_order_form">
                 <field name="name">Lunch Orders</field>
                 <field name="res_model">lunch.order</field>
                 <field name="view_mode">tree,form</field>
+                <field name="search_view_id" ref="view_lunch_order_filter"/>
+                <field name="context">{"search_default_Today":1}</field>
         </record>
 
         <menuitem name="Lunch Order" parent="menu_lunch"
@@ -133,20 +168,45 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="CashMove" editable="top">
+                    <field name="box" select="1"/>
                     <field name="name" select="1" required="1"/>
                     <field name="user_cashmove" select="1"/>
-                    <field name="amount" select="1" sum="Total amount"/>
-                    <field name="box" select="1"/>
                     <field name="create_date"/>
+                    <field name="amount" select="1" sum="Total amount"/>
                 </tree>
             </field>
         </record>
 
+<!--  Cash Move Search View  -->
+
+        <record id="view_lunch_cashmove_filter" model="ir.ui.view">
+            <field name="name">lunch.cashmove.list.select</field>
+            <field name="model">lunch.cashmove</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search CashMove">
+                    <filter icon="terp-go-today" name="Today" string="Today" domain="[('create_date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59'))]"/>
+                    <separator orientation="vertical"/>
+                    <field name="name"/>
+                    <field name="user_cashmove"/>
+                    <field name="create_date"/>
+                    <newline/>
+                    <group expand="0" string="Group By..." colspan="4" col="20">
+                        <filter string="User" icon="terp-personal" domain="[]"  context="{'group_by':'user_cashmove'}"/>
+                        <filter string="Box" icon="terp-accessories-archiver+" domain="[]"  context="{'group_by':'box'}"/>
+                    </group>
+                </search>
+
+            </field>
+        </record>
+
 <!-- Cash Move Action  -->
 
         <record model="ir.actions.act_window" id="action_lunch_cashmove_form">
                 <field name="name">CashMove</field>
                 <field name="res_model">lunch.cashmove</field>
+                <field name="search_view_id" ref="view_lunch_cashmove_filter"/>
+                <field name="context">{"search_default_Today":1}</field>
         </record>
 
         <menuitem name="Cash Moves" parent="menu_lunch"
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 478bb4a4f67..695f9b00895 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -152,6 +152,9 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="document_tree"/>
         </record>
-        <menuitem action="action_document_form" id="menu_action_document_form" parent="subscription.next_id_45"/>
+        <menuitem name="Configuration" parent="base.menu_tools"
+              id="base.menu_lunch_survey_root" sequence="20" />
+        <menuitem id="config_recuuring_event" name="Recurring Events" parent="base.menu_lunch_survey_root" sequence="4"/>
+        <menuitem action="action_document_form" id="menu_action_document_form" parent="config_recuuring_event"/>
     </data>
 </openerp>

From 8b17477fd85c256a5968c4a194a3f4e3c0fa1b29 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 21 Jun 2010 14:23:40 +0530
Subject: [PATCH 37/40] [IMP] stock: Improve the error message

bzr revid: sbh@tinyerp.com-20100621085340-qifu2qjnse04j6it
---
 addons/stock/stock.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index a3d077fbed9..2c67c0e4cc4 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -640,7 +640,7 @@ class stock_picking(osv.osv):
         todo = []
         for picking in self.browse(cr, uid, ids, context=context):
             if not picking.move_lines:
-                raise osv.except_osv(_('Error !'),_('You can not confirm Picking without Move Lines.'))
+                raise osv.except_osv(_('Error !'),_('You can not confirm Picking without Stock Move .'))
             
             for r in picking.move_lines:
                 if r.state == 'draft':
@@ -690,6 +690,8 @@ class stock_picking(osv.osv):
         """
         wf_service = netsvc.LocalService("workflow")
         for pick in self.browse(cr, uid, ids):
+            if not pick.move_lines:
+                raise osv.except_osv(_('Error !'),_('You can not done Picking without Move .'))            
             wf_service.trg_validate(uid, 'stock.picking', pick.id,
                 'button_confirm', cr)
             #move_ids = [x.id for x in pick.move_lines]

From 316d479b62edcb8358dd3652cd8922eda8caae36 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 21 Jun 2010 14:34:28 +0530
Subject: [PATCH 38/40] stock_location: revert the changed of company_id

bzr revid: sbh@tinyerp.com-20100621090428-iunjb471vzz3ugg2
---
 addons/stock_location/mrp_pull.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/stock_location/mrp_pull.py b/addons/stock_location/mrp_pull.py
index cd9a7999fdb..b4a68ca1b74 100644
--- a/addons/stock_location/mrp_pull.py
+++ b/addons/stock_location/mrp_pull.py
@@ -58,7 +58,6 @@ class procurement_order(osv.osv):
         move_obj = self.pool.get('stock.move')
         location_obj = self.pool.get('stock.location')
         wf_service = netsvc.LocalService("workflow")
-        res_user=self.pool.get('res.users').browse(cr,uid,uid)
         for proc in proc_obj.browse(cr, uid, ids, context=context):
             line = None
             for line in proc.product_id.flow_pull_ids:
@@ -68,7 +67,7 @@ class procurement_order(osv.osv):
             origin = (proc.origin or proc.name or '').split(':')[0] +':'+line.name
             picking_id = self.pool.get('stock.picking').create(cr, uid, {
                 'origin': origin,
-                'company_id': res_user.company_id and res_user.company_id.id or False,
+                'company_id': line.company_id and line.company_id.id or False,
                 'type': line.picking_type,
                 'stock_journal_id': line.journal_id and line.journal_id.id or False,
                 'move_type': 'one',
@@ -79,7 +78,7 @@ class procurement_order(osv.osv):
             move_id = self.pool.get('stock.move').create(cr, uid, {
                 'name': line.name,
                 'picking_id': picking_id,
-                'company_id':  res_user.company_id and res_user.company_id.id or False,
+                'company_id':  line.company_id and line.company_id.id or False,
                 'product_id': proc.product_id.id,
                 'date_planned': proc.date_planned,
                 'product_qty': proc.product_qty,
@@ -104,7 +103,7 @@ class procurement_order(osv.osv):
             proc_id = self.pool.get('procurement.order').create(cr, uid, {
                 'name': line.name,
                 'origin': origin,
-                'company_id':  res_user.company_id and res_user.company_id.id or False,
+                'company_id':  line.company_id and line.company_id.id or False,
                 'date_planned': proc.date_planned,
                 'product_id': proc.product_id.id,
                 'product_qty': proc.product_qty,

From 50bf02591345cebb01c37da4be8e2bc2409c7308 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 21 Jun 2010 15:47:10 +0530
Subject: [PATCH 39/40] [Fix,ADD] idea : problem of vote_id is solved, open
 button added

bzr revid: vir@tinyerp.com-20100621101710-zvz52nvql5ybsrae
---
 addons/idea/idea_view.xml            | 1 +
 addons/idea/wizard/idea_post_vote.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 495110236da..0f69931ca43 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -247,6 +247,7 @@
             <field name="count_comments" />
             <field name="count_votes" />
             <field name="state"/>
+             <button name="idea_open" string="Open" states="draft" icon="terp-gtk-go-back-rtl"/>
             <button name="%(idea.action_idea_post_vote)d" icon="gtk-execute" type="action" states="open" string="Submit Vote"/>
             <button name="idea_close" string="Accept" states="open" icon="gtk-jump-to"/>
             <button name="idea_cancel" string="Refuse" states="open"  icon="gtk-cancel"/>
diff --git a/addons/idea/wizard/idea_post_vote.py b/addons/idea/wizard/idea_post_vote.py
index e723d0a4505..c4ba6f331dc 100644
--- a/addons/idea/wizard/idea_post_vote.py
+++ b/addons/idea/wizard/idea_post_vote.py
@@ -101,6 +101,7 @@ class idea_post_vote(osv.osv_memory):
         """
 
         vote_ids = context and context.get('active_ids', []) or []
+        vote_id = context['active_ids'][0]
         vote_pool = self.pool.get('idea.vote')
         idea_pool = self.pool.get('idea.idea')
         comment_pool = self.pool.get('idea.comment')

From 93a68feaf7e020921cf2f46332790f1f9c41c44d Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 21 Jun 2010 17:58:39 +0530
Subject: [PATCH 40/40] [FIX] product_visible_discount: fix for sale order line

bzr revid: mra@mra-laptop-20100621122839-6yg0t192h4o1mz0t
---
 addons/product_visible_discount/product.py | 32 ++++++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/addons/product_visible_discount/product.py b/addons/product_visible_discount/product.py
index e81dac8668e..53c6446c57e 100644
--- a/addons/product_visible_discount/product.py
+++ b/addons/product_visible_discount/product.py
@@ -46,6 +46,25 @@ class sale_order_line(osv.osv):
             uom=False, qty_uos=0, uos=False, name='', partner_id=False,
             lang=False, update_tax=True,date_order=False,packaging=False,fiscal_position=False, flag=False):
 
+        def get_real_price(res_dict, product_id, pricelist):
+            item_obj = self.pool.get('product.pricelist.item')
+            price_type_obj = self.pool.get('product.price.type')
+            product_obj = self.pool.get('product.product')
+            template_obj = self.pool.get('product.template')
+            field_name = 'list_price'
+
+            if res_dict.get('item_id',False) and res_dict['item_id'].get(pricelist,False):
+                item = res_dict['item_id'].get(pricelist,False)
+                item_base = item_obj.read(cr, uid, [item], ['base'])[0]['base']
+                if item_base > 0:
+                    field_name = price_type_obj.browse(cr, uid, item_base).field
+
+            product_tmpl_id = product_obj.browse(cr, uid, product_id, context).product_tmpl_id.id
+
+            product_read = template_obj.read(cr, uid, product_tmpl_id, [field_name], context)
+            return product_read[field_name]
+
+
         res=super(sale_order_line, self).product_id_change(cr, uid, ids, pricelist, product, qty,
             uom, qty_uos, uos, name, partner_id,
             lang, update_tax,date_order,fiscal_position=fiscal_position,flag=flag)
@@ -68,15 +87,16 @@ class sale_order_line(osv.osv):
 #            product_read = self.pool.get('product.template').read(cr, uid, product_tmpl_id, [field_name], context)
 #            list_price = product_read[field_name]
             list_price = pricelist_obj.price_get(cr, uid, [pricelist],
-                    product.id, qty or 1.0, partner_id, {'uom': uom,'date': date_order })[pricelist]
+                    product.id, qty or 1.0, partner_id, {'uom': uom,'date': date_order })
 
-            pricelists=pricelist_obj.read(cr,uid,[pricelist],['visible_discount'])
+            pricelists = pricelist_obj.read(cr,uid,[pricelist],['visible_discount'])
 
             old_uom = product.uos_id or product.uom_id
-            new_list_price = product_uom_obj._compute_price(cr,
-                        uid, old_uom.id, list_price, uom)
-            if(len(pricelists)>0 and pricelists[0]['visible_discount'] and list_price != 0):
-                discount=(new_list_price-price) / new_list_price * 100
+#            new_list_price = product_uom_obj._compute_price(cr,
+#                        uid, old_uom.id, list_price, uom)
+            new_list_price = get_real_price(list_price, product.id, pricelist)
+            if(len(pricelists)>0 and pricelists[0]['visible_discount'] and list_price[pricelist] != 0):
+                discount = (new_list_price - price) / new_list_price * 100
                 result['price_unit'] = new_list_price
                 result['discount'] = discount
             else: