From 134979d1d1c2e462328da19e01fddf91746c10a1 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Mon, 22 Feb 2010 19:15:25 +0530
Subject: [PATCH 001/251] [IMP]: mrp: Added new osv_memory wizard to change
 production qty, Improvement in logic to change production qty as per new
 move_lines computation

bzr revid: rpa@openerp.co.in-20100222134525-uxhwpj9jvi2torl5
---
 addons/mrp/__terp__.py                        |   1 +
 addons/mrp/mrp.py                             |  15 +++
 addons/mrp/mrp_view.xml                       |  15 +--
 addons/mrp/wizard/__init__.py                 |   2 +
 .../wizard/wizard_change_production_qty.py    |   2 +
 addons/mrp/wizard/wizard_mrp.py               | 113 ++++++++++++++++++
 6 files changed, 139 insertions(+), 9 deletions(-)
 create mode 100644 addons/mrp/wizard/wizard_mrp.py

diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py
index 3bf2410cff9..aef16034573 100644
--- a/addons/mrp/__terp__.py
+++ b/addons/mrp/__terp__.py
@@ -60,6 +60,7 @@
         'security/ir.model.access.csv',
         'mrp_workflow.xml',
         'mrp_data.xml',
+        'wizard/wizard_mrp.xml', 
         'mrp_view.xml',
         'mrp_wizard.xml',
         'mrp_report.xml',
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 5e789c569da..1f941b8195c 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -641,6 +641,21 @@ class mrp_production(osv.osv):
                     } )
         return amount
 
+    def action_in_production_my(self, cr, uid, ids, qty=None):
+        print 'action_in_production', ids, qty
+        move_obj = self.pool.get('stock.move')
+        move_ids = []
+        for production in self.browse(cr, uid, ids):
+            move_ids = map(lambda x: x.id, production.move_lines + production.move_lines2)
+            if not production.date_start:
+                self.write(cr, uid, [production.id],
+                        {'date_start': time.strftime('%Y-%m-%d %H:%M:%S')})
+        print 'MMMMMMMMMMMMMMMMMMMMMMMM', move_ids
+        for move in move_obj.browse(cr, uid, move_ids):
+            move_obj.consume_moves(cr, uid, move.id, qty, move.location_id.id)
+
+#        self.write(cr, uid, ids, {'state': 'in_production'})
+        return True
     def action_in_production(self, cr, uid, ids):
         move_ids = []
         for production in self.browse(cr, uid, ids):
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 2ee0c1cd9fb..d3d334601fb 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -439,14 +439,6 @@
             </field>
         </record>
 
-        <wizard
-            string="Change Product Qty."
-            model="mrp.production"
-            name="change_production_qty"
-            id="mrp.wizard_change_production_qty"
-            keyword="client_action_multi"
-            multi="True"/>
-	
         <record id="mrp_production_form_view" model="ir.ui.view">
             <field name="name">mrp.production.form</field>
             <field name="model">mrp.production</field>
@@ -462,7 +454,11 @@
                         <group colspan="2" col="3">
                             <field name="product_uom"/>
                             <!-- TODO Fix change qty accroding to move_lines and move_lines2 -->
-<!--                            <button type="action" name="%(mrp.wizard_change_production_qty)d" string="Change Qty" states="ready,confirmed,in_production" icon="gtk-ok"/>-->
+                            <button type="action"
+                            	name="%(mrp.wizard_change_production_qty)d"
+                            	string="Change Qty"
+                            	states="ready,confirmed,in_production"
+                            	icon="gtk-ok" />
                         </group>
                         <label string="" colspan="2"/>                          
                         <field name="product_uos_qty" groups="product.group_uos"/>                        
@@ -537,6 +533,7 @@
                                 <button name="button_confirm" states="draft" string="Confirm Production" icon="gtk-apply"/>
 <!--                                <button name="action_start" states="ready" string="Mark as Start" icon="gtk-media-play" type="object"/>-->
                                 <button name="button_produce" states="ready" string="Produce" icon="gtk-execute"/>
+<!--								<button name="%(move_produce)d" states="ready" string="Produce" icon="gtk-execute" type="action"/>-->
                                 <button name="button_produce_done" states="in_production" string="Production done" icon="gtk-ok"/>
                                 <button name="force_production" states="confirmed,picking_except" string="Force Reservation" type="object" icon="gtk-jump-to"/>
                                 <button name="button_cancel" states="draft,ready,confirmed,in_production,picking_except" string="Cancel" icon="gtk-cancel"/>
diff --git a/addons/mrp/wizard/__init__.py b/addons/mrp/wizard/__init__.py
index 240f25daa9d..922f129c5a0 100644
--- a/addons/mrp/wizard/__init__.py
+++ b/addons/mrp/wizard/__init__.py
@@ -28,5 +28,7 @@ import wizard_track_prod
 import wizard_change_production_qty
 import make_procurement
 
+import wizard_mrp
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/mrp/wizard/wizard_change_production_qty.py b/addons/mrp/wizard/wizard_change_production_qty.py
index a9a8387acdf..0df570b5931 100644
--- a/addons/mrp/wizard/wizard_change_production_qty.py
+++ b/addons/mrp/wizard/wizard_change_production_qty.py
@@ -43,6 +43,8 @@ def _get_qty(self,cr,uid, data, state):
     prod = prod_obj.browse(cr, uid,data['ids'])[0]
     form1_fields['product_qty']['default']=prod.product_qty
     return {}
+
+
 def _get_states(self, cr, uid, data, context):
     prod_obj = pooler.get_pool(cr.dbname).get('mrp.production')
     prod = prod_obj.browse(cr, uid,data['ids'])[0]
diff --git a/addons/mrp/wizard/wizard_mrp.py b/addons/mrp/wizard/wizard_mrp.py
new file mode 100644
index 00000000000..d13d5c4d832
--- /dev/null
+++ b/addons/mrp/wizard/wizard_mrp.py
@@ -0,0 +1,113 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+
+class stock_move_produce(osv.osv_memory):
+    _name = "stock.move.produce"
+    _description = "Produce"
+    
+    _columns = {
+        'product_qty': fields.float('Quantity', required=True), 
+        'mode': fields.selection([('consume_produce', 'Consumme & Produce'), 
+                                  ('consume', 'Consumme Only')], 'Mode', required=True)
+              }
+
+    def _get_product_qty(self, cr, uid, context):
+        prod = self.pool.get('mrp.production').browse(cr, uid, context['active_id'], context=context)
+        return prod.product_qty
+    
+    _defaults = {
+                 'product_qty': _get_product_qty, 
+                 'mode': lambda *x: 'consume'
+                 }
+
+    def do_move_produce(self, cr, uid, ids, context={}):
+        datas = self.read(cr, uid, ids)[0]
+        prod_obj = self.pool.get('mrp.production')
+        wf_service = netsvc.LocalService('workflow')
+        wf_service.trg_validate(uid, 'mrp.production', context['active_id'], 'button_produce', cr)
+        return {}
+
+stock_move_produce()
+
+
+class change_production_qty(osv.osv_memory):
+    _name = "change.production.qty"
+    _description = "Change Production Qty"
+    
+    _columns = {
+        'product_qty': fields.float('Quantity', required=True), 
+              }
+
+    def _get_product_qty(self, cr, uid, context):
+        prod = self.pool.get('mrp.production').browse(cr, uid, context['active_id'], context=context)
+        return prod.product_qty
+    
+    _defaults = {
+                 'product_qty': _get_product_qty, 
+                 }
+
+    def change_prod_qty(self, cr, uid, ids, context={}):
+        datas = self.read(cr, uid, ids)[0]
+        prod_obj = self.pool.get('mrp.production')
+        move_lines_obj = self.pool.get('stock.move')
+        new_qty = datas['product_qty']
+        prod = prod_obj.browse(cr, uid, context['active_id'])
+        prod_obj.write(cr, uid, prod.id, {'product_qty' :  new_qty})
+        prod_obj.action_compute(cr, uid, [prod.id])
+        bom_point = prod.bom_id
+        bom_id = prod.bom_id.id
+        if not bom_point:
+            bom_id = self.pool.get('mrp.bom')._bom_find(cr, uid, prod.product_id.id, prod.product_uom.id)
+            if not bom_id:
+                raise osv.except_osv(_('Error'), _("Couldn't find bill of material for product"))
+            self.write(cr, uid, [prod.id], {'bom_id': bom_id})
+            bom_point = self.pool.get('mrp.bom').browse(cr, uid, [bom_id])[0]
+        factor = new_qty * prod.product_uom.factor / bom_point.product_uom.factor
+        res = self.pool.get('mrp.bom')._bom_explode(cr, uid, bom_point, factor / bom_point.product_qty, [])
+        qty_vals = {}
+        qty_vals_done = {}
+        moves = {}
+        moves_done = {}
+        for move in prod.move_lines:
+            moves[move.product_id.id] = []
+            qty_vals[move.product_id.id] = qty_vals.get(move.product_id.id, 0.0) + move.product_qty
+            moves[move.product_id.id].append(move.id)
+        for move in prod.move_lines2:
+            moves_done[move.product_id.id] = []
+            qty_vals_done[move.product_id.id] = qty_vals_done.get(move.product_id.id, 0.0) + move.product_qty
+            moves_done[move.product_id.id].append(move.id)
+
+        for r in res[0]:
+            to_add = (r['product_qty'] - qty_vals_done.get(r['product_id'], 0.0)) - qty_vals.get(r['product_id'], 0.0)
+            avail_qty = move_lines_obj.browse(cr, uid, moves[r['product_id']][0]).product_qty
+            move_lines_obj.write(cr, uid, moves[r['product_id']][0], {'product_qty': avail_qty + to_add})
+#    TODO
+#        product_lines_obj = self.pool.get('mrp.production.product.line')
+#        for m in prod.move_created_ids:
+#            move_lines_obj.write(cr, uid,m.id, {'product_qty' :  new_qty})
+
+        return {}
+    
+change_production_qty()
\ No newline at end of file

From 01b3026352f980bdcc27b23d732c5e0b289574a7 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Tue, 23 Feb 2010 11:39:13 +0530
Subject: [PATCH 002/251] [IMP]: mrp: Improvement in change product qty wizard

bzr revid: rpa@openerp.co.in-20100223060913-s8yebl794o62cst1
---
 addons/mrp/__init__.py           |  1 +
 addons/mrp/wizard/wizard_mrp.py  | 20 +++++++--
 addons/mrp/wizard/wizard_mrp.xml | 70 ++++++++++++++++++++++++++++++++
 3 files changed, 88 insertions(+), 3 deletions(-)
 create mode 100644 addons/mrp/wizard/wizard_mrp.xml

diff --git a/addons/mrp/__init__.py b/addons/mrp/__init__.py
index 90ca012bc48..d9ed84fcb6a 100644
--- a/addons/mrp/__init__.py
+++ b/addons/mrp/__init__.py
@@ -25,4 +25,5 @@ import wizard
 import report
 import company
 import schedulers
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/wizard/wizard_mrp.py b/addons/mrp/wizard/wizard_mrp.py
index d13d5c4d832..d0db2abb2c0 100644
--- a/addons/mrp/wizard/wizard_mrp.py
+++ b/addons/mrp/wizard/wizard_mrp.py
@@ -100,14 +100,28 @@ class change_production_qty(osv.osv_memory):
             moves_done[move.product_id.id].append(move.id)
 
         for r in res[0]:
+            if not moves.get(r['product_id']) and moves_done.get(r['product_id']):
+                new_qty = (r['product_qty'] - qty_vals_done.get(r['product_id'], 0.0))
+                new_move = move_lines_obj.copy(cr, uid, moves_done.get(r['product_id']), default={'product_qty': new_qty})
+                prod_obj.write(cr, uid, prod.id, {'move_lines': [(4, new_move)]})
+                continue
             to_add = (r['product_qty'] - qty_vals_done.get(r['product_id'], 0.0)) - qty_vals.get(r['product_id'], 0.0)
             avail_qty = move_lines_obj.browse(cr, uid, moves[r['product_id']][0]).product_qty
-            move_lines_obj.write(cr, uid, moves[r['product_id']][0], {'product_qty': avail_qty + to_add})
-#    TODO
+            new_qty = avail_qty + to_add
+            if new_qty == 0:
+                move_lines_obj.write(cr, uid, moves[r['product_id']][0], {'state': 'draft'})
+                move_lines_obj.unlink(cr, uid, moves[r['product_id']])
+            elif new_qty < 0:
+                avail_qty = move_lines_obj.browse(cr, uid, moves_done[r['product_id']][0]).product_qty
+                move_lines_obj.unlink(cr, uid, moves[r['product_id']][0])
+                move_lines_obj.write(cr, uid, moves_done[r['product_id']][0], {'product_qty': avail_qty + new_qty})
+            else:
+                move_lines_obj.write(cr, uid, moves[r['product_id']][0], {'product_qty': avail_qty + to_add})
+
+#        TODO:For Finished Product lines
 #        product_lines_obj = self.pool.get('mrp.production.product.line')
 #        for m in prod.move_created_ids:
 #            move_lines_obj.write(cr, uid,m.id, {'product_qty' :  new_qty})
-
         return {}
     
 change_production_qty()
\ No newline at end of file
diff --git a/addons/mrp/wizard/wizard_mrp.xml b/addons/mrp/wizard/wizard_mrp.xml
new file mode 100644
index 00000000000..7c93245a3d8
--- /dev/null
+++ b/addons/mrp/wizard/wizard_mrp.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    
+        
+        <!--  Produce -->
+        
+		<record id="view_stock_move_produce_wizard" model="ir.ui.view">
+            <field name="name">Produce</field>
+            <field name="model">stock.move.produce</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Produce">
+                	<separator string="Produce" colspan="4"/>
+				    <field name="mode" colspan="4"/>
+				    <field name="product_qty" colspan="2"/>
+                	<newline/>
+                	<separator string="" colspan="4" />
+                	<label string="" colspan="2" />
+                	<group col="2" colspan="1">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="do_move_produce" string="Confirm"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+        <record id="move_produce" model="ir.actions.act_window">
+            <field name="name">Produce</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.move.produce</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        
+        <record id="view_change_production_qty_wizard" model="ir.ui.view">
+            <field name="name">Change Production Qty</field>
+            <field name="model">change.production.qty</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Change Production Qty">
+                	<separator string="Change Production Qty" colspan="4"/>
+				    <field name="product_qty" colspan="2"/>
+                	<separator string="" colspan="4" />
+                	<label string="" colspan="2" />
+                	<group col="2" colspan="1">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="change_prod_qty" string="Validate"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+        <record id="wizard_change_production_qty" model="ir.actions.act_window">
+            <field name="name">Change Production Qty</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">change.production.qty</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        
+        
+	</data>
+</openerp>	
\ No newline at end of file

From 6e5147c9c5288f420b2523bbadc71cbadebd525b Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Tue, 23 Feb 2010 15:56:41 +0530
Subject: [PATCH 003/251] [IMP]: mrp: Added wizard of Production done, Moved
 change qty logic to mrp_production from wizard

bzr revid: rpa@openerp.co.in-20100223102641-yqolnuds2hkdr6a2
---
 addons/mrp/mrp.py               | 138 ++++++++++++++++++++++++--------
 addons/mrp/mrp_view.xml         |   2 +-
 addons/mrp/wizard/wizard_mrp.py |  64 +++------------
 3 files changed, 113 insertions(+), 91 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 5d4801f4f41..e7e2c29f256 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -586,27 +586,57 @@ class mrp_production(osv.osv):
         return True
 
     #TODO Review materials in function in_prod and prod_end.
-    def action_production_end(self, cr, uid, ids):
+    def action_production_end(self, cr, uid, ids, qty=0.0, mode=None):
         move_ids = []
+        finished = []
+        qty_rest = 0.0
+        move_obj = self.pool.get('stock.move')
         for production in self.browse(cr, uid, ids):
-            for res in production.move_lines:
-                for move in production.move_created_ids:
-                    #XXX must use the orm
-                    cr.execute('INSERT INTO stock_move_history_ids \
-                            (parent_id, child_id) VALUES (%s,%s)',
-                            (res.id, move.id))
-                move_ids.append(res.id)
-            vals= {'state':'confirmed'}
-            new_moves = [x.id for x in production.move_created_ids]
-            self.pool.get('stock.move').write(cr, uid, new_moves, vals)
-            if not production.date_finnished:
+            if qty > production.product_qty:
+                # Is it required??
+                raise osv.except_osv(_('Error'), _("Couldn't produce more quantity"))
+            elif qty == production.product_qty:
+                for res in production.move_lines:
+                    for move in production.move_created_ids:
+                        #XXX must use the orm
+                        cr.execute('INSERT INTO stock_move_history_ids \
+                                (parent_id, child_id) VALUES (%s,%s)', 
+                                (res.id, move.id))
+                    move_ids.append(res.id)
+                finished += [x.id for x in production.move_created_ids]
+            elif qty < production.product_qty:
+                qty_rest = production.product_qty - qty
+#                Needs other field to store value of already consumed products
+#                self.write(cr,  uid, ids, {'product_qty': qty_rest})
+                moves = map(lambda x: x.id, production.move_lines)
+                moves_created = map(lambda x: x.id, production.move_created_ids)
+                if mode == 'consume':
+                    temp = move_obj.consume_moves(cr, uid, moves, qty)
+                    temp1 = move_obj.consume_moves(cr, uid, moves_created, qty)
+                    move_ids += temp
+                    finished += temp1
+                elif mode == 'consume_produce':
+                    for move in move_obj.browse(cr, uid, moves):
+                        move_obj.write(cr, uid, move.id, {'product_qty': qty})
+                        new_move = move_obj.copy(cr, uid, move.id, {'product_qty': qty_rest, 'state': move.state})
+                        self.write(cr, uid, production.id, {'move_lines': [(4, new_move)]})
+                    move_ids += moves
+
+                    for move in move_obj.browse(cr, uid, moves_created):
+                        move_obj.write(cr, uid, move.id, {'product_qty': qty})
+                        new_finished = move_obj.copy(cr, uid, move.id, {'product_qty': qty_rest, 'state': move.state})
+                        self.write(cr, uid, production.id, {'move_created_ids': [(4, new_finished)]})
+                    finished += moves_created
+            move_obj.write(cr, uid, finished, vals={'state':'confirmed'})
+            if not production.date_finnished and mode != 'consume':
                 self.write(cr, uid, [production.id],
                         {'date_finnished': time.strftime('%Y-%m-%d %H:%M:%S')})
-            self.pool.get('stock.move').check_assign(cr, uid, new_moves)
-            self.pool.get('stock.move').action_done(cr, uid, new_moves)
-            self._costs_generate(cr, uid, production)
-        self.pool.get('stock.move').action_done(cr, uid, move_ids)
-        self.write(cr,  uid, ids, {'state': 'done'})
+            move_obj.action_done(cr, uid, finished)
+            move_obj.action_done(cr, uid, move_ids)
+            if mode == 'consume_produce' and not qty_rest and not finished:
+                move_obj.check_assign(cr, uid, finished)
+                self._costs_generate(cr, uid, production)
+                self.write(cr,  uid, ids, {'state': 'done'})
         return True
 
     def _costs_generate(self, cr, uid, production):
@@ -641,21 +671,6 @@ class mrp_production(osv.osv):
                     } )
         return amount
 
-    def action_in_production_my(self, cr, uid, ids, qty=None):
-        print 'action_in_production', ids, qty
-        move_obj = self.pool.get('stock.move')
-        move_ids = []
-        for production in self.browse(cr, uid, ids):
-            move_ids = map(lambda x: x.id, production.move_lines + production.move_lines2)
-            if not production.date_start:
-                self.write(cr, uid, [production.id],
-                        {'date_start': time.strftime('%Y-%m-%d %H:%M:%S')})
-        print 'MMMMMMMMMMMMMMMMMMMMMMMM', move_ids
-        for move in move_obj.browse(cr, uid, move_ids):
-            move_obj.consume_moves(cr, uid, move.id, qty, move.location_id.id)
-
-#        self.write(cr, uid, ids, {'state': 'in_production'})
-        return True
     def action_in_production(self, cr, uid, ids):
         move_ids = []        
         self.write(cr, uid, ids, {'state': 'in_production'})
@@ -777,6 +792,60 @@ class mrp_production(osv.osv):
         pick_obj = self.pool.get('stock.picking')
         pick_obj.force_assign(cr, uid, [prod.picking_id.id for prod in self.browse(cr, uid, ids)])
         return True
+    
+    def _change_prod_qty(self, cr, uid, ids, new_qty, context={}):
+        move_lines_obj = self.pool.get('stock.move')
+        for id in ids:
+            prod = self.browse(cr, uid, id)
+            self.write(cr, uid, prod.id, {'product_qty' :  new_qty})
+            self.action_compute(cr, uid, [prod.id])
+            bom_point = prod.bom_id
+            bom_id = prod.bom_id.id
+            if not bom_point:
+                bom_id = self.pool.get('mrp.bom')._bom_find(cr, uid, prod.product_id.id, prod.product_uom.id)
+                if not bom_id:
+                    raise osv.except_osv(_('Error'), _("Couldn't find bill of material for product"))
+                self.write(cr, uid, [prod.id], {'bom_id': bom_id})
+                bom_point = self.pool.get('mrp.bom').browse(cr, uid, [bom_id])[0]
+            factor = new_qty * prod.product_uom.factor / bom_point.product_uom.factor
+            res = self.pool.get('mrp.bom')._bom_explode(cr, uid, bom_point, factor / bom_point.product_qty, [])
+            qty_vals = {}
+            qty_vals_done = {}
+            moves = {}
+            moves_done = {}
+            for move in prod.move_lines:
+                moves[move.product_id.id] = []
+                qty_vals[move.product_id.id] = qty_vals.get(move.product_id.id, 0.0) + move.product_qty
+                moves[move.product_id.id].append(move.id)
+            for move in prod.move_lines2:
+                moves_done[move.product_id.id] = []
+                qty_vals_done[move.product_id.id] = qty_vals_done.get(move.product_id.id, 0.0) + move.product_qty
+                moves_done[move.product_id.id].append(move.id)
+    
+            for r in res[0]:
+                if not moves.get(r['product_id']) and moves_done.get(r['product_id']):
+                    new_qty = (r['product_qty'] - qty_vals_done.get(r['product_id'], 0.0))
+                    new_move = move_lines_obj.copy(cr, uid, moves_done.get(r['product_id']), default={'product_qty': new_qty})
+                    self.write(cr, uid, prod.id, {'move_lines': [(4, new_move)]})
+                    continue
+                to_add = (r['product_qty'] - qty_vals_done.get(r['product_id'], 0.0)) - qty_vals.get(r['product_id'], 0.0)
+                avail_qty = move_lines_obj.browse(cr, uid, moves[r['product_id']][0]).product_qty
+                new_qty = avail_qty + to_add
+                if new_qty == 0:
+                    move_lines_obj.write(cr, uid, moves[r['product_id']][0], {'state': 'draft'})
+                    move_lines_obj.unlink(cr, uid, moves[r['product_id']])
+                elif new_qty < 0:
+                    avail_qty = move_lines_obj.browse(cr, uid, moves_done[r['product_id']][0]).product_qty
+                    move_lines_obj.unlink(cr, uid, moves[r['product_id']][0])
+                    move_lines_obj.write(cr, uid, moves_done[r['product_id']][0], {'product_qty': avail_qty + new_qty})
+                else:
+                    move_lines_obj.write(cr, uid, moves[r['product_id']][0], {'product_qty': avail_qty + to_add})
+    
+    #        TODO:For Finished Product lines
+    #        product_lines_obj = self.pool.get('mrp.production.product.line')
+    #        for m in prod.move_created_ids:
+    #            move_lines_obj.write(cr, uid,m.id, {'product_qty' :  new_qty})
+        return {}
 
 mrp_production()
 
@@ -1305,7 +1374,6 @@ class StockMove(osv.osv):
                 if move.state=='assigned':
                     state='assigned'
                 for line in res[0]:
-                    print 'Line :',line
                     valdef = {
                         'picking_id': move.picking_id.id,
                         'product_id': line['product_id'],
@@ -1364,11 +1432,11 @@ class StockMove(osv.osv):
                 move_obj.action_done(cr, uid, [new])
         return {}
     
-    def consume_moves(self, cr, uid, ids, product_qty, location_id, context=None):
+    def consume_moves(self, cr, uid, ids, product_qty, location_id=None, context=None):
         res = []
         production_obj = self.pool.get('mrp.production')
         for move in self.browse(cr, uid, ids):
-            new_moves = super(StockMove, self).consume_moves(cr, uid, ids, product_qty, location_id, context=context)
+            new_moves = super(StockMove, self).consume_moves(cr, uid, [move.id], product_qty, location_id, context=context)
             production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
             for new_move in new_moves:
                 production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]})
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 83f40350b74..5a7bdf73b9f 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -532,7 +532,7 @@
                                 <button name="action_compute" states="draft" string="Compute Data" type="object" icon="gtk-execute"/>
                                 <button name="button_confirm" states="draft" string="Confirm Production" icon="gtk-apply"/>
                                 <button name="button_produce" states="ready" string="Mark as Start" icon="gtk-execute"/>
-                                <button name="button_produce_done" states="in_production" string="Production" icon="gtk-ok"/>
+                                <button name="%(move_produce)d" states="in_production" string="Produce" icon="gtk-ok" type="action"/>
                                 <button name="force_production" states="confirmed,picking_except" string="Force Reservation" type="object" icon="gtk-jump-to"/>
                                 <button name="button_cancel" states="draft,ready,confirmed,in_production,picking_except" string="Cancel" icon="gtk-cancel"/>
                                 <button name="button_recreate" states="picking_except" string="Recreate Picking" icon="gtk-convert"/>
diff --git a/addons/mrp/wizard/wizard_mrp.py b/addons/mrp/wizard/wizard_mrp.py
index d0db2abb2c0..158a4f16695 100644
--- a/addons/mrp/wizard/wizard_mrp.py
+++ b/addons/mrp/wizard/wizard_mrp.py
@@ -34,7 +34,8 @@ class stock_move_produce(osv.osv_memory):
               }
 
     def _get_product_qty(self, cr, uid, context):
-        prod = self.pool.get('mrp.production').browse(cr, uid, context['active_id'], context=context)
+        prod = self.pool.get('mrp.production').browse(cr, uid, 
+                                context['active_id'], context=context)
         return prod.product_qty
     
     _defaults = {
@@ -45,8 +46,11 @@ class stock_move_produce(osv.osv_memory):
     def do_move_produce(self, cr, uid, ids, context={}):
         datas = self.read(cr, uid, ids)[0]
         prod_obj = self.pool.get('mrp.production')
-        wf_service = netsvc.LocalService('workflow')
-        wf_service.trg_validate(uid, 'mrp.production', context['active_id'], 'button_produce', cr)
+#        wf_service = netsvc.LocalService('workflow')
+#        wf_service.trg_validate(uid, 'mrp.production', context['active_id'],
+#                                 'button_produce_done', cr)
+        prod_obj.action_production_end(cr, uid, [context['active_id']], 
+                                qty=datas['product_qty'], mode=datas['mode'])
         return {}
 
 stock_move_produce()
@@ -71,57 +75,7 @@ class change_production_qty(osv.osv_memory):
     def change_prod_qty(self, cr, uid, ids, context={}):
         datas = self.read(cr, uid, ids)[0]
         prod_obj = self.pool.get('mrp.production')
-        move_lines_obj = self.pool.get('stock.move')
-        new_qty = datas['product_qty']
-        prod = prod_obj.browse(cr, uid, context['active_id'])
-        prod_obj.write(cr, uid, prod.id, {'product_qty' :  new_qty})
-        prod_obj.action_compute(cr, uid, [prod.id])
-        bom_point = prod.bom_id
-        bom_id = prod.bom_id.id
-        if not bom_point:
-            bom_id = self.pool.get('mrp.bom')._bom_find(cr, uid, prod.product_id.id, prod.product_uom.id)
-            if not bom_id:
-                raise osv.except_osv(_('Error'), _("Couldn't find bill of material for product"))
-            self.write(cr, uid, [prod.id], {'bom_id': bom_id})
-            bom_point = self.pool.get('mrp.bom').browse(cr, uid, [bom_id])[0]
-        factor = new_qty * prod.product_uom.factor / bom_point.product_uom.factor
-        res = self.pool.get('mrp.bom')._bom_explode(cr, uid, bom_point, factor / bom_point.product_qty, [])
-        qty_vals = {}
-        qty_vals_done = {}
-        moves = {}
-        moves_done = {}
-        for move in prod.move_lines:
-            moves[move.product_id.id] = []
-            qty_vals[move.product_id.id] = qty_vals.get(move.product_id.id, 0.0) + move.product_qty
-            moves[move.product_id.id].append(move.id)
-        for move in prod.move_lines2:
-            moves_done[move.product_id.id] = []
-            qty_vals_done[move.product_id.id] = qty_vals_done.get(move.product_id.id, 0.0) + move.product_qty
-            moves_done[move.product_id.id].append(move.id)
-
-        for r in res[0]:
-            if not moves.get(r['product_id']) and moves_done.get(r['product_id']):
-                new_qty = (r['product_qty'] - qty_vals_done.get(r['product_id'], 0.0))
-                new_move = move_lines_obj.copy(cr, uid, moves_done.get(r['product_id']), default={'product_qty': new_qty})
-                prod_obj.write(cr, uid, prod.id, {'move_lines': [(4, new_move)]})
-                continue
-            to_add = (r['product_qty'] - qty_vals_done.get(r['product_id'], 0.0)) - qty_vals.get(r['product_id'], 0.0)
-            avail_qty = move_lines_obj.browse(cr, uid, moves[r['product_id']][0]).product_qty
-            new_qty = avail_qty + to_add
-            if new_qty == 0:
-                move_lines_obj.write(cr, uid, moves[r['product_id']][0], {'state': 'draft'})
-                move_lines_obj.unlink(cr, uid, moves[r['product_id']])
-            elif new_qty < 0:
-                avail_qty = move_lines_obj.browse(cr, uid, moves_done[r['product_id']][0]).product_qty
-                move_lines_obj.unlink(cr, uid, moves[r['product_id']][0])
-                move_lines_obj.write(cr, uid, moves_done[r['product_id']][0], {'product_qty': avail_qty + new_qty})
-            else:
-                move_lines_obj.write(cr, uid, moves[r['product_id']][0], {'product_qty': avail_qty + to_add})
-
-#        TODO:For Finished Product lines
-#        product_lines_obj = self.pool.get('mrp.production.product.line')
-#        for m in prod.move_created_ids:
-#            move_lines_obj.write(cr, uid,m.id, {'product_qty' :  new_qty})
+        prod_obj._change_prod_qty(cr, uid, context['active_ids'], datas['product_qty'], context=context)
         return {}
     
-change_production_qty()
\ No newline at end of file
+change_production_qty()

From 040c2a27f3562859cfda8754a8ed2d31db074a20 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Tue, 23 Feb 2010 16:54:02 +0530
Subject: [PATCH 004/251] [IMP]: mrp: Solved problem of already consumed
 products

bzr revid: rpa@openerp.co.in-20100223112402-ptardjdgq679pglm
---
 addons/mrp/mrp.py               | 22 +++++++++++-----------
 addons/mrp/wizard/wizard_mrp.py |  5 ++++-
 addons/stock/stock.py           |  4 ++--
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index e7e2c29f256..2d1eae50101 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -589,13 +589,17 @@ class mrp_production(osv.osv):
     def action_production_end(self, cr, uid, ids, qty=0.0, mode=None):
         move_ids = []
         finished = []
-        qty_rest = 0.0
         move_obj = self.pool.get('stock.move')
         for production in self.browse(cr, uid, ids):
+            done = 0.0
+            qty_rest = 0.0
+            for move in production.move_created_ids2:
+                done += move.product_qty
+            qty_operate = production.product_qty - done
             if qty > production.product_qty:
                 # Is it required??
                 raise osv.except_osv(_('Error'), _("Couldn't produce more quantity"))
-            elif qty == production.product_qty:
+            elif qty == qty_operate:
                 for res in production.move_lines:
                     for move in production.move_created_ids:
                         #XXX must use the orm
@@ -604,17 +608,13 @@ class mrp_production(osv.osv):
                                 (res.id, move.id))
                     move_ids.append(res.id)
                 finished += [x.id for x in production.move_created_ids]
-            elif qty < production.product_qty:
-                qty_rest = production.product_qty - qty
-#                Needs other field to store value of already consumed products
-#                self.write(cr,  uid, ids, {'product_qty': qty_rest})
+            elif qty < qty_operate:
+                qty_rest = qty_operate - qty
                 moves = map(lambda x: x.id, production.move_lines)
                 moves_created = map(lambda x: x.id, production.move_created_ids)
                 if mode == 'consume':
-                    temp = move_obj.consume_moves(cr, uid, moves, qty)
-                    temp1 = move_obj.consume_moves(cr, uid, moves_created, qty)
-                    move_ids += temp
-                    finished += temp1
+                    move_ids += move_obj.consume_moves(cr, uid, moves, qty)
+                    finished += move_obj.consume_moves(cr, uid, moves_created, qty)
                 elif mode == 'consume_produce':
                     for move in move_obj.browse(cr, uid, moves):
                         move_obj.write(cr, uid, move.id, {'product_qty': qty})
@@ -633,7 +633,7 @@ class mrp_production(osv.osv):
                         {'date_finnished': time.strftime('%Y-%m-%d %H:%M:%S')})
             move_obj.action_done(cr, uid, finished)
             move_obj.action_done(cr, uid, move_ids)
-            if mode == 'consume_produce' and not qty_rest and not finished:
+            if mode == 'consume_produce' and not qty_rest:
                 move_obj.check_assign(cr, uid, finished)
                 self._costs_generate(cr, uid, production)
                 self.write(cr,  uid, ids, {'state': 'done'})
diff --git a/addons/mrp/wizard/wizard_mrp.py b/addons/mrp/wizard/wizard_mrp.py
index 158a4f16695..fefca3ae6e4 100644
--- a/addons/mrp/wizard/wizard_mrp.py
+++ b/addons/mrp/wizard/wizard_mrp.py
@@ -36,7 +36,10 @@ class stock_move_produce(osv.osv_memory):
     def _get_product_qty(self, cr, uid, context):
         prod = self.pool.get('mrp.production').browse(cr, uid, 
                                 context['active_id'], context=context)
-        return prod.product_qty
+        done = 0.0
+        for move in prod.move_created_ids2:
+                done += move.product_qty
+        return (prod.product_qty - done) or prod.product_qty
     
     _defaults = {
                  'product_qty': _get_product_qty, 
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 1866bc8dd2a..c72a6a2c27f 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1488,7 +1488,7 @@ class stock_move(osv.osv):
                 self.write(cr, uid, [current_move], update_val)
         return new_move
 
-    def consume_moves(self, cr, uid, ids, quantity, location_id, context=None):
+    def consume_moves(self, cr, uid, ids, quantity, location_id=None, context=None):
         new_move = []
         if not context:
             context = {}        
@@ -1509,7 +1509,7 @@ class stock_move(osv.osv):
             default_val = {
                 'product_qty': quantity, 
                 'product_uos_qty': uos_qty,
-                'location_id' : location_id,                
+                'location_id' : location_id or move.location_id.id,
             }
             if move.product_id.track_production:
                 new_move = self.split_lines(cr, uid, [move.id], quantity, split_by_qty=1, context=context)

From 1659de6fa567631bf7b0304ee7ad9d3f5d61d920 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Tue, 23 Feb 2010 17:39:03 +0530
Subject: [PATCH 005/251] [IMP]: mrp: Improvement in change product qty for
 finished products line

bzr revid: rpa@openerp.co.in-20100223120903-13nn7urdnmik6qg1
---
 addons/mrp/mrp.py     | 65 ++++++++++++++++++++++++++++---------------
 addons/stock/stock.py | 12 ++++----
 2 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 2d1eae50101..530fd7a3242 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -794,7 +794,30 @@ class mrp_production(osv.osv):
         return True
     
     def _change_prod_qty(self, cr, uid, ids, new_qty, context={}):
-        move_lines_obj = self.pool.get('stock.move')
+        move_obj = self.pool.get('stock.move')
+
+        def change(product_id, product_qty, qty_vals, qty_vals_done, moves, 
+                        moves_done, field):
+            if not moves.get(product_id) and moves_done.get(product_id):
+                new_qty = (product_qty - qty_vals_done.get(product_id, 0.0))
+                new_move = move_obj.copy(cr, uid, moves_done.get(product_id), default={'product_qty': new_qty})
+                self.write(cr, uid, prod.id, {field: [(4, new_move)]})
+                return 
+            to_add = (product_qty - qty_vals_done.get(product_id, 0.0)) - \
+                            qty_vals.get(product_id, 0.0)
+            avail_qty = move_obj.browse(cr, uid, moves[product_id][0]).product_qty
+            new_qty = avail_qty + to_add
+            if new_qty == 0:
+                move_obj.write(cr, uid, moves[product_id][0], {'state': 'draft'})
+                move_obj.unlink(cr, uid, moves[product_id])
+            elif new_qty < 0:
+                avail_qty = move_obj.browse(cr, uid, moves_done[product_id][0]).product_qty
+                move_obj.unlink(cr, uid, moves[product_id][0])
+                move_obj.write(cr, uid, moves_done[product_id][0], {'product_qty': avail_qty + new_qty})
+            else:
+                move_obj.write(cr, uid, moves[product_id][0], {'product_qty': avail_qty + to_add})
+            return 
+
         for id in ids:
             prod = self.browse(cr, uid, id)
             self.write(cr, uid, prod.id, {'product_qty' :  new_qty})
@@ -823,28 +846,24 @@ class mrp_production(osv.osv):
                 moves_done[move.product_id.id].append(move.id)
     
             for r in res[0]:
-                if not moves.get(r['product_id']) and moves_done.get(r['product_id']):
-                    new_qty = (r['product_qty'] - qty_vals_done.get(r['product_id'], 0.0))
-                    new_move = move_lines_obj.copy(cr, uid, moves_done.get(r['product_id']), default={'product_qty': new_qty})
-                    self.write(cr, uid, prod.id, {'move_lines': [(4, new_move)]})
-                    continue
-                to_add = (r['product_qty'] - qty_vals_done.get(r['product_id'], 0.0)) - qty_vals.get(r['product_id'], 0.0)
-                avail_qty = move_lines_obj.browse(cr, uid, moves[r['product_id']][0]).product_qty
-                new_qty = avail_qty + to_add
-                if new_qty == 0:
-                    move_lines_obj.write(cr, uid, moves[r['product_id']][0], {'state': 'draft'})
-                    move_lines_obj.unlink(cr, uid, moves[r['product_id']])
-                elif new_qty < 0:
-                    avail_qty = move_lines_obj.browse(cr, uid, moves_done[r['product_id']][0]).product_qty
-                    move_lines_obj.unlink(cr, uid, moves[r['product_id']][0])
-                    move_lines_obj.write(cr, uid, moves_done[r['product_id']][0], {'product_qty': avail_qty + new_qty})
-                else:
-                    move_lines_obj.write(cr, uid, moves[r['product_id']][0], {'product_qty': avail_qty + to_add})
-    
-    #        TODO:For Finished Product lines
-    #        product_lines_obj = self.pool.get('mrp.production.product.line')
-    #        for m in prod.move_created_ids:
-    #            move_lines_obj.write(cr, uid,m.id, {'product_qty' :  new_qty})
+                change(r['product_id'], r['product_qty'], qty_vals, \
+                        qty_vals_done, moves, moves_done, 'move_lines')
+
+#            For Finished Product lines
+            qty_vals = {}
+            qty_vals_done = {}
+            moves = {}
+            moves_done = {}
+            for move in prod.move_created_ids:
+                moves[move.product_id.id] = []
+                qty_vals[move.product_id.id] = qty_vals.get(move.product_id.id, 0.0) + move.product_qty
+                moves[move.product_id.id].append(move.id)
+            for move in prod.move_created_ids2:
+                moves_done[move.product_id.id] = []
+                qty_vals_done[move.product_id.id] = qty_vals_done.get(move.product_id.id, 0.0) + move.product_qty
+                moves_done[move.product_id.id].append(move.id)
+            change(prod.product_id.id, prod.product_qty, qty_vals, \
+                        qty_vals_done, moves, moves_done, 'move_created_ids')
         return {}
 
 mrp_production()
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index c72a6a2c27f..09932dfb34c 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1460,8 +1460,8 @@ class stock_move(osv.osv):
             uos_qty_rest = split_by_qty / move.product_qty * move.product_uos_qty
 
             update_val = {
-                'product_qty': split_by_qty,
-                'product_uos_qty': uos_qty,
+                'product_qty': split_by_qty, 
+                'product_uos_qty': uos_qty, 
             }                
             for idx in range(int(quantity//split_by_qty)):
                 if idx:        
@@ -1508,8 +1508,8 @@ class stock_move(osv.osv):
 
             default_val = {
                 'product_qty': quantity, 
-                'product_uos_qty': uos_qty,
-                'location_id' : location_id or move.location_id.id,
+                'product_uos_qty': uos_qty, 
+                'location_id': location_id or move.location_id.id, 
             }
             if move.product_id.track_production:
                 new_move = self.split_lines(cr, uid, [move.id], quantity, split_by_qty=1, context=context)
@@ -1545,8 +1545,8 @@ class stock_move(osv.osv):
         
             default_val = {
                 'product_qty': quantity, 
-                'product_uos_qty': uos_qty,
-                'location_dest_id' : location_dest_id,
+                'product_uos_qty': uos_qty, 
+                'location_dest_id': location_dest_id, 
                 'state': move.state
             }
             current_move = self.copy(cr, uid, move.id, default_val)

From 2f3e7e70a7560ba054d51d39cbfbabf5030e4168 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Tue, 23 Feb 2010 17:51:04 +0530
Subject: [PATCH 006/251] [FIX]: mrp: Minor fix in change product qty

bzr revid: rpa@openerp.co.in-20100223122104-6mh24cuh1z5xdrzr
---
 addons/mrp/mrp.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 530fd7a3242..f543cb272f3 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -795,7 +795,8 @@ class mrp_production(osv.osv):
     
     def _change_prod_qty(self, cr, uid, ids, new_qty, context={}):
         move_obj = self.pool.get('stock.move')
-
+        if new_qty <= 0.0:
+            return {}
         def change(product_id, product_qty, qty_vals, qty_vals_done, moves, 
                         moves_done, field):
             if not moves.get(product_id) and moves_done.get(product_id):
@@ -812,7 +813,7 @@ class mrp_production(osv.osv):
                 move_obj.unlink(cr, uid, moves[product_id])
             elif new_qty < 0:
                 avail_qty = move_obj.browse(cr, uid, moves_done[product_id][0]).product_qty
-                move_obj.unlink(cr, uid, moves[product_id][0])
+                move_obj.unlink(cr, uid, moves[product_id])
                 move_obj.write(cr, uid, moves_done[product_id][0], {'product_qty': avail_qty + new_qty})
             else:
                 move_obj.write(cr, uid, moves[product_id][0], {'product_qty': avail_qty + to_add})

From 891dab12b1fb4e09b17878213ff8f727db723d01 Mon Sep 17 00:00:00 2001
From: "KSA (Open ERP)" <>
Date: Fri, 26 Feb 2010 16:22:10 +0530
Subject: [PATCH 007/251] [IMP]: wiki: Converted all simple wizards to
 osv_memory wizards in wiki

bzr revid: rpa@openerp.co.in-20100226105210-wo7so4kpqvn45oxr
---
 addons/wiki/__terp__.py            |  6 +++++-
 addons/wiki/wiki_view.xml          | 27 ++++++++++++++++++++-------
 addons/wiki/wizard/__init__.py     | 15 ++++++++++-----
 addons/wiki/wizard/create_menu.py  |  2 +-
 addons/wiki/wizard/wizard_view.xml | 10 +++++-----
 5 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/addons/wiki/__terp__.py b/addons/wiki/__terp__.py
index cf792be226f..b15346dba39 100644
--- a/addons/wiki/__terp__.py
+++ b/addons/wiki/__terp__.py
@@ -33,10 +33,14 @@
     'depends': ['base'],
     'init_xml': [],
     'update_xml': [
+        'wizard/wizard_view.xml',
+        'wizard/wiki_wiki_page_open_view.xml',
+        'wizard/wiki_create_menu_view.xml',
+        'wizard/wiki_wiki_help_open_view.xml',
+        'wizard/wiki_make_index_view.xml',
         'wiki_view.xml',
         'data/wiki_quickstart.xml',
         'data/wiki_main.xml',
-        'wizard/wizard_view.xml',
         'security/ir.model.access.csv'
     ],
     'demo_xml': [],
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index d2fa06d4fd5..e6feae5eeba 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -6,7 +6,7 @@
         <menuitem name="Wiki" id="menu_wiki_configuration" parent="base.menu_document_configuration" sequence="2"/>
         <menuitem id="base.menu_document2" name="Collaborative Content" parent="base.menu_document"/>
 
-        <wizard
+         <wizard
             id="wizard_group_menu_create"
             string="Create Menu"
             menu="True"
@@ -49,11 +49,16 @@
                         <field name="template" colspan="4" nolabel="1" widget="text_wiki"/>
                     </page>
                     </notebook>
-                    <button
-                        name="%(wizard_group_menu_create)d"
-                        string="Create a Menu"
-                        type="action"
-                        target="new" icon="gtk-justify-fill"/>
+                     <button
+			 	    	name="%(wiki.action_wiki_create_menu)d"
+			 	    	string="Create Menu"
+			 	     	type="action"
+			 	     	icon="gtk-justify-fill" />
+			 	     <button
+			 	    	name="%(wiki.action_view_wiki_wiki_page_open)d"
+			 	    	string="Open Wiki Page"
+			 	     	type="action"/>
+
                 </form>
             </field>
         </record>
@@ -137,6 +142,14 @@
                         <field name="tags" select="1" groups="base.group_extended"/>
                         <field name="summary" colspan="4" select="2" groups="base.group_extended"/>
                     </group>
+                     <button
+			 	    	name="%(wiki.action_view_wiki_wiki_help_open)d"
+			 	    	string="Basic Wiki Editing"
+			 	     	type="action"/>
+			 	     <button
+			 	    	name="%(wiki.action_view_wiki_make_index)d"
+			 	    	string="Create Index"
+			 	     	type="action"/>
                 </form>
             </field>
         </record>
@@ -234,7 +247,7 @@
             res_model="wiki.wiki"
             src_model="wiki.groups"/>
 
-        <wizard
+         <wizard
             id="wizard_open_page"
             string="Open Wiki Pages"
             name="wiki.wiki.page.open"
diff --git a/addons/wiki/wizard/__init__.py b/addons/wiki/wizard/__init__.py
index 1777b053bca..0c25e5f353c 100644
--- a/addons/wiki/wizard/__init__.py
+++ b/addons/wiki/wizard/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,13 +15,18 @@
 #    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 open_page
-import open_help
 import create_menu
-import show_diff
 import make_index
+import open_help
+import open_page
+import show_diff
+
+import wiki_wiki_page_open
+import wiki_create_menu
+import wiki_wiki_help_open
+import wiki_make_index
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/wizard/create_menu.py b/addons/wiki/wizard/create_menu.py
index e31a9daa664..633f45eb91d 100644
--- a/addons/wiki/wizard/create_menu.py
+++ b/addons/wiki/wizard/create_menu.py
@@ -53,7 +53,7 @@ def wiki_menu_create(self, cr, uid, data, context):
     home = data['form']['page']
     group_id = data['id']
     res = {
-        'home':home,
+        'home': home,
     }
     pool.get('wiki.groups').write(cr, uid, [data['id']], res)
     pool.get('wiki.groups.link').create(cr, uid, {'group_id':group_id, 'action_id':menu_id})
diff --git a/addons/wiki/wizard/wizard_view.xml b/addons/wiki/wizard/wizard_view.xml
index cbc5f020731..ce639714daf 100644
--- a/addons/wiki/wizard/wizard_view.xml
+++ b/addons/wiki/wizard/wizard_view.xml
@@ -13,18 +13,18 @@
             </field>
         </record>
         <act_window
-            id="act_view_diff" 
-            name="Differences" 
-            res_model="wizard.wiki.history.show_diff" 
+            id="act_view_diff"
+            name="Differences"
+            res_model="wizard.wiki.history.show_diff"
             src_model="wiki.wiki.history"
             target="new"
             view_mode="form"
         />
-<!--        <wizard
+        <wizard
             id="wizard_make_index"
             string="Create Index"
             name="wiki.make.index"
-            model="wiki.wiki"/-->
+            model="wiki.wiki"/>
         <wizard
             id="wizard_open_help"
             string="Basic Wiki Editing"

From 808fb068c48b91ed7cb9c63bf6f25f251b3c9989 Mon Sep 17 00:00:00 2001
From: "ATP (Open ERP)" <>
Date: Fri, 26 Feb 2010 16:50:39 +0530
Subject: [PATCH 008/251] [IMP]: Account: Converted all simple wizards to
 osv_memory wizards in account module

bzr revid: rpa@openerp.co.in-20100226112039-bzb7rw7pej7v804k
---
 addons/account/__terp__.py                    |  10 +
 addons/account/account_invoice_view.xml       |  10 +-
 addons/account/account_view.xml               |   9 +-
 addons/account/account_wizard.xml             |  15 +-
 addons/account/wizard/__init__.py             |   8 +
 addons/account/wizard/account_chart.py        |  79 ++++++
 .../account/wizard/account_invoice_refund.py  | 203 ++++++++++++++++
 .../wizard/account_move_bank_reconcile.py     |  62 +++++
 addons/account/wizard/account_move_journal.py |  97 ++++++++
 .../account_move_line_reconcile_select.py     |  55 +++++
 addons/account/wizard/account_period_close.py |  56 +++++
 addons/account/wizard/wizard_account_chart.py |  80 -------
 .../wizard/wizard_automatic_reconcile.py      |   1 +
 .../account/wizard/wizard_bank_reconcile.py   |  67 ------
 .../wizard/wizard_fiscalyear_close_state.py   |  71 ------
 addons/account/wizard/wizard_journal.py       |  99 --------
 addons/account/wizard/wizard_period_close.py  |  57 -----
 .../account/wizard/wizard_reconcile_select.py |  61 -----
 addons/account/wizard/wizard_refund.py        | 226 ------------------
 19 files changed, 590 insertions(+), 676 deletions(-)
 create mode 100644 addons/account/wizard/account_chart.py
 create mode 100644 addons/account/wizard/account_invoice_refund.py
 create mode 100644 addons/account/wizard/account_move_bank_reconcile.py
 create mode 100644 addons/account/wizard/account_move_journal.py
 create mode 100644 addons/account/wizard/account_move_line_reconcile_select.py
 create mode 100644 addons/account/wizard/account_period_close.py
 delete mode 100644 addons/account/wizard/wizard_account_chart.py
 delete mode 100644 addons/account/wizard/wizard_bank_reconcile.py
 delete mode 100644 addons/account/wizard/wizard_fiscalyear_close_state.py
 delete mode 100644 addons/account/wizard/wizard_journal.py
 delete mode 100644 addons/account/wizard/wizard_period_close.py
 delete mode 100644 addons/account/wizard/wizard_reconcile_select.py
 delete mode 100644 addons/account/wizard/wizard_refund.py

diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py
index 921dc8c8cb9..e600b806e08 100644
--- a/addons/account/__terp__.py
+++ b/addons/account/__terp__.py
@@ -40,9 +40,19 @@
         'security/account_security.xml',
         'security/ir.model.access.csv',
         'account_menuitem.xml',
+        'wizard/account_invoice_refund_view.xml',
+        'wizard/account_period_close_view.xml',
+        'wizard/account_fiscalyear_close_state.xml',
+        'wizard/account_chart_view.xml',
+        'wizard/account_move_bank_reconcile_view.xml',
+        'wizard/account_move_line_reconcile_select_view.xml',
+        'wizard/account_move_journal_view.xml',
+        
+        
         'account_wizard.xml',
         'account_view.xml',
         'account_end_fy.xml',
+        
         'account_invoice_view.xml',
         'account_report.xml',
         'partner_view.xml',
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 60eed3e0e62..4f8db313fc7 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -189,11 +189,13 @@
                                 <field name="amount_total"/>
                                 <field name="state" select="2"/>
                                 <field name="residual"/>
-                                <group col="3" colspan="4">
+                                <group col="6" colspan="4">
                                     <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-apply"/>
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
                                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                                     <button name='%(wizard_paid_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
+                                    <!-- <button name='%(wizard_invoice_pay)d' type='action' string='Pay Invoice' states='open,paid,proforma2' icon="STOCK_EXECUTE" /> -->
+                                    <!--  <button name='%(wizard_invoice_refund)d' type='action' string='Credit Note'  icon="STOCK_EXECUTE" />-->
                                 </group>
                             </group>
                         </page>
@@ -279,13 +281,15 @@
                                 <field name="amount_total"/>
                                 <field name="state" select="2"/>
                                 <field name="residual"/>
-                                <group col="3" colspan="4" groups="base.group_user">
+                                <group col="6" colspan="4" groups="base.group_user">
                                     <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="gtk-print"/>
                                     <button name="invoice_open" states="draft,proforma2" string="Create" icon="gtk-execute"/>
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
                                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                                     <button name='%(wizard_paid_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
-                                </group>
+                                    <!-- <button name='%(wizard_invoice_pay)d' type='action' string='Pay Invoice' states='open,paid,proforma2' icon="STOCK_EXECUTE" /> -->
+                                    <!-- <button name='%(wizard_invoice_refund)d' type='action' string='Credit Note'  icon="STOCK_EXECUTE" /> -->
+                               </group>
                             </group>
                         </page>
                         <page string="Other Info">
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 3ef24386c2d..d28748b4efb 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -81,6 +81,7 @@
                     <separator colspan="4" string="States"/>
                     <field name="state" select="1"/>
                     <button name="action_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert"/>
+                    <!--  <button name='%(wizard_period_close)d' type='action' string='Close a Period'  icon="STOCK_EXECUTE" />-->
                 </form>
             </field>
         </record>
@@ -668,8 +669,8 @@
             <field eval="True" name="object"/>
         </record>
 
-        <wizard id="action_move_journal_line_form" menu="False" model="account.move.line" name="account.move.journal" string="Making Entries by Line"/>
-        <menuitem icon="STOCK_JUSTIFY_FILL" action="action_move_journal_line_form" id="menu_action_move_journal_line_form" parent="account.menu_finance_entries" type="wizard" sequence="5"/>
+          <wizard id="action_move_journal_line_form" menu="False" model="account.move.line" name="account.move.journal" string="Making Entries by Line"/>
+<!--        <menuitem icon="STOCK_JUSTIFY_FILL" action="action_move_journal_line_form" id="menu_action_move_journal_line_form" parent="account.menu_finance_entries"  />-->
 
         <!--
     Entries lines
@@ -1008,7 +1009,7 @@
 
         <menuitem id="menu_finance_charts" name="Charts" parent="account.menu_finance" sequence="4"/>
         <wizard id="wizard_account_chart" menu="False" model="account.account" name="account.chart" string="Chart of Accounts"/>
-        <menuitem icon="STOCK_INDENT" action="wizard_account_chart" id="menu_action_account_tree2" parent="account.menu_finance_charts" type="wizard"/>
+<!--        <menuitem icon="STOCK_INDENT" action="wizard_account_chart" id="menu_action_account_tree2" parent="account.menu_finance_charts" />-->
 
 
 
@@ -1080,7 +1081,7 @@
 
         <menuitem action="action_bank_statement_reconciliation_form" id="menu_action_account_bank_reconcile_tree" parent="next_id_30"/>
         <wizard id="action_account_bank_reconcile_tree" menu="False" model="account.move.line" name="account.move.bank.reconcile" string="Bank reconciliation"/>
-        <menuitem action="action_account_bank_reconcile_tree" id="menu_action_account_bank_reconcile_check_tree" parent="account.next_id_30" type="wizard"/>
+<!--        <menuitem action="action_account_bank_reconcile_tree" id="menu_action_account_bank_reconcile_check_tree" parent="account.next_id_30" />-->
 
         <act_window
             domain="[('account_id', '=', active_id)]"
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index bd03390ce3f..5462dd020b3 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -6,18 +6,18 @@
 
         <wizard id="wizard_invoice_pay" model="account.invoice" name="account.invoice.pay" string="Pay invoice" groups="base.group_user"/>
 
-        <!-- close year, period, journal -->
+       	<!--  close year, period, journal -->
         <wizard id="wizard_fiscalyear_close" menu="False" model="account.fiscalyear" name="account.fiscalyear.close" string="Generate Fiscal Year Opening Entries"/>
 
-        <menuitem
+       <!--  <menuitem
             action="wizard_fiscalyear_close"
             id="menu_wizard_fy_close"
             parent="menu_account_end_year_treatments"
-            type="wizard"
-            sequence="1"/>
+            
+            sequence="1"/>-->
 
         <wizard id="wizard_fiscalyear_close_state" menu="False" model="account.fiscalyear" name="account.fiscalyear.close.state" string="Close a Fiscal Year"/>
-        <menuitem action="wizard_fiscalyear_close_state" id="menu_wizard_fy_close_state" parent="menu_account_end_year_treatments" type="wizard"/>
+        <!--  <menuitem action="wizard_fiscalyear_close_state" id="menu_wizard_fy_close_state" parent="menu_account_end_year_treatments" type="wizard"/>-->
 
         <wizard
             id="wizard_open_closed_fiscalyear"
@@ -31,13 +31,12 @@
             sequence="2"
             parent="account.menu_account_end_year_treatments" type="wizard"/>
 
-        <wizard id="wizard_period_close" model="account.period" name="account.period.close" string="Close a Period"/>
-
+        <wizard id="wizard_period_close" model="account.period" name="account.period.close" string="Close a Period"/> 
         <!-- automatic reconcile -->
         <wizard id="wizard_automatic_reconcile" menu="False" model="account.account" name="account.automatic.reconcile" string="Automatic reconciliation"/>
         <menuitem id="next_id_20" name="Reconciliation" parent="menu_finance_periodical_processing"/><menuitem action="wizard_automatic_reconcile" id="menu_automatic_reconcile" parent="next_id_20" type="wizard"/>
 
-        <!-- Import entry in statement -->
+  		<!-- Import entry in statement -->
 
         <wizard
             string="Import invoices"
diff --git a/addons/account/wizard/__init__.py b/addons/account/wizard/__init__.py
index 16266efbfeb..f1ddf80a08a 100644
--- a/addons/account/wizard/__init__.py
+++ b/addons/account/wizard/__init__.py
@@ -61,6 +61,14 @@ import wizard_central_journal
 import wizard_general_journal
 import wizard_change_currency
 
+import account_invoice_refund
+import account_period_close
+import account_fiscalyear_close_state
+import account_chart
+import account_move_bank_reconcile
+import account_move_line_reconcile_select
+import account_move_journal
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_chart.py b/addons/account/wizard/account_chart.py
new file mode 100644
index 00000000000..b83b477596d
--- /dev/null
+++ b/addons/account/wizard/account_chart.py
@@ -0,0 +1,79 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import wizard
+import netsvc
+import pooler
+import time
+from tools.translate import _
+import tools
+from osv import fields, osv
+
+class account_chart(osv.osv_memory):
+    """
+    For account chart
+    """
+    
+    def _get_defaults(self, cr, uid, context):
+        
+            """Return default Fiscalyear value""" 
+            
+            fiscalyear_obj = self.pool.get('account.fiscalyear')
+            fiscalyear = fiscalyear_obj.find(cr, uid)
+            return fiscalyear
+        
+    def _account_chart_open_window(self, cr, uid, ids, context):
+            """
+            cr is the current row, from the database cursor,
+            uid is the current user’s ID for security checks,
+            ID is the account chart’s ID or list of IDs if we want more than one
+            This function Open  account chart window  on given fiscalyear and all Entries or posted entries
+            """
+            for form in  self.read(cr, uid, ids):
+                mod_obj = self.pool.get('ir.model.data')
+                act_obj = self.pool.get('ir.actions.act_window')
+
+                result = mod_obj._get_id(cr, uid, 'account', 'action_account_tree')
+                id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
+                result = act_obj.read(cr, uid, [id], context=context)[0]
+                result['context'] = str({'fiscalyear': form['fiscalyear'],'state':form['target_move']})
+                if form['fiscalyear']:
+                    result['name']+=':'+self.pool.get('account.fiscalyear').read(cr,uid,[form['fiscalyear']])[0]['code']
+                 
+                return result
+            
+
+    _name = "account.chart"
+    _description = "chart"
+    _columns = {
+                'fiscalyear':fields.many2one('account.fiscalyear',  'Fiscal year', required=True, help = 'Keep empty for all open fiscal years'),
+                'target_move':fields.selection([
+                                            ('all','All Entries'),
+                                            ('posted','All Posted Entries'),
+                                     ],'Target Moves',  required = True),
+                        
+              }
+    _defaults = {
+                'fiscalyear':_get_defaults, 
+                'target_move':lambda * a:'all'
+                
+                }
+  
+account_chart()
diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
new file mode 100644
index 00000000000..acd85d4f7ef
--- /dev/null
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -0,0 +1,203 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import wizard
+import netsvc
+import pooler
+import time
+from tools.translate import _
+import tools
+from osv import fields, osv
+
+class account_invoice_refund(osv.osv_memory):
+    
+    """Account invoice refund or modify or cancel."""
+    
+    _name = "account.invoice.refund"
+    _description = "Invoice Refund"
+    _columns = {
+                  'date':fields.date('Operation date',required=False),  
+                  'period':fields.many2one('account.period',  'Force period', required=False), 
+                  'description':fields.char('Description', size=150, required=True),
+              }
+    
+    def _compute_refund(self, cr, uid, ids, mode, context):
+        """
+        cr is the current row, from the database cursor,
+        uid is the current user’s ID for security checks,
+        ID is the account invoice refund’s ID or list of IDs if we want more than one
+        
+        """
+        
+        for form in  self.read(cr, uid, ids):
+            reconcile_obj = self.pool.get('account.move.reconcile')
+            account_m_line_obj = self.pool.get('account.move.line')
+            created_inv = []
+            date = False
+            period = False
+            description = False
+            for inv in self.pool.get('account.invoice').browse(cr, uid, context['active_ids']):
+                if inv.state in ['draft', 'proforma2', 'cancel']:
+                    raise osv.except_osv(_('Error !'), _('Can not %s draft/proforma/cancel invoice.') % (mode))
+                if form['period'] :
+                    period = form['period']
+                else:
+                    period = inv.period_id and inv.period_id.id or False
+
+                if form['date'] :
+                    date = form['date']
+                    if not form['period'] :
+                            cr.execute("select name from ir_model_fields where model='account.period' and name='company_id'")
+                            result_query = cr.fetchone()
+                            if result_query:
+                            #in multi company mode
+                                cr.execute("""SELECT id
+                                          from account_period where date('%s')
+                                          between date_start AND  date_stop and company_id = %s limit 1 """,
+                                          (form['date'],self.pool.get('res.users').browse(cr, uid, uid).company_id.id,))
+                            else:
+                            #in mono company mode
+                                cr.execute("""SELECT id
+                                          from account_period where date('%s')
+                                          between date_start AND  date_stop  limit 1 """,
+                                          (form['date'],))
+                            res = cr.fetchone()
+                            if res:
+                                period = res[0]
+                else:
+                    date = inv.date_invoice
+
+                if form['description'] :
+                    description = form['description']
+                else:
+                    description = inv.name
+
+                if not period:
+                    raise osv.except_osv(_('Data Insufficient !'), _('No Period found on Invoice!'))
+
+                refund_id = self.pool.get('account.invoice').refund(cr, uid, [inv.id],date, period, description)
+                refund = self.pool.get('account.invoice').browse(cr, uid, refund_id[0])
+                # we compute due date
+                #!!!due date = date inv date on formdate
+                self.pool.get('account.invoice').write(cr, uid, [refund.id],{'date_due':date,'check_total':inv.check_total})
+                # to make the taxes calculated
+                self.pool.get('account.invoice').button_compute(cr, uid, refund_id)
+
+                created_inv.append(refund_id[0])
+                #if inv is paid we unreconcile
+                if mode in ('cancel','modify'):
+                    movelines = inv.move_id.line_id
+                    #we unreconcile the lines
+                    to_reconcile_ids = {}
+                    for line in movelines :
+                        #if the account of the line is the as the one in the invoice
+                        #we reconcile
+                        if line.account_id.id == inv.account_id.id :
+                            to_reconcile_ids[line.account_id.id] =[line.id]
+                        if type(line.reconcile_id) != osv.orm.browse_null :
+                            reconcile_obj.unlink(cr,uid, line.reconcile_id.id)
+                    #we advance the workflow of the refund to open
+                    wf_service = netsvc.LocalService('workflow')
+                    wf_service.trg_validate(uid, 'account.invoice', refund.id, 'invoice_open', cr)
+                    #we reload the browse record
+                    refund = self.pool.get('account.invoice').browse(cr, uid, refund_id[0])
+                    #we match the line to reconcile
+                    for tmpline in  refund.move_id.line_id :
+                        if tmpline.account_id.id == inv.account_id.id :
+                            to_reconcile_ids[tmpline.account_id.id].append(tmpline.id)
+                    for account in to_reconcile_ids :
+                        account_m_line_obj.reconcile(cr, uid, to_reconcile_ids[account],
+                                        writeoff_period_id=period,
+                                        writeoff_journal_id=inv.journal_id.id,
+                                        writeoff_acc_id=inv.account_id.id
+                                        )
+                    #we create a new invoice that is the copy of the original
+                    if mode == 'modify' :
+                        invoice = self.pool.get('account.invoice').read(cr, uid, [inv.id],
+                                            ['name', 'type', 'number', 'reference',
+                                            'comment', 'date_due', 'partner_id', 'address_contact_id',
+                                            'address_invoice_id', 'partner_insite','partner_contact',
+                                            'partner_ref', 'payment_term', 'account_id', 'currency_id',
+                                            'invoice_line', 'tax_line', 'journal_id','period_id'
+                                            ]
+                                )
+                        invoice = invoice[0]
+                        del invoice['id']
+                        invoice_lines = self.pool.get('account.invoice.line').read(cr, uid, invoice['invoice_line'])
+                        invoice_lines = self.pool.get('account.invoice')._refund_cleanup_lines(cr, uid, invoice_lines)
+                        tax_lines = self.pool.get('account.invoice.tax').read(
+                                                        cr, uid, invoice['tax_line'])
+                        tax_lines = self.pool.get('account.invoice')._refund_cleanup_lines(cr, uid, tax_lines)
+
+                        invoice.update({
+                            'type': inv.type,
+                            'date_invoice': date,
+                            'state': 'draft',
+                            'number': False,
+                            'invoice_line': invoice_lines,
+                            'tax_line': tax_lines,
+                            'period_id': period,
+                            'name':description
+                            })
+
+                        #take the id part of the tuple returned for many2one fields
+                        for field in ('address_contact_id', 'address_invoice_id', 'partner_id',
+                                'account_id', 'currency_id', 'payment_term', 'journal_id'):
+                                invoice[field] = invoice[field] and invoice[field][0]
+
+                        # create the new invoice
+                        inv_id = self.pool.get('account.invoice').create(cr, uid, invoice,{})
+                        # we compute due date
+                        if inv.payment_term.id:
+                            data = self.pool.get('account.invoice').onchange_payment_term_date_invoice(cr, uid, [inv_id],inv.payment_term.id,date)
+                            if 'value' in data and data['value']:
+                                self.pool.get('account.invoice').write(cr, uid, [inv_id],data['value'])
+                        created_inv.append(inv_id)
+
+            #we get the view id
+            mod_obj = self.pool.get('ir.model.data')
+            act_obj = self.pool.get('ir.actions.act_window')
+            if inv.type == 'out_invoice':
+                xml_id = 'action_invoice_tree1'
+            elif inv.type == 'in_invoice':
+                xml_id = 'action_invoice_tree2'
+            elif type == 'out_refund':
+                xml_id = 'action_invoice_tree3'
+            else:
+                xml_id = 'action_invoice_tree4'
+            #we get the model
+            result = mod_obj._get_id(cr, uid, 'account', xml_id)
+            id = mod_obj.read(cr, uid, result, ['res_id'])['res_id']
+            # we read the act window
+            result = act_obj.read(cr, uid, id)
+            result['res_id'] = created_inv
+
+            return result
+
+    def _invoice_refund(self, cr, uid, ids, context):
+        return self._compute_refund(cr, uid, ids, 'refund', context)
+
+    def _invoice_cancel(self, cr, uid, ids, context):
+        return self._compute_refund(cr, uid, ids, 'cancel', context)
+
+    def _invoice_modify(self, cr, uid, ids, context):
+        return self._compute_refund(cr, uid, ids, 'modify', context)
+
+account_invoice_refund()
diff --git a/addons/account/wizard/account_move_bank_reconcile.py b/addons/account/wizard/account_move_bank_reconcile.py
new file mode 100644
index 00000000000..4dd3e1354c2
--- /dev/null
+++ b/addons/account/wizard/account_move_bank_reconcile.py
@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import wizard
+import netsvc
+import pooler
+import time
+from tools.translate import _
+import tools
+from osv import fields, osv
+
+
+class account_move_bank_reconcile(osv.osv_memory):
+    
+    _name = "account.move.bank.reconcile"
+    _description = "Move bank reconcile"
+    _columns = {
+                'journal_id':fields.many2one('account.journal',  'Journal', required=True),
+                
+              }
+    def _action_open_window(self, cr, uid, ids, context):
+             """
+            cr is the current row, from the database cursor,
+            uid is the current user’s ID for security checks,
+            ID is the account move bank reconcile’s ID or list of IDs if we want more than one
+            This function Open  account move line   on given journal_id.
+            """
+             for form in  self.read(cr, uid, ids):
+                 cr.execute('select default_credit_account_id from account_journal where id=%s', (form['journal_id'],))
+                 account_id = cr.fetchone()[0]
+                 if not account_id:
+                     raise osv.except_osv(_('Error'), _('You have to define the bank account\nin the journal definition for reconciliation.'))
+                 return {
+                    'domain': "[('journal_id','=',%d), ('account_id','=',%d), ('state','<>','draft')]" % (form['journal_id'],account_id),
+                    'name': _('Standard Encoding'),
+                    
+                    'view_type': 'form',
+                    'view_mode': 'tree,form',
+                    'res_model': 'account.move.line',
+                    'view_id': False,
+                    'context': "{'journal_id':%d}" % (form['journal_id'],),
+                    'type': 'ir.actions.act_window'
+                     }
+
+account_move_bank_reconcile()
\ No newline at end of file
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
new file mode 100644
index 00000000000..cc74f663677
--- /dev/null
+++ b/addons/account/wizard/account_move_journal.py
@@ -0,0 +1,97 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import wizard
+import netsvc
+import pooler
+import time
+from tools.translate import _
+import tools
+from osv import fields, osv
+
+
+class account_move_journal(osv.osv_memory):
+    
+    def _get_period(self, cr, uid, context={}):
+        """Return  default account period value""" 
+        
+        ids = self.pool.get('account.period').find(cr, uid, context=context)
+        period_id = False
+        if len(ids):
+            period_id = ids[0]
+        return period_id
+    
+    def _action_open_window(self, cr, uid, ids, context={}):
+        """
+        cr is the current row, from the database cursor,
+        uid is the current user’s ID for security checks,
+        ID is the account move journal’s ID or list of IDs if we want more than one
+        This function Open action move line window on given period and  Journal/Payment Mode
+        """
+        for form in  self.read(cr, uid, ids,['journal_id', 'period_id']):
+            cr.execute('select id,name from ir_ui_view where model=%s and type=%s', ('account.move.line', 'form' ))
+            view_res = cr.fetchone()
+            jp = self.pool.get('account.journal.period')
+            ids = jp.search(cr, uid, [('journal_id','=',form['journal_id']), ('period_id','=',form['period_id'])])
+            
+            if not len(ids):
+                print "ids",ids
+                name = self.pool.get('account.journal').read(cr, uid, [form['journal_id']])[0]['name']
+                state = self.pool.get('account.period').read(cr, uid, [form['period_id']])[0]['state']
+                if state == 'done':
+                    raise osv.except_osv(_('UserError'), _('This period is already closed !'))
+                company = self.pool.get('account.period').read(cr, uid, [form['period_id']])[0]['company_id'][0]
+                jp.create(cr, uid, {'name':name, 'period_id': form['period_id'], 'journal_id':form['journal_id'], 'company_id':company})
+            ids = jp.search(cr, uid, [('journal_id','=',form['journal_id']), ('period_id','=',form['period_id'])])
+            print "jp",ids
+            jp = jp.browse(cr, uid, ids, context=context)[0]
+            name = (jp.journal_id.code or '') + ':' + (jp.period_id.code or '')
+            mod_obj = self.pool.get('ir.model.data')
+            result = mod_obj._get_id(cr, uid, 'account', 'view_account_move_line_filter')
+            id = mod_obj.read(cr, uid, result, ['res_id']) 
+            return {
+                'domain': "[('journal_id','=',%d), ('period_id','=',%d)]" % (form['journal_id'],form['period_id']),
+                'name': name,
+                'view_type': 'form',
+                'view_mode': 'tree,form',
+                'res_model': 'account.move.line',
+                'view_id': view_res,
+                'context': "{'journal_id':%d, 'period_id':%d}" % (form['journal_id'],form['period_id']),
+                'type': 'ir.actions.act_window',
+                'search_view_id': id['res_id']        
+                }
+            
+    _name = "account.move.journal"
+    _description = "Move journal"
+    
+    _columns = {
+                'journal_id':fields.many2one('account.journal',  'Journal/Payment Mode', required=True),
+                'period_id':fields.many2one('account.period', 'Period', required=True),
+                }
+
+    _defaults = {
+                'period_id':_get_period
+                }
+    
+account_move_journal()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account/wizard/account_move_line_reconcile_select.py b/addons/account/wizard/account_move_line_reconcile_select.py
new file mode 100644
index 00000000000..5c100b38ac0
--- /dev/null
+++ b/addons/account/wizard/account_move_line_reconcile_select.py
@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import wizard
+import netsvc
+import pooler
+import time
+from tools.translate import _
+import tools
+from osv import fields, osv
+
+class account_move_line_reconcile_select(osv.osv_memory):
+    _name = "account.move.line.reconcile.select"
+    _description = "Move line reconcile select"
+    _columns = {
+                'account_id':fields.many2one('account.account',  'Account', domain = [('reconcile','=',1)], required=True),
+              }
+    
+    def _action_open_window(self, cr, uid, ids, context):
+        """
+         cr is the current row, from the database cursor,
+         uid is the current user’s ID for security checks,
+         ID is the account move line reconcile select’s ID or list of IDs if we want more than one
+         This function Open  account move line window for reconcile on given account id
+         """
+        for data in  self.read(cr, uid, ids):
+            
+            return {
+                'domain': "[('account_id','=',%d),('reconcile_id','=',False),('state','<>','draft')]" % data['account_id'],
+                'name': _('Reconciliation'),
+                'view_type': 'form',
+                'view_mode': 'tree,form',
+                'view_id': False,
+                'res_model': 'account.move.line',
+                'type': 'ir.actions.act_window'
+                }
+        
+account_move_line_reconcile_select()
\ No newline at end of file
diff --git a/addons/account/wizard/account_period_close.py b/addons/account/wizard/account_period_close.py
new file mode 100644
index 00000000000..4df4e652ec5
--- /dev/null
+++ b/addons/account/wizard/account_period_close.py
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import wizard
+import netsvc
+import pooler
+import time
+from tools.translate import _
+import tools
+from osv import fields, osv
+
+
+class account_period_close(osv.osv_memory):
+    """close period"""
+    _name = "account.period.close"
+    _description = "period close"
+    _columns = {
+                  'sure':fields.boolean('Check this box', required=False),
+              }
+
+    def _data_save(self, cr, uid, ids, context):
+        """
+         cr is the current row, from the database cursor,
+         uid is the current user’s ID for security checks,
+         ID is the account period close’s ID or list of IDs if we want more than one
+         This function close period
+         """
+        
+        mode = 'done'
+        for form in self.read(cr, uid, ids): 
+            if form['sure']:
+                for id in context['active_ids']:
+                    cr.execute('update account_journal_period set state=%s where period_id=%s', (mode, id))
+                    cr.execute('update account_period set state=%s where id=%s', (mode, id))
+            return {}
+
+account_period_close()
+
+
diff --git a/addons/account/wizard/wizard_account_chart.py b/addons/account/wizard/wizard_account_chart.py
deleted file mode 100644
index ca8153f3ce7..00000000000
--- a/addons/account/wizard/wizard_account_chart.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import pooler
-
-class wizard_account_chart(wizard.interface):
-    _account_chart_arch = '''<?xml version="1.0"?>
-    <form string="Account charts">
-        <field name="fiscalyear"/>
-        <label align="0.7" colspan="6" string="(If you do not select Fiscal year it will take all open fiscal years)"/>
-        <field name="target_move"/>
-    </form>'''
-
-    _account_chart_fields = {
-            'fiscalyear': {
-                'string': 'Fiscal year',
-                'type': 'many2one',
-                'relation': 'account.fiscalyear',
-                'help': 'Keep empty for all open fiscal years',
-        },
-            'target_move': {
-                'string': 'Target Moves',
-                'type': 'selection',
-                'selection': [('all','All Entries'),('posted','All Posted Entries')],
-                'required': True,
-                'default': lambda *a:"all",
-        },
-    }
-
-    def _get_defaults(self, cr, uid, data, context):
-        fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear')
-        data['form']['fiscalyear'] = fiscalyear_obj.find(cr, uid)
-        return data['form']
-
-
-    def _account_chart_open_window(self, cr, uid, data, context):
-        mod_obj = pooler.get_pool(cr.dbname).get('ir.model.data')
-        act_obj = pooler.get_pool(cr.dbname).get('ir.actions.act_window')
-
-        result = mod_obj._get_id(cr, uid, 'account', 'action_account_tree')
-        id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
-        result = act_obj.read(cr, uid, [id], context=context)[0]
-        result['context'] = str({'fiscalyear': data['form']['fiscalyear'],'state':data['form']['target_move']})
-        if data['form']['fiscalyear']:
-            result['name']+=':'+pooler.get_pool(cr.dbname).get('account.fiscalyear').read(cr,uid,[data['form']['fiscalyear']])[0]['code']
-        return result
-
-    states = {
-        'init': {
-            'actions': [_get_defaults],
-            'result': {'type': 'form', 'arch':_account_chart_arch, 'fields':_account_chart_fields, 'state': [('end', 'Cancel'), ('open', 'Open Charts')]}
-        },
-        'open': {
-            'actions': [],
-            'result': {'type': 'action', 'action':_account_chart_open_window, 'state':'end'}
-        }
-    }
-wizard_account_chart('account.chart')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account/wizard/wizard_automatic_reconcile.py b/addons/account/wizard/wizard_automatic_reconcile.py
index 7a0f5a8c465..e80b4406fdf 100644
--- a/addons/account/wizard/wizard_automatic_reconcile.py
+++ b/addons/account/wizard/wizard_automatic_reconcile.py
@@ -218,6 +218,7 @@ def _reconcile(self, cr, uid, data, context):
     max_amount = form.get('max_amount', 0.0)
     power = form['power']
     reconciled = unreconciled = 0
+    print "form",form
     if not form['account_ids'][0][2]:
         raise wizard.except_wizard(_('UserError'), _('You must select accounts to reconcile'))
     for account_id in form['account_ids'][0][2]:
diff --git a/addons/account/wizard/wizard_bank_reconcile.py b/addons/account/wizard/wizard_bank_reconcile.py
deleted file mode 100644
index c081657304a..00000000000
--- a/addons/account/wizard/wizard_bank_reconcile.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-from tools.translate import _
-
-_journal_form = '''<?xml version="1.0"?>
-<form string="%s">
-    <field name="journal_id"/>
-</form>''' % ('Bank reconciliation',)
-
-_journal_fields = {
-    'journal_id': {'string':'Journal', 'type':'many2one', 'relation':'account.journal', 'required':True},
-}
-
-def _action_open_window(self, cr, uid, data, context):
-    form = data['form']
-    cr.execute('select default_credit_account_id from account_journal where id=%s', (form['journal_id'],))
-    account_id = cr.fetchone()[0]
-    if not account_id:
-        raise wizard.except_wizard(_('Error'), _('You have to define the bank account\nin the journal definition for reconciliation.'))
-    return {
-        'domain': "[('journal_id','=',%d), ('account_id','=',%d), ('state','<>','draft')]" % (form['journal_id'],account_id),
-        'name': _('Standard Encoding'),
-
-        'view_type': 'form',
-        'view_mode': 'tree,form',
-        'res_model': 'account.move.line',
-        'view_id': False,
-        'context': "{'journal_id':%d}" % (form['journal_id'],),
-        'type': 'ir.actions.act_window'
-    }
-
-class wiz_journal(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':_journal_form, 'fields':_journal_fields, 'state':[('end','Cancel'),('open','Open for bank reconciliation')]}
-        },
-        'open': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _action_open_window, 'state':'end'}
-        }
-    }
-wiz_journal('account.move.bank.reconcile')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account/wizard/wizard_fiscalyear_close_state.py b/addons/account/wizard/wizard_fiscalyear_close_state.py
deleted file mode 100644
index 2f8331f2d3e..00000000000
--- a/addons/account/wizard/wizard_fiscalyear_close_state.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import osv
-import pooler
-from tools.translate import _
-
-_transaction_form = '''<?xml version="1.0"?>
-<form string=" Close states of Fiscal year and periods">
-    <field name="fy_id"/>
-    <separator string="Are you sure you want to close the fiscal year ?" colspan="4"/>
-    <field name="sure"/>
-</form>'''
-
-_transaction_fields = {
-    'fy_id': {'string':'Fiscal Year to close', 'type':'many2one', 'relation': 'account.fiscalyear','required':True, 'domain':[('state','=','draft')]},
-    'sure': {'string':'Check this box', 'type':'boolean'},
-}
-
-def _data_save(self, cr, uid, data, context):
-    if not data['form']['sure']:
-        raise wizard.except_wizard(_('UserError'), _('Closing of states cancelled, please check the box !'))
-    pool = pooler.get_pool(cr.dbname)
-
-    fy_id = data['form']['fy_id']
-
-    cr.execute('UPDATE account_journal_period ' \
-            'SET state = %s ' \
-            'WHERE period_id IN (SELECT id FROM account_period WHERE fiscalyear_id = %s)',
-            ('done',fy_id))
-    cr.execute('UPDATE account_period SET state = %s ' \
-            'WHERE fiscalyear_id = %s', ('done',fy_id))
-    cr.execute('UPDATE account_fiscalyear ' \
-            'SET state = %s WHERE id = %s', ('done', fy_id))
-    return {}
-
-class wiz_journal_close_state(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':_transaction_form, 'fields':_transaction_fields, 'state':[('end','Cancel'),('close','Close states')]}
-        },
-        'close': {
-            'actions': [_data_save],
-            'result': {'type': 'state', 'state':'end'}
-        }
-    }
-wiz_journal_close_state('account.fiscalyear.close.state')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account/wizard/wizard_journal.py b/addons/account/wizard/wizard_journal.py
deleted file mode 100644
index fd2b012863e..00000000000
--- a/addons/account/wizard/wizard_journal.py
+++ /dev/null
@@ -1,99 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-from osv import osv
-import pooler
-from tools.translate import _
-
-_journal_form = '''<?xml version="1.0"?>
-<form string="Standard entries">
-    <field name="journal_id"/>
-    <newline/>
-    <field name="period_id"/>
-</form>'''
-
-def _period_get(self, cr, uid, datas, ctx={}):
-    try:
-        pool = pooler.get_pool(cr.dbname)
-        ids = pool.get('account.period').find(cr, uid, context=ctx)
-        return {'period_id': ids[0]}
-    except:
-        return {}
-
-_journal_fields = {
-    'journal_id': {'string':'Journal', 'type':'many2one', 'relation':'account.journal', 'required':True},
-    'period_id': {
-        'string':'Period', 
-        'type':'many2one', 
-        'relation':'account.period', 
-        'required':True,
-    }
-}
-
-def _action_open_window(self, cr, uid, data, context):
-    form = data['form']
-    cr.execute('select id,name from ir_ui_view where model=%s and type=%s', ('account.move.line', 'form'))
-    view_res = cr.fetchone()
-    jp = pooler.get_pool(cr.dbname).get('account.journal.period')
-    ids = jp.search(cr, uid, [('journal_id','=',form['journal_id']), ('period_id','=',form['period_id'])])
-    if not len(ids):
-        name = pooler.get_pool(cr.dbname).get('account.journal').read(cr, uid, [form['journal_id']])[0]['name']
-        state = pooler.get_pool(cr.dbname).get('account.period').read(cr, uid, [form['period_id']])[0]['state']
-        if state == 'done':
-            raise wizard.except_wizard(_('UserError'), _('This period is already closed !'))
-        company = pooler.get_pool(cr.dbname).get('account.period').read(cr, uid, [form['period_id']])[0]['company_id'][0]
-        jp.create(cr, uid, {'name':name, 'period_id': form['period_id'], 'journal_id':form['journal_id'], 'company_id':company})
-    ids = jp.search(cr, uid, [('journal_id','=',form['journal_id']), ('period_id','=',form['period_id'])])
-    jp = jp.browse(cr, uid, ids, context=context)[0]
-    name = (jp.journal_id.code or '') + ':' + (jp.period_id.code or '')
-
-    mod_obj = pooler.get_pool(cr.dbname).get('ir.model.data')
-    result = mod_obj._get_id(cr, uid, 'account', 'view_account_move_line_filter')
-    id = mod_obj.read(cr, uid, result, ['res_id'])    
-    return {
-        'domain': "[('journal_id','=',%d), ('period_id','=',%d)]" % (form['journal_id'],form['period_id']),
-        'name': name,
-        'view_type': 'form',
-        'view_mode': 'tree,form',
-        'res_model': 'account.move.line',
-        'view_id': view_res,
-        'context': "{'journal_id':%d, 'period_id':%d}" % (form['journal_id'],form['period_id']),
-        'type': 'ir.actions.act_window',
-        'search_view_id': id['res_id']        
-    }
-
-class wiz_journal(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_period_get],
-            'result': {'type': 'form', 'arch':_journal_form, 'fields':_journal_fields, 'state':[('end','Cancel'),('open','Open Journal')]}
-        },
-        'open': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _action_open_window, 'state':'end'}
-        }
-    }
-wiz_journal('account.move.journal')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account/wizard/wizard_period_close.py b/addons/account/wizard/wizard_period_close.py
deleted file mode 100644
index d6ba73683f2..00000000000
--- a/addons/account/wizard/wizard_period_close.py
+++ /dev/null
@@ -1,57 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-
-_transaction_form = '''<?xml version="1.0"?>
-<form string="Close Period">
-    <separator string="Are you sure ?" colspan="4"/>
-    <field name="sure"/>
-</form>'''
-
-_transaction_fields = {
-    'sure': {'string':'Check this box', 'type':'boolean'},
-}
-
-def _data_save(self, cr, uid, data, context):
-    mode = 'done'
-    if data['form']['sure']:
-        for id in data['ids']:
-            cr.execute('update account_journal_period set state=%s where period_id=%s', (mode, id))
-            cr.execute('update account_period set state=%s where id=%s', (mode, id))
-    return {}
-
-class wiz_journal_close(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':_transaction_form, 'fields':_transaction_fields, 'state':[('end','Cancel'),('close','Close Period')]}
-        },
-        'close': {
-            'actions': [_data_save],
-            'result': {'type': 'state', 'state':'end'}
-        }
-    }
-wiz_journal_close('account.period.close')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account/wizard/wizard_reconcile_select.py b/addons/account/wizard/wizard_reconcile_select.py
deleted file mode 100644
index 594020debd4..00000000000
--- a/addons/account/wizard/wizard_reconcile_select.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-from tools.translate import _
-
-
-_journal_form = '''<?xml version="1.0"?>
-<form string="%s">
-    <field name="account_id"/>
-</form>''' % ('Reconciliation',)
-
-_journal_fields = {
-    'account_id': {'string':'Account', 'type':'many2one', 'relation':'account.account','domain': [('reconcile','=',1)], 'required':True},
-}
-
-def _action_open_window(self, cr, uid, data, context):
-    return {
-        'domain': "[('account_id','=',%d),('reconcile_id','=',False),('state','<>','draft')]" % data['form']['account_id'],
-        'name': _('Reconciliation'),
-        'view_type': 'form',
-        'view_mode': 'tree,form',
-        'view_id': False,
-        'res_model': 'account.move.line',
-        'type': 'ir.actions.act_window'
-    }
-
-class wiz_rec_select(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':_journal_form, 'fields':_journal_fields, 'state':[('end','Cancel'),('open','Open for reconciliation')]}
-        },
-        'open': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _action_open_window, 'state':'end'}
-        }
-    }
-wiz_rec_select('account.move.line.reconcile.select')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account/wizard/wizard_refund.py b/addons/account/wizard/wizard_refund.py
deleted file mode 100644
index 42526f3cc0a..00000000000
--- a/addons/account/wizard/wizard_refund.py
+++ /dev/null
@@ -1,226 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import pooler
-import osv
-import netsvc
-import time
-from tools.translate import _
-
-sur_form = '''<?xml version="1.0"?>
-<form string="Credit Note">
-    <label string="Are you sure you want to refund this invoice ?" colspan="2"/>
-    <newline />
-    <field name="date" />
-    <field name="period" />
-    <field name="description" width="150" />
-</form>'''
-
-sur_fields = {
-    'date': {'string':'Operation date','type':'date', 'required':'False'},
-    'period':{'string': 'Force period', 'type': 'many2one',
-        'relation': 'account.period', 'required': False},
-    'description':{'string':'Description', 'type':'char', 'required':'True'},
-    }
-
-
-class wiz_refund(wizard.interface):
-
-    def _invoice_refund(self, cr, uid, data, context):
-        return self._compute_refund(cr, uid, data, 'refund', context)
-
-    def _invoice_cancel(self, cr, uid, data, context):
-        return self._compute_refund(cr, uid, data, 'cancel', context)
-
-    def _invoice_modify(self, cr, uid, data, context):
-        return self._compute_refund(cr, uid, data, 'modify', context)
-
-    def _compute_refund(self, cr, uid, data, mode, context):
-        form = data['form']
-        pool = pooler.get_pool(cr.dbname)
-        reconcile_obj = pool.get('account.move.reconcile')
-        account_m_line_obj = pool.get('account.move.line')
-        created_inv = []
-        date = False
-        period = False
-        description = False
-        for inv in pool.get('account.invoice').browse(cr, uid, data['ids']):
-            if inv.state in ['draft', 'proforma2', 'cancel']:
-                raise wizard.except_wizard(_('Error !'), _('Can not %s draft/proforma/cancel invoice.') % (mode))
-            if form['period'] :
-                period = form['period']
-            else:
-                period = inv.period_id and inv.period_id.id or False
-
-            if form['date'] :
-                date = form['date']
-                if not form['period'] :
-                    cr.execute("select name from ir_model_fields where model='account.period' and name='company_id'")
-                    result_query = cr.fetchone()
-                    if result_query:
-                        #in multi company mode
-                        cr.execute("""SELECT id
-                                      from account_period where date('%s')
-                                      between date_start AND  date_stop and company_id = %s limit 1 """,
-                                      (form['date'],pool.get('res.users').browse(cr,uid,uid).company_id.id,))
-                    else:
-                        #in mono company mode
-                        cr.execute("""SELECT id
-                                      from account_period where date('%s')
-                                      between date_start AND  date_stop  limit 1 """,
-                                      (form['date'],))
-                    res = cr.fetchone()
-                    if res:
-                        period = res[0]
-            else:
-                date = inv.date_invoice
-
-            if form['description'] :
-                description = form['description']
-            else:
-                description = inv.name
-
-            if not period:
-                raise wizard.except_wizard(_('Data Insufficient !'), _('No Period found on Invoice!'))
-
-            refund_id = pool.get('account.invoice').refund(cr, uid, [inv.id],date, period, description)
-            refund = pool.get('account.invoice').browse(cr, uid, refund_id[0])
-            # we compute due date
-            #!!!due date = date inv date on formdate
-            pool.get('account.invoice').write(cr, uid, [refund.id],{'date_due':date,'check_total':inv.check_total})
-            # to make the taxes calculated
-            pool.get('account.invoice').button_compute(cr, uid, refund_id)
-
-            created_inv.append(refund_id[0])
-            #if inv is paid we unreconcile
-            if mode in ('cancel','modify'):
-                movelines = inv.move_id.line_id
-                #we unreconcile the lines
-                to_reconcile_ids = {}
-                for line in movelines :
-                    #if the account of the line is the as the one in the invoice
-                    #we reconcile
-                    if line.account_id.id == inv.account_id.id :
-                        to_reconcile_ids[line.account_id.id] =[line.id]
-                    if type(line.reconcile_id) != osv.orm.browse_null :
-                        reconcile_obj.unlink(cr,uid, line.reconcile_id.id)
-                #we advance the workflow of the refund to open
-                wf_service = netsvc.LocalService('workflow')
-                wf_service.trg_validate(uid, 'account.invoice', refund.id, 'invoice_open', cr)
-                #we reload the browse record
-                refund = pool.get('account.invoice').browse(cr, uid, refund_id[0])
-                #we match the line to reconcile
-                for tmpline in  refund.move_id.line_id :
-                    if tmpline.account_id.id == inv.account_id.id :
-                        to_reconcile_ids[tmpline.account_id.id].append(tmpline.id)
-                for account in to_reconcile_ids :
-                    account_m_line_obj.reconcile(cr, uid, to_reconcile_ids[account],
-                        writeoff_period_id=period,
-                        writeoff_journal_id=inv.journal_id.id,
-                        writeoff_acc_id=inv.account_id.id
-                    )
-                #we create a new invoice that is the copy of the original
-                if mode == 'modify' :
-                    invoice = pool.get('account.invoice').read(cr, uid, [inv.id],
-                        ['name', 'type', 'number', 'reference',
-                            'comment', 'date_due', 'partner_id', 'address_contact_id',
-                            'address_invoice_id', 'partner_insite','partner_contact',
-                            'partner_ref', 'payment_term', 'account_id', 'currency_id',
-                            'invoice_line', 'tax_line', 'journal_id','period_id'
-                        ]
-                    )
-                    invoice = invoice[0]
-                    del invoice['id']
-                    invoice_lines = pool.get('account.invoice.line').read(cr, uid, invoice['invoice_line'])
-                    invoice_lines = pool.get('account.invoice')._refund_cleanup_lines(cr, uid, invoice_lines)
-                    tax_lines = pool.get('account.invoice.tax').read(
-                        cr, uid, invoice['tax_line'])
-                    tax_lines = pool.get('account.invoice')._refund_cleanup_lines(cr, uid, tax_lines)
-
-                    invoice.update({
-                        'type': inv.type,
-                        'date_invoice': date,
-                        'state': 'draft',
-                        'number': False,
-                        'invoice_line': invoice_lines,
-                        'tax_line': tax_lines,
-                        'period_id': period,
-                        'name':description
-                        })
-
-                    #take the id part of the tuple returned for many2one fields
-                    for field in ('address_contact_id', 'address_invoice_id', 'partner_id',
-                        'account_id', 'currency_id', 'payment_term', 'journal_id'):
-                        invoice[field] = invoice[field] and invoice[field][0]
-
-                    # create the new invoice
-                    inv_id = pool.get('account.invoice').create(cr, uid, invoice,{})
-                    # we compute due date
-                    if inv.payment_term.id:
-                        data = pool.get('account.invoice').onchange_payment_term_date_invoice(cr, uid, [inv_id],inv.payment_term.id,date)
-                        if 'value' in data and data['value']:
-                            pool.get('account.invoice').write(cr, uid, [inv_id],data['value'])
-                    created_inv.append(inv_id)
-
-        #we get the view id
-        mod_obj = pool.get('ir.model.data')
-        act_obj = pool.get('ir.actions.act_window')
-        if inv.type == 'out_invoice':
-            xml_id = 'action_invoice_tree5'
-        elif inv.type == 'in_invoice':
-            xml_id = 'action_invoice_tree8'
-        elif type == 'out_refund':
-            xml_id = 'action_invoice_tree10'
-        else:
-            xml_id = 'action_invoice_tree12'
-        #we get the model
-        result = mod_obj._get_id(cr, uid, 'account', xml_id)
-        id = mod_obj.read(cr, uid, result, ['res_id'])['res_id']
-        # we read the act window
-        result = act_obj.read(cr, uid, id)
-        result['res_id'] = created_inv
-
-        return result
-
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type':'form', 'arch':sur_form, 'fields':sur_fields, 'state':[('end','Cancel'),('refund','Refund Invoice'),('cancel_invoice','Cancel Invoice'),('modify_invoice','Modify Invoice')]}
-        },
-        'refund': {
-            'actions': [],
-            'result': {'type':'action', 'action':_invoice_refund, 'state':'end'},
-        },
-        'cancel_invoice': {
-            'actions': [],
-            'result': {'type':'action', 'action':_invoice_cancel, 'state':'end'},
-        },
-        'modify_invoice': {
-            'actions': [],
-            'result': {'type':'action', 'action':_invoice_modify, 'state':'end'},
-        },
-
-    }
-wiz_refund('account.invoice.refund')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From 96d7b673134aead54d462630c698f5787f1bc259 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Fri, 26 Feb 2010 17:21:42 +0530
Subject: [PATCH 009/251] [REF] mrp: Converted 'Requisition Request' wizard on
 product to osv_memory wizard.

bzr revid: uco@tinyerp.co.in-20100226115142-ebqk9jd40c67m27k
---
 addons/mrp/__init__.py                |   3 +
 addons/mrp/__terp__.py                |   1 +
 addons/mrp/make_procurement.py        |  98 +++++++++++++++++++++++++
 addons/mrp/make_procurement.xml       |  51 +++++++++++++
 addons/mrp/mrp_wizard.xml             |  12 +--
 addons/mrp/wizard/__init__.py         |   1 -
 addons/mrp/wizard/make_procurement.py | 102 --------------------------
 7 files changed, 159 insertions(+), 109 deletions(-)
 create mode 100644 addons/mrp/make_procurement.py
 create mode 100644 addons/mrp/make_procurement.xml
 delete mode 100644 addons/mrp/wizard/make_procurement.py

diff --git a/addons/mrp/__init__.py b/addons/mrp/__init__.py
index b219d932141..3283ec11b99 100644
--- a/addons/mrp/__init__.py
+++ b/addons/mrp/__init__.py
@@ -26,4 +26,7 @@ import wizard
 import report
 import company
 import schedulers
+
+import make_procurement
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py
index 1d5eb98da2e..6497dc3933a 100644
--- a/addons/mrp/__terp__.py
+++ b/addons/mrp/__terp__.py
@@ -69,6 +69,7 @@
         'process/service_product_process.xml',
         'process/procurement_process.xml',
         'mrp_installer.xml',
+        'make_procurement.xml',
     ],
     'demo_xml': ['mrp_demo.xml', 'mrp_order_point.xml'],
     'installable': True,
diff --git a/addons/mrp/make_procurement.py b/addons/mrp/make_procurement.py
new file mode 100644
index 00000000000..29b0f58ccf0
--- /dev/null
+++ b/addons/mrp/make_procurement.py
@@ -0,0 +1,98 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import pooler
+import netsvc
+from osv import fields, osv
+
+import time
+
+class make_procurement(osv.osv_memory):
+    '''Wizard that create a procurement from a product form'''
+    
+    _name = 'make.procurement'
+    _description = 'Make Procurements'
+    
+    def onchange_product_id(self, cr, uid, ids, prod_id):
+        product = self.pool.get('product.product').browse(cr, uid, prod_id)
+        return {'value': {'uom_id': product.uom_id.id}}
+    
+    _columns = {
+        'qty': fields.float('Quantity', digits=(16,2), required=True),
+        'product_id': fields.many2one('product.product', 'Product', required=True, readonly=1),
+        'uom_id': fields.many2one('product.uom', 'Unit of Measure', required=True),
+        'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True),
+        'date_planned': fields.date('Planned Date', required=True),
+    }
+    
+    _defaults = {
+            'date_planned': lambda *args: time.strftime('%Y-%m-%d'),
+            'qty': lambda *args: 1.0,
+    }
+    
+    def make_procurement(self, cr, uid, ids, context=None):
+        '''Create procurement'''
+        for proc in self.browse(cr, uid, ids):
+            wh = self.pool.get('stock.warehouse').browse(cr, uid, proc.id, context)
+            user = self.pool.get('res.users').browse(cr, uid, uid, context)
+            procure_id = self.pool.get('mrp.procurement').create(cr, uid, {
+                'name':'INT:'+str(user.login),
+                'date_planned': proc.date_planned,
+                'product_id': proc.product_id.id,
+                'product_qty': proc.qty,
+                'product_uom': proc.uom_id.id,
+                'location_id': wh.lot_stock_id.id,
+                'procure_method':'make_to_order',
+            })
+            wf_service = netsvc.LocalService("workflow")
+            wf_service.trg_validate(uid, 'mrp.procurement', procure_id, 'button_confirm', cr)
+        
+        data_obj = self.pool.get('ir.model.data')
+        id2 = data_obj._get_id(cr, uid, 'mrp', 'mrp_procurement_tree_view')
+        id3 = data_obj._get_id(cr, uid, 'mrp', 'mrp_procurement_form_view')
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        if id3:
+            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+        
+        return {
+                'view_type': 'form',
+                'view_mode': 'tree,form',
+                'res_model': 'mrp.procurement',
+                'res_id' : procure_id,
+                'views': [(id3,'form'),(id2,'tree')],
+                'type': 'ir.actions.act_window',
+        }
+    
+    def default_get(self, cr, uid, fields, context=None):
+        record_id = context and context.get('record_id', False) or False
+
+        res = super(make_procurement, self).default_get(cr, uid, fields, context=context)
+
+        if record_id:
+            product_id = self.pool.get('product.product').browse(cr, uid, record_id, context=context).id
+            res['product_id'] = product_id
+
+        return res
+
+make_procurement()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/mrp/make_procurement.xml b/addons/mrp/make_procurement.xml
new file mode 100644
index 00000000000..fae3eab6f42
--- /dev/null
+++ b/addons/mrp/make_procurement.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Make Procurement -->
+        
+		<record id="view_make_procurment_wizard" model="ir.ui.view">
+            <field name="name">Requisition Request</field>
+            <field name="model">make.procurement</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Requisition Request">
+				    <label string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders." colspan="4"/>
+				    <field name="product_id" on_change="onchange_product_id(product_id)"/>
+				    <field name="qty"/>
+				    <field name="uom_id"/>
+				    <field name="date_planned"/>
+				    <field name="warehouse_id" colspan="4"/>
+				    <newline/>
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="make_procurement" string="Ask New Products"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_make_procurement" model="ir.actions.act_window">
+            <field name="name">Requisition Request</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">make.procurement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="context">{'record_id' : active_id}</field>
+        </record>
+        
+       <record model="ir.values" id="make_procurement_products">
+            <field name="model_id" ref="product.model_product_product" />
+            <field name="object" eval="1" />
+            <field name="name">Requisition Request</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_make_procurement'))" />
+            <field name="key">action</field>
+            <field name="model">product.product</field>
+        </record>
+		
+	</data>
+</openerp>	
\ No newline at end of file
diff --git a/addons/mrp/mrp_wizard.xml b/addons/mrp/mrp_wizard.xml
index cc9e4aa7114..852bc57bac9 100644
--- a/addons/mrp/mrp_wizard.xml
+++ b/addons/mrp/mrp_wizard.xml
@@ -24,12 +24,12 @@
             <field eval="True" name="object"/>
         </record>
 
-        <wizard
-            string="Requisition Request"
-            model="product.product"
-            name="product.product.procurement"
-            keyword="client_action_multi"
-            id="product_procurement_wizard"/>
+<!--        <wizard-->
+<!--            string="Requisition Request"-->
+<!--            model="product.product"-->
+<!--            name="product.product.procurement"-->
+<!--            keyword="client_action_multi"-->
+<!--            id="product_procurement_wizard"/>-->
 
     </data>
 </openerp>
diff --git a/addons/mrp/wizard/__init__.py b/addons/mrp/wizard/__init__.py
index 240f25daa9d..5ec6eae958a 100644
--- a/addons/mrp/wizard/__init__.py
+++ b/addons/mrp/wizard/__init__.py
@@ -26,7 +26,6 @@ import wizard_price
 import wizard_workcenter_load
 import wizard_track_prod
 import wizard_change_production_qty
-import make_procurement
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/mrp/wizard/make_procurement.py b/addons/mrp/wizard/make_procurement.py
deleted file mode 100644
index 0cf12107181..00000000000
--- a/addons/mrp/wizard/make_procurement.py
+++ /dev/null
@@ -1,102 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import pooler
-import netsvc
-
-import time
-
-def _get_default(obj, cr, uid, data, context=None):
-    pool = pooler.get_pool(cr.dbname)
-    product = pool.get('product.product').browse(cr, uid, data['id'], context)
-    return {'product_id': product.id, 'uom_id':product.uom_id.id, 'qty':1.0}
-
-def make_procurement(obj, cr, uid, data, context=None):
-    '''Create procurement'''
-    pool = pooler.get_pool(cr.dbname)
-    wh = pool.get('stock.warehouse').browse(cr, uid, data['form']['warehouse_id'], context)
-    user = pool.get('res.users').browse(cr, uid, uid, context)
-    procure_id = pool.get('mrp.procurement').create(cr, uid, {
-        'name':'INT:'+str(user.login),
-        'date_planned':data['form']['date_planned'],
-        'product_id':data['form']['product_id'],
-        'product_qty':data['form']['qty'],
-        'product_uom':data['form']['uom_id'],
-        'location_id':wh.lot_stock_id.id,
-        'procure_method':'make_to_order',
-    }, context=context)
-    wf_service = netsvc.LocalService("workflow")
-    wf_service.trg_validate(uid, 'mrp.procurement', procure_id, 'button_confirm', cr)
-    return {}
-
-
-class MakeProcurement(wizard.interface):
-    '''Wizard that create a procurement from a product form'''
-
-    done_form = """<?xml version="1.0"?>
-<form string="Make Requisition">
-    <label string="Your procurement request has been sent !"/>
-</form>"""
-    procurement_form = """<?xml version="1.0"?>
-<form string="Internal Requisition Request">
-    <label string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders." align="0.0" colspan="4"/>
-    <field name="product_id"/>
-    <field name="warehouse_id"/>
-    <field name="qty"/>
-    <field name="uom_id"/>
-    <field name="date_planned"/>
-</form>"""
-    procurement_fields = {
-        'qty': {'string': 'Quantity', 'type': 'float', 'digits':(16,2), 'required': True},
-        'product_id': {'string': 'product', 'type': 'many2one', 'relation': 'product.product', 'required': True, 'readonly':1},
-        'uom_id': {'string': 'Unit of Measure', 'type': 'many2one', 'relation': 'product.uom', 'required':True},
-        'warehouse_id': {'string': 'Warehouse', 'type': 'many2one', 'relation':'stock.warehouse', 'required':True},
-        'date_planned': {'string': 'Planned Date', 'type': 'date', 'required':True, 'default': lambda *args: time.strftime('%Y-%m-%d')}
-    }
-
-    states = {
-        'init': {
-            'actions': [_get_default],
-            'result': {'type': 'form', 'arch': procurement_form, 'fields': procurement_fields,
-                'state': [
-                    ('end', 'Cancel'),
-                    ('create', 'Ask New Products')
-                ]
-            }
-        },
-        'done': {
-            'actions': [],
-            'result': {'type': 'form', 'arch': done_form, 'fields': {},
-                'state': [
-                    ('end', 'Close'),
-                ]
-            }
-        },
-        'create': {
-            'actions': [],
-            'result': {'type': 'action', 'action': make_procurement, 'state': 'done'}
-        }
-    }
-
-MakeProcurement('product.product.procurement')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From bb217dcc3506a35d65c30faeb5953c6da58f7bbc Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Fri, 26 Feb 2010 19:04:27 +0530
Subject: [PATCH 010/251] [IMP] Docstring added

bzr revid: atp@tinyerp.co.in-20100226133427-x1ywimv1y0ugirmm
---
 addons/account/account_view.xml               |  2 +
 addons/account/wizard/account_chart.py        |  9 +--
 addons/account/wizard/account_chart_view.xml  | 33 ++++++++++
 .../wizard/account_fiscalyear_close_state.py  | 63 +++++++++++++++++++
 .../wizard/account_fiscalyear_close_state.xml | 34 ++++++++++
 .../account/wizard/account_invoice_refund.py  |  6 +-
 .../wizard/account_invoice_refund_view.xml    | 37 +++++++++++
 .../wizard/account_move_bank_reconcile.py     |  8 +--
 .../account_move_bank_reconcile_view.xml      | 31 +++++++++
 addons/account/wizard/account_move_journal.py |  8 ++-
 .../wizard/account_move_journal_view.xml      | 33 ++++++++++
 .../account_move_line_reconcile_select.py     | 10 +--
 ...ccount_move_line_reconcile_select_view.xml | 32 ++++++++++
 addons/account/wizard/account_period_close.py | 10 +--
 .../wizard/account_period_close_view.xml      | 33 ++++++++++
 15 files changed, 327 insertions(+), 22 deletions(-)
 create mode 100644 addons/account/wizard/account_chart_view.xml
 create mode 100644 addons/account/wizard/account_fiscalyear_close_state.py
 create mode 100644 addons/account/wizard/account_fiscalyear_close_state.xml
 create mode 100644 addons/account/wizard/account_invoice_refund_view.xml
 create mode 100644 addons/account/wizard/account_move_bank_reconcile_view.xml
 create mode 100644 addons/account/wizard/account_move_journal_view.xml
 create mode 100644 addons/account/wizard/account_move_line_reconcile_select_view.xml
 create mode 100644 addons/account/wizard/account_period_close_view.xml

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index d28748b4efb..b0bdeebbb89 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1008,6 +1008,7 @@
         <menuitem action="action_move_line_search" id="menu_action_move_line_search" parent="account.next_id_29"/>
 
         <menuitem id="menu_finance_charts" name="Charts" parent="account.menu_finance" sequence="4"/>
+      
         <wizard id="wizard_account_chart" menu="False" model="account.account" name="account.chart" string="Chart of Accounts"/>
 <!--        <menuitem icon="STOCK_INDENT" action="wizard_account_chart" id="menu_action_account_tree2" parent="account.menu_finance_charts" />-->
 
@@ -1080,6 +1081,7 @@
             groups="group_account_user"/>
 
         <menuitem action="action_bank_statement_reconciliation_form" id="menu_action_account_bank_reconcile_tree" parent="next_id_30"/>
+
         <wizard id="action_account_bank_reconcile_tree" menu="False" model="account.move.line" name="account.move.bank.reconcile" string="Bank reconciliation"/>
 <!--        <menuitem action="action_account_bank_reconcile_tree" id="menu_action_account_bank_reconcile_check_tree" parent="account.next_id_30" />-->
 
diff --git a/addons/account/wizard/account_chart.py b/addons/account/wizard/account_chart.py
index b83b477596d..f30efa1fe27 100644
--- a/addons/account/wizard/account_chart.py
+++ b/addons/account/wizard/account_chart.py
@@ -41,10 +41,11 @@ class account_chart(osv.osv_memory):
         
     def _account_chart_open_window(self, cr, uid, ids, context):
             """
-            cr is the current row, from the database cursor,
-            uid is the current user’s ID for security checks,
-            ID is the account chart’s ID or list of IDs if we want more than one
-            This function Open  account chart window  on given fiscalyear and all Entries or posted entries
+            
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param id: the account chart’s ID or list of IDs if we want more than one
+            @return: dictionary of Open  account chart window  on given fiscalyear and all Entries or posted entries
             """
             for form in  self.read(cr, uid, ids):
                 mod_obj = self.pool.get('ir.model.data')
diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
new file mode 100644
index 00000000000..a3838a5483c
--- /dev/null
+++ b/addons/account/wizard/account_chart_view.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_account_chart" model="ir.ui.view">
+            <field name="name">account.chart.form</field>
+            <field name="model">account.chart</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Account charts">
+                	<group colspan="4" >
+                		 <field name="fiscalyear"/>
+              			 <label align="0.7" colspan="6" string="(If you do not select Fiscal year it will take all open fiscal years)"/>  		 
+                		 <field name="target_move"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                       	<label string ="" colspan="2"/>
+                    	<button  special="cancel" string="Cancel"/>
+                    	<button string="Open Charts" name="_account_chart_open_window" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+        <record id="wizard_account_chart" model="ir.actions.act_window">
+            <field name="name">Chart of Accounts</field>
+            <field name="res_model">account.chart</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_account_chart"/> 
+           <field name="target">new</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/account/wizard/account_fiscalyear_close_state.py b/addons/account/wizard/account_fiscalyear_close_state.py
new file mode 100644
index 00000000000..a1cc37663ef
--- /dev/null
+++ b/addons/account/wizard/account_fiscalyear_close_state.py
@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import wizard
+import netsvc
+import pooler
+import time
+from tools.translate import _
+import tools
+from osv import fields, osv
+
+class account_fiscalyear_close_state(osv.osv_memory):
+    """
+    close  Account Fiscalyear 
+    """
+    _name = "account.fiscalyear.close.state"
+    _description = "Fiscalyear Close state"
+    _columns = {
+                'fy_id':fields.many2one('account.fiscalyear',  'Fiscal Year to close', required=True),
+                'sure':fields.boolean('Check this box', required=False)
+              }
+
+    def _data_save(self, cr, uid, ids, context):
+        """
+        This function close account fiscalyear
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param id: account fiscalyear close state’s ID or list of IDs if we want more than one
+ 
+        """
+        for form in  self.read(cr, uid, ids):
+            if not form['sure']:
+                raise osv.except_osv(_('UserError'), _('Closing of states cancelled, please check the box !'))
+            fy_id = form['fy_id']
+            
+            cr.execute('UPDATE account_journal_period ' \
+                    'SET state = %s ' \
+                    'WHERE period_id IN (SELECT id FROM account_period WHERE fiscalyear_id = %s)',
+                    ('done',fy_id))
+            cr.execute('UPDATE account_period SET state = %s ' \
+                    'WHERE fiscalyear_id = %s', ('done',fy_id))
+            cr.execute('UPDATE account_fiscalyear ' \
+                    'SET state = %s WHERE id = %s', ('done', fy_id))
+            return {}
+    
+account_fiscalyear_close_state()
diff --git a/addons/account/wizard/account_fiscalyear_close_state.xml b/addons/account/wizard/account_fiscalyear_close_state.xml
new file mode 100644
index 00000000000..19acf3fe567
--- /dev/null
+++ b/addons/account/wizard/account_fiscalyear_close_state.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_account_fiscalyear_close_state" model="ir.ui.view">
+            <field name="name">account.fiscalyear.close.state.form</field>
+            <field name="model">account.fiscalyear.close.state</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Close states of Fiscal year and periods">
+                	<group colspan="4" >
+                		 <field name="fy_id"  domain = "[('state','=','draft')]"/>
+              			 <separator string="Are you sure you want to close the fiscal year ?" colspan="4"/>  		 
+                		 <field name="sure"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                       	<label string ="" colspan="2"/>
+                    	<button  special="cancel" string="Cancel"/>
+                    	<button string="Close states" name="_data_save" type="object"/>
+                   </group>
+               </form>
+            </field>
+        </record>
+        <record id="wizard_fiscalyear_close_state" model="ir.actions.act_window">
+            <field name="name">Close a Fiscal Year</field>
+            <field name="res_model">account.fiscalyear.close.state</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_account_fiscalyear_close_state"/> 
+           <field name="target">new</field>
+        </record>
+    	<menuitem action="wizard_fiscalyear_close_state" id="menu_wizard_fy_close_state" parent="menu_account_end_year_treatments" />
+    </data>
+</openerp>
diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
index acd85d4f7ef..be2fa002b12 100644
--- a/addons/account/wizard/account_invoice_refund.py
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -40,9 +40,9 @@ class account_invoice_refund(osv.osv_memory):
     
     def _compute_refund(self, cr, uid, ids, mode, context):
         """
-        cr is the current row, from the database cursor,
-        uid is the current user’s ID for security checks,
-        ID is the account invoice refund’s ID or list of IDs if we want more than one
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param id: the account invoice refund’s ID or list of IDs if we want more than one
         
         """
         
diff --git a/addons/account/wizard/account_invoice_refund_view.xml b/addons/account/wizard/account_invoice_refund_view.xml
new file mode 100644
index 00000000000..1efb63a9ff1
--- /dev/null
+++ b/addons/account/wizard/account_invoice_refund_view.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_account_invoice_refund" model="ir.ui.view">
+            <field name="name">account.invoice.refund.form</field>
+            <field name="model">account.invoice.refund</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Credit Note">
+                	<group colspan="4" >
+                    	 <label string="Are you sure you want to refund this invoice ?" colspan="2"/>
+                    	 <newline/>
+                    	 <field name="date"/>
+                    	 <field name="period"/>
+                    	 <field name="description"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                       	<label string ="" colspan="2"/>
+                    	<button  special="cancel" string="Cancel"/>
+                    	<button string="Refund Invoice" name="_invoice_refund" type="object"/>
+                    	<button string="Cancel Invoice" name="_invoice_cancel" type="object"/>
+                    	<button string="Modify Invoice" name="_invoice_modify" type="object"/>
+                   </group>
+               </form>
+            </field>
+    	</record>
+        <record id="wizard_invoice_refund" model="ir.actions.act_window">
+            <field name="name">Credit Note</field>
+            <field name="res_model">account.invoice.refund</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_account_invoice_refund"/> 
+           <field name="target">new</field>
+        </record>
+    </data>
+</openerp>	
\ No newline at end of file
diff --git a/addons/account/wizard/account_move_bank_reconcile.py b/addons/account/wizard/account_move_bank_reconcile.py
index 4dd3e1354c2..faa154c950c 100644
--- a/addons/account/wizard/account_move_bank_reconcile.py
+++ b/addons/account/wizard/account_move_bank_reconcile.py
@@ -37,10 +37,10 @@ class account_move_bank_reconcile(osv.osv_memory):
               }
     def _action_open_window(self, cr, uid, ids, context):
              """
-            cr is the current row, from the database cursor,
-            uid is the current user’s ID for security checks,
-            ID is the account move bank reconcile’s ID or list of IDs if we want more than one
-            This function Open  account move line   on given journal_id.
+           @param cr: the current row, from the database cursor,
+           @param uid: the current user’s ID for security checks,
+           @param id: account move bank reconcile’s ID or list of IDs if we want more than one
+           @return:dictionary of  Open  account move line   on given journal_id.
             """
              for form in  self.read(cr, uid, ids):
                  cr.execute('select default_credit_account_id from account_journal where id=%s', (form['journal_id'],))
diff --git a/addons/account/wizard/account_move_bank_reconcile_view.xml b/addons/account/wizard/account_move_bank_reconcile_view.xml
new file mode 100644
index 00000000000..6750d2d143a
--- /dev/null
+++ b/addons/account/wizard/account_move_bank_reconcile_view.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_account_move_bank_reconcile" model="ir.ui.view">
+            <field name="name">account.move.bank.reconcile.form</field>
+            <field name="model">account.move.bank.reconcile</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Bank reconciliation">
+                	<group colspan="4" >
+                		 <field name="journal_id"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                       	<label string ="" colspan="2"/>
+                    	<button  special="cancel" string="Cancel"/>
+                    	<button string="Open for bank reconciliation" name="_action_open_window" type="object"/>
+                   </group>
+               </form>
+            </field>
+    	</record>
+    	<record id="action_account_bank_reconcile_tree" model="ir.actions.act_window">
+            <field name="name">Bank reconciliation</field>
+            <field name="res_model">account.move.bank.reconcile</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_account_move_bank_reconcile"/> 
+           <field name="target">new</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index cc74f663677..1e6645c5b27 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -41,10 +41,12 @@ class account_move_journal(osv.osv_memory):
     
     def _action_open_window(self, cr, uid, ids, context={}):
         """
-        cr is the current row, from the database cursor,
-        uid is the current user’s ID for security checks,
-        ID is the account move journal’s ID or list of IDs if we want more than one
         This function Open action move line window on given period and  Journal/Payment Mode
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param id: account move journal’s ID or list of IDs if we want more than one
+        @return:dictionary of Open action move line window on given period and  Journal/Payment Mode
+        
         """
         for form in  self.read(cr, uid, ids,['journal_id', 'period_id']):
             cr.execute('select id,name from ir_ui_view where model=%s and type=%s', ('account.move.line', 'form' ))
diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
new file mode 100644
index 00000000000..691539952b6
--- /dev/null
+++ b/addons/account/wizard/account_move_journal_view.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_account_move_journal_form" model="ir.ui.view">
+            <field name="name">account.move.journal.form</field>
+            <field name="model">account.move.journal</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Standard entries">
+                	<group colspan="4" >
+                    	<field name="journal_id"/>
+                    	<newline/>
+                    	<field name="period_id" />
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                       	<label string ="" colspan="2"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button string="Open Journal" name="_action_open_window" type="object"/>
+                   	</group>
+               </form>
+            </field>
+        </record>
+        <record id="action_move_journal_line_form" model="ir.actions.act_window">
+            <field name="name">Making Entries by Line</field>
+            <field name="res_model">account.move.journal</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_account_move_journal_form"/> 
+           <field name="target">new</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/account/wizard/account_move_line_reconcile_select.py b/addons/account/wizard/account_move_line_reconcile_select.py
index 5c100b38ac0..5286b2b70a4 100644
--- a/addons/account/wizard/account_move_line_reconcile_select.py
+++ b/addons/account/wizard/account_move_line_reconcile_select.py
@@ -35,10 +35,12 @@ class account_move_line_reconcile_select(osv.osv_memory):
     
     def _action_open_window(self, cr, uid, ids, context):
         """
-         cr is the current row, from the database cursor,
-         uid is the current user’s ID for security checks,
-         ID is the account move line reconcile select’s ID or list of IDs if we want more than one
-         This function Open  account move line window for reconcile on given account id
+        This function Open  account move line window for reconcile on given account id
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param id: account move line reconcile select’s ID or list of IDs if we want more than one
+        @return:dictionary of  Open  account move line window for reconcile on given account id
+        
          """
         for data in  self.read(cr, uid, ids):
             
diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml
new file mode 100644
index 00000000000..3b1d4537a6b
--- /dev/null
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_account_move_line_reconcile_select" model="ir.ui.view">
+            <field name="name">account.move.line.reconcile.select.form</field>
+            <field name="model">account.move.line.reconcile.select</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Reconciliation">
+                	<group colspan="4" >
+                		 <field name="account_id"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                       	<label string ="" colspan="2"/>
+                    	<button  special="cancel" string="Cancel"/>
+                    	<button string="Open for reconciliation" name="_action_open_window" type="object"/>
+                   </group>
+               </form>
+            </field>
+    	</record>
+        <record id="wizard_reconcile_select" model="ir.actions.act_window">
+            <field name="name">Reconcile entries</field>
+            <field name="res_model">account.move.line.reconcile.select</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_account_move_line_reconcile_select"/> 
+           <field name="target">new</field>
+        </record>
+        <menuitem id="next_id_20" name="Reconciliation" parent="menu_finance_periodical_processing"/><menuitem action="wizard_reconcile_select" id="menu_reconcile_select" parent="account.next_id_20" />
+    </data>
+</openerp>
diff --git a/addons/account/wizard/account_period_close.py b/addons/account/wizard/account_period_close.py
index 4df4e652ec5..4aaf773ce80 100644
--- a/addons/account/wizard/account_period_close.py
+++ b/addons/account/wizard/account_period_close.py
@@ -37,10 +37,12 @@ class account_period_close(osv.osv_memory):
 
     def _data_save(self, cr, uid, ids, context):
         """
-         cr is the current row, from the database cursor,
-         uid is the current user’s ID for security checks,
-         ID is the account period close’s ID or list of IDs if we want more than one
-         This function close period
+        This function close period
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param id:account period close’s ID or list of IDs if we want more than one
+         
+         
          """
         
         mode = 'done'
diff --git a/addons/account/wizard/account_period_close_view.xml b/addons/account/wizard/account_period_close_view.xml
new file mode 100644
index 00000000000..35e05f4586c
--- /dev/null
+++ b/addons/account/wizard/account_period_close_view.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_account_period_close" model="ir.ui.view">
+            <field name="name">account.period.close.form</field>
+            <field name="model">account.period.close</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Close Period">
+                	<group colspan="4" >
+                    	 <separator string="Are you sure ?" colspan="4"/>
+                    	 <field name="sure"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                       	<label string ="" colspan="2"/>
+                    	<button  special="cancel" string="Cancel"/>
+                    	<button string="Close Period" name="_data_save" type="object"/>
+                   </group>
+               </form>
+            </field>
+        </record>
+		<record id="wizard_period_close" model="ir.actions.act_window">
+            <field name="name">Close a Period</field>
+            <field name="res_model">account.period.close</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_account_period_close"/> 
+           <field name="target">new</field>
+        </record>
+
+    </data>
+</openerp>	
\ No newline at end of file

From 602c38bcc28f4496f95706468234277552c8fda4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= <rvalyi@gmail.com>
Date: Sun, 28 Feb 2010 00:18:01 -0300
Subject: [PATCH 011/251] [REF] backward compatible refactoring introducing an
 extension point in inventory line to move line creation. Useful for instance
 for double unit management of inventory extension module. Removed TOPO
 comment regarding need for tracking in inventory as it seems to work like a
 charm

bzr revid: rvalyi@gmail.com-20100228031801-171hrv4yq9anu9n9
---
 addons/stock/stock.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 240bc9762ce..b6b98316805 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1585,10 +1585,12 @@ class stock_inventory(osv.osv):
         'state': lambda *a: 'draft',
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.inventory', context=c)
     }
+    
+    
+    def _inventory_line_hook(self, cr, uid, inventory_line, move_vals):
+        '''Creates a stock move from an inventory line'''
+        return self.pool.get('stock.move').create(cr, uid, move_vals)
 
-    #
-    # Update to support tracking
-    #
     def action_done(self, cr, uid, ids, context=None):
         for inv in self.browse(cr, uid, ids):
             move_ids = []
@@ -1628,7 +1630,7 @@ class stock_inventory(osv.osv):
                             'prodlot_id': lot_id,
                             'product_qty': line.product_qty
                         })
-                    move_ids.append(self.pool.get('stock.move').create(cr, uid, value))
+                    move_ids.append(self._inventory_line_hook(cr, uid, line, value))
             if len(move_ids):
                 self.pool.get('stock.move').action_done(cr, uid, move_ids,
                         context=context)

From 353f7026a15571490010a804828bf6b129753e64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= <rvalyi@gmail.com>
Date: Sun, 28 Feb 2010 00:52:50 -0300
Subject: [PATCH 012/251] [REF] [MRP] action_produce_assign_product method
 refactoring: several mrp.production where made and not linked to their
 procurement only last id was returned. -> Not possible to override cleany for
 instance to pass custom options from a procurement to a production order.
 Implemented it with the {} trick. This is debatable whether {} links or hook
 before creation is better. At least now you can override it...

bzr revid: rvalyi@gmail.com-20100228035250-xnp9q1tx5j0sjnlr
---
 addons/mrp/mrp.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index bea0e5f2b94..a7f4b6b739f 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -1115,7 +1115,7 @@ class mrp_procurement(osv.osv):
         return True
 
     def action_produce_assign_product(self, cr, uid, ids, context={}):
-        produce_id = False
+        res = {}
         company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
         for procurement in self.browse(cr, uid, ids):
             res_id = procurement.move_id.id
@@ -1136,6 +1136,7 @@ class mrp_procurement(osv.osv):
                 'move_prod_id': res_id,
                 'company_id': procurement.company_id.id,
             })
+            res[procurement.id] = produce_id
             self.write(cr, uid, [procurement.id], {'state':'running'})
             bom_result = self.pool.get('mrp.production').action_compute(cr, uid,
                     [produce_id], properties=[x.id for x in procurement.property_ids])
@@ -1143,7 +1144,7 @@ class mrp_procurement(osv.osv):
             wf_service.trg_validate(uid, 'mrp.production', produce_id, 'button_confirm', cr)
             self.pool.get('stock.move').write(cr, uid, [res_id],
                     {'location_id':procurement.location_id.id})
-        return produce_id
+        return res
 
     def action_po_assign(self, cr, uid, ids, context={}):
         purchase_id = False

From dc1722f35d10f84c13bfce7e116302dc689dfe35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= <rvalyi@gmail.com>
Date: Sun, 28 Feb 2010 01:16:10 -0300
Subject: [PATCH 013/251] [REF] [MRP] action_po_assign method refactoring:
 several purchase.order where made and not linked to their procurement only
 last id was returned. -> Not possible to override cleany for instance to pass
 custom options from a procurement to a production order. Implemented it with
 the {} trick. This is debatable whether {} links or hook before creation is
 better. At least now you can override it...

bzr revid: rvalyi@gmail.com-20100228041610-knbvwzptzgzjyq42
---
 addons/mrp/mrp.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index a7f4b6b739f..29300198523 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -1147,7 +1147,7 @@ class mrp_procurement(osv.osv):
         return res
 
     def action_po_assign(self, cr, uid, ids, context={}):
-        purchase_id = False
+        res = {}
         company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
         for procurement in self.browse(cr, uid, ids):
             res_id = procurement.move_id.id
@@ -1199,8 +1199,9 @@ class mrp_procurement(osv.osv):
                 'company_id': procurement.company_id.id,
                 'fiscal_position': partner.property_account_position and partner.property_account_position.id or False
             })
+            res[procurement.id] = purchase_id
             self.write(cr, uid, [procurement.id], {'state':'running', 'purchase_id':purchase_id})
-        return purchase_id
+        return res
 
     def action_cancel(self, cr, uid, ids):
         todo = []

From 1efc4235a590b17e4727a9000d26ac99da1fb19f Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Tue, 2 Mar 2010 10:25:33 +0530
Subject: [PATCH 014/251] [ADD]: Wiki: Missing wizard files

bzr revid: rpa@openerp.co.in-20100302045533-p6whkwsbai5504s8
---
 addons/wiki/wizard/wiki_create_menu.py        |  41 +++++
 addons/wiki/wizard/wiki_create_menu_view.xml  |  32 ++++
 addons/wiki/wizard/wiki_make_index.py         |  64 ++++++++
 addons/wiki/wizard/wiki_make_index_view.xml   |  30 ++++
 addons/wiki/wizard/wiki_wiki_help_open.py     |  27 ++++
 .../wiki/wizard/wiki_wiki_help_open_view.xml  |  26 ++++
 addons/wiki/wizard/wiki_wiki_page_open.py     |  41 +++++
 .../wiki/wizard/wiki_wiki_page_open_view.xml  |  26 ++++
 addons/wiki/wizard/wizard_wiki.py             | 142 ++++++++++++++++++
 addons/wiki/wizard/wizard_wiki.xml            | 105 +++++++++++++
 10 files changed, 534 insertions(+)
 create mode 100644 addons/wiki/wizard/wiki_create_menu.py
 create mode 100644 addons/wiki/wizard/wiki_create_menu_view.xml
 create mode 100644 addons/wiki/wizard/wiki_make_index.py
 create mode 100644 addons/wiki/wizard/wiki_make_index_view.xml
 create mode 100644 addons/wiki/wizard/wiki_wiki_help_open.py
 create mode 100644 addons/wiki/wizard/wiki_wiki_help_open_view.xml
 create mode 100644 addons/wiki/wizard/wiki_wiki_page_open.py
 create mode 100644 addons/wiki/wizard/wiki_wiki_page_open_view.xml
 create mode 100644 addons/wiki/wizard/wizard_wiki.py
 create mode 100644 addons/wiki/wizard/wizard_wiki.xml

diff --git a/addons/wiki/wizard/wiki_create_menu.py b/addons/wiki/wizard/wiki_create_menu.py
new file mode 100644
index 00000000000..0bfd102a5cf
--- /dev/null
+++ b/addons/wiki/wizard/wiki_create_menu.py
@@ -0,0 +1,41 @@
+from osv import fields, osv
+from service import web_services
+import time
+import wizard
+import pooler
+
+class wiki_create_menu(osv.osv_memory):
+    _name = "wiki.create.menu"
+    _description = "Wizard Create Menu"
+    _columns = {
+        'menu_name': fields.char('Menu Name', size=256, select=True, required=True), 
+        'menu_parent_id': fields.many2one('ir.ui.menu', 'Parent Menu', required=True), 
+        'page': fields.many2one('wiki.wiki', 'Group Home Page'), 
+    }
+
+    def wiki_menu_create(self, cr, uid, ids, context):
+        """ Create Menu On the base of Group id and Action id """
+
+        for group in self.pool.get('wiki.groups').browse(cr, uid, ids):
+            for menu in self.pool.get('wiki.create.menu').browse(cr, uid, ids):
+
+                mod_obj = self.pool.get('ir.model.data')
+                action_id = mod_obj._get_id(cr, uid, 'wiki', 'action_view_wiki_wiki_page_open')
+                menu_id = self.pool.get('ir.ui.menu').create(cr, uid, {
+                'name': menu.menu_name, 
+                'parent_id': menu.menu_parent_id.id, 
+                'icon': 'STOCK_DIALOG_QUESTION', 
+                'action': 'ir.actions.act_window,'+ str(action_id)
+                }, context)
+                home = menu.page.id
+                group_id = menu.id
+                res = {
+                'home': home, 
+                }
+                self.pool.get('wiki.groups').write(cr, uid, ids, res)
+                self.pool.get('wiki.groups.link').create(cr, uid, {'group_id': group_id, 'action_id': menu_id})
+
+                return {}
+
+
+wiki_create_menu()
diff --git a/addons/wiki/wizard/wiki_create_menu_view.xml b/addons/wiki/wizard/wiki_create_menu_view.xml
new file mode 100644
index 00000000000..7acd1e2a70d
--- /dev/null
+++ b/addons/wiki/wizard/wiki_create_menu_view.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+		<record id="view_wiki_create_menu" model="ir.ui.view">
+            <field name="name">Create Menu</field>
+            <field name="model">wiki.create.menu</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Create Menu">
+             		<separator string="Menu Information" colspan="4" />
+                	<field name="menu_name" />
+                	<field name="menu_parent_id" />
+                	<field name="page" colspan="4" />
+	                <separator string="" colspan="4" />
+    	            <label string="" colspan="2" />
+        	        <button special="cancel" string="Cancel" />
+            	    <button name="wiki_menu_create" string="Create Menu" type="object"/>
+             </form>
+            </field>
+		</record>
+
+		<record id="action_wiki_create_menu" model="ir.actions.act_window">
+            <field name="name">Create Menu</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">wiki.create.menu</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/wiki/wizard/wiki_make_index.py b/addons/wiki/wizard/wiki_make_index.py
new file mode 100644
index 00000000000..c63e8a2b05f
--- /dev/null
+++ b/addons/wiki/wizard/wiki_make_index.py
@@ -0,0 +1,64 @@
+from osv import fields, osv
+from service import web_services
+import time
+import wizard
+import pooler
+
+class wiki_make_index(osv.osv_memory):
+    _name = "wiki.make.index"
+    _description = "Create Index"
+    _columns = {
+    }
+
+    def wiki_do_index(self, cr, uid, ids, context):
+        """ Makes Index according to page hierarchy"""
+        for index_obj in self.browse(cr, uid, ids):
+            wiki_pool = self.pool.get('wiki.wiki')
+            cr.execute("Select id, section from wiki_wiki where id = ANY(%s) order by section " , (context['active_ids'],))
+            lst0 = cr.fetchall()
+            lst = []
+            s_ids = {}
+            for l in lst0:
+                s_ids[l[1]] = l[0]
+                lst.append(l[1])
+
+            lst.sort()
+            val = None
+            def toint(x):
+                try:
+                    return int(x)
+                except:
+                    return 1
+
+            lst = map(lambda x: map(toint, x.split('.')), lst)
+
+            result = []
+            current = ['0']
+            current2 = []
+
+            for l in lst:
+                for pos in range(len(l)):
+                    if pos >= len(current):
+                        current.append('1')
+                        continue
+                    if (pos == len(l) - 1) or (pos >= len(current2)) or (toint(l[pos]) > toint(current2[pos])):
+                        current[pos] = str(toint(current[pos]) + 1)
+                        current = current[:pos + 1]
+                        if pos == len(l) - 1:
+                            break
+
+                key = ('.'.join([str(x) for x in l]))
+                id = s_ids[key]
+                val = ('.'.join([str(x) for x in current[:]]), id)
+
+            if val:
+                result.append(val)
+            current2 = l
+
+            for rs in result:
+                wiki_pool.write(cr, uid, [rs[1]], {'section': rs[0]})
+        return {}
+
+
+wiki_make_index()
+
diff --git a/addons/wiki/wizard/wiki_make_index_view.xml b/addons/wiki/wizard/wiki_make_index_view.xml
new file mode 100644
index 00000000000..fcba8909f5f
--- /dev/null
+++ b/addons/wiki/wizard/wiki_make_index_view.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_wiki_make_index" model="ir.ui.view">
+            <field name="name">Create Index</field>
+            <field name="model">wiki.make.index</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Create Menu">
+    			<separator string="Menu Information" colspan="4"/>
+    			<label string="Want to create a Index on Selected Pages ? "/>
+    			<separator string="" colspan="4" />
+    	        <label string="" colspan="2" />
+        	    <button special="cancel" string="Cancel" />
+            	<button name="wiki_do_index" string="Create Index" type="object"/>
+			</form>
+            </field>
+		</record>
+
+		<record id="action_view_wiki_make_index" model="ir.actions.act_window">
+            <field name="name">Create Index</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">wiki.make.index</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+    	</record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/wiki/wizard/wiki_wiki_help_open.py b/addons/wiki/wizard/wiki_wiki_help_open.py
new file mode 100644
index 00000000000..457f52658f4
--- /dev/null
+++ b/addons/wiki/wizard/wiki_wiki_help_open.py
@@ -0,0 +1,27 @@
+from osv import fields, osv
+from service import web_services
+import time
+import wizard
+import pooler
+
+class wiki_wiki_help_open(osv.osv_memory):
+    _name = "wiki.wiki.help.open"
+    _description = "Basic Wiki Editing"
+    _columns = {
+    }
+    def _open_wiki_page(self, cr, uid, ids, context):
+        """ Opens Wiki Page for Editing"""
+        pages = self.pool.get('wiki.wiki').search(cr, uid, [('name', '=', 'Basic Wiki Editing')])
+
+        value = {
+            'view_type': 'form', 
+            'view_mode': 'form,tree', 
+            'res_model': 'wiki.wiki', 
+            'view_id': False, 
+            'res_id': pages[0], 
+            'type': 'ir.actions.act_window', 
+        }
+
+        return value
+
+wiki_wiki_help_open()
diff --git a/addons/wiki/wizard/wiki_wiki_help_open_view.xml b/addons/wiki/wizard/wiki_wiki_help_open_view.xml
new file mode 100644
index 00000000000..2f525443900
--- /dev/null
+++ b/addons/wiki/wizard/wiki_wiki_help_open_view.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_wiki_wiki_help_open" model="ir.ui.view">
+            <field name="name">Basic Wiki Editing</field>
+            <field name="model">wiki.wiki.help.open</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Open Help">
+             	 <separator string="" colspan="6" />
+              	 <label string="" colspan="2" />
+                 <button name="_open_wiki_page" string="Basic Wiki Editing" type="object"/>
+             </form>
+            </field>
+		</record>
+
+		<record id="action_view_wiki_wiki_help_open" model="ir.actions.act_window">
+            <field name="name">Basic Wiki Editing</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">wiki.wiki.help.open</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/wiki/wizard/wiki_wiki_page_open.py b/addons/wiki/wizard/wiki_wiki_page_open.py
new file mode 100644
index 00000000000..324fa5754ab
--- /dev/null
+++ b/addons/wiki/wizard/wiki_wiki_page_open.py
@@ -0,0 +1,41 @@
+from osv import fields, osv
+from service import web_services
+import time
+import wizard
+import pooler
+
+class wiki_wiki_page_open(osv.osv_memory):
+    _name = "wiki.wiki.page.open"
+    _description = "wiz open page"
+    _columns = {
+
+    }
+    def _open_wiki_page(self, cr, uid, ids, context):
+        """ Opens Wiki Page of Group"""
+        for group in self.pool.get('wiki.groups').browse(cr, uid, ids):
+
+         for openpage in self.pool.get('wiki.wiki.page.open').browse(cr, uid, ids):
+
+            value = {
+                'domain': "[('group_id','=',%d)]" % (group.id), 
+                'name': 'Wiki Page', 
+                'view_type': 'form', 
+                'view_mode': 'form,tree', 
+                'res_model': 'wiki.wiki', 
+                'view_id': False, 
+                'type': 'ir.actions.act_window', 
+        }
+        if group.method == 'page':
+            value['res_id'] = group.home.id
+        elif group.method == 'list':
+            value['view_type'] = 'form'
+            value['view_mode'] = 'tree,form'
+        elif group.method == 'tree':
+            view_id = pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'wiki.wiki.tree.childs')])
+            value['view_id'] = view_id
+            value['domain'] = [('group_id', '=', group.id), ('parent_id', '=', False)]
+            value['view_type'] = 'tree'
+
+        return value
+
+wiki_wiki_page_open()
diff --git a/addons/wiki/wizard/wiki_wiki_page_open_view.xml b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
new file mode 100644
index 00000000000..7e21f868d6e
--- /dev/null
+++ b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_wiki_wiki_page_open" model="ir.ui.view">
+            <field name="name">Open Page</field>
+            <field name="model">wiki.wiki.page.open</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Open Page">
+             	<separator string="" colspan="6" />
+              	<label string="" colspan="2" />
+               	<button name="_open_wiki_page" string="Open Wiki Page" type="object"/>
+             </form>
+            </field>
+		</record>
+
+		<record id="action_view_wiki_wiki_page_open" model="ir.actions.act_window">
+            <field name="name">Open Page</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">wiki.wiki.page.open</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+    	</record>
+    </data>
+</openerp>
diff --git a/addons/wiki/wizard/wizard_wiki.py b/addons/wiki/wizard/wizard_wiki.py
new file mode 100644
index 00000000000..9113b0a1b72
--- /dev/null
+++ b/addons/wiki/wizard/wizard_wiki.py
@@ -0,0 +1,142 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from service import web_services
+import time
+import wizard
+import pooler
+
+
+class wizard_create_menu(osv.osv_memory):
+    _name = "wiki.wizard.create.menu"
+    _description="Wiki.Wizard Create Menu"
+    _columns={
+        'menu_name':fields.char('Menu Name', size=256, select=True, required=True), 
+        'menu_parent_id': fields.many2one('ir.ui.menu', 'Parent Menu', required=True), 
+        'page': fields.many2one('wiki.wiki', 'Group Home Page'), 
+    }
+
+    def wiki_menu_create(self, cr, uid, ids, context):
+        group = self.pool.get('wiki.groups').browse(cr, uid, ids)[0]
+        menu = self.pool.get('wiki.wizard.create.menu').browse(cr, uid, ids)[0]
+        action_id = self.pool.get('').search(cr, uid, [('wiz_name', '=', 'wiki.wiki.page.open')])
+
+        menu_id = self.pool.get('ir.ui.menu').create(cr, uid, {
+        'name':menu.menu_name, 
+        'parent_id':menu.menu_parent_id.id, 
+        'icon': 'STOCK_DIALOG_QUESTION', 
+        'action': 'ir.actions.wizard,'+str(action_id[0])
+        }, context)
+
+        home = menu.page.id
+        group_id = menu.id
+        res = {
+        'home':home, 
+    }
+        self.pool.get('wiki.groups').write(cr, uid, ids, res)
+        self.pool.get('wiki.groups.link').create(cr, uid, {'group_id':group_id, 'action_id':menu_id})
+
+        return {}
+
+
+wizard_create_menu()
+
+class wiz_open_help(osv.osv_memory):
+    _name = "wiki.wiz.open.help"
+    _description="Wiki Open Help"
+    _columns={
+        'name':fields.char('Basic Wiki Editing', size=256, select=True, required=False), 
+
+    }
+    def _open_wiki_page(self, cr, uid, ids, context):
+        pages = self.pool.get('wiki.wiki').search(cr, uid, [('name', '=', 'Basic Wiki Editing')])
+
+        value = {
+            'view_id': False, 
+            'res_id': pages[0], 
+        }
+
+        return value
+
+wiz_open_help()
+
+class wiz_open_page(osv.osv_memory):
+    _name = "wiki.wiz.open.page"
+    _description="wiz open page"
+    _columns={
+        'name':fields.char('Wiki Page', size=256, select=True, required=False), 
+
+    }
+    def _open_wiki_page(self, cr, uid, ids, context):
+        group = self.pool.get('wiki.groups').browse(cr, uid, ids)[0]
+        openpage = self.pool.get('wiki.wiz.open.page').browse(cr, uid, ids)[0]
+
+        value = {
+            'context': "{'group_id':%d, 'section':%s}" % (group.id, group.section), 
+            'domain': "[('group_id','=',%d)]" % (group.id), 
+            'type': 'ir.actions.act_window', 
+        }
+        if group.method == 'page':
+            value['res_id'] = group.home.id
+        elif group.method == 'list':
+            value['view_type'] = 'form'
+            value['view_mode'] = 'tree,form'
+        elif group.method == 'tree':
+            view_id = pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'wiki.wiki.tree.childs')])
+            value['view_id'] = view_id
+            value['domain'] = [('group_id', '=', group.id), ('parent_id', '=', False)]
+            value['view_type'] = 'tree'
+
+        return value
+wiz_open_page()
+
+class showdiff(osv.osv_memory):
+    _name = 'wizard.wiki.history.show_diff'
+
+    def _get_diff(self, cr, uid, ctx):
+        history = self.pool.get('wiki.wiki.history')
+        ids = ctx.get('active_ids')
+        diff = ""
+        if len(ids) == 2:
+            if ids[0] > ids[1]:
+                diff = history.getDiff(cr, uid, ids[1], ids[0])
+            else:
+                diff = history.getDiff(cr, uid, ids[0], ids[1])
+
+        elif len(ids) == 1:
+            old = history.browse(cr, uid, ids[0])
+            nids = history.search(cr, uid, [('wiki_id', '=', old.wiki_id.id)])
+            nids.sort()
+            diff = history.getDiff(cr, uid, ids[0], nids[-1])
+        else:
+            raise osv.except_osv(_('Warning'), _('You need to select minimum 1 or maximum 2 history revision!'))
+        return diff
+
+    _columns = {
+        'diff': fields.text('Diff'), 
+    }
+    _defaults = {
+        'diff': _get_diff
+    }
+
+showdiff()
+
diff --git a/addons/wiki/wizard/wizard_wiki.xml b/addons/wiki/wizard/wizard_wiki.xml
new file mode 100644
index 00000000000..8125836d8bf
--- /dev/null
+++ b/addons/wiki/wizard/wizard_wiki.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    
+    <!--  correct indentation -->
+
+    	<record id="view_wizard_create_menu" model="ir.ui.view">
+            <field name="name">Create Menu</field>
+            <field name="model">wiki.wizard.create.menu</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Create Menu">
+             		<separator string="Menu Information" colspan="4" />
+                	<field name="menu_name" />
+                	<field name="menu_parent_id" />
+                	<field name="page" colspan="4" />
+	                	<separator string="" colspan="4" />
+    	              	<label string="" colspan="2" />
+        	        		<button special="cancel" string="Cancel" />
+            	    		<button name="wiki_menu_create" string="Create Menu" type="object"/>
+             </form>
+            </field>
+		</record>
+
+		<record id="wizard_group_menu_create" model="ir.actions.act_window">
+            <field name="name">Create Menu</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">wiki.wizard.create.menu</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <!-- ==========================open help =========================-->
+
+        <record id="view_wiz_open_help" model="ir.ui.view">
+            <field name="name">Open Help</field>
+            <field name="model">wiki.wiz.open.help</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Open Help">
+                	<field name="name" />
+                 	<separator string="" colspan="6" />
+                  	<label string="" colspan="2" />
+             </form>
+            </field>
+		</record>
+
+		<record id="wizard_open_help" model="ir.actions.act_window">
+            <field name="name">Open Help</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">wiki.wiki</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="target">new</field>
+        </record>
+        <!-- ==========================Open Page =========================-->
+
+		<record id="view_wiz_open_page" model="ir.ui.view">
+            <field name="name">Open Page</field>
+            <field name="model">wiki.wiz.open.page</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Open Page">
+                	<field name="name" />
+                 	<separator string="" colspan="6" />
+                  	<label string="" colspan="2" />
+             </form>
+            </field>
+		</record>
+
+		<record id="wizard_open_page" model="ir.actions.act_window">
+            <field name="name">Open Page</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">wiki.wiki</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="target">new</field>
+    	</record>
+	
+	
+	<record id="view_wiki_history_diff" model="ir.ui.view">
+            <field name="name">Differences</field>
+            <field name="model">wizard.wiki.history.show_diff</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="History Differance">
+                    <separator string="Wiki Differance" colspan="4"/>
+                    <field name="diff" widget="text_html" nolabel="1" colspan="4"/>
+                </form>
+            </field>
+        </record>
+
+        <act_window
+            id="act_view_diff" 
+            name="Differences" 
+            res_model="wizard.wiki.history.show_diff" 
+            src_model="wiki.wiki.history"
+            target="new"
+            view_mode="form"
+        />
+	
+	
+	</data>
+</openerp>
\ No newline at end of file

From 39645f269b840a792122eb685464d496c3dbdd72 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Tue, 2 Mar 2010 12:43:15 +0530
Subject: [PATCH 015/251] [IMP]: account: Code + Quality improvement for
 wizards

bzr revid: rpa@openerp.co.in-20100302071315-hxcltca6fnwvot1e
---
 addons/account/__terp__.py                    |   1 -
 addons/account/account_invoice_view.xml       |  13 +-
 addons/account/wizard/__init__.py             |  12 +-
 addons/account/wizard/account_chart.py        |  63 +++++----
 addons/account/wizard/account_chart_view.xml  |   3 +
 .../wizard/account_fiscalyear_close_state.py  |  43 ++++---
 .../wizard/account_fiscalyear_close_state.xml |   2 +
 .../account/wizard/account_invoice_refund.py  | 121 ++++++++++--------
 .../wizard/account_move_bank_reconcile.py     |  49 +++----
 addons/account/wizard/account_move_journal.py |  81 ++++++------
 .../wizard/account_move_journal_view.xml      |   3 +
 .../account_move_line_reconcile_select.py     |  38 +++---
 addons/account/wizard/account_period_close.py |  27 ++--
 .../wizard/wizard_automatic_reconcile.py      |   1 -
 addons/account/wizard/wizard_state_open.py    |   2 +-
 15 files changed, 250 insertions(+), 209 deletions(-)

diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py
index e600b806e08..8f216c7f6f7 100644
--- a/addons/account/__terp__.py
+++ b/addons/account/__terp__.py
@@ -48,7 +48,6 @@
         'wizard/account_move_line_reconcile_select_view.xml',
         'wizard/account_move_journal_view.xml',
         
-        
         'account_wizard.xml',
         'account_view.xml',
         'account_end_fy.xml',
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 4f8db313fc7..9016823b54f 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -189,15 +189,17 @@
                                 <field name="amount_total"/>
                                 <field name="state" select="2"/>
                                 <field name="residual"/>
-                                <group col="6" colspan="4">
+                                <group col="7" colspan="4">
                                     <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-apply"/>
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
                                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                                     <button name='%(wizard_paid_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
-                                    <!-- <button name='%(wizard_invoice_pay)d' type='action' string='Pay Invoice' states='open,paid,proforma2' icon="STOCK_EXECUTE" /> -->
-                                    <!--  <button name='%(wizard_invoice_refund)d' type='action' string='Credit Note'  icon="STOCK_EXECUTE" />-->
+                                    <!-- Wizard Buttons: To Remove -->
+                                    <button name="%(wizard_invoice_pay)d" type="action" string="Pay Invoice" states="open,paid,proforma2" icon="STOCK_EXECUTE" /> 
+							 		<button name="%(wizard_invoice_refund)d" type="action" string="Credit Note"  icon="STOCK_EXECUTE" />
                                 </group>
                             </group>
+                             
                         </page>
                         <page string="Other Info">
                             <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
@@ -287,8 +289,9 @@
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
                                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                                     <button name='%(wizard_paid_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
-                                    <!-- <button name='%(wizard_invoice_pay)d' type='action' string='Pay Invoice' states='open,paid,proforma2' icon="STOCK_EXECUTE" /> -->
-                                    <!-- <button name='%(wizard_invoice_refund)d' type='action' string='Credit Note'  icon="STOCK_EXECUTE" /> -->
+                                    <!-- Wizard Buttons: To Remove -->
+                                    <button name="%(wizard_invoice_pay)d" type="action" string="Pay Invoice" states="open,paid,proforma2" icon="STOCK_EXECUTE" /> 
+							 		<button name="%(wizard_invoice_refund)d" type="action" string="Credit Note"  icon="STOCK_EXECUTE" />
                                </group>
                             </group>
                         </page>
diff --git a/addons/account/wizard/__init__.py b/addons/account/wizard/__init__.py
index f1ddf80a08a..1034cfe9094 100644
--- a/addons/account/wizard/__init__.py
+++ b/addons/account/wizard/__init__.py
@@ -19,17 +19,14 @@
 #
 ##############################################################################
 
+# OLD Wizards
 import wizard_automatic_reconcile
-import wizard_reconcile_select
 import wizard_unreconcile_select
 import wizard_reconcile
 import wizard_unreconcile
-import wizard_refund
 import wizard_pay_invoice
 
-import wizard_journal
 import wizard_journal_select
-import wizard_bank_reconcile
 import wizard_subscription_generate
 
 import wizard_aged_trial_balance
@@ -38,16 +35,14 @@ import wizard_third_party_ledger
 import wizard_account_balance_report
 import wizard_partner_balance_report
 
-import wizard_period_close
 import wizard_fiscalyear_close
-import wizard_fiscalyear_close_state
+#import wizard_fiscalyear_close_state
 import wizard_open_closed_fiscalyear
 
 import wizard_vat
 
 import wizard_invoice_state
 import wizard_account_duplicate
-import wizard_account_chart
 import wizard_move_line_select
 
 import wizard_validate_account_move
@@ -70,6 +65,3 @@ import account_move_line_reconcile_select
 import account_move_journal
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account/wizard/account_chart.py b/addons/account/wizard/account_chart.py
index f30efa1fe27..fddb6bc0474 100644
--- a/addons/account/wizard/account_chart.py
+++ b/addons/account/wizard/account_chart.py
@@ -18,63 +18,70 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import wizard
+
+from osv import fields, osv
+from tools.translate import _
 import netsvc
 import pooler
 import time
-from tools.translate import _
 import tools
-from osv import fields, osv
+import wizard
 
 class account_chart(osv.osv_memory):
     """
-    For account chart
+    For Chart of Accounrs
     """
-    
+
     def _get_defaults(self, cr, uid, context):
-        
-            """Return default Fiscalyear value""" 
-            
+
+            """Return default Fiscalyear value"""
+
             fiscalyear_obj = self.pool.get('account.fiscalyear')
             fiscalyear = fiscalyear_obj.find(cr, uid)
             return fiscalyear
-        
+
     def _account_chart_open_window(self, cr, uid, ids, context):
             """
-            
+            Opens chart of Accounts
             @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param id: the account chart’s ID or list of IDs if we want more than one
-            @return: dictionary of Open  account chart window  on given fiscalyear and all Entries or posted entries
+            @param ids: List of account chart’s IDs
+            @return: dictionary of Open account chart window on given fiscalyear and all Entries or posted entries
             """
-            for form in  self.read(cr, uid, ids):
+
+            for data in  self.read(cr, uid, ids):
                 mod_obj = self.pool.get('ir.model.data')
                 act_obj = self.pool.get('ir.actions.act_window')
 
                 result = mod_obj._get_id(cr, uid, 'account', 'action_account_tree')
                 id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
                 result = act_obj.read(cr, uid, [id], context=context)[0]
-                result['context'] = str({'fiscalyear': form['fiscalyear'],'state':form['target_move']})
-                if form['fiscalyear']:
-                    result['name']+=':'+self.pool.get('account.fiscalyear').read(cr,uid,[form['fiscalyear']])[0]['code']
-                 
+                result['context'] = str({'fiscalyear': data['fiscalyear'], \
+                                            'state': data['target_move']})
+                if data['fiscalyear']:
+                    result['name'] += ':' + self.pool.get('account.fiscalyear').read(cr, uid, [data['fiscalyear']])[0]['code']
+
                 return result
-            
+
 
     _name = "account.chart"
     _description = "chart"
     _columns = {
-                'fiscalyear':fields.many2one('account.fiscalyear',  'Fiscal year', required=True, help = 'Keep empty for all open fiscal years'),
-                'target_move':fields.selection([
-                                            ('all','All Entries'),
-                                            ('posted','All Posted Entries'),
-                                     ],'Target Moves',  required = True),
-                        
+                'fiscalyear': fields.many2one('account.fiscalyear', \
+                                'Fiscal year', required=True, \
+                                help = 'Keep empty for all open fiscal years'), 
+                'target_move': fields.selection([
+                                            ('all', 'All Entries'), 
+                                            ('posted', 'All Posted Entries'), 
+                                     ], 'Target Moves', required = True), 
+
               }
     _defaults = {
-                'fiscalyear':_get_defaults, 
-                'target_move':lambda * a:'all'
-                
+                'fiscalyear': _get_defaults, 
+                'target_move': lambda * a: 'all'
                 }
-  
+
 account_chart()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index a3838a5483c..5603bd546a1 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
   		<record id="view_account_chart" model="ir.ui.view">
             <field name="name">account.chart.form</field>
             <field name="model">account.chart</field>
@@ -21,6 +22,7 @@
                </form>
             </field>
   		</record>
+
         <record id="wizard_account_chart" model="ir.actions.act_window">
             <field name="name">Chart of Accounts</field>
             <field name="res_model">account.chart</field>
@@ -29,5 +31,6 @@
            <field name="view_id" ref="view_account_chart"/> 
            <field name="target">new</field>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/account/wizard/account_fiscalyear_close_state.py b/addons/account/wizard/account_fiscalyear_close_state.py
index a1cc37663ef..8468bcf2635 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.py
+++ b/addons/account/wizard/account_fiscalyear_close_state.py
@@ -18,23 +18,25 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import wizard
+
+from osv import fields, osv
+from tools.translate import _
 import netsvc
 import pooler
 import time
-from tools.translate import _
 import tools
-from osv import fields, osv
+import wizard
 
 class account_fiscalyear_close_state(osv.osv_memory):
     """
-    close  Account Fiscalyear 
+    Closes  Account Fiscalyear
     """
     _name = "account.fiscalyear.close.state"
     _description = "Fiscalyear Close state"
     _columns = {
-                'fy_id':fields.many2one('account.fiscalyear',  'Fiscal Year to close', required=True),
-                'sure':fields.boolean('Check this box', required=False)
+                'fy_id': fields.many2one('account.fiscalyear', \
+                                    'Fiscal Year to close', required=True), 
+                'sure': fields.boolean('Check this box', required=False)
               }
 
     def _data_save(self, cr, uid, ids, context):
@@ -42,22 +44,27 @@ class account_fiscalyear_close_state(osv.osv_memory):
         This function close account fiscalyear
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param id: account fiscalyear close state’s ID or list of IDs if we want more than one
- 
+        @param ids: List of Account fiscalyear close state’s IDs
+
         """
-        for form in  self.read(cr, uid, ids):
-            if not form['sure']:
-                raise osv.except_osv(_('UserError'), _('Closing of states cancelled, please check the box !'))
-            fy_id = form['fy_id']
-            
+        for data in  self.read(cr, uid, ids):
+            if not data['sure']:
+                raise osv.except_osv(_('UserError'), _('Closing of states \
+cancelled, please check the box !'))
+            fy_id = data['fy_id']
+
             cr.execute('UPDATE account_journal_period ' \
-                    'SET state = %s ' \
-                    'WHERE period_id IN (SELECT id FROM account_period WHERE fiscalyear_id = %s)',
-                    ('done',fy_id))
+                        'SET state = %s ' \
+                        'WHERE period_id IN (SELECT id FROM account_period \
+                        WHERE fiscalyear_id = %s)', 
+                    ('done', fy_id))
             cr.execute('UPDATE account_period SET state = %s ' \
-                    'WHERE fiscalyear_id = %s', ('done',fy_id))
+                    'WHERE fiscalyear_id = %s', ('done', fy_id))
             cr.execute('UPDATE account_fiscalyear ' \
                     'SET state = %s WHERE id = %s', ('done', fy_id))
             return {}
-    
+
 account_fiscalyear_close_state()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account/wizard/account_fiscalyear_close_state.xml b/addons/account/wizard/account_fiscalyear_close_state.xml
index 19acf3fe567..e71edc5225c 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.xml
+++ b/addons/account/wizard/account_fiscalyear_close_state.xml
@@ -29,6 +29,8 @@
            <field name="view_id" ref="view_account_fiscalyear_close_state"/> 
            <field name="target">new</field>
         </record>
+        
     	<menuitem action="wizard_fiscalyear_close_state" id="menu_wizard_fy_close_state" parent="menu_account_end_year_treatments" />
+
     </data>
 </openerp>
diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
index be2fa002b12..162d21a9654 100644
--- a/addons/account/wizard/account_invoice_refund.py
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -18,34 +18,36 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import wizard
+
+from osv import fields, osv
+from tools.translate import _
 import netsvc
 import pooler
 import time
-from tools.translate import _
 import tools
-from osv import fields, osv
+import wizard
 
 class account_invoice_refund(osv.osv_memory):
-    
-    """Account invoice refund or modify or cancel."""
-    
+
+    """Refunds invoice."""
+
     _name = "account.invoice.refund"
     _description = "Invoice Refund"
     _columns = {
-                  'date':fields.date('Operation date',required=False),  
-                  'period':fields.many2one('account.period',  'Force period', required=False), 
-                  'description':fields.char('Description', size=150, required=True),
-              }
-    
+              'date': fields.date('Operation date', required=False), 
+              'period': fields.many2one('account.period', 'Force period', required=False), 
+              'description': fields.char('Description', size=150, required=True), 
+                }
+
     def _compute_refund(self, cr, uid, ids, mode, context):
         """
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param id: the account invoice refund’s ID or list of IDs if we want more than one
-        
+        @param ids: the account invoice refund’s ID or list of IDs
+
         """
         
+        inv_obj = self.pool.get('account.invoice')
         for form in  self.read(cr, uid, ids):
             reconcile_obj = self.pool.get('account.move.reconcile')
             account_m_line_obj = self.pool.get('account.move.line')
@@ -53,7 +55,7 @@ class account_invoice_refund(osv.osv_memory):
             date = False
             period = False
             description = False
-            for inv in self.pool.get('account.invoice').browse(cr, uid, context['active_ids']):
+            for inv in inv_obj.browse(cr, uid, context['active_ids']):
                 if inv.state in ['draft', 'proforma2', 'cancel']:
                     raise osv.except_osv(_('Error !'), _('Can not %s draft/proforma/cancel invoice.') % (mode))
                 if form['period'] :
@@ -64,20 +66,23 @@ class account_invoice_refund(osv.osv_memory):
                 if form['date'] :
                     date = form['date']
                     if not form['period'] :
-                            cr.execute("select name from ir_model_fields where model='account.period' and name='company_id'")
+                            cr.execute("select name from ir_model_fields \
+                                            where model = 'account.period' \
+                                            and name = 'company_id'")
                             result_query = cr.fetchone()
                             if result_query:
                             #in multi company mode
                                 cr.execute("""SELECT id
                                           from account_period where date('%s')
-                                          between date_start AND  date_stop and company_id = %s limit 1 """,
-                                          (form['date'],self.pool.get('res.users').browse(cr, uid, uid).company_id.id,))
+                                          between date_start AND  date_stop \
+                                          and company_id = %s limit 1 """, 
+                                          (form['date'], self.pool.get('res.users').browse(cr, uid, uid).company_id.id,))
                             else:
                             #in mono company mode
                                 cr.execute("""SELECT id
-                                          from account_period where date('%s')
-                                          between date_start AND  date_stop  limit 1 """,
-                                          (form['date'],))
+                                        from account_period where date('%s')
+                                        between date_start AND  date_stop  \
+                                        limit 1 """, (form['date'],))
                             res = cr.fetchone()
                             if res:
                                 period = res[0]
@@ -90,19 +95,21 @@ class account_invoice_refund(osv.osv_memory):
                     description = inv.name
 
                 if not period:
-                    raise osv.except_osv(_('Data Insufficient !'), _('No Period found on Invoice!'))
+                    raise osv.except_osv(_('Data Insufficient !'), \
+                                            _('No Period found on Invoice!'))
 
-                refund_id = self.pool.get('account.invoice').refund(cr, uid, [inv.id],date, period, description)
-                refund = self.pool.get('account.invoice').browse(cr, uid, refund_id[0])
+                refund_id = inv_obj.refund(cr, uid, [inv.id], date, period, description)
+                refund = inv_obj.browse(cr, uid, refund_id[0])
                 # we compute due date
                 #!!!due date = date inv date on formdate
-                self.pool.get('account.invoice').write(cr, uid, [refund.id],{'date_due':date,'check_total':inv.check_total})
+                inv_obj.write(cr, uid, [refund.id], {'date_due': date, 
+                                                'check_total': inv.check_total})
                 # to make the taxes calculated
-                self.pool.get('account.invoice').button_compute(cr, uid, refund_id)
+                inv_obj.button_compute(cr, uid, refund_id)
 
                 created_inv.append(refund_id[0])
                 #if inv is paid we unreconcile
-                if mode in ('cancel','modify'):
+                if mode in ('cancel', 'modify'):
                     movelines = inv.move_id.line_id
                     #we unreconcile the lines
                     to_reconcile_ids = {}
@@ -110,65 +117,66 @@ class account_invoice_refund(osv.osv_memory):
                         #if the account of the line is the as the one in the invoice
                         #we reconcile
                         if line.account_id.id == inv.account_id.id :
-                            to_reconcile_ids[line.account_id.id] =[line.id]
+                            to_reconcile_ids[line.account_id.id] = [line.id]
                         if type(line.reconcile_id) != osv.orm.browse_null :
-                            reconcile_obj.unlink(cr,uid, line.reconcile_id.id)
+                            reconcile_obj.unlink(cr, uid, line.reconcile_id.id)
                     #we advance the workflow of the refund to open
                     wf_service = netsvc.LocalService('workflow')
-                    wf_service.trg_validate(uid, 'account.invoice', refund.id, 'invoice_open', cr)
+                    wf_service.trg_validate(uid, 'account.invoice', \
+                                        refund.id, 'invoice_open', cr)
                     #we reload the browse record
-                    refund = self.pool.get('account.invoice').browse(cr, uid, refund_id[0])
+                    refund = inv_obj.browse(cr, uid, refund_id[0])
                     #we match the line to reconcile
                     for tmpline in  refund.move_id.line_id :
                         if tmpline.account_id.id == inv.account_id.id :
                             to_reconcile_ids[tmpline.account_id.id].append(tmpline.id)
                     for account in to_reconcile_ids :
-                        account_m_line_obj.reconcile(cr, uid, to_reconcile_ids[account],
-                                        writeoff_period_id=period,
-                                        writeoff_journal_id=inv.journal_id.id,
+                        account_m_line_obj.reconcile(cr, uid, to_reconcile_ids[account], 
+                                        writeoff_period_id=period, 
+                                        writeoff_journal_id=inv.journal_id.id, 
                                         writeoff_acc_id=inv.account_id.id
                                         )
                     #we create a new invoice that is the copy of the original
                     if mode == 'modify' :
-                        invoice = self.pool.get('account.invoice').read(cr, uid, [inv.id],
-                                            ['name', 'type', 'number', 'reference',
-                                            'comment', 'date_due', 'partner_id', 'address_contact_id',
-                                            'address_invoice_id', 'partner_insite','partner_contact',
-                                            'partner_ref', 'payment_term', 'account_id', 'currency_id',
-                                            'invoice_line', 'tax_line', 'journal_id','period_id'
-                                            ]
-                                )
+                        invoice = inv_obj.read(cr, uid, [inv.id], 
+                                    ['name', 'type', 'number', 'reference', 
+                                    'comment', 'date_due', 'partner_id', 
+                                    'address_contact_id', 'address_invoice_id',
+                                    'partner_insite', 'partner_contact', 
+                                    'partner_ref', 'payment_term', 'account_id',
+                                    'currency_id', 'invoice_line', 'tax_line', 
+                                    'journal_id', 'period_id'])
                         invoice = invoice[0]
                         del invoice['id']
                         invoice_lines = self.pool.get('account.invoice.line').read(cr, uid, invoice['invoice_line'])
-                        invoice_lines = self.pool.get('account.invoice')._refund_cleanup_lines(cr, uid, invoice_lines)
+                        invoice_lines = inv_obj._refund_cleanup_lines(cr, uid, invoice_lines)
                         tax_lines = self.pool.get('account.invoice.tax').read(
                                                         cr, uid, invoice['tax_line'])
-                        tax_lines = self.pool.get('account.invoice')._refund_cleanup_lines(cr, uid, tax_lines)
+                        tax_lines = inv_obj._refund_cleanup_lines(cr, uid, tax_lines)
 
                         invoice.update({
-                            'type': inv.type,
-                            'date_invoice': date,
-                            'state': 'draft',
-                            'number': False,
-                            'invoice_line': invoice_lines,
-                            'tax_line': tax_lines,
-                            'period_id': period,
-                            'name':description
+                            'type': inv.type, 
+                            'date_invoice': date, 
+                            'state': 'draft', 
+                            'number': False, 
+                            'invoice_line': invoice_lines, 
+                            'tax_line': tax_lines, 
+                            'period_id': period, 
+                            'name': description
                             })
 
                         #take the id part of the tuple returned for many2one fields
-                        for field in ('address_contact_id', 'address_invoice_id', 'partner_id',
+                        for field in ('address_contact_id', 'address_invoice_id', 'partner_id', 
                                 'account_id', 'currency_id', 'payment_term', 'journal_id'):
                                 invoice[field] = invoice[field] and invoice[field][0]
 
                         # create the new invoice
-                        inv_id = self.pool.get('account.invoice').create(cr, uid, invoice,{})
+                        inv_id = inv_obj.create(cr, uid, invoice, {})
                         # we compute due date
                         if inv.payment_term.id:
-                            data = self.pool.get('account.invoice').onchange_payment_term_date_invoice(cr, uid, [inv_id],inv.payment_term.id,date)
+                            data = inv_obj.onchange_payment_term_date_invoice(cr, uid, [inv_id], inv.payment_term.id, date)
                             if 'value' in data and data['value']:
-                                self.pool.get('account.invoice').write(cr, uid, [inv_id],data['value'])
+                                inv_obj.write(cr, uid, [inv_id], data['value'])
                         created_inv.append(inv_id)
 
             #we get the view id
@@ -201,3 +209,6 @@ class account_invoice_refund(osv.osv_memory):
         return self._compute_refund(cr, uid, ids, 'modify', context)
 
 account_invoice_refund()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account/wizard/account_move_bank_reconcile.py b/addons/account/wizard/account_move_bank_reconcile.py
index faa154c950c..a39f500eac8 100644
--- a/addons/account/wizard/account_move_bank_reconcile.py
+++ b/addons/account/wizard/account_move_bank_reconcile.py
@@ -18,45 +18,50 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import wizard
+
+from osv import fields, osv
+from tools.translate import _
 import netsvc
 import pooler
 import time
-from tools.translate import _
 import tools
-from osv import fields, osv
-
+import wizard
 
 class account_move_bank_reconcile(osv.osv_memory):
-    
+    """
+        Bank Reconciliation
+    """
     _name = "account.move.bank.reconcile"
     _description = "Move bank reconcile"
     _columns = {
-                'journal_id':fields.many2one('account.journal',  'Journal', required=True),
-                
+                'journal_id': fields.many2one('account.journal', 'Journal', required=True), 
               }
+
     def _action_open_window(self, cr, uid, ids, context):
-             """
+            """
            @param cr: the current row, from the database cursor,
            @param uid: the current user’s ID for security checks,
-           @param id: account move bank reconcile’s ID or list of IDs if we want more than one
-           @return:dictionary of  Open  account move line   on given journal_id.
+           @param ids: account move bank reconcile’s ID or list of IDs
+           @return: dictionary of  Open  account move line   on given journal_id.
             """
-             for form in  self.read(cr, uid, ids):
-                 cr.execute('select default_credit_account_id from account_journal where id=%s', (form['journal_id'],))
+            for data in  self.read(cr, uid, ids):
+                 cr.execute('select default_credit_account_id \
+                                from account_journal where id=%s', (data['journal_id'],))
                  account_id = cr.fetchone()[0]
                  if not account_id:
-                     raise osv.except_osv(_('Error'), _('You have to define the bank account\nin the journal definition for reconciliation.'))
+                     raise osv.except_osv(_('Error'), _('You have to define \
+the bank account\nin the journal definition for reconciliation.'))
                  return {
-                    'domain': "[('journal_id','=',%d), ('account_id','=',%d), ('state','<>','draft')]" % (form['journal_id'],account_id),
-                    'name': _('Standard Encoding'),
-                    
-                    'view_type': 'form',
-                    'view_mode': 'tree,form',
-                    'res_model': 'account.move.line',
-                    'view_id': False,
-                    'context': "{'journal_id':%d}" % (form['journal_id'],),
+                    'domain': "[('journal_id','=',%d), ('account_id','=',%d), ('state','<>','draft')]" % (data['journal_id'], account_id), 
+                    'name': _('Standard Encoding'), 
+                    'view_type': 'form', 
+                    'view_mode': 'tree,form', 
+                    'res_model': 'account.move.line', 
+                    'view_id': False, 
+                    'context': "{'journal_id': %d}" % (data['journal_id'],), 
                     'type': 'ir.actions.act_window'
                      }
 
-account_move_bank_reconcile()
\ No newline at end of file
+account_move_bank_reconcile()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index 1e6645c5b27..08aef8ca544 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,84 +15,87 @@
 #    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 wizard
+from osv import fields, osv
+from tools.translate import _
 import netsvc
 import pooler
 import time
-from tools.translate import _
 import tools
-from osv import fields, osv
+import wizard
 
 
 class account_move_journal(osv.osv_memory):
-    
+
     def _get_period(self, cr, uid, context={}):
-        """Return  default account period value""" 
-        
+        """Return  default account period value"""
+
         ids = self.pool.get('account.period').find(cr, uid, context=context)
         period_id = False
         if len(ids):
             period_id = ids[0]
         return period_id
-    
+
     def _action_open_window(self, cr, uid, ids, context={}):
         """
         This function Open action move line window on given period and  Journal/Payment Mode
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param id: account move journal’s ID or list of IDs if we want more than one
-        @return:dictionary of Open action move line window on given period and  Journal/Payment Mode
-        
+        @param ids: account move journal’s ID or list of IDs
+        @return: dictionary of Open action move line window on given period and  Journal/Payment Mode
+
         """
-        for form in  self.read(cr, uid, ids,['journal_id', 'period_id']):
-            cr.execute('select id,name from ir_ui_view where model=%s and type=%s', ('account.move.line', 'form' ))
+        for data in  self.read(cr, uid, ids, ['journal_id', 'period_id']):
+            cr.execute('select id,name from ir_ui_view where model=%s and type=%s', ('account.move.line', 'form'))
             view_res = cr.fetchone()
+            journal_id = data['journal_id']
+            period_id = data['period_id']
             jp = self.pool.get('account.journal.period')
-            ids = jp.search(cr, uid, [('journal_id','=',form['journal_id']), ('period_id','=',form['period_id'])])
-            
+            ids = jp.search(cr, uid, [('journal_id', '=', journal_id), \
+                                        ('period_id', '=', period_id)])
+
             if not len(ids):
-                print "ids",ids
-                name = self.pool.get('account.journal').read(cr, uid, [form['journal_id']])[0]['name']
-                state = self.pool.get('account.period').read(cr, uid, [form['period_id']])[0]['state']
+                name = self.pool.get('account.journal').read(cr, uid, [journal_id])[0]['name']
+                state = self.pool.get('account.period').read(cr, uid, [period_id])[0]['state']
                 if state == 'done':
                     raise osv.except_osv(_('UserError'), _('This period is already closed !'))
-                company = self.pool.get('account.period').read(cr, uid, [form['period_id']])[0]['company_id'][0]
-                jp.create(cr, uid, {'name':name, 'period_id': form['period_id'], 'journal_id':form['journal_id'], 'company_id':company})
-            ids = jp.search(cr, uid, [('journal_id','=',form['journal_id']), ('period_id','=',form['period_id'])])
-            print "jp",ids
+                company = self.pool.get('account.period').read(cr, uid, [period_id])[0]['company_id'][0]
+                jp.create(cr, uid, {'name': name, 'period_id': period_id, 'journal_id': journal_id, 'company_id': company})
+
+            ids = jp.search(cr, uid, [('journal_id', '=', journal_id), ('period_id', '=', period_id)])
             jp = jp.browse(cr, uid, ids, context=context)[0]
             name = (jp.journal_id.code or '') + ':' + (jp.period_id.code or '')
             mod_obj = self.pool.get('ir.model.data')
             result = mod_obj._get_id(cr, uid, 'account', 'view_account_move_line_filter')
-            id = mod_obj.read(cr, uid, result, ['res_id']) 
+            res = mod_obj.read(cr, uid, result, ['res_id'])
+
             return {
-                'domain': "[('journal_id','=',%d), ('period_id','=',%d)]" % (form['journal_id'],form['period_id']),
-                'name': name,
-                'view_type': 'form',
-                'view_mode': 'tree,form',
-                'res_model': 'account.move.line',
-                'view_id': view_res,
-                'context': "{'journal_id':%d, 'period_id':%d}" % (form['journal_id'],form['period_id']),
-                'type': 'ir.actions.act_window',
-                'search_view_id': id['res_id']        
+                'domain': "[('journal_id','=',%d), ('period_id','=',%d)]" % (journal_id, period_id), 
+                'name': name, 
+                'view_type': 'form', 
+                'view_mode': 'tree,form', 
+                'res_model': 'account.move.line', 
+                'view_id': view_res, 
+                'context': "{'journal_id': %d, 'period_id': %d}" % (journal_id, period_id), 
+                'type': 'ir.actions.act_window', 
+                'search_view_id': res['res_id']
                 }
-            
+
     _name = "account.move.journal"
     _description = "Move journal"
-    
+
     _columns = {
-                'journal_id':fields.many2one('account.journal',  'Journal/Payment Mode', required=True),
-                'period_id':fields.many2one('account.period', 'Period', required=True),
+                'journal_id': fields.many2one('account.journal', 'Journal/Payment Mode', required=True), 
+                'period_id': fields.many2one('account.period', 'Period', required=True), 
                 }
 
     _defaults = {
-                'period_id':_get_period
+                'period_id': _get_period
                 }
-    
+
 account_move_journal()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
index 691539952b6..74cca898219 100644
--- a/addons/account/wizard/account_move_journal_view.xml
+++ b/addons/account/wizard/account_move_journal_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
   		<record id="view_account_move_journal_form" model="ir.ui.view">
             <field name="name">account.move.journal.form</field>
             <field name="model">account.move.journal</field>
@@ -21,6 +22,7 @@
                </form>
             </field>
         </record>
+
         <record id="action_move_journal_line_form" model="ir.actions.act_window">
             <field name="name">Making Entries by Line</field>
             <field name="res_model">account.move.journal</field>
@@ -29,5 +31,6 @@
            <field name="view_id" ref="view_account_move_journal_form"/> 
            <field name="target">new</field>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/account/wizard/account_move_line_reconcile_select.py b/addons/account/wizard/account_move_line_reconcile_select.py
index 5286b2b70a4..f1a72e44b91 100644
--- a/addons/account/wizard/account_move_line_reconcile_select.py
+++ b/addons/account/wizard/account_move_line_reconcile_select.py
@@ -18,40 +18,44 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import wizard
+
+from osv import fields, osv
+from tools.translate import _
 import netsvc
 import pooler
 import time
-from tools.translate import _
 import tools
-from osv import fields, osv
+import wizard
 
 class account_move_line_reconcile_select(osv.osv_memory):
     _name = "account.move.line.reconcile.select"
     _description = "Move line reconcile select"
     _columns = {
-                'account_id':fields.many2one('account.account',  'Account', domain = [('reconcile','=',1)], required=True),
+                'account_id': fields.many2one('account.account', 'Account', \
+                            domain = [('reconcile', '=', 1)], required=True), 
               }
-    
+
     def _action_open_window(self, cr, uid, ids, context):
         """
         This function Open  account move line window for reconcile on given account id
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param id: account move line reconcile select’s ID or list of IDs if we want more than one
-        @return:dictionary of  Open  account move line window for reconcile on given account id
-        
+        @param ids: account move line reconcile select’s ID or list of IDs
+        @return: dictionary of  Open  account move line window for reconcile on given account id
+
          """
         for data in  self.read(cr, uid, ids):
-            
+
             return {
-                'domain': "[('account_id','=',%d),('reconcile_id','=',False),('state','<>','draft')]" % data['account_id'],
-                'name': _('Reconciliation'),
-                'view_type': 'form',
-                'view_mode': 'tree,form',
-                'view_id': False,
-                'res_model': 'account.move.line',
+                'domain': "[('account_id','=',%d),('reconcile_id','=',False),('state','<>','draft')]" % data['account_id'], 
+                'name': _('Reconciliation'), 
+                'view_type': 'form', 
+                'view_mode': 'tree,form', 
+                'view_id': False, 
+                'res_model': 'account.move.line', 
                 'type': 'ir.actions.act_window'
                 }
-        
-account_move_line_reconcile_select()
\ No newline at end of file
+
+account_move_line_reconcile_select()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_period_close.py b/addons/account/wizard/account_period_close.py
index 4aaf773ce80..8ef38faf3cc 100644
--- a/addons/account/wizard/account_period_close.py
+++ b/addons/account/wizard/account_period_close.py
@@ -18,21 +18,23 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import wizard
+
+from osv import fields, osv
+from tools.translate import _
 import netsvc
 import pooler
 import time
-from tools.translate import _
 import tools
-from osv import fields, osv
-
+import wizard
 
 class account_period_close(osv.osv_memory):
-    """close period"""
+    """
+        close period
+    """
     _name = "account.period.close"
     _description = "period close"
     _columns = {
-                  'sure':fields.boolean('Check this box', required=False),
+                  'sure': fields.boolean('Check this box', required=False),
               }
 
     def _data_save(self, cr, uid, ids, context):
@@ -40,19 +42,20 @@ class account_period_close(osv.osv_memory):
         This function close period
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param id:account period close’s ID or list of IDs if we want more than one
-         
-         
+        @param ids: account period close’s ID or list of IDs
          """
-        
+
         mode = 'done'
         for form in self.read(cr, uid, ids): 
             if form['sure']:
                 for id in context['active_ids']:
-                    cr.execute('update account_journal_period set state=%s where period_id=%s', (mode, id))
-                    cr.execute('update account_period set state=%s where id=%s', (mode, id))
+                    cr.execute('update account_journal_period set state=%s \
+                                    where period_id=%s', (mode, id))
+                    cr.execute('update account_period set state=%s \
+                                    where id=%s', (mode, id))
             return {}
 
 account_period_close()
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account/wizard/wizard_automatic_reconcile.py b/addons/account/wizard/wizard_automatic_reconcile.py
index e80b4406fdf..7a0f5a8c465 100644
--- a/addons/account/wizard/wizard_automatic_reconcile.py
+++ b/addons/account/wizard/wizard_automatic_reconcile.py
@@ -218,7 +218,6 @@ def _reconcile(self, cr, uid, data, context):
     max_amount = form.get('max_amount', 0.0)
     power = form['power']
     reconciled = unreconciled = 0
-    print "form",form
     if not form['account_ids'][0][2]:
         raise wizard.except_wizard(_('UserError'), _('You must select accounts to reconcile'))
     for account_id in form['account_ids'][0][2]:
diff --git a/addons/account/wizard/wizard_state_open.py b/addons/account/wizard/wizard_state_open.py
index 9720f48e25e..f33c90231f4 100644
--- a/addons/account/wizard/wizard_state_open.py
+++ b/addons/account/wizard/wizard_state_open.py
@@ -47,7 +47,7 @@ class wiz_state_open(wizard.interface):
     states = {
         'init': {
             'actions': [],
-            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','No','gtk-no'),('yes','Yes','gtk-yes')]}
+            'result': {'type':'form', 'arch':form, 'fields': fields, 'state':[('end','No','gtk-no'),('yes','Yes','gtk-yes')]}
         },
         'yes': {
             'actions': [_change_inv_state],

From 911fab40e8598716499d505b206bf522806ffad6 Mon Sep 17 00:00:00 2001
From: "ATP (Open ERP)" <>
Date: Tue, 2 Mar 2010 13:02:35 +0530
Subject: [PATCH 016/251] [IMP]: account: Improvement in wizard actions id

bzr revid: rpa@openerp.co.in-20100302073235-r4u1holtrs7n48i3
---
 addons/account/account_invoice_view.xml       |  2 +-
 addons/account/account_view.xml               | 20 +++++++++----------
 addons/account/account_wizard.xml             |  7 +++----
 addons/account/wizard/account_chart_view.xml  |  6 +++++-
 .../wizard/account_fiscalyear_close_state.xml |  9 ++++++---
 .../wizard/account_invoice_refund_view.xml    |  2 +-
 .../account_move_bank_reconcile_view.xml      |  1 +
 .../wizard/account_move_journal_view.xml      |  7 ++++++-
 ...ccount_move_line_reconcile_select_view.xml |  4 ++--
 .../wizard/account_period_close_view.xml      |  2 +-
 10 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 9016823b54f..3b917b93f68 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -283,7 +283,7 @@
                                 <field name="amount_total"/>
                                 <field name="state" select="2"/>
                                 <field name="residual"/>
-                                <group col="6" colspan="4" groups="base.group_user">
+                                <group col="7" colspan="4" groups="base.group_user">
                                     <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="gtk-print"/>
                                     <button name="invoice_open" states="draft,proforma2" string="Create" icon="gtk-execute"/>
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index b0bdeebbb89..9dc00c58c38 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -81,7 +81,7 @@
                     <separator colspan="4" string="States"/>
                     <field name="state" select="1"/>
                     <button name="action_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert"/>
-                    <!--  <button name='%(wizard_period_close)d' type='action' string='Close a Period'  icon="STOCK_EXECUTE" />-->
+                    
                 </form>
             </field>
         </record>
@@ -668,9 +668,8 @@
             <field eval="'ir.actions.wizard,%d'%action_move_journal_line_form_select" name="value"/>
             <field eval="True" name="object"/>
         </record>
-
-          <wizard id="action_move_journal_line_form" menu="False" model="account.move.line" name="account.move.journal" string="Making Entries by Line"/>
-<!--        <menuitem icon="STOCK_JUSTIFY_FILL" action="action_move_journal_line_form" id="menu_action_move_journal_line_form" parent="account.menu_finance_entries"  />-->
+		<!--  <wizard id="action_move_journal_line_form" menu="False" model="account.move.line" name="account.move.journal" string="Making Entries by Line"/>
+        <menuitem icon="STOCK_JUSTIFY_FILL" action="action_move_journal_line_form" id="menu_action_move_journal_line_form" parent="account.menu_finance_entries" type="wizard" sequence="5"/>-->
 
         <!--
     Entries lines
@@ -1008,10 +1007,9 @@
         <menuitem action="action_move_line_search" id="menu_action_move_line_search" parent="account.next_id_29"/>
 
         <menuitem id="menu_finance_charts" name="Charts" parent="account.menu_finance" sequence="4"/>
-      
-        <wizard id="wizard_account_chart" menu="False" model="account.account" name="account.chart" string="Chart of Accounts"/>
-<!--        <menuitem icon="STOCK_INDENT" action="wizard_account_chart" id="menu_action_account_tree2" parent="account.menu_finance_charts" />-->
-
+      	<!-- <wizard id="wizard_account_chart" menu="False" model="account.account" name="account.chart" string="Chart of Accounts"/>
+        <menuitem icon="STOCK_INDENT" action="wizard_account_chart" id="menu_action_account_tree2" parent="account.menu_finance_charts" type="wizard"/> -->
+        
 
 
         <record id="view_bank_statement_reconcile_form" model="ir.ui.view">
@@ -1082,8 +1080,10 @@
 
         <menuitem action="action_bank_statement_reconciliation_form" id="menu_action_account_bank_reconcile_tree" parent="next_id_30"/>
 
-        <wizard id="action_account_bank_reconcile_tree" menu="False" model="account.move.line" name="account.move.bank.reconcile" string="Bank reconciliation"/>
-<!--        <menuitem action="action_account_bank_reconcile_tree" id="menu_action_account_bank_reconcile_check_tree" parent="account.next_id_30" />-->
+        <!--<wizard id="action_account_bank_reconcile_tree" menu="False" model="account.move.line" name="account.move.bank.reconcile" string="Bank reconciliation"/> -->
+        <menuitem action="action_account_bank_reconcile_tree"
+        	id="menu_action_account_bank_reconcile_check_tree"
+        	parent="account.next_id_30" />
 
         <act_window
             domain="[('account_id', '=', active_id)]"
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index 5462dd020b3..4c494003414 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -17,7 +17,7 @@
             sequence="1"/>-->
 
         <wizard id="wizard_fiscalyear_close_state" menu="False" model="account.fiscalyear" name="account.fiscalyear.close.state" string="Close a Fiscal Year"/>
-        <!--  <menuitem action="wizard_fiscalyear_close_state" id="menu_wizard_fy_close_state" parent="menu_account_end_year_treatments" type="wizard"/>-->
+        
 
         <wizard
             id="wizard_open_closed_fiscalyear"
@@ -31,7 +31,7 @@
             sequence="2"
             parent="account.menu_account_end_year_treatments" type="wizard"/>
 
-        <wizard id="wizard_period_close" model="account.period" name="account.period.close" string="Close a Period"/> 
+        <!--  <wizard id="wizard_period_close" model="account.period" name="account.period.close" string="Close a Period"/>--> 
         <!-- automatic reconcile -->
         <wizard id="wizard_automatic_reconcile" menu="False" model="account.account" name="account.automatic.reconcile" string="Automatic reconciliation"/>
         <menuitem id="next_id_20" name="Reconciliation" parent="menu_finance_periodical_processing"/><menuitem action="wizard_automatic_reconcile" id="menu_automatic_reconcile" parent="next_id_20" type="wizard"/>
@@ -51,8 +51,7 @@
         <wizard id="wizard_reconcile_unreconcile" model="account.move.reconcile" name="account.reconcile.unreconcile" string="Unreconcile Entries"/>
 
 
-        <wizard id="wizard_reconcile_select" menu="False" model="account.move.line" name="account.move.line.reconcile.select" string="Reconcile entries"/>
-        <menuitem action="wizard_reconcile_select" id="menu_reconcile_select" parent="account.next_id_20" type="wizard"/>
+        
 
         <!-- unreconcile -->
         <wizard id="wizard_unreconcile" model="account.move.line" name="account.move.line.unreconcile" string="Unreconcile Entries"/>
diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index 5603bd546a1..eedd259c762 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -23,7 +23,7 @@
             </field>
   		</record>
 
-        <record id="wizard_account_chart" model="ir.actions.act_window">
+        <record id="action_account_chart" model="ir.actions.act_window">
             <field name="name">Chart of Accounts</field>
             <field name="res_model">account.chart</field>
             <field name="view_type">form</field>
@@ -32,5 +32,9 @@
            <field name="target">new</field>
         </record>
 
+        <menuitem icon="STOCK_INDENT" action="action_account_chart"
+        	id="menu_action_account_tree2"
+        	parent="account.menu_finance_charts" />
+
     </data>
 </openerp>
diff --git a/addons/account/wizard/account_fiscalyear_close_state.xml b/addons/account/wizard/account_fiscalyear_close_state.xml
index e71edc5225c..7a6492ddb0d 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.xml
+++ b/addons/account/wizard/account_fiscalyear_close_state.xml
@@ -21,7 +21,8 @@
                </form>
             </field>
         </record>
-        <record id="wizard_fiscalyear_close_state" model="ir.actions.act_window">
+
+        <record id="action_account_fiscalyear_close_state" model="ir.actions.act_window">
             <field name="name">Close a Fiscal Year</field>
             <field name="res_model">account.fiscalyear.close.state</field>
             <field name="view_type">form</field>
@@ -29,8 +30,10 @@
            <field name="view_id" ref="view_account_fiscalyear_close_state"/> 
            <field name="target">new</field>
         </record>
-        
-    	<menuitem action="wizard_fiscalyear_close_state" id="menu_wizard_fy_close_state" parent="menu_account_end_year_treatments" />
+
+        <menuitem action="action_account_fiscalyear_close_state"
+        	id="menu_wizard_fy_close_state"
+        	parent="menu_account_end_year_treatments" />
 
     </data>
 </openerp>
diff --git a/addons/account/wizard/account_invoice_refund_view.xml b/addons/account/wizard/account_invoice_refund_view.xml
index 1efb63a9ff1..8a02c20faf7 100644
--- a/addons/account/wizard/account_invoice_refund_view.xml
+++ b/addons/account/wizard/account_invoice_refund_view.xml
@@ -25,7 +25,7 @@
                </form>
             </field>
     	</record>
-        <record id="wizard_invoice_refund" model="ir.actions.act_window">
+        <record id="action_account_invoice_refund" model="ir.actions.act_window">
             <field name="name">Credit Note</field>
             <field name="res_model">account.invoice.refund</field>
             <field name="view_type">form</field>
diff --git a/addons/account/wizard/account_move_bank_reconcile_view.xml b/addons/account/wizard/account_move_bank_reconcile_view.xml
index 6750d2d143a..87400d5c3cd 100644
--- a/addons/account/wizard/account_move_bank_reconcile_view.xml
+++ b/addons/account/wizard/account_move_bank_reconcile_view.xml
@@ -27,5 +27,6 @@
            <field name="view_id" ref="view_account_move_bank_reconcile"/> 
            <field name="target">new</field>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
index 74cca898219..293212ce2e3 100644
--- a/addons/account/wizard/account_move_journal_view.xml
+++ b/addons/account/wizard/account_move_journal_view.xml
@@ -23,7 +23,7 @@
             </field>
         </record>
 
-        <record id="action_move_journal_line_form" model="ir.actions.act_window">
+        <record id="action_account_move_journal_line_form" model="ir.actions.act_window">
             <field name="name">Making Entries by Line</field>
             <field name="res_model">account.move.journal</field>
             <field name="view_type">form</field>
@@ -32,5 +32,10 @@
            <field name="target">new</field>
         </record>
 
+        <menuitem icon="STOCK_JUSTIFY_FILL"
+        	action="action_account_move_journal_line_form"
+        	id="menu_action_move_journal_line_form"
+        	parent="account.menu_finance_entries" sequence="5" />
+
     </data>
 </openerp>
diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml
index 3b1d4537a6b..a2a45454c90 100644
--- a/addons/account/wizard/account_move_line_reconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -19,7 +19,7 @@
                </form>
             </field>
     	</record>
-        <record id="wizard_reconcile_select" model="ir.actions.act_window">
+        <record id="action_account_reconcile_select" model="ir.actions.act_window">
             <field name="name">Reconcile entries</field>
             <field name="res_model">account.move.line.reconcile.select</field>
             <field name="view_type">form</field>
@@ -27,6 +27,6 @@
            <field name="view_id" ref="view_account_move_line_reconcile_select"/> 
            <field name="target">new</field>
         </record>
-        <menuitem id="next_id_20" name="Reconciliation" parent="menu_finance_periodical_processing"/><menuitem action="wizard_reconcile_select" id="menu_reconcile_select" parent="account.next_id_20" />
+        <menuitem id="next_id_20" name="Reconciliation" parent="menu_finance_periodical_processing"/><menuitem action="action_account_reconcile_select" id="menu_reconcile_select" parent="account.next_id_20" />
     </data>
 </openerp>
diff --git a/addons/account/wizard/account_period_close_view.xml b/addons/account/wizard/account_period_close_view.xml
index 35e05f4586c..b1e9e289083 100644
--- a/addons/account/wizard/account_period_close_view.xml
+++ b/addons/account/wizard/account_period_close_view.xml
@@ -20,7 +20,7 @@
                </form>
             </field>
         </record>
-		<record id="wizard_period_close" model="ir.actions.act_window">
+		<record id="action_account_period_close" model="ir.actions.act_window">
             <field name="name">Close a Period</field>
             <field name="res_model">account.period.close</field>
             <field name="view_type">form</field>

From 194bcd8ab82454473c9b6037045f9500e3c19380 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Tue, 2 Mar 2010 14:34:52 +0530
Subject: [PATCH 017/251] [IMP]: account: Minor changes for wizards

bzr revid: rpa@openerp.co.in-20100302090452-elyjrhoo2g8ojqyl
---
 addons/account/account_invoice_view.xml                   | 6 +++---
 addons/account/account_view.xml                           | 5 ++++-
 addons/account/wizard/account_invoice_refund_view.xml     | 3 +++
 .../account/wizard/account_move_bank_reconcile_view.xml   | 1 +
 .../wizard/account_move_line_reconcile_select_view.xml    | 8 +++++++-
 addons/account/wizard/account_period_close_view.xml       | 2 ++
 6 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 3b917b93f68..d281403b68f 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -196,11 +196,11 @@
                                     <button name='%(wizard_paid_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
                                     <!-- Wizard Buttons: To Remove -->
                                     <button name="%(wizard_invoice_pay)d" type="action" string="Pay Invoice" states="open,paid,proforma2" icon="STOCK_EXECUTE" /> 
-							 		<button name="%(wizard_invoice_refund)d" type="action" string="Credit Note"  icon="STOCK_EXECUTE" />
+							 		<button name="%(action_account_invoice_refund)d" type="action" string="Credit Note"  icon="STOCK_EXECUTE" />
                                 </group>
                             </group>
-                             
                         </page>
+                        
                         <page string="Other Info">
                             <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
                             <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
@@ -291,7 +291,7 @@
                                     <button name='%(wizard_paid_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
                                     <!-- Wizard Buttons: To Remove -->
                                     <button name="%(wizard_invoice_pay)d" type="action" string="Pay Invoice" states="open,paid,proforma2" icon="STOCK_EXECUTE" /> 
-							 		<button name="%(wizard_invoice_refund)d" type="action" string="Credit Note"  icon="STOCK_EXECUTE" />
+							 		<button name="%(action_account_invoice_refund)d" type="action" string="Credit Note"  icon="STOCK_EXECUTE" />
                                </group>
                             </group>
                         </page>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 9dc00c58c38..4723f2b890f 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -81,7 +81,10 @@
                     <separator colspan="4" string="States"/>
                     <field name="state" select="1"/>
                     <button name="action_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert"/>
-                    
+                    <!-- Wizard Buttons: To Remove -->
+                    <button name="%(action_account_period_close)d"
+                    	states="draft" string="Close Period" type="action"
+                    	icon="gtk-close" />
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_invoice_refund_view.xml b/addons/account/wizard/account_invoice_refund_view.xml
index 8a02c20faf7..4a38f3e2c63 100644
--- a/addons/account/wizard/account_invoice_refund_view.xml
+++ b/addons/account/wizard/account_invoice_refund_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
     	<record id="view_account_invoice_refund" model="ir.ui.view">
             <field name="name">account.invoice.refund.form</field>
             <field name="model">account.invoice.refund</field>
@@ -25,6 +26,7 @@
                </form>
             </field>
     	</record>
+
         <record id="action_account_invoice_refund" model="ir.actions.act_window">
             <field name="name">Credit Note</field>
             <field name="res_model">account.invoice.refund</field>
@@ -33,5 +35,6 @@
            <field name="view_id" ref="view_account_invoice_refund"/> 
            <field name="target">new</field>
         </record>
+
     </data>
 </openerp>	
\ No newline at end of file
diff --git a/addons/account/wizard/account_move_bank_reconcile_view.xml b/addons/account/wizard/account_move_bank_reconcile_view.xml
index 87400d5c3cd..719e9f8a9a2 100644
--- a/addons/account/wizard/account_move_bank_reconcile_view.xml
+++ b/addons/account/wizard/account_move_bank_reconcile_view.xml
@@ -19,6 +19,7 @@
                </form>
             </field>
     	</record>
+    	
     	<record id="action_account_bank_reconcile_tree" model="ir.actions.act_window">
             <field name="name">Bank reconciliation</field>
             <field name="res_model">account.move.bank.reconcile</field>
diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml
index a2a45454c90..f6598413767 100644
--- a/addons/account/wizard/account_move_line_reconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -27,6 +27,12 @@
            <field name="view_id" ref="view_account_move_line_reconcile_select"/> 
            <field name="target">new</field>
         </record>
-        <menuitem id="next_id_20" name="Reconciliation" parent="menu_finance_periodical_processing"/><menuitem action="action_account_reconcile_select" id="menu_reconcile_select" parent="account.next_id_20" />
+
+        <menuitem id="next_id_20" name="Reconciliation"
+        	parent="menu_finance_periodical_processing" />
+
+        <menuitem action="action_account_reconcile_select"
+        	id="menu_reconcile_select" parent="account.next_id_20" />
+
     </data>
 </openerp>
diff --git a/addons/account/wizard/account_period_close_view.xml b/addons/account/wizard/account_period_close_view.xml
index b1e9e289083..3be41101fdc 100644
--- a/addons/account/wizard/account_period_close_view.xml
+++ b/addons/account/wizard/account_period_close_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+    
         <record id="view_account_period_close" model="ir.ui.view">
             <field name="name">account.period.close.form</field>
             <field name="model">account.period.close</field>
@@ -20,6 +21,7 @@
                </form>
             </field>
         </record>
+        
 		<record id="action_account_period_close" model="ir.actions.act_window">
             <field name="name">Close a Period</field>
             <field name="res_model">account.period.close</field>

From 3394daefc5d270d7a2e718f641e251b94978c223 Mon Sep 17 00:00:00 2001
From: "ATP (OpenERP)" <>
Date: Tue, 2 Mar 2010 15:47:28 +0530
Subject: [PATCH 018/251] [IMP]: account: Added icons on wizard buttons

bzr revid: rpa@openerp.co.in-20100302101728-03qbgh5xy7c8ti61
---
 addons/account/wizard/account_chart_view.xml  |  8 +--
 .../wizard/account_fiscalyear_close_state.xml |  4 +-
 .../wizard/account_invoice_refund_view.xml    |  8 +--
 .../account_move_bank_reconcile_view.xml      |  4 +-
 .../wizard/account_move_journal_view.xml      |  2 +-
 ...ccount_move_line_reconcile_select_view.xml |  6 +-
 .../wizard/account_period_close_view.xml      |  4 +-
 addons/account/wizard/wizard_reconcile.py     | 60 +++++++++----------
 8 files changed, 49 insertions(+), 47 deletions(-)

diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index eedd259c762..ae89dfb9945 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -16,9 +16,10 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<button  special="cancel" string="Cancel"/>
-                    	<button string="Open Charts" name="_account_chart_open_window" type="object"/>
-                   </group>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel" />
+                    	<button icon="gtk-open" string="Open Charts"
+                    		name="_account_chart_open_window" type="object" />
+                    </group>
                </form>
             </field>
   		</record>
@@ -35,6 +36,5 @@
         <menuitem icon="STOCK_INDENT" action="action_account_chart"
         	id="menu_action_account_tree2"
         	parent="account.menu_finance_charts" />
-
     </data>
 </openerp>
diff --git a/addons/account/wizard/account_fiscalyear_close_state.xml b/addons/account/wizard/account_fiscalyear_close_state.xml
index 7a6492ddb0d..d6fe49c9b2c 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.xml
+++ b/addons/account/wizard/account_fiscalyear_close_state.xml
@@ -15,8 +15,8 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<button  special="cancel" string="Cancel"/>
-                    	<button string="Close states" name="_data_save" type="object"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-close" string="Close states" name="_data_save" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/account/wizard/account_invoice_refund_view.xml b/addons/account/wizard/account_invoice_refund_view.xml
index 4a38f3e2c63..0d2bb036c06 100644
--- a/addons/account/wizard/account_invoice_refund_view.xml
+++ b/addons/account/wizard/account_invoice_refund_view.xml
@@ -18,10 +18,10 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<button  special="cancel" string="Cancel"/>
-                    	<button string="Refund Invoice" name="_invoice_refund" type="object"/>
-                    	<button string="Cancel Invoice" name="_invoice_cancel" type="object"/>
-                    	<button string="Modify Invoice" name="_invoice_modify" type="object"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-redo" string="Refund Invoice" name="_invoice_refund" type="object"/>
+                    	<button icon="gtk-ok" string="Cancel Invoice" name="_invoice_cancel" type="object"/>
+                    	<button icon="gtk-undo" string="Modify Invoice" name="_invoice_modify" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/account/wizard/account_move_bank_reconcile_view.xml b/addons/account/wizard/account_move_bank_reconcile_view.xml
index 719e9f8a9a2..5a542a7e270 100644
--- a/addons/account/wizard/account_move_bank_reconcile_view.xml
+++ b/addons/account/wizard/account_move_bank_reconcile_view.xml
@@ -13,8 +13,8 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<button  special="cancel" string="Cancel"/>
-                    	<button string="Open for bank reconciliation" name="_action_open_window" type="object"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-open" string="Open for bank reconciliation" name="_action_open_window" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
index 293212ce2e3..e32148c9c69 100644
--- a/addons/account/wizard/account_move_journal_view.xml
+++ b/addons/account/wizard/account_move_journal_view.xml
@@ -17,7 +17,7 @@
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button string="Open Journal" name="_action_open_window" type="object"/>
+                    	<button icon="gtk-open" string="Open Journal" name="_action_open_window" type="object"/>
                    	</group>
                </form>
             </field>
diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml
index f6598413767..2bb05b2e9ab 100644
--- a/addons/account/wizard/account_move_line_reconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -13,8 +13,10 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<button  special="cancel" string="Cancel"/>
-                    	<button string="Open for reconciliation" name="_action_open_window" type="object"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel" />
+						<button icon="gtk-open"
+							string="Open for reconciliation" name="_action_open_window"
+							type="object" />
                    </group>
                </form>
             </field>
diff --git a/addons/account/wizard/account_period_close_view.xml b/addons/account/wizard/account_period_close_view.xml
index 3be41101fdc..fc8c5273a79 100644
--- a/addons/account/wizard/account_period_close_view.xml
+++ b/addons/account/wizard/account_period_close_view.xml
@@ -15,8 +15,8 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<button  special="cancel" string="Cancel"/>
-                    	<button string="Close Period" name="_data_save" type="object"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon="gtk-close" string="Close Period" name="_data_save" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/account/wizard/wizard_reconcile.py b/addons/account/wizard/wizard_reconcile.py
index 9debe7afbef..6d7de403f79 100644
--- a/addons/account/wizard/wizard_reconcile.py
+++ b/addons/account/wizard/wizard_reconcile.py
@@ -19,13 +19,13 @@
 #
 ##############################################################################
 
-import wizard
-import netsvc
-import time
-import osv
-import pooler
 from datetime import datetime
 from tools.translate import _
+import netsvc
+import osv
+import pooler
+import time
+import wizard
 
 _transaction_form = '''<?xml version="1.0"?>
 <form string="Reconciliation">
@@ -39,10 +39,10 @@ _transaction_form = '''<?xml version="1.0"?>
 </form>'''
 
 _transaction_fields = {
-    'trans_nbr': {'string':'# of Transaction', 'type':'integer', 'readonly':True},
-    'credit': {'string':'Credit amount', 'type':'float', 'readonly':True},
-    'debit': {'string':'Debit amount', 'type':'float', 'readonly':True},
-    'writeoff': {'string':'Write-Off amount', 'type':'float', 'readonly':True},
+    'trans_nbr': {'string':'# of Transaction', 'type':'integer', 'readonly':True}, 
+    'credit': {'string':'Credit amount', 'type':'float', 'readonly':True}, 
+    'debit': {'string':'Debit amount', 'type':'float', 'readonly':True}, 
+    'writeoff': {'string':'Write-Off amount', 'type':'float', 'readonly':True}, 
 }
 
 def _trans_rec_get(self, cr, uid, data, context=None):
@@ -83,12 +83,12 @@ def _trans_rec_reconcile(self, cr, uid, data, context=None):
     journal_id = form.get('journal_id', False)
     context['comment'] = form.get('comment', False)
     context['analytic_id'] = form.get('analytic_id', False)
-    account_move_line_obj.reconcile(cr, uid, data['ids'], 'manual', account_id,
+    account_move_line_obj.reconcile(cr, uid, data['ids'], 'manual', account_id, 
             period_id, journal_id, context=context)
     return {}
 
 def _partial_check(self, cr, uid, data, context):
-    if _trans_rec_get(self,cr,uid, data, context)['writeoff'] == 0:
+    if _trans_rec_get(self, cr, uid, data, context)['writeoff'] == 0:
         return 'init_full'
     return 'init_partial'
 
@@ -104,11 +104,11 @@ _transaction_add_form = '''<?xml version="1.0"?>
 </form>'''
 
 _transaction_add_fields = {
-    'journal_id': {'string': 'Write-Off Journal', 'type': 'many2one', 'relation':'account.journal', 'required':True},
-    'writeoff_acc_id': {'string':'Write-Off account', 'type':'many2one', 'relation':'account.account', 'required':True},
-    'date_p': {'string':'Date','type':'date'},
-    'comment': {'string':'Comment','type':'char', 'size': 64, 'required':True},
-    'analytic_id': {'string':'Analytic Account', 'type': 'many2one', 'relation':'account.analytic.account'},
+    'journal_id': {'string': 'Write-Off Journal', 'type': 'many2one', 'relation':'account.journal', 'required':True}, 
+    'writeoff_acc_id': {'string':'Write-Off account', 'type':'many2one', 'relation':'account.account', 'required':True}, 
+    'date_p': {'string':'Date', 'type':'date'}, 
+    'comment': {'string':'Comment', 'type':'char', 'size': 64, 'required':True}, 
+    'analytic_id': {'string':'Analytic Account', 'type': 'many2one', 'relation':'account.analytic.account'}, 
 }
 
 def _trans_rec_addendum(self, cr, uid, data, context={}):
@@ -119,27 +119,27 @@ def _trans_rec_addendum(self, cr, uid, data, context={}):
 class wiz_reconcile(wizard.interface):
     states = {
         'init': {
-            'actions': [],
+            'actions': [], 
             'result': {'type': 'choice', 'next_state': _partial_check}
-        },
+        }, 
         'init_full': {
-            'actions': [_trans_rec_get],
-            'result': {'type': 'form', 'arch':_transaction_form, 'fields':_transaction_fields, 'state':[('end','Cancel'),('reconcile','Reconcile')]}
-        },
+            'actions': [_trans_rec_get], 
+            'result': {'type': 'form', 'arch':_transaction_form, 'fields':_transaction_fields, 'state':[('end', 'Cancel'), ('reconcile', 'Reconcile')]}
+        }, 
         'init_partial': {
-            'actions': [_trans_rec_get],
-            'result': {'type': 'form', 'arch':_transaction_form, 'fields':_transaction_fields, 'state':[('end','Cancel'),('addendum','Reconcile With Write-Off'),('partial','Partial Reconcile')]}
-        },
+            'actions': [_trans_rec_get], 
+            'result': {'type': 'form', 'arch':_transaction_form, 'fields':_transaction_fields, 'state':[('end', 'Cancel'), ('addendum', 'Reconcile With Write-Off'), ('partial', 'Partial Reconcile')]}
+        }, 
         'addendum': {
-            'actions': [_trans_rec_addendum],
-            'result': {'type': 'form', 'arch':_transaction_add_form, 'fields':_transaction_add_fields, 'state':[('end','Cancel'),('reconcile','Reconcile')]}
-        },
+            'actions': [_trans_rec_addendum], 
+            'result': {'type': 'form', 'arch':_transaction_add_form, 'fields':_transaction_add_fields, 'state':[('end', 'Cancel'), ('reconcile', 'Reconcile')]}
+        }, 
         'reconcile': {
-            'actions': [_trans_rec_reconcile],
+            'actions': [_trans_rec_reconcile], 
             'result': {'type': 'state', 'state':'end'}
-        },
+        }, 
         'partial': {
-            'actions': [_trans_rec_reconcile_partial],
+            'actions': [_trans_rec_reconcile_partial], 
             'result': {'type': 'state', 'state':'end'}
         }
     }

From a76ba1ceff9d033930e3321e973b6d670b60b3f8 Mon Sep 17 00:00:00 2001
From: "ATP (OpenERP)" <>
Date: Tue, 2 Mar 2010 16:09:13 +0530
Subject: [PATCH 019/251] [REF]: account_voucher: Converted all simple wizards
 to osv_memory wizards in account_voucher

bzr revid: rpa@openerp.co.in-20100302103913-686vj1p49yzlayrm
---
 addons/account_voucher/__terp__.py            |   3 +-
 addons/account_voucher/wizard/__init__.py     |   3 +-
 .../wizard/account_voucher_open.py            |  76 +++++++++++++
 .../wizard/account_voucher_open_view.xml      |  39 +++++++
 addons/account_voucher/wizard/open_voucher.py | 104 ------------------
 5 files changed, 119 insertions(+), 106 deletions(-)
 create mode 100644 addons/account_voucher/wizard/account_voucher_open.py
 create mode 100644 addons/account_voucher/wizard/account_voucher_open_view.xml
 delete mode 100644 addons/account_voucher/wizard/open_voucher.py

diff --git a/addons/account_voucher/__terp__.py b/addons/account_voucher/__terp__.py
index 242cc5fb391..cb2033abe06 100755
--- a/addons/account_voucher/__terp__.py
+++ b/addons/account_voucher/__terp__.py
@@ -42,7 +42,8 @@
         "voucher_sequence.xml",
         "account_report.xml",
         "voucher_view.xml",
-        "voucher_wizard.xml",
+        "wizard/account_voucher_open_view.xml",
+        #"voucher_wizard.xml",
         "account_view.xml",
     ],
     'certificate': '0037580727101',
diff --git a/addons/account_voucher/wizard/__init__.py b/addons/account_voucher/wizard/__init__.py
index 136fd1d8ee9..237055f710d 100644
--- a/addons/account_voucher/wizard/__init__.py
+++ b/addons/account_voucher/wizard/__init__.py
@@ -19,4 +19,5 @@
 #
 ##############################################################################
 
-import open_voucher
+
+import account_voucher_open
diff --git a/addons/account_voucher/wizard/account_voucher_open.py b/addons/account_voucher/wizard/account_voucher_open.py
new file mode 100644
index 00000000000..5c3448eb57f
--- /dev/null
+++ b/addons/account_voucher/wizard/account_voucher_open.py
@@ -0,0 +1,76 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import time
+import netsvc
+from osv import fields, osv
+import ir
+import pooler
+import mx.DateTime
+from mx.DateTime import RelativeDateTime
+from tools import config
+
+class account_voucher_open(osv.osv_memory):
+    """
+    Open Account Voucher
+    """
+    _name ="account.voucher.open"
+    _description ="Open Voucher"
+    _columns ={
+               'type':fields.selection([('pay_voucher','Cash Payment Voucher'),('bank_pay_voucher','Bank Payment Voucher'),('rec_voucher','Cash Receipt Voucher'),('bank_rec_voucher','Bank Receipt Voucher'),('cont_voucher','Contra Voucher'),( 'journal_sale_vou','Journal Sale Voucher'),('journal_pur_voucher','Journal Purchase Voucher')], 'Voucher Type', required=True),
+               'state':fields.selection([('draft','Draft'),
+                                         ('proforma','Pro-forma'),
+                                         ('posted','Posted'),
+                                         ('cancel','Cancel')], 'State', required=True),
+                'period_ids':fields.many2many('account.period', 'account_period_rel', 'voucher_id', 'period_id', 'Periods')                         
+               }
+    def _action_open_window(self, cr, uid, ids, context):
+        """
+        Open account voucher form.
+        @param cr: the current row, from the database cursor.
+        @param uid: the current user’s ID for security checks.
+        @param id: account voucher open’s ID or list of IDs if we want more than one.
+        @param return:dictionary of account voucher on  given state ,type and account period id.
+         """
+        
+        for form  in self.read(cr, uid, ids):
+            periods = []
+            if not form['period_ids']:
+                period = self.pool.get('account.period')
+                year = self.pool.get('account.fiscalyear')
+                year = year.find(cr, uid)
+                periods = period.search(cr, uid, [('fiscalyear_id','=',year)])
+            else:
+                periods = form['period_ids']
+        
+            return {
+                'domain': "[('type','=','%s'), ('state','=','%s'), ('period_id','in',%s)]" % (form['type'], form['state'], periods),
+                'name': "%s - %s" % (form['type'],form['state']),
+                'view_type': 'form',
+                'view_mode': 'tree,form',
+                'res_model': 'account.voucher',
+                'view_id': False,
+                'context': "{'type':'%s', 'state':'%s', 'period_id':%s}" % (form['type'], form['state'], periods),
+                'type': 'ir.actions.act_window'
+                }
+account_voucher_open()
+
+
diff --git a/addons/account_voucher/wizard/account_voucher_open_view.xml b/addons/account_voucher/wizard/account_voucher_open_view.xml
new file mode 100644
index 00000000000..c3ef1acf94e
--- /dev/null
+++ b/addons/account_voucher/wizard/account_voucher_open_view.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>
+		<record id="view_account_voucher_open_form" model="ir.ui.view">
+            <field name="name">account.voucher.open.form</field>
+            <field name="model">account.voucher.open</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Open Vouchers">
+                	<group colspan="4" >
+                    	<field name="type"/>
+    					<field name="state"/>
+    					<field name="period_ids" colspan="4"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                       	<label string ="" colspan="2"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button string="Open Voucher Entries" name="_action_open_window" type="object"/>
+                   	</group>
+               </form>
+            </field>
+        </record>
+        <record id="action_account_voucher_open" model="ir.actions.act_window">
+            <field name="name">Open a Voucher Entry</field>
+            <field name="res_model">account.voucher.open</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_account_voucher_open_form"/> 
+           <field name="target">new</field>
+        </record>
+        <menuitem 
+	     	action="action_account_voucher_open" 
+	     	id="menu_wizard_account_voucher_open" 
+	     	name="Open Vouchers"
+	     	sequence="0" 
+	     	parent="menu_action_voucher_list"/>
+	</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/account_voucher/wizard/open_voucher.py b/addons/account_voucher/wizard/open_voucher.py
deleted file mode 100644
index 5a3892e1a14..00000000000
--- a/addons/account_voucher/wizard/open_voucher.py
+++ /dev/null
@@ -1,104 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-from tools.translate import _
-import pooler
-
-_voucher_form = '''<?xml version="1.0"?>
-<form string="Open Vouchers">
-    <field name="type"/>
-    <field name="state"/>
-    <field name="period_ids" colspan="4"/>
-</form>'''
-
-_types = {
-    'pay_voucher':'Cash Payment Voucher',
-    'bank_pay_voucher':'Bank Payment Voucher',
-    'rec_voucher':'Cash Receipt Voucher',
-    'bank_rec_voucher':'Bank Receipt Voucher',
-    'cont_voucher':'Contra Voucher',
-    'journal_sale_vou':'Journal Sale Voucher',
-    'journal_pur_voucher':'Journal Purchase Voucher'
-}
-_states = {
-    'draft':'Draft',
-    'proforma':'Pro-forma',
-    'posted':'Posted',
-    'cancel':'Cancel'  
-}
-
-_voucher_fields = {
-    'type': {'string':'Voucher Type', 'type':'selection', 'selection':[
-            ('pay_voucher','Cash Payment Voucher'),
-            ('bank_pay_voucher','Bank Payment Voucher'),
-            ('rec_voucher','Cash Receipt Voucher'),
-            ('bank_rec_voucher','Bank Receipt Voucher'),
-            ('cont_voucher','Contra Voucher'),
-            ('journal_sale_vou','Journal Sale Voucher'),
-            ('journal_pur_voucher','Journal Purchase Voucher')], 'required':True},
-    'state': {'string':'State', 'type':'selection', 'selection':[
-                    ('draft','Draft'),
-                    ('proforma','Pro-forma'),
-                    ('posted','Posted'),
-                    ('cancel','Cancel')], 'required':True},
-    'period_ids': {'string':'Periods', 'type':'many2many', 'relation':'account.period'},
-}
-
-def _action_open_window(self, cr, uid, data, context):
-    form = data['form']
-    periods = []
-    
-    if not form['period_ids'][0][2]:
-        pool = pooler.get_pool(cr.dbname)
-        period = pool.get('account.period')
-        year = pool.get('account.fiscalyear')
-        
-        year = year.find(cr, uid)
-        periods = period.search(cr, uid, [('fiscalyear_id','=',year)])
-    else:
-        periods = form['period_ids'][0][2]
-        
-    return {
-        'domain': "[('type','=','%s'), ('state','=','%s'), ('period_id','in',%s)]" % (form['type'], form['state'], periods),
-        'name': "%s - %s" % (_types[form['type']], _states[form['state']]),
-        'view_type': 'form',
-        'view_mode': 'tree,form',
-        'res_model': 'account.voucher',
-        'view_id': False,
-        'context': "{'type':'%s', 'state':'%s', 'period_id':%s}" % (form['type'], form['state'], periods),
-        'type': 'ir.actions.act_window'
-    }
-
-class OpenVoucherEntries(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':_voucher_form, 'fields':_voucher_fields, 'state':[('end','Cancel'),('open','Open Voucher Entries')]}
-        },
-        'open': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _action_open_window, 'state':'end'}
-        }
-    }
-OpenVoucherEntries('account.voucher.open')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 6c6f070839622ff7ef959c9a8fd47c0e72578554 Mon Sep 17 00:00:00 2001
From: "KSA (OpenERP)" <>
Date: Tue, 2 Mar 2010 16:26:55 +0530
Subject: [PATCH 020/251] [IMP]: wiki: Improvement for wizard names

bzr revid: rpa@openerp.co.in-20100302105655-tquoxqb3l094nyto
---
 addons/wiki/wizard/__init__.py            |  7 +-
 addons/wiki/wizard/create_menu.py         | 79 ------------------
 addons/wiki/wizard/make_index.py          | 98 -----------------------
 addons/wiki/wizard/open_help.py           | 58 --------------
 addons/wiki/wizard/open_page.py           | 68 ----------------
 addons/wiki/wizard/wiki_create_menu.py    | 44 +++++++---
 addons/wiki/wizard/wiki_make_index.py     | 30 ++++++-
 addons/wiki/wizard/wiki_wiki_help_open.py | 39 +++++++--
 addons/wiki/wizard/wiki_wiki_page_open.py | 45 ++++++++---
 9 files changed, 127 insertions(+), 341 deletions(-)
 delete mode 100644 addons/wiki/wizard/create_menu.py
 delete mode 100644 addons/wiki/wizard/make_index.py
 delete mode 100644 addons/wiki/wizard/open_help.py
 delete mode 100644 addons/wiki/wizard/open_page.py

diff --git a/addons/wiki/wizard/__init__.py b/addons/wiki/wizard/__init__.py
index 0c25e5f353c..13caf0b9216 100644
--- a/addons/wiki/wizard/__init__.py
+++ b/addons/wiki/wizard/__init__.py
@@ -19,14 +19,9 @@
 #
 ##############################################################################
 
-import create_menu
-import make_index
-import open_help
-import open_page
-import show_diff
-
 import wiki_wiki_page_open
 import wiki_create_menu
 import wiki_wiki_help_open
 import wiki_make_index
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/wizard/create_menu.py b/addons/wiki/wizard/create_menu.py
deleted file mode 100644
index 633f45eb91d..00000000000
--- a/addons/wiki/wizard/create_menu.py
+++ /dev/null
@@ -1,79 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import time
-import wizard
-import osv
-import pooler
-
-section_form = '''<?xml version="1.0"?>
-<form string="Create Menu">
-    <separator string="Menu Information" colspan="4"/>
-    <field name="menu_name"/>
-    <field name="menu_parent_id"/>
-    <field name="page" colspan="4"/>
-</form>'''
-
-section_fields = {
-    'menu_name': {'string':'Menu Name', 'type':'char', 'required':True, 'size':64},
-    'menu_parent_id': {'string':'Parent Menu', 'type':'many2one', 'relation':'ir.ui.menu', 'required':True},
-    'page': {'string':'Group Home Page', 'type':'many2one', 'relation':'wiki.wiki'},
-}
-
-def wiki_menu_create(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    group = pool.get('wiki.groups').browse(cr, uid, data['id'])
-    action_id = pool.get('ir.actions.wizard').search(cr, uid, [('wiz_name','=','wiki.wiki.page.open')])
-
-    menu_id = pool.get('ir.ui.menu').create(cr, uid, {
-        'name': data['form']['menu_name'],
-        'parent_id': data['form']['menu_parent_id'],
-        'icon': 'STOCK_DIALOG_QUESTION',
-        'action': 'ir.actions.wizard,'+str(action_id[0])
-    }, context)
-    
-    home = data['form']['page']
-    group_id = data['id']
-    res = {
-        'home': home,
-    }
-    pool.get('wiki.groups').write(cr, uid, [data['id']], res)
-    pool.get('wiki.groups.link').create(cr, uid, {'group_id':group_id, 'action_id':menu_id})
-    
-    return {}
-
-class wizard_create_menu(wizard.interface):
-    states = {
-        'init': {
-            'actions': [], 
-            'result': {'type':'form', 'arch':section_form, 'fields':section_fields, 'state':[('end','Cancel'),('create_menu','Create Menu')]}
-        },
-        'create_menu': {
-            'actions': [wiki_menu_create], 
-            'result': {
-                'type':'state', 
-                'state':'end'
-            }
-        }
-    }
-wizard_create_menu('wiki.create.menu')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/wizard/make_index.py b/addons/wiki/wizard/make_index.py
deleted file mode 100644
index 09a3b5de4ac..00000000000
--- a/addons/wiki/wizard/make_index.py
+++ /dev/null
@@ -1,98 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-import wizard
-import osv
-import pooler
-
-section_form = '''<?xml version="1.0"?>
-<form string="Create Menu">
-    <separator string="Menu Information" colspan="4"/>
-    <label string="Want to create a Index on Selected Pages ? "/>
-</form>'''
-
-def wiki_do_index(self, cr, uid, data, context):
-    ids = data['ids']
-    pool = pooler.get_pool(cr.dbname)
-    wiki_pool = pool.get('wiki.wiki')
-    cr.execute("Select id, section from wiki_wiki where id = ANY(%s) order by section " ,(ids,))
-    lst0 = cr.fetchall()
-    lst = []
-    ids = {}
-    for l in lst0:
-        ids[l[1]] = l[0]
-        lst.append(l[1])
-
-    lst.sort()
-    val = None
-    def toint(x):
-        try:
-            return int(x)
-        except:
-            return 1
-
-    lst = map(lambda x: map(toint, x.split('.')), lst)
-
-    result = []
-    current = ['0']
-    current2 = []
-
-    for l in lst:
-        for pos in range(len(l)):
-            if pos >= len(current):
-                current.append('1')
-                continue
-            if (pos == len(l) - 1) or (pos >= len(current2)) or (toint(l[pos]) > toint(current2[pos])):
-                 current[pos] = str(toint(current[pos]) + 1)
-                 current = current[:pos + 1]
-            if pos == len(l) - 1:
-                 break
-
-        key = ('.'.join([str(x) for x in l]))
-        id = ids[key]
-        val = ('.'.join([str(x) for x in current[:]]), id)
-
-        if val:
-            result.append(val)
-        current2 = l
-
-    for rs in result:
-        wiki_pool.write(cr, uid, [rs[1]], {'section':rs[0]})
-    return {}
-
-class make_index(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type':'form', 'arch':section_form, 'fields':{}, 'state':[('end','Cancel'),('yes','Create Index')]}
-        },
-        'yes': {
-            'actions': [wiki_do_index],
-            'result': {
-                'type':'state',
-                'state':'end'
-            }
-        }
-    }
-make_index('wiki.make.index')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/wizard/open_help.py b/addons/wiki/wizard/open_help.py
deleted file mode 100644
index 6be88349a81..00000000000
--- a/addons/wiki/wizard/open_help.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution    
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-
-import wizard
-import netsvc
-import time
-import pooler
-from osv import osv
-from tools.translate import _
-
-class wiz_open_help(wizard.interface):
-    
-    def _open_wiki_page(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        pages = pool.get('wiki.wiki').search(cr, uid, [('name','=','Basic Wiki Editing')])
-        
-        value = {
-            'name': 'Basic Wiki Editing',
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'wiki.wiki',
-            'view_id': False,
-            'res_id': pages[0],
-            'type': 'ir.actions.act_window',
-        }
-                    
-        return value
-
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type':'action', 'action':_open_wiki_page, 'state':'end'}
-        }
-    }
-wiz_open_help('wiki.wiki.help.open')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/wiki/wizard/open_page.py b/addons/wiki/wizard/open_page.py
deleted file mode 100644
index df015f5c5a0..00000000000
--- a/addons/wiki/wizard/open_page.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-
-import wizard
-import netsvc
-import time
-import pooler
-from osv import osv
-from tools.translate import _
-
-class wiz_open_page(wizard.interface):
-    
-    def _open_wiki_page(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        group = pool.get('wiki.groups').browse(cr, uid, data['id'])
-        
-        value = {
-            'context': "{'group_id':%d, 'section':%s}" % (group.id, group.section),
-            'domain': "[('group_id','=',%d)]" % (group.id),
-            'name': 'Wiki Page',
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'wiki.wiki',
-            'view_id': False,
-            'type': 'ir.actions.act_window',
-        }
-        if group.method == 'page':
-            value['res_id'] = group.home.id
-        elif group.method == 'list':
-            value['view_type'] = 'form'
-            value['view_mode'] = 'tree,form'
-        elif group.method == 'tree':
-            view_id = pool.get('ir.ui.view').search(cr, uid, [('name','=','wiki.wiki.tree.childs')])
-            value['view_id'] = view_id
-            value['domain'] = [('group_id','=',group.id),('parent_id','=',False)]
-            value['view_type'] = 'tree'            
-
-        return value
-
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type':'action', 'action':_open_wiki_page, 'state':'end'}
-        }
-    }
-wiz_open_page('wiki.wiki.page.open')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/wizard/wiki_create_menu.py b/addons/wiki/wizard/wiki_create_menu.py
index 0bfd102a5cf..352e9e78a4c 100644
--- a/addons/wiki/wizard/wiki_create_menu.py
+++ b/addons/wiki/wizard/wiki_create_menu.py
@@ -1,16 +1,38 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
 from osv import fields, osv
 from service import web_services
+import pooler
 import time
 import wizard
-import pooler
 
 class wiki_create_menu(osv.osv_memory):
     _name = "wiki.create.menu"
     _description = "Wizard Create Menu"
     _columns = {
-        'menu_name': fields.char('Menu Name', size=256, select=True, required=True), 
-        'menu_parent_id': fields.many2one('ir.ui.menu', 'Parent Menu', required=True), 
-        'page': fields.many2one('wiki.wiki', 'Group Home Page'), 
+        'menu_name': fields.char('Menu Name', size=256, select=True, required=True),
+        'menu_parent_id': fields.many2one('ir.ui.menu', 'Parent Menu', required=True),
+        'page': fields.many2one('wiki.wiki', 'Group Home Page'),
     }
 
     def wiki_menu_create(self, cr, uid, ids, context):
@@ -22,20 +44,22 @@ class wiki_create_menu(osv.osv_memory):
                 mod_obj = self.pool.get('ir.model.data')
                 action_id = mod_obj._get_id(cr, uid, 'wiki', 'action_view_wiki_wiki_page_open')
                 menu_id = self.pool.get('ir.ui.menu').create(cr, uid, {
-                'name': menu.menu_name, 
-                'parent_id': menu.menu_parent_id.id, 
-                'icon': 'STOCK_DIALOG_QUESTION', 
+                'name':menu.menu_name,
+                'parent_id':menu.menu_parent_id.id,
+                'icon': 'STOCK_DIALOG_QUESTION',
                 'action': 'ir.actions.act_window,'+ str(action_id)
                 }, context)
                 home = menu.page.id
                 group_id = menu.id
                 res = {
-                'home': home, 
+                'home':home,
                 }
                 self.pool.get('wiki.groups').write(cr, uid, ids, res)
-                self.pool.get('wiki.groups.link').create(cr, uid, {'group_id': group_id, 'action_id': menu_id})
+                self.pool.get('wiki.groups.link').create(cr, uid,
+                                    {'group_id': group_id, 'action_id':menu_id})
 
                 return {}
 
-
 wiki_create_menu()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/wiki/wizard/wiki_make_index.py b/addons/wiki/wizard/wiki_make_index.py
index c63e8a2b05f..56980c5288e 100644
--- a/addons/wiki/wizard/wiki_make_index.py
+++ b/addons/wiki/wizard/wiki_make_index.py
@@ -1,3 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
 from osv import fields, osv
 from service import web_services
 import time
@@ -12,9 +33,10 @@ class wiki_make_index(osv.osv_memory):
 
     def wiki_do_index(self, cr, uid, ids, context):
         """ Makes Index according to page hierarchy"""
-        for index_obj in self.browse(cr, uid, ids):
+        for index_obj in self.browse(cr,uid,ids):
             wiki_pool = self.pool.get('wiki.wiki')
-            cr.execute("Select id, section from wiki_wiki where id = ANY(%s) order by section " , (context['active_ids'],))
+            cr.execute("Select id, section from wiki_wiki where id = ANY(%s) \
+                            order by section " ,(context['active_ids'],))
             lst0 = cr.fetchall()
             lst = []
             s_ids = {}
@@ -56,9 +78,9 @@ class wiki_make_index(osv.osv_memory):
             current2 = l
 
             for rs in result:
-                wiki_pool.write(cr, uid, [rs[1]], {'section': rs[0]})
+                wiki_pool.write(cr, uid, [rs[1]], {'section':rs[0]})
         return {}
 
-
 wiki_make_index()
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/wizard/wiki_wiki_help_open.py b/addons/wiki/wizard/wiki_wiki_help_open.py
index 457f52658f4..933aa54f7cd 100644
--- a/addons/wiki/wizard/wiki_wiki_help_open.py
+++ b/addons/wiki/wizard/wiki_wiki_help_open.py
@@ -1,3 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
 from osv import fields, osv
 from service import web_services
 import time
@@ -11,17 +33,20 @@ class wiki_wiki_help_open(osv.osv_memory):
     }
     def _open_wiki_page(self, cr, uid, ids, context):
         """ Opens Wiki Page for Editing"""
-        pages = self.pool.get('wiki.wiki').search(cr, uid, [('name', '=', 'Basic Wiki Editing')])
+        pages = self.pool.get('wiki.wiki').search(cr, uid, [('name','=','Basic Wiki Editing')])
 
         value = {
-            'view_type': 'form', 
-            'view_mode': 'form,tree', 
-            'res_model': 'wiki.wiki', 
-            'view_id': False, 
-            'res_id': pages[0], 
-            'type': 'ir.actions.act_window', 
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': 'wiki.wiki',
+            'view_id': False,
+            'res_id': pages[0],
+            'type': 'ir.actions.act_window',
         }
 
         return value
 
 wiki_wiki_help_open()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/wiki/wizard/wiki_wiki_page_open.py b/addons/wiki/wizard/wiki_wiki_page_open.py
index 324fa5754ab..4102e6486dd 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open.py
+++ b/addons/wiki/wizard/wiki_wiki_page_open.py
@@ -1,3 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
 from osv import fields, osv
 from service import web_services
 import time
@@ -12,18 +33,18 @@ class wiki_wiki_page_open(osv.osv_memory):
     }
     def _open_wiki_page(self, cr, uid, ids, context):
         """ Opens Wiki Page of Group"""
-        for group in self.pool.get('wiki.groups').browse(cr, uid, ids):
+        for group in self.pool.get('wiki.groups').browse(cr, uid,ids):
 
-         for openpage in self.pool.get('wiki.wiki.page.open').browse(cr, uid, ids):
+         for openpage in self.pool.get('wiki.wiki.page.open').browse(cr, uid,ids):
 
             value = {
-                'domain': "[('group_id','=',%d)]" % (group.id), 
-                'name': 'Wiki Page', 
-                'view_type': 'form', 
-                'view_mode': 'form,tree', 
-                'res_model': 'wiki.wiki', 
-                'view_id': False, 
-                'type': 'ir.actions.act_window', 
+                'domain': "[('group_id','=',%d)]" % (group.id),
+                'name': 'Wiki Page',
+                'view_type': 'form',
+                'view_mode': 'form,tree',
+                'res_model': 'wiki.wiki',
+                'view_id': False,
+                'type': 'ir.actions.act_window',
         }
         if group.method == 'page':
             value['res_id'] = group.home.id
@@ -31,11 +52,13 @@ class wiki_wiki_page_open(osv.osv_memory):
             value['view_type'] = 'form'
             value['view_mode'] = 'tree,form'
         elif group.method == 'tree':
-            view_id = pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'wiki.wiki.tree.childs')])
+            view_id = pool.get('ir.ui.view').search(cr, uid, [('name','=','wiki.wiki.tree.childs')])
             value['view_id'] = view_id
-            value['domain'] = [('group_id', '=', group.id), ('parent_id', '=', False)]
+            value['domain'] = [('group_id','=',group.id),('parent_id','=',False)]
             value['view_type'] = 'tree'
 
         return value
 
 wiki_wiki_page_open()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 253fcaafe338a4aecdc989adec28f928d09ff67f Mon Sep 17 00:00:00 2001
From: "KSA (Open ERP)" <>
Date: Tue, 2 Mar 2010 17:46:14 +0530
Subject: [PATCH 021/251] [ADD, REF]: Converted all simple wizards to
 osv_memory wizards in stock

bzr revid: rpa@openerp.co.in-20100302121614-24onu2psztoxh2yx
---
 addons/stock/__init__.py                      |   6 +-
 addons/stock/__terp__.py                      |   9 +-
 addons/stock/stock.py                         | 190 ++++++++++++------
 addons/stock/stock_view.xml                   |  63 ++++--
 addons/stock/stock_wizard.py                  |  92 ++++-----
 addons/stock/stock_wizard.xml                 |   6 +-
 addons/stock/wizard/__init__.py               |  15 +-
 addons/stock/wizard/inventory_merge.py        |   1 +
 .../wizard/inventory_merge_stock_zero.py      |  72 +++++++
 .../inventory_merge_stock_zero_view.xml       |  32 +++
 addons/stock/wizard/inventory_merge_zero.py   |  94 ---------
 addons/stock/wizard/stock_fill_inventory.py   |  89 ++++++++
 .../wizard/stock_fill_inventory_view.xml      |  33 +++
 .../wizard/stock_inventory_line_split.py      | 104 ++++++++++
 .../stock_inventory_line_split_view.xml       |  30 +++
 .../stock/wizard/stock_invoice_onshipping.py  | 111 ++++++++++
 .../wizard/stock_invoice_onshipping_view.xml  |  34 ++++
 addons/stock/wizard/stock_location_product.py |  59 ++++++
 .../wizard/stock_location_product_view.xml    |  35 ++++
 addons/stock/wizard/stock_traceability.py     |   4 +-
 addons/stock/wizard/wizard_inventory.py       | 111 ----------
 .../stock/wizard/wizard_invoice_onshipping.py | 167 ---------------
 .../stock/wizard/wizard_location_product.py   |  76 -------
 .../wizard/wizard_split_inventory_lots.py     |  98 ---------
 24 files changed, 849 insertions(+), 682 deletions(-)
 create mode 100644 addons/stock/wizard/inventory_merge_stock_zero.py
 create mode 100644 addons/stock/wizard/inventory_merge_stock_zero_view.xml
 delete mode 100644 addons/stock/wizard/inventory_merge_zero.py
 create mode 100644 addons/stock/wizard/stock_fill_inventory.py
 create mode 100644 addons/stock/wizard/stock_fill_inventory_view.xml
 create mode 100644 addons/stock/wizard/stock_inventory_line_split.py
 create mode 100644 addons/stock/wizard/stock_inventory_line_split_view.xml
 create mode 100644 addons/stock/wizard/stock_invoice_onshipping.py
 create mode 100644 addons/stock/wizard/stock_invoice_onshipping_view.xml
 create mode 100755 addons/stock/wizard/stock_location_product.py
 create mode 100644 addons/stock/wizard/stock_location_product_view.xml
 delete mode 100644 addons/stock/wizard/wizard_inventory.py
 delete mode 100644 addons/stock/wizard/wizard_invoice_onshipping.py
 delete mode 100755 addons/stock/wizard/wizard_location_product.py
 delete mode 100644 addons/stock/wizard/wizard_split_inventory_lots.py

diff --git a/addons/stock/__init__.py b/addons/stock/__init__.py
index d728efbf2fe..12a218a31be 100644
--- a/addons/stock/__init__.py
+++ b/addons/stock/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.
 #
 ##############################################################################
 
@@ -26,9 +26,9 @@ import product
 import report
 import wizard
 import report_stock
-
 import stock_wizard
 
 
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/stock/__terp__.py b/addons/stock/__terp__.py
index 8081c4b6738..ff47ac55d8b 100644
--- a/addons/stock/__terp__.py
+++ b/addons/stock/__terp__.py
@@ -41,11 +41,16 @@ Thanks to the double entry management, the inventory controlling is powerful and
     "init_xml" : [],
     "demo_xml" : ["stock_demo.xml"],
     "update_xml" : [
-        "stock_workflow.xml",
         "stock_data.xml",
+        "wizard/inventory_merge_stock_zero_view.xml",
+        "wizard/stock_fill_inventory_view.xml",
+        "wizard/stock_invoice_onshipping_view.xml",
+        "wizard/stock_location_product_view.xml",
+        "wizard/stock_inventory_line_split_view.xml",
+        "stock_workflow.xml",
         "stock_incoterms.xml",
         "stock_wizard.xml",
-        "stock_wizard_view.xml", 
+        "stock_wizard_view.xml",
         "stock_view.xml",
         "stock_report.xml",
         "stock_sequence.xml",
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 240bc9762ce..ae7263112f0 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -219,7 +219,7 @@ class stock_location(osv.osv):
         # Take the user company and pricetype
         price_type_id=self.pool.get('res.users').browse(cr,uid,uid).company_id.property_valuation_price_type.id
         pricetype=self.pool.get('product.price.type').browse(cr,uid,price_type_id)
-        
+
         if not product_ids:
             product_ids = product_obj.search(cr, uid, [])
 
@@ -250,10 +250,10 @@ class stock_location(osv.osv):
                         continue
                     product = products_by_id[product_id]
                     quantity_total += qty[product_id]
-                    
+
                     # Compute based on pricetype
                     # Choose the right filed standard_price to read
-                    amount_unit=product.price_get(pricetype.field, context)[product.id] 
+                    amount_unit=product.price_get(pricetype.field, context)[product.id]
                     price = qty[product_id] * amount_unit
                     # price = qty[product_id] * product.standard_price
 
@@ -662,8 +662,8 @@ class stock_picking(osv.osv):
         if type in ('in_invoice', 'in_refund'):
             # Take the user company and pricetype
             price_type_id=self.pool.get('res.users').browse(cr,users,users).company_id.property_valuation_price_type.id
-            pricetype=self.pool.get('product.price.type').browse(cr,uid,price_type_id)            
-            amount_unit=move_line.product_id.price_get(pricetype.field, context)[move_line.product_id.id] 
+            pricetype=self.pool.get('product.price.type').browse(cr,uid,price_type_id)
+            amount_unit=move_line.product_id.price_get(pricetype.field, context)[move_line.product_id.id]
             return amount_unit
         else:
             return move_line.product_id.list_price
@@ -1379,12 +1379,12 @@ class stock_move(osv.osv):
                     # Base computation on valuation price type
                     else:
                         company_id=move.company_id.id
-                        
+
                         pricetype=self.pool.get('product.price.type').browse(cr,uid,move.company_id.property_valuation_price_type.id)
                         amount_unit=move.product_id.price_get(pricetype.field, context)[move.product_id.id]
                         amount=amount_unit * q or 1.0
                         # amount = q * move.product_id.standard_price
-                    
+
                     partner_id = False
                     if move.picking_id:
                         partner_id = move.picking_id.address_id and (move.picking_id.address_id.partner_id and move.picking_id.address_id.partner_id.id or False) or False
@@ -1430,7 +1430,7 @@ class stock_move(osv.osv):
                 raise osv.except_osv(_('UserError'),
                         _('You can only delete draft moves.'))
         return super(stock_move, self).unlink(
-            cr, uid, ids, context=context)    
+            cr, uid, ids, context=context)
 
     def _create_lot(self, cr, uid, ids, product_id, prefix=False):
         prodlot_obj = self.pool.get('stock.production.lot')
@@ -1438,23 +1438,31 @@ class stock_move(osv.osv):
         sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
         if not sequence:
             raise wizard.except_wizard(_('Error!'), _('No production sequence defined'))
+        new_move = []
+
+        def _create_lot(move_id, product_id):
+            prodlot_id = prodlot_obj.create(cr, uid, {'name': sequence, 'prefix': prefix}, {'product_id': product_id})
+            prodlot = prodlot_obj.browse(cr, uid, prodlot_id)
+            ref = '%d' % (move_id)
+            if prodlot.ref:
+                ref = '%s, %s' % (prodlot.ref, ref)
+            prodlot_obj.write(cr, uid, [prodlot_id], {'ref': ref})
+            return prodlot_id
         prodlot_id = prodlot_obj.create(cr, uid, {'name': sequence, 'prefix': prefix}, {'product_id': product_id})
-        prodlot = prodlot_obj.browse(cr, uid, prodlot_id) 
+        prodlot = prodlot_obj.browse(cr, uid, prodlot_id)
         ref = ','.join(map(lambda x:str(x),ids))
         if prodlot.ref:
-            ref = '%s, %s' % (prodlot.ref, ref) 
+            ref = '%s, %s' % (prodlot.ref, ref)
         prodlot_obj.write(cr, uid, [prodlot_id], {'ref': ref})
         return prodlot_id
 
     def split_lines(self, cr, uid, ids, quantity, split_by_qty=1, prefix=False, with_lot=True, context=None):
-        
 
         if quantity <= 0:
             raise osv.except_osv(_('Warning!'), _('Please provide Proper Quantity !'))
 
         res = []
-
-        for move in self.browse(cr, uid, ids):            
+        for move in self.browse(cr, uid, ids):
             if split_by_qty <= 0 or quantity == 0:
                 return res
 
@@ -1466,8 +1474,18 @@ class stock_move(osv.osv):
             update_val = {
                 'product_qty': split_by_qty,
                 'product_uos_qty': uos_qty,
-            }                         
-            for idx in range(int(quantity//split_by_qty)):                 
+                }
+
+            for idx in range(int(quantity//split_by_qty)):
+                if idx:
+                    current_move = self.copy(cr, uid, move.id, {'state': move.state})
+                    new_move.append(current_move)
+                else:
+                    update_val = {
+                        'product_qty': split_by_qty,
+                        'product_uos_qty': uos_qty,
+                        }
+            for idx in range(int(quantity//split_by_qty)):
                 if not idx and move.product_qty<=quantity:
                     current_move = move.id
                 else:
@@ -1477,94 +1495,154 @@ class stock_move(osv.osv):
                     update_val['prodlot_id'] = self._create_lot(cr, uid, [current_move], move.product_id.id)
 
                 self.write(cr, uid, [current_move], update_val)
-        
-            
-            if quantity_rest > 0:    
-                idx = int(quantity//split_by_qty)            
+            if quantity_rest > 0:
+                idx = int(quantity//split_by_qty)
+
+            if quantity_rest > 0:
+                idx = int(quantity//split_by_qty)
                 update_val['product_qty'] = quantity_rest
-                update_val['product_uos_qty'] = uos_qty_rest    
-                if not idx and move.product_qty<=quantity:        
-                    current_move = move.id                    
+                update_val['product_uos_qty'] = uos_qty_rest
+                if idx:
+                    current_move = self.copy(cr, uid, move.id, {'state': move.state})
+                    new_move.append(current_move)
+                update_val['product_uos_qty'] = uos_qty_rest
+                if not idx and move.product_qty<=quantity:
+                    current_move = move.id
                 else:
-                    current_move = self.copy(cr, uid, move.id, {'state': move.state}) 
-                                                    
+                    current_move = move.id
+                update_val['prodlot_id'] = _create_lot(current_move, move.product_id.id)
+                current_move = self.copy(cr, uid, move.id, {'state': move.state})
+
                 res.append(current_move)
-                 
-                
-                if with_lot:             
+
+
+                if with_lot:
                     update_val['prodlot_id'] = self._create_lot(cr, uid, [current_move], move.product_id.id)
 
                 self.write(cr, uid, [current_move], update_val)
-        return res    
+        return res
 
-    def consume_moves(self, cr, uid, ids, quantity, location_id=False, location_dest_id=False, consume=True, context=None):        
+    def consume_moves(self, cr, uid, ids, quantity, location_id=False, location_dest_id=False, consume=True, context=None):
         if not context:
             context = {}
-                
+            context = {}
+
         if quantity <= 0:
             raise osv.except_osv(_('Warning!'), _('Please provide Proper Quantity !'))
 
-        res = []       
-        for move in self.browse(cr, uid, ids, context=context):            
+        for move in self.browse(cr, uid, ids, context=context):
+
+            res = []
+        for move in self.browse(cr, uid, ids, context=context):
             move_qty = move.product_qty
             quantity_rest = move.product_qty
 
-            quantity_rest -= quantity            
+            quantity_rest -= quantity
             uos_qty_rest = quantity_rest / move_qty * move.product_uos_qty
             if quantity_rest <= 0:
-                quantity_rest = 0 
+                quantity_rest = quantity
+                break
+
+            default_val = {
+                'product_qty': quantity,
+                'product_uos_qty': uos_qty,
+                'location_id': location_id or move.location_id.id,
+            }
+            if move.product_id.track_production:
+                new_move = self.split_lines(cr, uid, [move.id], quantity, split_by_qty=1, context=context)
+            else:
+                current_move = self.copy(cr, uid, move.id, default_val)
+                new_move.append(current_move)
+
+            update_val = {}
+            if quantity_rest > 0:
+                quantity_rest = 0
                 uos_qty_rest = 0
                 quantity = move.product_qty
- 
+
             uos_qty = quantity / move_qty * move.product_uos_qty
 
-            if quantity_rest > 0:  
+            if quantity_rest > 0:
                 default_val = {
-                    'product_qty': quantity, 
-                    'product_uos_qty': uos_qty, 
-                    'state': move.state, 
+                    'product_qty': quantity,
+                    'product_uos_qty': uos_qty,
+                    'state': move.state,
                 }
                 if location_dest_id:
-                   default_val.update({'location_dest_id': location_dest_id}) 
+                   default_val.update({'location_dest_id': location_dest_id})
                 if location_id:
-                   default_val.update({'location_id': location_id}) 
-                
+                   default_val.update({'location_id': location_id})
+
                 if move.product_id.track_production and location_id:
                     res += self.split_lines(cr, uid, [move.id], quantity, split_by_qty=1, context=context)
                 else:
                     current_move = self.copy(cr, uid, move.id, default_val)
                     res += [current_move]
 
-                update_val = {}                                  
+                update_val = {}
                 update_val['product_qty'] = quantity_rest
-                update_val['product_uos_qty'] = uos_qty_rest                          
-                self.write(cr, uid, [move.id], update_val) 
+                update_val['product_uos_qty'] = uos_qty_rest
+                self.write(cr, uid, [move.id], update_val)
 
-            else: 
-                quantity_rest = quantity    
+                self.action_done(cr, uid, new_move)
+                return new_move
+                update_val['product_uos_qty'] = uos_qty_rest
+                self.write(cr, uid, [move.id], update_val)
+
+            else:
+                quantity_rest = quantity
                 uos_qty_rest =  uos_qty
-                
+
                 if move.product_id.track_production and location_id:
                     res += self.split_lines(cr, uid, [move.id], quantity_rest, split_by_qty=1, context=context)
-                else:                     
-                    res += [move.id] 
-                    update_val = {}                                  
+                else:
+                    res += [move.id]
+                    update_val = {}
                     update_val['product_qty'] = quantity_rest
                     update_val['product_uos_qty'] = uos_qty_rest
                     if location_dest_id:
-                       update_val.update({'location_dest_id': location_dest_id}) 
+                       update_val.update({'location_dest_id': location_dest_id})
                     if location_id:
-                       update_val.update({'location_id': location_id}) 
+                       update_val.update({'location_id': location_id})
 
                     self.write(cr, uid, [move.id], update_val)
 
         if consume:
-            self.action_done(cr, uid, res)        
+            self.action_done(cr, uid, res)
         return res
 
     def scrap_moves(self, cr, uid, ids, quantity, location_dest_id, context=None):
-        return self.consume_moves(cr, uid, ids, quantity, location_id=False, location_dest_id=location_dest_id, consume=False, context=context)
+        new_move = []
+        if quantity <= 0:
+            raise osv.except_osv(_('Warning!'), _('Please provide Proper Quantity !'))
 
+        for move in self.browse(cr, uid, ids, context=context):
+            location = move.location_dest_id.id
+            move_qty = move.product_qty
+            quantity_rest = move.product_qty
+
+            quantity_rest -= quantity
+            uos_qty = quantity / move_qty * move.product_uos_qty
+            uos_qty_rest = quantity_rest / move_qty * move.product_uos_qty
+            if quantity_rest <= 0:
+                quantity_rest = quantity
+                break
+
+            default_val = {
+                'product_qty': quantity,
+                'product_uos_qty': uos_qty,
+                'location_dest_id': location_dest_id,
+                'state': move.state
+            }
+            current_move = self.copy(cr, uid, move.id, default_val)
+            new_move.append(current_move)
+            update_val = {}
+            if quantity_rest > 0:
+                update_val['product_qty'] = quantity_rest
+                update_val['product_uos_qty'] = uos_qty_rest
+                self.write(cr, uid, [move.id], update_val)
+        return new_move
+        return self.consume_moves(cr, uid, ids, quantity, location_id=False, location_dest_id=location_dest_id, consume=False, context=context)
 stock_move()
 
 
@@ -1595,7 +1673,7 @@ class stock_inventory(osv.osv):
             move_line = []
             for line in inv.inventory_line_id:
                 pid = line.product_id.id
-                
+
                 # price = line.product_id.standard_price or 0.0
                 amount = self.pool.get('stock.location')._product_get(cr, uid, line.location_id.id, [pid], {'uom': line.product_uom.id})[pid]
                 change = line.product_qty - amount
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 3cada5cbb6d..a850c6980b7 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -33,7 +33,9 @@
                     <field name="product_uom"/>
                     <field name="prod_lot_id"/>
                     <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>
-                    <button name="%(split_inventory_lots)d" string="Split Inventory Lines" type="action" icon="gtk-justify-fill"/>
+                    <button name="%(stock.action_view_stock_inventory_line_split)d"
+                     		 				string="Split inventory lines"
+                      		 				type="action" icon="gtk-justify-fill"/>
                 </form>
             </field>
         </record>
@@ -50,6 +52,7 @@
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     </group>
                 </search>
+
             </field>
         </record>
 
@@ -64,6 +67,7 @@
                     <field name="state"/>
                 </tree>
             </field>
+
         </record>
         <record id="view_inventory_form" model="ir.ui.view">
             <field name="name">stock.inventory.form</field>
@@ -89,11 +93,12 @@
                                 <field name="product_qty"/>
                                 <field name="product_uom"/>
                                 <field  domain="[('usage','=','internal')]" name="location_id" select="1"/>
+                                <field name="prod_lot_id"/>
                                 <group colspan="2" col="3">
-	                                <field name="prod_lot_id"/>
-	                                <button name="%(split_inventory_lots)d" string="Split in Production Lots" type="action" icon="gtk-justify-fill"/>
-                                </group>
-
+                                   <button name="%(stock.action_view_stock_inventory_line_split)d"
+                     		 				string="Split inventory lines"
+                      		 				type="action" icon="gtk-justify-fill"/>
+								</group>
                             </form>
                         </field>
                     </page><page string="Posted Inventory">
@@ -105,7 +110,18 @@
                         <button name="action_done" states="draft" string="Confirm Inventory" type="object" icon="gtk-apply"/>
                         <button name="action_cancel" states="cancel" string="Set to Draft" type="object" icon="gtk-cancel"/>
                         <button name="action_cancel_inventary" states="draft" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
+                         <group col="4" colspan="2">
+                        	<button name="%(stock.action_view_inventory_merge_stock_zero)d"
+                     		 string="Set Stock to Zero"
+                      		 type="action"/>
+                      		<button name="%(stock.action_view_stock_fill_inventory)d"
+                     		 string="Fill Inventory"
+                      		 type="action"/>
+						</group>
+
+
                     </group>
+
                 </form>
             </field>
         </record>
@@ -138,6 +154,9 @@
                     <field name="name" select="1"/>
                     <field name="serial" select="1"/>
                     <field name="date" select="1"/>
+                    <field name="active" select="1"/>
+                    <group colspan="4">
+                    </group>
                     <field name="active" />
                 </form>
             </field>
@@ -410,6 +429,9 @@
                     </group>
                     <separator string="Additional Information" colspan="4"/>
                     <field colspan="4" name="comment" nolabel="1"/>
+                    <button name="%(stock.action_view_stock_location_product)d"
+                     		 string="Products by Location"
+                      		 type="action"/>
                 </form>
             </field>
         </record>
@@ -524,7 +546,7 @@
             <field name="auto_refresh" eval="1"/>
             <field name="target">new</field>
             <field name="context">{'action_id': active_id}</field>
-        </record>    	
+        </record>
 
         <record model="ir.ui.view" id="stock_picking_calendar">
             <field name="name">stock.picking.calendar</field>
@@ -585,7 +607,7 @@
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
-                                    <field name="state"/> 
+                                    <field name="state"/>
                                     <button
                            				name="%(stock.track_line)d"
                            				string="Split in production lots"
@@ -662,6 +684,9 @@
                             <field name="move_type"/>
                         </page>
                     </notebook>
+                      <button name="%(stock.action_stock_invoice_onshipping)d"
+                     		 string="Create Invoices"
+                      		 type="action"/>
                 </form>
             </field>
         </record>
@@ -726,6 +751,7 @@
                         <field name="min_date" select="1"/>
                         <field name="type"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+
                     </group>
                         <notebook colspan="4">
                         <page string="General Information">
@@ -740,7 +766,7 @@
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
-                                    <field name="state"/> 
+                                    <field name="state"/>
                                     <button
                            				name="%(stock.track_line)d"
                            				string="Split in production lots"
@@ -812,7 +838,10 @@
                             <field name="move_type"/>
                         </page>
                     </notebook>
-                </form>
+ 							<button name="%(stock.action_stock_invoice_onshipping)d"
+                     		 string="Get Type"
+                      		 type="action"/>
+                      	 </form>
             </field>
         </record>
 
@@ -890,8 +919,8 @@
                     <field name="state"/>
                     <button name="%(partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-go-forward" help="Validate Picking"/>
                     <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the picking.    Do you want to continue?"/>
-                    <button name="%(wizard_invoice_onshipping)d" states="done" string="Invoice" type="action" 
-                    			icon="gtk-execute" help="Create invoice" 
+                    <button name="%(wizard_invoice_onshipping)d" states="done" string="Invoice" type="action"
+                    			icon="gtk-execute" help="Create invoice"
                     			attrs="{'invisible': [('invoice_state', '!=', '2binvoiced')]}" />
                 </tree>
             </field>
@@ -925,7 +954,7 @@
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
-                                    <field name="state"/> 
+                                    <field name="state"/>
                                     <button
                            				name="%(stock.track_line)d"
                            				string="Split in production lots"
@@ -1110,8 +1139,8 @@
                            				name="%(stock.move_scrap)d"
                            				string="D" type="action"
                            				icon="gtk-convert"
-                           				states="draft,waiting,confirmed,assigned" />
-                                </tree>                                
+                           				states="done,cancel" />
+                                </tree>
                                 <form string="Stock Moves">
                                 	<notebook colspan="4">
                                 		<page string="General Information">
@@ -1278,7 +1307,7 @@
                     <field name="location_id"/>
                     <field name="location_dest_id"/>
                     <field name="date_planned"/>
-                    <field name="state"/>                    
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
@@ -1317,7 +1346,7 @@
                                 <field name="date"/>
                                 <field name="date_planned"/>
                                 <field name="priority"/>
-                            </group> 
+                            </group>
 
                             <group colspan="2" col="4">
                                 <separator string="Tracability" colspan="4" />
@@ -1327,7 +1356,7 @@
                                     domain="[('product_id','=?',product_id)]"
                                     on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
                                 <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill" colspan="2" />
-                            </group> 
+                            </group>
                         </page>
                         <page string="Return Picking History">
                             <field name="move_stock_return_history" nolabel="1"/>
diff --git a/addons/stock/stock_wizard.py b/addons/stock/stock_wizard.py
index c813b8583b6..035676a2ea4 100644
--- a/addons/stock/stock_wizard.py
+++ b/addons/stock/stock_wizard.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.
 #
 ##############################################################################
 
@@ -25,16 +25,16 @@ from tools.translate import _
 class stock_move_track(osv.osv_memory):
     _name = "stock.move.track"
     _description = "Track moves"
-    
+
     _columns = {
-        'tracking_prefix': fields.char('Tracking prefix', size=64), 
+        'tracking_prefix': fields.char('Tracking prefix', size=64),
         'quantity': fields.float("Quantity per lot")
               }
 
     _defaults = {
         'quantity': lambda *x: 1
                  }
-    
+
     def track_lines(self, cr, uid, ids, context={}):
         datas = self.read(cr, uid, ids)[0]
         move_obj = self.pool.get('stock.move')
@@ -46,43 +46,43 @@ stock_move_track()
 class stock_move_consume(osv.osv_memory):
     _name = "stock.move.consume"
     _description = "Consume Products"
-    
+
     _columns = {
-        'product_id': fields.many2one('product.product', 'Product', required=True, select=True), 
-        'product_qty': fields.float('Quantity', required=True), 
-        'product_uom': fields.many2one('product.uom', 'Product UOM', required=True), 
+        'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
+        'product_qty': fields.float('Quantity', required=True),
+        'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
         'location_id': fields.many2one('stock.location', 'Location', required=True)
               }
 
     def _get_product_id(self, cr, uid, context):
         move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
         return move.product_id.id
-    
+
     def _get_product_qty(self, cr, uid, context):
         move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
         return move.product_qty
-    
+
     def _get_product_uom(self, cr, uid, context):
         move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
         return move.product_uom.id
-    
+
     def _get_location_id(self, cr, uid, context):
         move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
         return move.location_id.id
-    
+
     _defaults = {
-                 'product_id': _get_product_id, 
-                 'product_qty': _get_product_qty, 
-                 'product_uom': _get_product_uom, 
+                 'product_id': _get_product_id,
+                 'product_qty': _get_product_qty,
+                 'product_uom': _get_product_uom,
                  'location_id': _get_location_id
                  }
 
     def do_move_consume(self, cr, uid, ids, context={}):
         move_obj = self.pool.get('stock.move')
         move_ids = context['active_ids']
-        for data in self.read(cr, uid, ids):            
-            move_obj.consume_moves(cr, uid, move_ids, 
-                             data['product_qty'], data['location_id'], 
+        for data in self.read(cr, uid, ids):
+            move_obj.consume_moves(cr, uid, move_ids,
+                             data['product_qty'], data['location_id'],
                              context=context)
         return {}
 
@@ -93,17 +93,17 @@ class stock_move_scrap(osv.osv_memory):
     _name = "stock.move.scrap"
     _description = "Scrap Products"
     _inherit = "stock.move.consume"
-    
+
     _defaults = {
                  'location_id': lambda *x: False
-    }
+                 }
 
     def move_scrap(self, cr, uid, ids, context={}):
-        move_obj = self.pool.get('stock.move')        
+        move_obj = self.pool.get('stock.move')
         move_ids = context['active_ids']
         for data in self.read(cr, uid, ids):
-            move_obj.scrap_moves(cr, uid, move_ids, 
-                             data['product_qty'], data['location_id'], 
+            move_obj.scrap_moves(cr, uid, move_ids,
+                             data['product_qty'], data['location_id'],
                              context=context)
         return {}
 
@@ -113,18 +113,18 @@ stock_move_scrap()
 class spilt_in_production_lot(osv.osv_memory):
     _name = "stock.move.spilt"
     _description = "Split in Production lots"
-    
+
     _columns = {
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
         'line_ids': fields.one2many('stock.move.spilt.lines', 'lot_id', 'Lots Number')
      }
-    
+
     def _get_product_id(self, cr, uid, context):
         move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
         return move.product_id.id
-    
+
     _defaults = {
-                 'product_id': _get_product_id, 
+                 'product_id': _get_product_id,
                  }
 
     def split_lot(self, cr, uid, ids, context=None):
@@ -135,16 +135,15 @@ class spilt_in_production_lot(osv.osv_memory):
         prodlot_obj = self.pool.get('stock.production.lot')
         ir_sequence_obj = self.pool.get('ir.sequence')
         move_obj = self.pool.get('stock.move')
-        new_move = []        
+        new_move = []
         for data in self.browse(cr, uid, ids):
             for move in move_obj.browse(cr, uid, move_ids):
                 move_qty = move.product_qty
                 quantity_rest = move.product_qty
                 uos_qty_rest = move.product_uos_qty
-                new_move = []                            
+                new_move = []
                 for line in data.line_ids:
                     quantity = line.quantity
-                    
 
                     if quantity <= 0 or move_qty == 0:
                         continue
@@ -155,52 +154,53 @@ class spilt_in_production_lot(osv.osv_memory):
                         quantity_rest = quantity
                         break
                     default_val = {
-                        'product_qty': quantity, 
-                        'product_uos_qty': uos_qty, 
+                        'product_qty': quantity,
+                        'product_uos_qty': uos_qty,
                         'state': move.state
                     }
+
                     current_move = move_obj.copy(cr, uid, move.id, default_val)
                     new_move.append(current_move)
                     prodlot_id = False
                     if line.use_exist and line.name:
                         prodlot_id = prodlot_obj.search(cr, uid, [('prefix','=',line.name),('product_id','=',data.product_id.id)])
                         if prodlot_id:
-                            prodlot_id = prodlot_id[0]                    
+                            prodlot_id = prodlot_id[0]
                     if not prodlot_id:
                         sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
-                        prodlot_id = prodlot_obj.create(cr, uid, {'name': sequence, 'prefix' : line.name}, 
-                                                 {'product_id': move.product_id.id})                    
+                        prodlot_id = prodlot_obj.create(cr, uid, {'name': sequence, 'prefix' : line.name},
+                                                 {'product_id': move.product_id.id})
                     move_obj.write(cr, uid, [current_move], {'prodlot_id': prodlot_id})
-                    prodlot = prodlot_obj.browse(cr, uid, prodlot_id) 
+                    prodlot = prodlot_obj.browse(cr, uid, prodlot_id)
                     ref = '%d' % (current_move)
                     if prodlot.ref:
-                        ref = '%s, %s' % (prodlot.ref, ref) 
+                        ref = '%s, %s' % (prodlot.ref, ref)
                     prodlot_obj.write(cr, uid, [prodlot_id], {'ref': ref})
-                    
+
                     update_val = {}
-                    if quantity_rest > 0:                        
+                    if quantity_rest > 0:
                         update_val['product_qty'] = quantity_rest
-                        update_val['product_uos_qty'] = uos_qty_rest                          
+                        update_val['product_uos_qty'] = uos_qty_rest
                         move_obj.write(cr, uid, [move.id], update_val)
 
-                    
+
         return new_move
 spilt_in_production_lot()
 
 class stock_move_spilt_lines(osv.osv_memory):
     _name = "stock.move.spilt.lines"
     _description = "Split lines"
-    
+
     _columns = {
-        'name': fields.char('Tracking serial', size=64), 
-        'quantity': fields.integer('Quantity'), 
+        'name': fields.char('Tracking serial', size=64),
+        'quantity': fields.integer('Quantity'),
         'use_exist' : fields.boolean('Use Exist'),
         'lot_id': fields.many2one('stock.move.spilt', 'Lot'),
         'action': fields.selection([('split','Split'),('keepinone','Keep in one lot')],'Action'),
     }
     _defaults = {
         'quantity': lambda *x: 1,
-        'action' : lambda *x: 'split', 
+        'action' : lambda *x: 'split',
     }
 
 stock_move_spilt_lines()
diff --git a/addons/stock/stock_wizard.xml b/addons/stock/stock_wizard.xml
index 5db1269d42c..88952bdb91e 100644
--- a/addons/stock/stock_wizard.xml
+++ b/addons/stock/stock_wizard.xml
@@ -78,6 +78,6 @@
         model="stock.location"
         name="stock.location.products"
         string="Products by Location"/>
-            
-   </data>        
-</openerp>
+
+   </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py
index 6a15449a151..87f1f30b626 100644
--- a/addons/stock/wizard/__init__.py
+++ b/addons/stock/wizard/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.
 #
 ##############################################################################
 
@@ -27,12 +27,13 @@ import wizard_replacement
 import wizard_return
 import wizard_split_lot_line
 import wizard_ups
-import wizard_invoice_onshipping
-import wizard_location_product
-import wizard_inventory
-import wizard_split_inventory_lots
-import inventory_merge_zero
 import inventory_merge
 
+import inventory_merge_stock_zero
+import stock_fill_inventory
+import stock_inventory_line_split
+import stock_invoice_onshipping
+import stock_location_product
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/stock/wizard/inventory_merge.py b/addons/stock/wizard/inventory_merge.py
index 7be8eb2b3e3..b32ad83bec3 100644
--- a/addons/stock/wizard/inventory_merge.py
+++ b/addons/stock/wizard/inventory_merge.py
@@ -41,6 +41,7 @@ def do_merge(self, cr, uid, data, context):
     invent_lines = {}
 
     if len(data['ids']) < 2:
+       
         raise wizard.except_wizard(_('Warning'),
             _('Please select at least two inventories.'))
 
diff --git a/addons/stock/wizard/inventory_merge_stock_zero.py b/addons/stock/wizard/inventory_merge_stock_zero.py
new file mode 100644
index 00000000000..cfb1d4a0ac9
--- /dev/null
+++ b/addons/stock/wizard/inventory_merge_stock_zero.py
@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from service import web_services
+from tools.misc import UpdateableStr, UpdateableDict
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import wizard
+
+
+class inventory_merge_stock_zero(osv.osv_memory):
+    _name = "stock.inventory.merge.stock.zero"
+    _description = "Set Stock to 0"
+    _columns = {
+            'location_id': fields.many2one('stock.location', 'Location', required=True), 
+            }
+    
+    def do_merge(self, cr, uid, ids, context):
+        invent_obj = pooler.get_pool(cr.dbname).get('stock.inventory')
+        invent_line_obj = pooler.get_pool(cr.dbname).get('stock.inventory.line')
+        prod_obj =  pooler.get_pool(cr.dbname).get('product.product')
+    
+        if len(context['active_ids']) <> 1:
+            raise wizard.except_wizard(_('Warning'), 
+                                       _('Please select one and only one inventory !'))
+        for id in ids:
+            datas = self.read(cr, uid, id)
+            loc = str(datas['location_id'])
+        
+            cr.execute('select distinct location_id,product_id \
+                        from stock_inventory_line \
+                        where inventory_id=%s', (context['active_ids'][0],))
+            inv = cr.fetchall()
+            cr.execute('select distinct product_id from stock_move where \
+                        location_dest_id=%s or location_id=%s', (loc, loc,))
+            stock = cr.fetchall()
+            for s in stock:
+                if (loc, s[0]) not in inv:
+                    p = prod_obj.browse(cr, uid, s[0])
+                    invent_line_obj.create(cr, uid, {
+                        'inventory_id': context['active_ids'][0], 
+                        'location_id': loc, 
+                        'product_id': s[0], 
+                        'product_uom': p.uom_id.id, 
+                        'product_qty': 0.0, 
+                        })
+        return {}
+
+inventory_merge_stock_zero()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/inventory_merge_stock_zero_view.xml b/addons/stock/wizard/inventory_merge_stock_zero_view.xml
new file mode 100644
index 00000000000..b3c51bc0315
--- /dev/null
+++ b/addons/stock/wizard/inventory_merge_stock_zero_view.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_inventory_merge_stock_zero" model="ir.ui.view">
+            <field name="name">Set Stock to Zero</field>
+            <field name="model">stock.inventory.merge.stock.zero</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Set Stock to Zero">
+             		<separator string="Set Stocks to Zero" colspan="4" />
+             		<group colspan="4">
+                	<field name="location_id"/>
+                	</group>
+    		<newline/>
+    		 <label colspan="4" string="Do you want to set stocks to zero ?"/>
+        	        <separator string="" colspan="4" />
+					<button special="cancel" string="Cancel" />
+            	    <button name="do_merge" string="Set Stock to Zero" type="object"/>
+             </form>
+            </field>
+		</record>
+
+		<record id="action_view_inventory_merge_stock_zero" model="ir.actions.act_window">
+            <field name="name">Set Stock to Zero</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.inventory.merge.stock.zero</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/stock/wizard/inventory_merge_zero.py b/addons/stock/wizard/inventory_merge_zero.py
deleted file mode 100644
index 3aa2b1e9fd9..00000000000
--- a/addons/stock/wizard/inventory_merge_zero.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-
-import wizard
-import pooler
-from tools.translate import _
-
-
-_form = """<?xml version="1.0"?>
-<form string="Set Stock to Zero">
-    <separator colspan="4" string="Set Stocks to Zero" />
-    <field name="location_id"/>
-    <newline/>
-    <label colspan="4" string="Do you want to set stocks to zero ?"/>
-</form>
-"""
-_inventory_fields = {
-    'location_id' : {
-        'string':'Location',
-        'type':'many2one',
-        'relation':'stock.location',
-        'required':True
-        }
-}
-
-
-def do_merge(self, cr, uid, data, context):
-    invent_obj = pooler.get_pool(cr.dbname).get('stock.inventory')
-    invent_line_obj = pooler.get_pool(cr.dbname).get('stock.inventory.line')
-    prod_obj =  pooler.get_pool(cr.dbname).get('product.product')
-
-    if len(data['ids']) <> 1:
-        raise wizard.except_wizard(_('Warning'),
-                                   _('Please select one and only one inventory !'))
-
-    loc = str(data['form']['location_id'])
-
-    cr.execute('select distinct location_id,product_id from stock_inventory_line where inventory_id=%s', (data['ids'][0],))
-    inv = cr.fetchall()
-    cr.execute('select distinct product_id from stock_move where location_dest_id=%s or location_id=%s',(loc,loc,))
-    stock = cr.fetchall()
-    for s in stock:
-        if (loc,s[0]) not in inv:
-            p = prod_obj.browse(cr, uid, s[0])
-            invent_line_obj.create(cr, uid, {
-                'inventory_id': data['ids'][0],
-                'location_id': loc,
-                'product_id': s[0],
-                'product_uom': p.uom_id.id,
-                'product_qty': 0.0,
-                })
-    return {}
-
-
-class merge_inventory(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'form',
-                    'arch' : _form,
-                    'fields' : _inventory_fields,
-                    'state' : [('end', 'Cancel', 'gtk-cancel'),
-                               ('merge', 'Set to Zero', 'gtk-apply', True) ]}
-        },
-        'merge' : {
-            'actions' : [],
-            'result' : {'type' : 'action',
-                        'action': do_merge,
-                        'state' : 'end'}
-        },
-    }
-merge_inventory("inventory.merge.stock.zero")
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
new file mode 100644
index 00000000000..6d70736bbd2
--- /dev/null
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -0,0 +1,89 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import wizard
+import netsvc
+import pooler
+
+import time
+from osv import fields, osv
+from tools.translate import _
+from service import web_services
+from tools.misc import UpdateableStr, UpdateableDict
+
+class stock_fill_inventory(osv.osv_memory):
+    _name = "stock.fill.inventory"
+    _description = "Fill Inventory"
+    _columns = {
+            'location_id': fields.many2one('stock.location', 'Location', required=True), 
+            'recursive': fields.boolean("Include all childs for the location"), 
+            }
+
+    def _fill_inventory(self, cr, uid, ids, context):
+        inventory_line_obj = self.pool.get('stock.inventory.line')
+        location_obj = self.pool.get('stock.location')
+        for fill_inventory in self.browse(cr, uid, ids):
+            res={}
+            res_location = {}
+            if fill_inventory.recursive :
+                location_ids = location_obj.search(cr, uid, [('location_id', 
+                                 'child_of', fill_inventory.location_id.id)])
+                for location in location_ids :
+                    res=location_obj._product_get(cr, uid, location)
+                    res_location[location]=res
+            else:
+                context.update({'compute_child':False})
+                res=location_obj._product_get(cr, uid, fill_inventory.location_id.id, context=context)
+                res_location[fill_inventory.location_id.id]=res
+
+                product_ids=[]
+                for location in res_location.keys():
+                    res=res_location[location]
+                    for product_id in res.keys():
+                        prod = self.pool.get('product.product').browse(cr, uid, [product_id])[0]
+                        uom = prod.uom_id.id
+                        context.update({'uom': uom})
+                        amount=self.pool.get('stock.location')._product_get(cr, uid, 
+                                 location, [product_id], context=context)[product_id]
+
+                        if(amount):
+                            line_ids=inventory_line_obj.search(cr, uid, 
+                                [('inventory_id', '=', context['active_ids']), 
+                                 ('location_id', '=', location), 
+                                 ('product_id', '=', product_id), 
+                                 ('product_uom', '=', uom), 
+                                ('product_qty', '=', amount)])
+                            if not len(line_ids):
+                                inventory_line={'inventory_id': context['active_ids'][0], 
+                                                    'location_id': location, 
+                                                    'product_id': product_id, 
+                                                    'product_uom': uom, 
+                                                    'product_qty': amount}
+                                inventory_line_obj.create(cr, uid, inventory_line)
+                            product_ids.append(product_id)
+
+                if(len(product_ids)==0):
+                    raise osv.except_osv(_('Message !'), _('No product in this location.'))
+                return {}
+
+stock_fill_inventory()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/stock_fill_inventory_view.xml b/addons/stock/wizard/stock_fill_inventory_view.xml
new file mode 100644
index 00000000000..e321300ccf2
--- /dev/null
+++ b/addons/stock/wizard/stock_fill_inventory_view.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+   		<record id="view_stock_fill_inventory" model="ir.ui.view">
+            <field name="name">Fill Inventory</field>
+            <field name="model">stock.fill.inventory</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Fill Inventory">
+             		<separator string="Fill Inventory for specific location" colspan="4" />
+                	<field name="location_id"/>
+                	<newline/>
+                	<field name="recursive"/>
+    				<newline/>
+        	        <separator string="" colspan="4" />
+					<button special="cancel" string="Cancel" />
+            	    <button name="_fill_inventory" string="Fill Inventory" type="object"/>
+             </form>
+            </field>
+		</record>
+
+		<record id="action_view_stock_fill_inventory" model="ir.actions.act_window">
+            <field name="name">Fill Inventory</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.fill.inventory</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="context">{'record_id' : active_id}</field>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/stock/wizard/stock_inventory_line_split.py b/addons/stock/wizard/stock_inventory_line_split.py
new file mode 100644
index 00000000000..fab550d1461
--- /dev/null
+++ b/addons/stock/wizard/stock_inventory_line_split.py
@@ -0,0 +1,104 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from service import web_services
+from tools.misc import UpdateableStr, UpdateableDict
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import wizard
+
+class stock_inventory_line_split(osv.osv_memory):
+    _name = "stock.inventory.line.split"
+    _description = "Split inventory lines"
+    _columns = {
+            'prefix': fields.char('Prefix', size=64),
+            'quantity': fields.float('Quantity per lot'),
+            }
+
+    def _check_production_lot(self, cr, uid, context):
+        for inv_obj in self.pool.get('stock.inventory.line').browse(cr, uid, context['active_ids']):
+            if not inv_obj.prod_lot_id:
+                raise osv.except_osv(_('Caution!'), _('Before splitting the inventory lines, \
+                             make sure the production lot is assigned to this product.'))
+            return
+
+    _defaults = {
+            'quantity': lambda *a: '1',
+            'prefix': _check_production_lot,
+            }
+
+    def _split_lines(self, cr, uid, ids, context):
+        inv_id = context['active_id']
+        inv_line_obj = self.pool.get('stock.inventory.line')
+        prodlot_obj = self.pool.get('stock.production.lot')
+        for linesplit_obj in self.browse(cr, uid, ids):
+            ir_sequence_obj = self.pool.get('ir.sequence')
+
+            sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
+            if not sequence:
+                raise wizard.except_wizard(_('Error!'), _('No production sequence defined'))
+            if linesplit_obj.prefix:
+                sequence=linesplit_obj.prefix + '/'+(sequence or '')
+
+            inv = inv_line_obj.browse(cr, uid, [inv_id])[0]
+            quantity = linesplit_obj.quantity
+            prodlot_obj.write(cr, uid, inv.prod_lot_id.id, {'name':sequence})
+
+            if quantity <= 0 or inv.product_qty == 0:
+                return {}
+
+            quantity_rest = inv.product_qty%quantity
+
+            update_val = {
+                    'product_qty': quantity,
+            }
+
+            new_line = []
+            for idx in range(int(inv.product_qty//quantity)):
+                if idx:
+                    current_line = inv_line_obj.copy(cr, uid, inv.id,
+                                 {'prod_lot_id': inv.prod_lot_id.id})
+                    new_line.append(current_line)
+                else:
+                    current_line = inv.id
+                    inv_line_obj.write(cr, uid, [current_line], update_val)
+
+            if quantity_rest > 0:
+                idx = int(inv.product_qty//quantity)
+                update_val['product_qty']=quantity_rest
+
+                if idx:
+                    current_line = inv_line_obj.copy(cr, uid, inv.id,
+                                 {'prod_lot_id': inv.prod_lot_id.id})
+                    new_line.append(current_line)
+                else:
+                    current_line = inv_line_obj.id
+                inv_line_obj.write(cr, uid, [current_line], update_val)
+
+            return {}
+
+stock_inventory_line_split()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/stock/wizard/stock_inventory_line_split_view.xml b/addons/stock/wizard/stock_inventory_line_split_view.xml
new file mode 100644
index 00000000000..fe78f630852
--- /dev/null
+++ b/addons/stock/wizard/stock_inventory_line_split_view.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+     	<record id="view_stock_inventory_line_split" model="ir.ui.view">
+            <field name="name">Split inventory lines</field>
+            <field name="model">stock.inventory.line.split</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+               <form string="Split Inventory Line">
+ 					<field name="prefix"/>
+ 					<newline/>
+ 					<field name="quantity"/>
+ 					<separator string="" colspan="4" />
+        			<label string=""/>
+					<button special="cancel" string="Cancel" icon="gtk-cancel" />
+           	    	<button name="_split_lines" string="Ok" type="object" icon="gtk-ok"/>
+    			</form>
+            </field>
+		</record>
+
+		<record id="action_view_stock_inventory_line_split" model="ir.actions.act_window">
+            <field name="name">Split inventory lines</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.inventory.line.split</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+    	</record>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py
new file mode 100644
index 00000000000..d29f96fb9a6
--- /dev/null
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@@ -0,0 +1,111 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from service import web_services
+from tools.misc import UpdateableStr, UpdateableDict
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import wizard
+
+class stock_invoice_onshipping(osv.osv_memory):
+    _name = "stock.invoice.onshipping"
+    _description = "Stock Invoice Onshipping"
+    _columns = {
+            'journal_id': fields.many2one('account.journal', 'Destination Journal', required=True),
+            'group': fields.boolean("Group by partner"),
+            'type': fields.selection([('out_invoice', 'Customer Invoice'),
+                        ('in_invoice', 'Supplier Invoice'),
+                        ('out_refund', 'Customer Refund'),
+                        ('in_refund', 'Supplier Refund')] , 'Type', required=True),
+            'invoice_date': fields.date('Invoiced date'),
+            }
+
+    def _get_type(self, cr, uid, context):
+        picking_obj = self.pool.get('stock.picking')
+        usage = 'customer'
+        pick = picking_obj.browse(cr, uid, context['active_id'])
+        if pick.invoice_state == 'invoiced':
+            raise osv.except_osv(_('UserError'), _('Invoice is already created.'))
+        if pick.invoice_state == 'none':
+            raise osv.except_osv(_('UserError'), _('Invoice cannot be created from Picking.'))
+        if pick.move_lines:
+            usage = pick.move_lines[0].location_id.usage
+
+        if pick.type == 'out' and usage == 'supplier':
+            type = 'in_refund'
+        elif pick.type == 'out' and usage == 'customer':
+            type = 'out_invoice'
+        elif pick.type == 'in' and usage == 'supplier':
+            type = 'in_invoice'
+        elif pick.type == 'in' and usage == 'customer':
+            type = 'out_refund'
+        else:
+            type = 'out_invoice'
+        return type
+
+    _defaults = {
+            'type': _get_type,
+        }
+
+    def _create_invoice(self, cr, uid, ids, context):
+        result = []
+        for onshipdata_obj in self.read(cr, uid, ids, ['journal_id', 'group', 'type', 'invoice_date']):
+            if context.get('new_picking', False):
+                onshipdata_obj[id] = onshipdata_obj.new_picking
+                onshipdata_obj[ids] = onshipdata_obj.new_picking
+
+            picking_obj = self.pool.get('stock.picking')
+            mod_obj = self.pool.get('ir.model.data')
+            act_obj = self.pool.get('ir.actions.act_window')
+
+            type = onshipdata_obj['type']
+            context['date_inv'] = onshipdata_obj['invoice_date']
+            res = picking_obj.action_invoice_create(cr, uid, [onshipdata_obj['id']],
+                  journal_id = onshipdata_obj['journal_id'],
+                  group=onshipdata_obj['group'],
+                  type=type,
+                  context=context)
+            invoice_ids = res.values()
+            if not invoice_ids:
+                raise  osv.except_osv(_('Error'), _('Invoice is not created'))
+
+            if type == 'out_invoice':
+                xml_id = 'action_invoice_tree1'
+            elif type == 'in_invoice':
+                xml_id = 'action_invoice_tree2'
+            elif type == 'out_refund':
+                xml_id = 'action_invoice_tree3'
+            else:
+                xml_id = 'action_invoice_tree4'
+
+            result = mod_obj._get_id(cr, uid, 'account', xml_id)
+            id = mod_obj.read(cr, uid, result, ['res_id'])
+            result = act_obj.read(cr, uid, id['res_id'])
+            result['res_id'] = invoice_ids
+            return result
+
+stock_invoice_onshipping()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml
new file mode 100644
index 00000000000..77988aab94a
--- /dev/null
+++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_stock_invoice_onshipping" model="ir.ui.view">
+            <field name="name">Stock Invoice Onshipping</field>
+            <field name="model">stock.invoice.onshipping</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Create invoices">
+					<separator colspan="4" string="Create invoices" />
+    				<field name="journal_id"/>
+    				<newline/>
+					<field name="group"/>
+					<newline/>
+					<field name="type"/>
+					<newline/>
+					<field name="invoice_date" />
+			   	    <separator string="" colspan="4" />
+					<button special="cancel" string="Cancel" />
+			       	<button name="_create_invoice" string="Create Invoices" type="object"/>
+             </form>
+            </field>
+		</record>
+
+		<record id="action_stock_invoice_onshipping" model="ir.actions.act_window">
+            <field name="name">Stock Invoice Onshipping</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.invoice.onshipping</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/stock/wizard/stock_location_product.py b/addons/stock/wizard/stock_location_product.py
new file mode 100755
index 00000000000..801d1da8869
--- /dev/null
+++ b/addons/stock/wizard/stock_location_product.py
@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from service import web_services
+from tools.misc import UpdateableStr, UpdateableDict
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import wizard
+
+class stock_location_product(osv.osv_memory):
+    _name = "stock.location.product"
+    _description = "Products by Location"
+    _columns = {
+                'from_date': fields.datetime('From'),
+                'to_date': fields.datetime('To'),
+                }
+
+    def _action_open_window(self, cr, uid, ids, context):
+        mod_obj = self.pool.get('ir.model.data')
+        for product_obj in self.read(cr, uid, ids, ['from_date', 'to_date']):
+            result = mod_obj._get_id(cr, uid, 'product', 'product_search_form_view')
+            id = mod_obj.read(cr, uid, result, ['res_id'])
+            return {
+                    'name': 'product',
+                    'view_type': 'form',
+                    "view_mode": 'tree,form',
+                    'res_model': 'product.product',
+                    'type': 'ir.actions.act_window',
+                    'context':{'location':product_obj['id'],
+                           'from_date':product_obj['from_date'],
+                           'to_date':product_obj['to_date']},
+                    'domain':[('type', '<>', 'service')],
+                    'search_view_id': id['res_id']
+                    }
+
+stock_location_product()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/stock_location_product_view.xml b/addons/stock/wizard/stock_location_product_view.xml
new file mode 100644
index 00000000000..8bafa8f4750
--- /dev/null
+++ b/addons/stock/wizard/stock_location_product_view.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_stock_location_product" model="ir.ui.view">
+            <field name="name">Products by Location</field>
+            <field name="model">stock.location.product</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+               <form string="View Stock of Products">
+        			<separator string="Stock Location Analysis" colspan="4"/>
+       				<field name="from_date" colspan="4"/>
+       				<newline/>
+       				<field name="to_date" colspan="4"/>
+       				<newline/>
+       				<label string=""/>
+       				<label string="(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to filter all resources of the day for the 'From' date and 23:59:59 for the 'To' date)" align="0.0" colspan="3"/>
+        			<separator string="" colspan="4" />
+        			<label string=""/>
+					<button special="cancel" string="Cancel" icon="gtk-cancel" />
+           	    	<button name="_action_open_window" string="Open Product" type="object" icon="gtk-ok"/>
+    			</form>
+            </field>
+		</record>
+
+		<record id="action_view_stock_location_product" model="ir.actions.act_window">
+            <field name="name">Products by Location</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.location.product</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+    	</record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/stock/wizard/stock_traceability.py b/addons/stock/wizard/stock_traceability.py
index 58cc26a3224..3fc65ff74c0 100644
--- a/addons/stock/wizard/stock_traceability.py
+++ b/addons/stock/wizard/stock_traceability.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.
 #
 ##############################################################################
 
diff --git a/addons/stock/wizard/wizard_inventory.py b/addons/stock/wizard/wizard_inventory.py
deleted file mode 100644
index 42345353866..00000000000
--- a/addons/stock/wizard/wizard_inventory.py
+++ /dev/null
@@ -1,111 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import time
-import wizard
-import ir
-import pooler
-from osv.osv import except_osv
-from osv import fields,osv
-import netsvc
-from tools.translate import _
-
-inventory_form = """<?xml version="1.0"?>
-<form string="Fill Inventory">
-    <separator colspan="4" string="Fill Inventory for specific location" />
-    <field name="location_id"/>
-    <newline/>
-    <field name="recursive"/>
-    <newline/>
-
-</form>
-"""
-
-inventory_fields = {
-    'location_id' : {
-        'string':'Location',
-        'type':'many2one',
-        'relation':'stock.location',
-        'required':True
-    },
-    'recursive' : {'string':'Include all childs for the location', 'type':'boolean'}
-}
-
-
-
-def _fill_inventory(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    inventory_line_obj = pooler.get_pool(cr.dbname).get('stock.inventory.line')
-    location_obj = pooler.get_pool(cr.dbname).get('stock.location')
-    res={}
-    res_location={}
-    if data['form']['recursive'] :
-        location_ids = location_obj.search(cr, uid, [('location_id', 'child_of', [data['form']['location_id']])])
-        for location in location_ids :
-            res=location_obj._product_get(cr, uid, location)
-            res_location[location]=res
-    else:
-        context.update({'compute_child':False})
-        res=location_obj._product_get(cr, uid, data['form']['location_id'],context=context)
-        res_location[data['form']['location_id']]=res
-
-    product_ids=[]
-    for location in res_location.keys():
-        res=res_location[location]
-        for product_id in res.keys():
-            #product_ids.append(product_id)
-            prod = pool.get('product.product').browse(cr, uid, [product_id])[0]
-            uom = prod.uom_id.id
-            context.update({'uom': uom})
-            amount=pool.get('stock.location')._product_get(cr, uid, location, [product_id], context=context)[product_id]
-
-            if(amount):
-                line_ids=inventory_line_obj.search(cr,uid,[('inventory_id','=',data['id']),('location_id','=',location),('product_id','=',product_id),('product_uom','=',uom),('product_qty','=',amount)])
-                if not len(line_ids):
-                    inventory_line={'inventory_id':data['id'],'location_id':location,'product_id':product_id,'product_uom':uom,'product_qty':amount}
-                    inventory_line_obj.create(cr, uid, inventory_line)
-                product_ids.append(product_id)
-
-    if(len(product_ids)==0):
-        raise wizard.except_wizard(_('Message !'), _('No product in this location.'))
-    return {}
-
-
-
-class fill_inventory(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'form',
-                    'arch' : inventory_form,
-                    'fields' : inventory_fields,
-                    'state' : [('end', 'Cancel', 'gtk-cancel'),('fill_inventory', 'Fill Inventory', 'gtk-apply', True) ]}
-        },
-        'fill_inventory' : {
-            'actions' : [],
-            'result' : {'type' : 'action', 'action': _fill_inventory, 'state' : 'end'}
-        },
-    }
-fill_inventory("stock.fill_inventory")
-
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/wizard_invoice_onshipping.py b/addons/stock/wizard/wizard_invoice_onshipping.py
deleted file mode 100644
index 22cdbc97e70..00000000000
--- a/addons/stock/wizard/wizard_invoice_onshipping.py
+++ /dev/null
@@ -1,167 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import pooler
-from tools.translate import _
-
-invoice_form = """<?xml version="1.0"?>
-<form string="Create invoices">
-    <separator colspan="4" string="Create invoices" />
-    <field name="journal_id"/>
-    <newline/>
-    <field name="group"/>
-    <newline/>
-    <field name="type"/>
-    <newline/>
-    <field name="invoice_date" />
-</form>
-"""
-
-invoice_fields = {
-    'journal_id': {
-        'string': 'Destination Journal',
-        'type': 'many2one',
-        'relation': 'account.journal',
-        'required': True
-    },
-    'group': {
-        'string': 'Group by partner',
-        'type': 'boolean'
-    },
-    'type': {
-        'string': 'Type',
-        'type': 'selection',
-        'selection': [],
-        'required': True
-    },
-    'invoice_date': {'string': 'Invoiced date', 'type':'date' }
-}
-
-
-def _get_type(obj, cr, uid, data, context):
-    picking_obj = pooler.get_pool(cr.dbname).get('stock.picking')
-    usage = 'customer'
-    pick = picking_obj.browse(cr, uid, data['id'], context)
-    if pick.invoice_state == 'invoiced':
-        raise wizard.except_wizard(_('UserError'), _('Invoice is already created.'))
-    if pick.invoice_state == 'none':
-        raise wizard.except_wizard(_('UserError'), _('Invoice cannot be created from Picking.'))
-
-    if pick.move_lines:
-        usage = pick.move_lines[0].location_id.usage
-
-    if pick.type =='out':
-        invoice_fields['type']['selection'] = [
-            ('out_invoice', 'Customer Invoice'),
-            ('in_refund', 'Supplier Refund'),
-            ]
-    elif pick.type =='in':
-        invoice_fields['type']['selection'] = [
-            ('in_invoice', 'Supplier Invoice'),
-            ('out_refund', 'Customer Refund'),
-            ]
-    else:
-        invoice_fields['type']['selection']=[
-            ('out_invoice', 'Customer Invoice'),
-            ('in_invoice', 'Supplier Invoice'),
-            ('out_refund', 'Customer Refund'),
-            ('in_refund', 'Supplier Refund'),
-            ]
-
-    if pick.type == 'out' and usage == 'supplier':
-        type = 'in_refund'
-    elif pick.type == 'out' and usage == 'customer':
-        type = 'out_invoice'
-    elif pick.type == 'in' and usage == 'supplier':
-        type = 'in_invoice'
-    elif pick.type == 'in' and usage == 'customer':
-        type = 'out_refund'
-    else:
-        type = 'out_invoice'
-    return {'type': type}
-
-
-def _create_invoice(obj, cr, uid, data, context):
-    if data['form'].get('new_picking', False):
-        data['id'] = data['form']['new_picking']
-        data['ids'] = [data['form']['new_picking']]
-    pool = pooler.get_pool(cr.dbname)
-    picking_obj = pooler.get_pool(cr.dbname).get('stock.picking')
-    mod_obj = pool.get('ir.model.data')
-    act_obj = pool.get('ir.actions.act_window')
-
-    type = data['form']['type']
-
-    context['date_inv'] = data['form']['invoice_date']
-    res = picking_obj.action_invoice_create(cr, uid, data['ids'],
-            journal_id = data['form']['journal_id'], group=data['form']['group'],
-            type=type, context= context)
-
-    invoice_ids = res.values()
-    if not invoice_ids:
-        raise  wizard.except_wizard(_('Error'), _('Invoice is not created'))
-
-    if type == 'out_invoice':
-        xml_id = 'action_invoice_tree1'
-    elif type == 'in_invoice':
-        xml_id = 'action_invoice_tree2'
-    elif type == 'out_refund':
-        xml_id = 'action_invoice_tree3'
-    else:
-        xml_id = 'action_invoice_tree4'
-
-    result = mod_obj._get_id(cr, uid, 'account', xml_id)
-    id = mod_obj.read(cr, uid, result, ['res_id'])
-    result = act_obj.read(cr, uid, id['res_id'])
-    result['res_id'] = invoice_ids
-    return result
-
-
-class make_invoice_onshipping(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_get_type],
-            'result': {
-                'type': 'form',
-                'arch': invoice_form,
-                'fields': invoice_fields,
-                'state': [
-                    ('end', 'Cancel', 'gtk-cancel'),
-                    ('create_invoice', 'Create invoice', 'gtk-apply', True)
-                ]
-            }
-        },
-        'create_invoice': {
-            'actions': [],
-            'result': {
-                'type': 'action',
-                'action': _create_invoice,
-                'state': 'end'
-            }
-        },
-    }
-
-make_invoice_onshipping("stock.invoice_onshipping")
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/stock/wizard/wizard_location_product.py b/addons/stock/wizard/wizard_location_product.py
deleted file mode 100755
index c423c426832..00000000000
--- a/addons/stock/wizard/wizard_location_product.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import pooler
-import time
-
-def _action_open_window(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname) 
-    mod_obj = pool.get('ir.model.data') 
-    result = mod_obj._get_id(cr, uid, 'product', 'product_search_form_view')
-    id = mod_obj.read(cr, uid, result, ['res_id'])          
-    return {
-        'name': False,
-        'view_type': 'form',
-        "view_mode": 'tree,form',
-        'res_model': 'product.product',
-        'type': 'ir.actions.act_window',
-        'context':{'location': data['ids'][0],'from_date':data['form']['from_date'],'to_date':data['form']['to_date']},
-        'domain':[('type','<>','service')],
-        'search_view_id': id['res_id'] 
-    }
-
-
-class product_by_location(wizard.interface):
-    form1 = '''<?xml version="1.0"?>
-    <form string="View Stock of Products">
-        <separator string="Stock Location Analysis" colspan="4"/>
-        <field name="from_date"/>
-        <newline/>
-        <field name="to_date"/>
-        <newline/>
-        <label string=""/>
-        <label string="(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to filter all resources of the day for the 'From' date and 23:59:59 for the 'To' date)" align="0.0" colspan="3"/>
-    </form>'''
-    form1_fields = {
-             'from_date': {
-                'string': 'From',
-                'type': 'datetime',
-        },
-             'to_date': {
-                'string': 'To',
-                'type': 'datetime',
-        },
-    }
-
-    states = {
-      'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':form1, 'fields':form1_fields, 'state': [('end', 'Cancel', 'gtk-cancel'),('open', 'Open Products', 'gtk-apply', True)]}
-        },
-    'open': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _action_open_window, 'state':'end'}
-        }
-    }
-product_by_location('stock.location.products')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/wizard_split_inventory_lots.py b/addons/stock/wizard/wizard_split_inventory_lots.py
deleted file mode 100644
index 92963f0b145..00000000000
--- a/addons/stock/wizard/wizard_split_inventory_lots.py
+++ /dev/null
@@ -1,98 +0,0 @@
-import wizard
-import netsvc
-import pooler
-
-import time
-from osv import osv
-from tools.translate import _
-
-inv_form = '''<?xml version="1.0"?>
-<form string="Split Inventory Line">
- <field name="prefix"/>
- <newline/>
- <field name="quantity"/>
-</form>
-'''
-inv_fields = {
-        'prefix': {
-            'string': 'Prefix',
-            'type': 'char',
-            'size': 64,
-        },
-        'quantity': {
-            'string': 'Quantity per lot',
-            'type': 'float',
-            'default': 1,
-        }
-}
-
-def _check_production_lot(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    inv_obj = pool.get('stock.inventory.line').browse(cr, uid, data['id'])
-    if not inv_obj.prod_lot_id:
-        raise wizard.except_wizard(_('Caution!'), _('Before splitting the inventory lines, make sure the production lot is assigned to this product.'))
-    return data['form']
-
-def _split_lines(self, cr, uid, data, context):
-    inv_id = data['id']
-
-    pool = pooler.get_pool(cr.dbname)
-    inv_line_obj = pool.get('stock.inventory.line')
-    prodlot_obj = pool.get('stock.production.lot')
-
-    ir_sequence_obj = pool.get('ir.sequence')
-
-    sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
-    if not sequence:
-        raise wizard.except_wizard(_('Error!'), _('No production sequence defined'))
-    if data['form']['prefix']:
-        sequence=data['form']['prefix']+'/'+(sequence or '')
-        
-    inv = inv_line_obj.browse(cr, uid, [inv_id])[0]
-    quantity=data['form']['quantity']
-    prodlot_obj.write(cr, uid, inv.prod_lot_id.id, {'name':sequence})
-    
-    if quantity <= 0 or inv.product_qty == 0:
-        return {}
-
-    quantity_rest = inv.product_qty%quantity
-
-    update_val = {
-        'product_qty': quantity,
-    }
-
-    new_line = []
-    for idx in range(int(inv.product_qty//quantity)):
-        if idx:
-            current_line = inv_line_obj.copy(cr, uid, inv.id, {'prod_lot_id': inv.prod_lot_id.id})
-            new_line.append(current_line)
-        else:
-            current_line = inv.id
-        inv_line_obj.write(cr, uid, [current_line], update_val)
-    
-    if quantity_rest > 0:
-        idx = int(inv.product_qty//quantity)
-        update_val['product_qty']=quantity_rest
-        
-        if idx:
-            current_line = inv_line_obj.copy(cr, uid, inv.id, {'prod_lot_id': inv.prod_lot_id.id})
-            new_line.append(current_line)
-        else:
-            current_line = inv.id
-        inv_line_obj.write(cr, uid, [current_line], update_val)
-        
-    return {}
-
-class wizard_split_inventory_lots(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_check_production_lot],
-            'result': {'type': 'form', 'arch': inv_form, 'fields': inv_fields, 'state': [('end', 'Cancel', 'gtk-cancel'), ('split', 'Ok', 'gtk-apply', True)]},
-            },
-        'split': {
-            'actions': [_split_lines],
-            'result': {'type':'state', 'state':'end'}
-        }
-    }
-
-wizard_split_inventory_lots('stock.inventory.line.split')
\ No newline at end of file

From 504b6a5bf38b3d61d5d22d37ee306161c06ca7c2 Mon Sep 17 00:00:00 2001
From: Mitesh Soni <mso@tinyerp.com>
Date: Tue, 2 Mar 2010 18:20:48 +0530
Subject: [PATCH 022/251] [IMP] product_margin:Changes in wizard by converting
 them into OSV memory

bzr revid: mso@tinyerp.com-20100302125048-sv5k0r9gr7acpoj1
---
 addons/product_margin/__terp__.py             |  3 +-
 addons/product_margin/product_margin_view.xml |  9 --
 addons/product_margin/wizard/__init__.py      |  3 +-
 .../product_margin/wizard/product_margin.py   | 98 +++++++++++++++++++
 .../wizard/product_margin_view.xml            | 35 +++++++
 .../wizard/wizard_product_margin.py           | 93 ------------------
 6 files changed, 137 insertions(+), 104 deletions(-)
 create mode 100644 addons/product_margin/wizard/product_margin.py
 create mode 100644 addons/product_margin/wizard/product_margin_view.xml
 delete mode 100644 addons/product_margin/wizard/wizard_product_margin.py

diff --git a/addons/product_margin/__terp__.py b/addons/product_margin/__terp__.py
index b0e81f341a7..dc7f13d6cb8 100644
--- a/addons/product_margin/__terp__.py
+++ b/addons/product_margin/__terp__.py
@@ -31,7 +31,8 @@ the report has several options to help you get the data you need.
 """,
     'author': 'Tiny',
     'depends': ['base', 'product', 'account'],
-    'update_xml': ['product_margin_view.xml'],
+    'update_xml': ['wizard/product_margin_view.xml',
+    'product_margin_view.xml'],
     'demo_xml': [],
     'installable': True,
     'active': False,
diff --git a/addons/product_margin/product_margin_view.xml b/addons/product_margin/product_margin_view.xml
index 03dfbdf2280..eaf64179015 100644
--- a/addons/product_margin/product_margin_view.xml
+++ b/addons/product_margin/product_margin_view.xml
@@ -1,15 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
-
-    <wizard id="action_open_margin" menu="False" model="product.product" name="product.margins" string="Product Margins"/>
-
-<!--    <menuitem id="menu_product_reporting"-->
-<!--        name="Reporting" parent ="product.menu_main_product"-->
-<!--        groups="product.group_product_manager"/>-->
-<!---->
-<!--    <menuitem icon="STOCK_JUSTIFY_FILL" action="action_open_margin" id="menu_action_product_margin" type="wizard" sequence="5" parent="menu_product_reporting" />-->
-
     <record model="ir.ui.view" id="view_product_margin_graph">
             <field name="name">product.margin.graph</field>
             <field name="model">product.product</field>
diff --git a/addons/product_margin/wizard/__init__.py b/addons/product_margin/wizard/__init__.py
index 4e2ecc2e39a..578c1de3b78 100644
--- a/addons/product_margin/wizard/__init__.py
+++ b/addons/product_margin/wizard/__init__.py
@@ -19,7 +19,8 @@
 #
 ##############################################################################
 
-import wizard_product_margin
+
+import product_margin
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/product_margin/wizard/product_margin.py b/addons/product_margin/wizard/product_margin.py
new file mode 100644
index 00000000000..b82445bc874
--- /dev/null
+++ b/addons/product_margin/wizard/product_margin.py
@@ -0,0 +1,98 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+from osv import osv
+from osv import fields
+
+import netsvc
+import time
+from tools.translate import _
+class product_margin(osv.osv_memory):
+    '''
+    Product Margin
+    '''
+    _name = 'product.margin'
+    _description = 'Product Margin'
+
+    def _action_open_window(self, cr, uid, ids, context):
+        """
+            @summary:
+
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: the account  ID or list of IDs if we want more than one
+
+            @return:
+        """
+        mod_obj = self.pool.get('ir.model.data')
+        result = mod_obj._get_id(cr, uid, 'product', 'product_search_form_view')
+        id = mod_obj.read(cr, uid, result, ['res_id'])
+        cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('product.margin.graph', 'graph'))
+        view_res3 = cr.fetchone()[0]
+        cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('product.margin.form.inherit', 'form'))
+        view_res2 = cr.fetchone()[0]
+        cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('product.margin.tree', 'tree'))
+        view_res = cr.fetchone()[0]
+
+        #get the current product.margin object to obtain the values from it
+        product_margin_obj = self.browse(cr,uid,ids)[0]
+
+        return {
+            'name': _('Product Margins'),
+            'context':{'date_from':product_margin_obj.from_date,'date_to':product_margin_obj.to_date,'invoice_state' : product_margin_obj.invoice_state},
+            'view_type': 'form',
+            "view_mode": 'tree,form,graph',
+            'res_model':'product.product',
+            'type': 'ir.actions.act_window',
+            'views': [(view_res,'tree'), (view_res2,'form'), (view_res3,'graph')],
+            'view_id': False,
+            'search_view_id': id['res_id']
+        }
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        """
+            @summary:
+
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: the account  ID or list of IDs if we want more than one
+
+            @return:
+        """
+        return {'type':'ir.actions.act_window_close'}
+
+    _columns = {
+        #TODO : import time required to get currect date
+        'from_date': fields.datetime('From'),
+        #TODO : import time required to get currect date
+        'to_date': fields.datetime('To'),
+        'invoice_state':fields.selection([
+           ('paid','Paid'),
+           ('open_paid','Open and Paid'),
+           ('draft_open_paid','Draft, Open and Paid'),
+        ],'Invoice State', select=True, required=True),
+    }
+    _defaults = {
+        'from_date':  lambda *a:time.strftime('%Y-01-01'),
+        'to_date': lambda *a:time.strftime('%Y-01-01'),
+        'invoice_state': lambda *a:"open_paid",
+    }
+product_margin()
diff --git a/addons/product_margin/wizard/product_margin_view.xml b/addons/product_margin/wizard/product_margin_view.xml
new file mode 100644
index 00000000000..f7c292b576d
--- /dev/null
+++ b/addons/product_margin/wizard/product_margin_view.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+        <data>
+     	<record id="product_margin_form_view" model="ir.ui.view">
+            <field name="name">product.margin.form</field>
+            <field name="model">product.margin</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Properties categories">
+                    <separator colspan="4" string="General Information"/>
+					<field name="from_date" />
+					<field name="to_date" />
+					<field name="invoice_state" />
+					<group col="4" colspan="2">
+					    	<button name="action_cancel" string="Cancel" type="object"/>
+					    	<button name="_action_open_window" string="Open Margins" type="object"/>
+					</group>
+                </form>
+            </field>
+        </record>
+        <record id="product_margin_action" model="ir.actions.act_window">
+            <field name="name">Product Margine</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="target">new</field>
+            <field name="res_model">product.margin</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="product_margin_form_view"/>
+        </record>
+		<menuitem
+            action="product_margin_action"
+            id="menu_mrp_property_action"
+            parent="menu_product_reporting" />
+        </data>
+</openerp>
diff --git a/addons/product_margin/wizard/wizard_product_margin.py b/addons/product_margin/wizard/wizard_product_margin.py
deleted file mode 100644
index 625cfd4c1df..00000000000
--- a/addons/product_margin/wizard/wizard_product_margin.py
+++ /dev/null
@@ -1,93 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import pooler
-import time
-
-from tools.translate import _
-
-def _action_open_window(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname) 
-    mod_obj = pool.get('ir.model.data') 
-    result = mod_obj._get_id(cr, uid, 'product', 'product_search_form_view')
-    id = mod_obj.read(cr, uid, result, ['res_id'])    
-    cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('product.margin.graph', 'graph'))
-    view_res3 = cr.fetchone()[0]
-    cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('product.margin.form.inherit', 'form'))
-    view_res2 = cr.fetchone()[0]
-    cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('product.margin.tree', 'tree'))
-    view_res = cr.fetchone()[0]
-    return {
-        'name': _('Product Margins'),
-        'context':{'date_from':data['form']['from_date'],'date_to':data['form']['to_date'],'invoice_state' : data['form']['invoice_state']},
-        'view_type': 'form',
-        "view_mode": 'tree,form,graph',
-        'res_model':'product.product',
-        'type': 'ir.actions.act_window',
-        'views': [(view_res,'tree'), (view_res2,'form'), (view_res3,'graph')],
-        'view_id': False,
-        'search_view_id': id['res_id'] 
-    }
-
-
-class product_margins(wizard.interface):
-    form1 = '''<?xml version="1.0"?>
-    <form string="View Stock of Products">
-        <separator string="Select " colspan="4"/>
-        <field name="from_date"/>
-        <field name="to_date"/>
-        <field name="invoice_state"/>
-    </form>'''
-    form1_fields = {
-             'from_date': {
-                'string': 'From',
-                'type': 'date',
-                'default': lambda *a:time.strftime('%Y-01-01'),
-
-        },
-             'to_date': {
-                'string': 'To',
-                'type': 'date',
-                'default': lambda *a:time.strftime('%Y-12-31'),
-
-        },
-         'invoice_state': {
-                'string': 'Invoice State',
-                'type': 'selection',
-                'selection': [('paid','Paid'),('open_paid','Open and Paid'),('draft_open_paid','Draft, Open and Paid'),],
-                'required': True,
-                'default': lambda *a:"open_paid",
-        },
-    }
-
-    states = {
-      'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':form1, 'fields':form1_fields, 'state': [('end', 'Cancel','gtk-cancel'),('open', 'Open Margins','gtk-ok')]}
-        },
-    'open': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _action_open_window, 'state':'end'}
-        }
-    }
-product_margins('product.margins')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 94709660aa863399239c5a58be70a93fedf29a5a Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Tue, 2 Mar 2010 18:22:53 +0530
Subject: [PATCH 023/251] [IMP, FIX]: stock: Fixes + code improvement

bzr revid: rpa@openerp.co.in-20100302125253-zxzabj4iqwk4b7x1
---
 addons/stock/stock.py                         |  8 ++--
 addons/stock/stock_view.xml                   | 14 +++----
 .../inventory_merge_stock_zero_view.xml       |  8 ++--
 addons/stock/wizard/stock_fill_inventory.py   | 42 +++++++++----------
 .../wizard/stock_inventory_line_split.py      | 33 ++++++++-------
 .../stock_inventory_line_split_view.xml       |  1 +
 .../stock/wizard/stock_invoice_onshipping.py  |  2 +-
 addons/stock/wizard/stock_location_product.py | 24 +++++------
 8 files changed, 67 insertions(+), 65 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index ae7263112f0..94c98b3ca50 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -657,13 +657,13 @@ class stock_picking(osv.osv):
         '''Return comment string for invoice'''
         return picking.note or ''
 
-    def _get_price_unit_invoice(self, cursor, user, move_line, type):
+    def _get_price_unit_invoice(self, cr, users, move_line, type):
         '''Return the price unit for the move line'''
         if type in ('in_invoice', 'in_refund'):
             # Take the user company and pricetype
-            price_type_id=self.pool.get('res.users').browse(cr,users,users).company_id.property_valuation_price_type.id
-            pricetype=self.pool.get('product.price.type').browse(cr,uid,price_type_id)
-            amount_unit=move_line.product_id.price_get(pricetype.field, context)[move_line.product_id.id]
+            price_type_id=self.pool.get('res.users').browse(cr, users, users).company_id.property_valuation_price_type.id
+            pricetype=self.pool.get('product.price.type').browse(cr, users, price_type_id)
+            amount_unit=move_line.product_id.price_get(pricetype.field, context={})[move_line.product_id.id]
             return amount_unit
         else:
             return move_line.product_id.list_price
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index a850c6980b7..6129c345b1c 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -684,9 +684,9 @@
                             <field name="move_type"/>
                         </page>
                     </notebook>
-                      <button name="%(stock.action_stock_invoice_onshipping)d"
-                     		 string="Create Invoices"
-                      		 type="action"/>
+                    <button
+                    	name="%(stock.action_stock_invoice_onshipping)d"
+                    	string="Create Invoices" type="action" />
                 </form>
             </field>
         </record>
@@ -838,10 +838,10 @@
                             <field name="move_type"/>
                         </page>
                     </notebook>
- 							<button name="%(stock.action_stock_invoice_onshipping)d"
-                     		 string="Get Type"
-                      		 type="action"/>
-                      	 </form>
+					<button
+                     	name="%(stock.action_stock_invoice_onshipping)d"
+                     	string="Create Invoice" type="action" />
+                </form>
             </field>
         </record>
 
diff --git a/addons/stock/wizard/inventory_merge_stock_zero_view.xml b/addons/stock/wizard/inventory_merge_stock_zero_view.xml
index b3c51bc0315..d71df8dc4ef 100644
--- a/addons/stock/wizard/inventory_merge_stock_zero_view.xml
+++ b/addons/stock/wizard/inventory_merge_stock_zero_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
     	<record id="view_inventory_merge_stock_zero" model="ir.ui.view">
             <field name="name">Set Stock to Zero</field>
             <field name="model">stock.inventory.merge.stock.zero</field>
@@ -8,11 +9,9 @@
             <field name="arch" type="xml">
               <form string="Set Stock to Zero">
              		<separator string="Set Stocks to Zero" colspan="4" />
-             		<group colspan="4">
                 	<field name="location_id"/>
-                	</group>
-    		<newline/>
-    		 <label colspan="4" string="Do you want to set stocks to zero ?"/>
+    				<newline/>
+    				<label colspan="4" string="Do you want to set stocks to zero ?"/>
         	        <separator string="" colspan="4" />
 					<button special="cancel" string="Cancel" />
             	    <button name="do_merge" string="Set Stock to Zero" type="object"/>
@@ -28,5 +27,6 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
+        
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index 6d70736bbd2..3de4b9e1aea 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -19,15 +19,15 @@
 #
 ##############################################################################
 
-import wizard
-import netsvc
-import pooler
-
-import time
 from osv import fields, osv
-from tools.translate import _
 from service import web_services
 from tools.misc import UpdateableStr, UpdateableDict
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import wizard
+
 
 class stock_fill_inventory(osv.osv_memory):
     _name = "stock.fill.inventory"
@@ -41,27 +41,27 @@ class stock_fill_inventory(osv.osv_memory):
         inventory_line_obj = self.pool.get('stock.inventory.line')
         location_obj = self.pool.get('stock.location')
         for fill_inventory in self.browse(cr, uid, ids):
-            res={}
+            res = {}
             res_location = {}
             if fill_inventory.recursive :
                 location_ids = location_obj.search(cr, uid, [('location_id', 
                                  'child_of', fill_inventory.location_id.id)])
                 for location in location_ids :
-                    res=location_obj._product_get(cr, uid, location)
-                    res_location[location]=res
+                    res = location_obj._product_get(cr, uid, location)
+                    res_location[location] = res
             else:
-                context.update({'compute_child':False})
-                res=location_obj._product_get(cr, uid, fill_inventory.location_id.id, context=context)
-                res_location[fill_inventory.location_id.id]=res
+                context.update({'compute_child': False})
+                res = location_obj._product_get(cr, uid, fill_inventory.location_id.id, context=context)
+                res_location[fill_inventory.location_id.id] = res
 
-                product_ids=[]
+                product_ids = []
                 for location in res_location.keys():
-                    res=res_location[location]
+                    res = res_location[location]
                     for product_id in res.keys():
                         prod = self.pool.get('product.product').browse(cr, uid, [product_id])[0]
                         uom = prod.uom_id.id
                         context.update({'uom': uom})
-                        amount=self.pool.get('stock.location')._product_get(cr, uid, 
+                        amount = self.pool.get('stock.location')._product_get(cr, uid, 
                                  location, [product_id], context=context)[product_id]
 
                         if(amount):
@@ -72,15 +72,15 @@ class stock_fill_inventory(osv.osv_memory):
                                  ('product_uom', '=', uom), 
                                 ('product_qty', '=', amount)])
                             if not len(line_ids):
-                                inventory_line={'inventory_id': context['active_ids'][0], 
-                                                    'location_id': location, 
-                                                    'product_id': product_id, 
-                                                    'product_uom': uom, 
-                                                    'product_qty': amount}
+                                inventory_line = {'inventory_id': context['active_ids'][0], 
+                                                'location_id': location, 
+                                                'product_id': product_id, 
+                                                'product_uom': uom, 
+                                                'product_qty': amount}
                                 inventory_line_obj.create(cr, uid, inventory_line)
                             product_ids.append(product_id)
 
-                if(len(product_ids)==0):
+                if(len(product_ids) == 0):
                     raise osv.except_osv(_('Message !'), _('No product in this location.'))
                 return {}
 
diff --git a/addons/stock/wizard/stock_inventory_line_split.py b/addons/stock/wizard/stock_inventory_line_split.py
index fab550d1461..1769385cda7 100644
--- a/addons/stock/wizard/stock_inventory_line_split.py
+++ b/addons/stock/wizard/stock_inventory_line_split.py
@@ -32,20 +32,21 @@ class stock_inventory_line_split(osv.osv_memory):
     _name = "stock.inventory.line.split"
     _description = "Split inventory lines"
     _columns = {
-            'prefix': fields.char('Prefix', size=64),
-            'quantity': fields.float('Quantity per lot'),
+            'prefix': fields.char('Prefix', size=64), 
+            'quantity': fields.float('Quantity per lot'), 
             }
 
     def _check_production_lot(self, cr, uid, context):
-        for inv_obj in self.pool.get('stock.inventory.line').browse(cr, uid, context['active_ids']):
+        for inv_obj in self.pool.get('stock.inventory.line').browse(cr, uid, \
+                            context['active_ids']):
             if not inv_obj.prod_lot_id:
-                raise osv.except_osv(_('Caution!'), _('Before splitting the inventory lines, \
-                             make sure the production lot is assigned to this product.'))
+                raise osv.except_osv(_('Caution!'), _('Before splitting the \
+inventory lines, make sure the production lot is assigned to this product.'))
             return
 
     _defaults = {
-            'quantity': lambda *a: '1',
-            'prefix': _check_production_lot,
+            'quantity': lambda *a: '1', 
+            'prefix': _check_production_lot, 
             }
 
     def _split_lines(self, cr, uid, ids, context):
@@ -59,25 +60,25 @@ class stock_inventory_line_split(osv.osv_memory):
             if not sequence:
                 raise wizard.except_wizard(_('Error!'), _('No production sequence defined'))
             if linesplit_obj.prefix:
-                sequence=linesplit_obj.prefix + '/'+(sequence or '')
+                sequence = linesplit_obj.prefix + '/' + (sequence or '')
 
             inv = inv_line_obj.browse(cr, uid, [inv_id])[0]
             quantity = linesplit_obj.quantity
-            prodlot_obj.write(cr, uid, inv.prod_lot_id.id, {'name':sequence})
+            prodlot_obj.write(cr, uid, inv.prod_lot_id.id, {'name': sequence})
 
             if quantity <= 0 or inv.product_qty == 0:
                 return {}
 
-            quantity_rest = inv.product_qty%quantity
+            quantity_rest = inv.product_qty % quantity
 
             update_val = {
-                    'product_qty': quantity,
+                    'product_qty': quantity, 
             }
 
             new_line = []
-            for idx in range(int(inv.product_qty//quantity)):
+            for idx in range(int(inv.product_qty // quantity)):
                 if idx:
-                    current_line = inv_line_obj.copy(cr, uid, inv.id,
+                    current_line = inv_line_obj.copy(cr, uid, inv.id, 
                                  {'prod_lot_id': inv.prod_lot_id.id})
                     new_line.append(current_line)
                 else:
@@ -85,11 +86,11 @@ class stock_inventory_line_split(osv.osv_memory):
                     inv_line_obj.write(cr, uid, [current_line], update_val)
 
             if quantity_rest > 0:
-                idx = int(inv.product_qty//quantity)
-                update_val['product_qty']=quantity_rest
+                idx = int(inv.product_qty // quantity)
+                update_val['product_qty'] = quantity_rest
 
                 if idx:
-                    current_line = inv_line_obj.copy(cr, uid, inv.id,
+                    current_line = inv_line_obj.copy(cr, uid, inv.id, 
                                  {'prod_lot_id': inv.prod_lot_id.id})
                     new_line.append(current_line)
                 else:
diff --git a/addons/stock/wizard/stock_inventory_line_split_view.xml b/addons/stock/wizard/stock_inventory_line_split_view.xml
index fe78f630852..cc191105bd6 100644
--- a/addons/stock/wizard/stock_inventory_line_split_view.xml
+++ b/addons/stock/wizard/stock_inventory_line_split_view.xml
@@ -26,5 +26,6 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
     	</record>
+
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py
index d29f96fb9a6..110a55c6aef 100644
--- a/addons/stock/wizard/stock_invoice_onshipping.py
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@@ -81,7 +81,7 @@ class stock_invoice_onshipping(osv.osv_memory):
 
             type = onshipdata_obj['type']
             context['date_inv'] = onshipdata_obj['invoice_date']
-            res = picking_obj.action_invoice_create(cr, uid, [onshipdata_obj['id']],
+            res = picking_obj.action_invoice_create(cr, uid,context['active_ids'],
                   journal_id = onshipdata_obj['journal_id'],
                   group=onshipdata_obj['group'],
                   type=type,
diff --git a/addons/stock/wizard/stock_location_product.py b/addons/stock/wizard/stock_location_product.py
index 801d1da8869..6240e34c80d 100755
--- a/addons/stock/wizard/stock_location_product.py
+++ b/addons/stock/wizard/stock_location_product.py
@@ -32,25 +32,25 @@ class stock_location_product(osv.osv_memory):
     _name = "stock.location.product"
     _description = "Products by Location"
     _columns = {
-                'from_date': fields.datetime('From'),
-                'to_date': fields.datetime('To'),
+                'from_date': fields.datetime('From'), 
+                'to_date': fields.datetime('To'), 
                 }
 
     def _action_open_window(self, cr, uid, ids, context):
         mod_obj = self.pool.get('ir.model.data')
-        for product_obj in self.read(cr, uid, ids, ['from_date', 'to_date']):
+        for location_obj in self.read(cr, uid, ids, ['from_date', 'to_date']):
             result = mod_obj._get_id(cr, uid, 'product', 'product_search_form_view')
             id = mod_obj.read(cr, uid, result, ['res_id'])
             return {
-                    'name': 'product',
-                    'view_type': 'form',
-                    "view_mode": 'tree,form',
-                    'res_model': 'product.product',
-                    'type': 'ir.actions.act_window',
-                    'context':{'location':product_obj['id'],
-                           'from_date':product_obj['from_date'],
-                           'to_date':product_obj['to_date']},
-                    'domain':[('type', '<>', 'service')],
+                    'name': 'product', 
+                    'view_type': 'form', 
+                    'view_mode': 'tree,form', 
+                    'res_model': 'product.product', 
+                    'type': 'ir.actions.act_window', 
+                    'context': {'location': context['active_ids'][0], 
+                           'from_date': location_obj['from_date'], 
+                           'to_date': location_obj['to_date']}, 
+                    'domain': [('type', '<>', 'service')], 
                     'search_view_id': id['res_id']
                     }
 

From ffaa3b607bab126e72c482fe3d9d54c25db31c30 Mon Sep 17 00:00:00 2001
From: "MTR (OpenERP)" <>
Date: Wed, 3 Mar 2010 11:19:15 +0530
Subject: [PATCH 024/251] [IMP]: product: wizard is changed into osv_memory
 wizard

bzr revid: mso@tinyerp.com-20100303054915-i4uxlei0ylgt1y95
---
 addons/product/__terp__.py                    |  5 +--
 addons/product/product_view.xml               |  9 +++++
 addons/product/wizard/__init__.py             |  3 +-
 ...{wizard_price.py => product_price_list.py} |  0
 .../wizard/product_price_list_view.xml        | 36 +++++++++++++++++++
 5 files changed, 50 insertions(+), 3 deletions(-)
 rename addons/product/wizard/{wizard_price.py => product_price_list.py} (100%)
 create mode 100644 addons/product/wizard/product_price_list_view.xml

diff --git a/addons/product/__terp__.py b/addons/product/__terp__.py
index 8c0a8340984..4fca732a568 100644
--- a/addons/product/__terp__.py
+++ b/addons/product/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.
 #
 ##############################################################################
 
@@ -51,6 +51,7 @@
         'security/ir.model.access.csv',
         'product_data.xml',
         'product_report.xml',
+        'wizard/product_price_list_view.xml',
         'product_view.xml',
         'pricelist_view.xml',
         'partner_view.xml',
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index e6c5588f4f7..6272645f907 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -602,6 +602,15 @@
             <field name="view_id" ref="product_template_tree_view"/>
         </record>
 
+        <record model="ir.values" id="action_wizard_pricelist_report">
+                <field name="object" eval="1" />
+                <field name="name">Price List</field>
+                <field name="key2">client_print_multi</field>
+                <field name="value" eval="'ir.actions.act_window,' + str(ref('action_product_price_view'))" />
+                <field name="key">action</field>
+                <field name="model">product.product</field>
+         </record>
+
         <!--
         <menuitem action="product_template_action_tree" id="menu_templates" parent="product.menu_products" sequence="2"
                   groups="product.group_product_variant" />
diff --git a/addons/product/wizard/__init__.py b/addons/product/wizard/__init__.py
index fed1bcf3783..7382a1fc2b1 100644
--- a/addons/product/wizard/__init__.py
+++ b/addons/product/wizard/__init__.py
@@ -18,7 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
-import wizard_price
+
+import product_price_list
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/product/wizard/wizard_price.py b/addons/product/wizard/product_price_list.py
similarity index 100%
rename from addons/product/wizard/wizard_price.py
rename to addons/product/wizard/product_price_list.py
diff --git a/addons/product/wizard/product_price_list_view.xml b/addons/product/wizard/product_price_list_view.xml
new file mode 100644
index 00000000000..5463b88c30a
--- /dev/null
+++ b/addons/product/wizard/product_price_list_view.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+	<record id="view_product_price_view" model="ir.ui.view">
+            <field name="name">Price list</field>
+            <field name="model">product.price.list</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Price list">
+	  	 <field name="price_list" colspan="2" />
+     		 <field name="qty1" colspan="2" />
+		 <field name="qty2" colspan="2" />
+         	 <field name="qty3" colspan="2" />
+		 <field name="qty4" colspan="2" />
+    		 <field name="qty5" colspan="2" />
+	           <separator string="" colspan="4" />
+    		     <label string="" colspan="2" />
+        	       <button special="cancel" string="Cancel" />
+	               <button string="Print" type="object"/> 
+             </form>
+           </field>
+	</record>
+	
+	<record id="action_product_price_view" model="ir.actions.act_window">
+            <field name="name">Price List </field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">product.price.list</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+	    <field name="view_id" ref="view_product_price_view"/>
+        </record>
+
+    </data>
+</openerp>
+

From 34db4d4bae793736c3945d0959aaebab77a4d77d Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Wed, 3 Mar 2010 11:24:59 +0530
Subject: [PATCH 025/251] [REF] mrp: Converted 'Compute stock minimum rules
 only' wizard to osv_memory wizard.

bzr revid: uco@tinyerp.co.in-20100303055459-h4w26kc4crczkgsv
---
 addons/mrp/__init__.py                        |   1 +
 addons/mrp/__terp__.py                        |   1 +
 addons/mrp/mrp_wizard.xml                     |   2 +-
 addons/mrp/orderpoint_procurement.xml         |  46 ++++++++
 addons/mrp/wizard/make_procurement.py         | 102 ++++++++++++++++++
 addons/mrp/wizard/orderpoint_procurement.py   |  61 +++++++++++
 .../wizard/wizard_orderpoint_procurement.py   |  73 -------------
 7 files changed, 212 insertions(+), 74 deletions(-)
 create mode 100644 addons/mrp/orderpoint_procurement.xml
 create mode 100644 addons/mrp/wizard/make_procurement.py
 create mode 100644 addons/mrp/wizard/orderpoint_procurement.py
 delete mode 100644 addons/mrp/wizard/wizard_orderpoint_procurement.py

diff --git a/addons/mrp/__init__.py b/addons/mrp/__init__.py
index 3283ec11b99..4c69a136661 100644
--- a/addons/mrp/__init__.py
+++ b/addons/mrp/__init__.py
@@ -28,5 +28,6 @@ import company
 import schedulers
 
 import make_procurement
+import orderpoint_procurement
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py
index 6497dc3933a..72b09d3a77a 100644
--- a/addons/mrp/__terp__.py
+++ b/addons/mrp/__terp__.py
@@ -70,6 +70,7 @@
         'process/procurement_process.xml',
         'mrp_installer.xml',
         'make_procurement.xml',
+        'orderpoint_procurement.xml',
     ],
     'demo_xml': ['mrp_demo.xml', 'mrp_order_point.xml'],
     'installable': True,
diff --git a/addons/mrp/mrp_wizard.xml b/addons/mrp/mrp_wizard.xml
index 852bc57bac9..fe13df46387 100644
--- a/addons/mrp/mrp_wizard.xml
+++ b/addons/mrp/mrp_wizard.xml
@@ -8,7 +8,7 @@
           <menuitem action="wiz_mrp_proc1" id="menu_wiz_mrp_proc1" parent="mrp.mrp_Sched_all" type="wizard"/>
         -->
 
-        <wizard id="wiz_mrp_proc2" model="mrp.procurement" string="Compute Stock Minimum Rules Only" name="mrp.procurement.orderpoint.compute"/>
+<!--        <wizard id="wiz_mrp_proc2" model="mrp.procurement" string="Compute Stock Minimum Rules Only" name="mrp.procurement.orderpoint.compute"/>-->
         <!--
              <menuitem action="wiz_mrp_proc2" id="menu_wiz_mrp_proc2" parent="mrp.mrp_Sched_all" type="wizard"/>
         -->
diff --git a/addons/mrp/orderpoint_procurement.xml b/addons/mrp/orderpoint_procurement.xml
new file mode 100644
index 00000000000..3a2ac2bb638
--- /dev/null
+++ b/addons/mrp/orderpoint_procurement.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Compute Stock Minimum Rules Only -->
+        
+		<record id="view_procurement_compute_wizard" model="ir.ui.view">
+            <field name="name">Compute Stock Minimum Rules Only</field>
+            <field name="model">mrp.procurement.orderpoint.compute</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Parameters">
+				    <field name="automatic"/>
+				    <separator colspan="4"/>
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="procure_calculation" string="Compute Stock"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_procurement_compute" model="ir.actions.act_window">
+            <field name="name">Compute Stock Minimum Rules Only</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.procurement.orderpoint.compute</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="context">{'record_id' : active_id}</field>
+        </record>
+        
+       <record model="ir.values" id="procurement_compute_order_point">
+            <field name="model_id" ref="mrp.model_mrp_procurement" />
+            <field name="object" eval="1" />
+            <field name="name">Compute Stock Minimum Rules Only</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_procurement_compute'))" />
+            <field name="key">action</field>
+            <field name="model">mrp.procurement</field>
+        </record>
+		
+	</data>
+</openerp>	
\ No newline at end of file
diff --git a/addons/mrp/wizard/make_procurement.py b/addons/mrp/wizard/make_procurement.py
new file mode 100644
index 00000000000..0cf12107181
--- /dev/null
+++ b/addons/mrp/wizard/make_procurement.py
@@ -0,0 +1,102 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import wizard
+import pooler
+import netsvc
+
+import time
+
+def _get_default(obj, cr, uid, data, context=None):
+    pool = pooler.get_pool(cr.dbname)
+    product = pool.get('product.product').browse(cr, uid, data['id'], context)
+    return {'product_id': product.id, 'uom_id':product.uom_id.id, 'qty':1.0}
+
+def make_procurement(obj, cr, uid, data, context=None):
+    '''Create procurement'''
+    pool = pooler.get_pool(cr.dbname)
+    wh = pool.get('stock.warehouse').browse(cr, uid, data['form']['warehouse_id'], context)
+    user = pool.get('res.users').browse(cr, uid, uid, context)
+    procure_id = pool.get('mrp.procurement').create(cr, uid, {
+        'name':'INT:'+str(user.login),
+        'date_planned':data['form']['date_planned'],
+        'product_id':data['form']['product_id'],
+        'product_qty':data['form']['qty'],
+        'product_uom':data['form']['uom_id'],
+        'location_id':wh.lot_stock_id.id,
+        'procure_method':'make_to_order',
+    }, context=context)
+    wf_service = netsvc.LocalService("workflow")
+    wf_service.trg_validate(uid, 'mrp.procurement', procure_id, 'button_confirm', cr)
+    return {}
+
+
+class MakeProcurement(wizard.interface):
+    '''Wizard that create a procurement from a product form'''
+
+    done_form = """<?xml version="1.0"?>
+<form string="Make Requisition">
+    <label string="Your procurement request has been sent !"/>
+</form>"""
+    procurement_form = """<?xml version="1.0"?>
+<form string="Internal Requisition Request">
+    <label string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders." align="0.0" colspan="4"/>
+    <field name="product_id"/>
+    <field name="warehouse_id"/>
+    <field name="qty"/>
+    <field name="uom_id"/>
+    <field name="date_planned"/>
+</form>"""
+    procurement_fields = {
+        'qty': {'string': 'Quantity', 'type': 'float', 'digits':(16,2), 'required': True},
+        'product_id': {'string': 'product', 'type': 'many2one', 'relation': 'product.product', 'required': True, 'readonly':1},
+        'uom_id': {'string': 'Unit of Measure', 'type': 'many2one', 'relation': 'product.uom', 'required':True},
+        'warehouse_id': {'string': 'Warehouse', 'type': 'many2one', 'relation':'stock.warehouse', 'required':True},
+        'date_planned': {'string': 'Planned Date', 'type': 'date', 'required':True, 'default': lambda *args: time.strftime('%Y-%m-%d')}
+    }
+
+    states = {
+        'init': {
+            'actions': [_get_default],
+            'result': {'type': 'form', 'arch': procurement_form, 'fields': procurement_fields,
+                'state': [
+                    ('end', 'Cancel'),
+                    ('create', 'Ask New Products')
+                ]
+            }
+        },
+        'done': {
+            'actions': [],
+            'result': {'type': 'form', 'arch': done_form, 'fields': {},
+                'state': [
+                    ('end', 'Close'),
+                ]
+            }
+        },
+        'create': {
+            'actions': [],
+            'result': {'type': 'action', 'action': make_procurement, 'state': 'done'}
+        }
+    }
+
+MakeProcurement('product.product.procurement')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/mrp/wizard/orderpoint_procurement.py b/addons/mrp/wizard/orderpoint_procurement.py
new file mode 100644
index 00000000000..e9bf9377d11
--- /dev/null
+++ b/addons/mrp/wizard/orderpoint_procurement.py
@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+#
+# Order Point Method:
+#    - Order if the virtual stock of today is bellow the min of the defined order point
+#
+
+import threading
+from osv import fields,osv
+
+class procurement_compute(osv.osv):
+    _name = 'mrp.procurement.orderpoint.compute'
+    _description = 'Automatic Order Point'
+    
+    _columns = {
+           'automatic': fields.boolean('Automatic Orderpoint', help='If the stock of a product is under 0, it will act like an orderpoint'),     
+    }
+
+    _defaults = {
+            'automatic' : lambda *a: False,
+    }
+    
+    def _procure_calculation_orderpoint(self, cr, uid, ids, context):
+        try:
+            proc_obj = self.pool.get('mrp.procurement')
+            for proc in self.browse(cr, uid, ids):
+                proc_obj._procure_orderpoint_confirm(cr, uid, automatic=proc.automatic, use_new_cursor=cr.dbname, context=context)
+        finally:
+            cr.close()
+        return {}
+    
+    def procure_calculation(self, cr, uid, ids, context):
+        threaded_calculation = threading.Thread(target=self._procure_calculation_orderpoint, args=(cr, uid, ids, context))
+        threaded_calculation.start()
+        return {}
+
+procurement_compute()
+
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/mrp/wizard/wizard_orderpoint_procurement.py b/addons/mrp/wizard/wizard_orderpoint_procurement.py
deleted file mode 100644
index a4fa57bb9a8..00000000000
--- a/addons/mrp/wizard/wizard_orderpoint_procurement.py
+++ /dev/null
@@ -1,73 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-#
-# Order Point Method:
-#    - Order if the virtual stock of today is bellow the min of the defined order point
-#
-
-import wizard
-import threading
-import pooler
-
-parameter_form = '''<?xml version="1.0"?>
-<form string="Parameters" colspan="4">
-    <field name="automatic" />
-</form>'''
-
-parameter_fields = {
-    'automatic': {'string': 'Automatic orderpoint', 'type': 'boolean', 'help': 'If the stock of a product is under 0, it will act like an orderpoint', 'default': lambda *a: False},
-}
-
-def _procure_calculation_orderpoint(self, db_name, uid, data, context):
-    db, pool = pooler.get_db_and_pool(db_name)
-    cr = db.cursor()
-    try:
-        proc_obj = pool.get('mrp.procurement')
-        automatic = data['form']['automatic']
-        proc_obj._procure_orderpoint_confirm(cr, uid, automatic=automatic,\
-                use_new_cursor=cr.dbname, context=context)
-    finally:
-        cr.close()
-    return {}
-
-def _procure_calculation(self, cr, uid, data, context):
-    threaded_calculation = threading.Thread(target=_procure_calculation_orderpoint, args=(self, cr.dbname, uid, data, context))
-    threaded_calculation.start()
-    return {}
-
-class procurement_compute(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':parameter_form, 'fields': parameter_fields, 'state':[('end','Cancel'),('compute','Compute Stock')]}
-        },
-        'compute': {
-            'actions': [_procure_calculation],
-            'result': {'type': 'state', 'state':'end'}
-        },
-    }
-procurement_compute('mrp.procurement.orderpoint.compute')
-
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From 27c588415eef0583c6a82e49f268006c511ae01a Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Wed, 3 Mar 2010 12:03:55 +0530
Subject: [PATCH 026/251] [FIX] mrp: Small fix.

bzr revid: uco@tinyerp.co.in-20100303063355-su28558gh8fp1zz0
---
 .../{make_procurement.py => wizard/make_procurement_product.py} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename addons/mrp/{make_procurement.py => wizard/make_procurement_product.py} (99%)

diff --git a/addons/mrp/make_procurement.py b/addons/mrp/wizard/make_procurement_product.py
similarity index 99%
rename from addons/mrp/make_procurement.py
rename to addons/mrp/wizard/make_procurement_product.py
index 29b0f58ccf0..3ef342c308d 100644
--- a/addons/mrp/make_procurement.py
+++ b/addons/mrp/wizard/make_procurement_product.py
@@ -51,7 +51,7 @@ class make_procurement(osv.osv_memory):
     def make_procurement(self, cr, uid, ids, context=None):
         '''Create procurement'''
         for proc in self.browse(cr, uid, ids):
-            wh = self.pool.get('stock.warehouse').browse(cr, uid, proc.id, context)
+            wh = self.pool.get('stock.warehouse').browse(cr, uid, proc.warehouse_id.id, context)
             user = self.pool.get('res.users').browse(cr, uid, uid, context)
             procure_id = self.pool.get('mrp.procurement').create(cr, uid, {
                 'name':'INT:'+str(user.login),

From 83ac35ae9aab0c3a59d6ae184b608214c8abb916 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Wed, 3 Mar 2010 14:16:27 +0530
Subject: [PATCH 027/251] [REF] mrp: Converted 'Compute Schedulers' wizard to
 osv_memory wizard.

bzr revid: uco@tinyerp.co.in-20100303084627-hlvinkp5b4k8y0ry
---
 addons/mrp/__init__.py                      |   2 -
 addons/mrp/__terp__.py                      |   1 +
 addons/mrp/mrp_wizard.xml                   |   6 +-
 addons/mrp/schedulers_all.xml               |  49 ++++++++++
 addons/mrp/wizard/__init__.py               |   5 +-
 addons/mrp/wizard/make_procurement.py       | 102 --------------------
 addons/mrp/wizard/orderpoint_procurement.py |   2 +-
 addons/mrp/wizard/schedulers_all.py         |  53 ++++++++++
 addons/mrp/wizard/wizard_schedulers_all.py  |  64 ------------
 9 files changed, 110 insertions(+), 174 deletions(-)
 create mode 100644 addons/mrp/schedulers_all.xml
 delete mode 100644 addons/mrp/wizard/make_procurement.py
 create mode 100644 addons/mrp/wizard/schedulers_all.py
 delete mode 100644 addons/mrp/wizard/wizard_schedulers_all.py

diff --git a/addons/mrp/__init__.py b/addons/mrp/__init__.py
index 4c69a136661..ca3dfa07ac9 100644
--- a/addons/mrp/__init__.py
+++ b/addons/mrp/__init__.py
@@ -27,7 +27,5 @@ import report
 import company
 import schedulers
 
-import make_procurement
-import orderpoint_procurement
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py
index 72b09d3a77a..93b9938b97a 100644
--- a/addons/mrp/__terp__.py
+++ b/addons/mrp/__terp__.py
@@ -71,6 +71,7 @@
         'mrp_installer.xml',
         'make_procurement.xml',
         'orderpoint_procurement.xml',
+        'schedulers_all.xml',
     ],
     'demo_xml': ['mrp_demo.xml', 'mrp_order_point.xml'],
     'installable': True,
diff --git a/addons/mrp/mrp_wizard.xml b/addons/mrp/mrp_wizard.xml
index fe13df46387..00101ffecc7 100644
--- a/addons/mrp/mrp_wizard.xml
+++ b/addons/mrp/mrp_wizard.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <wizard id="wiz_mrp_proc0" model="mrp.procurement" string="Compute Schedulers" name="mrp.procurement.compute.all"/>
-        <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="menu_mrp_root" sequence="4"/>   
-        <menuitem action="wiz_mrp_proc0" id="mrp_Sched_all" parent="mrp.menu_mrp_scheduler" type="wizard" sequence="90"/>
+<!--        <wizard id="wiz_mrp_proc0" model="mrp.procurement" string="Compute Schedulers" name="mrp.procurement.compute.all"/>-->
+<!--        <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="menu_mrp_root" sequence="4"/>   -->
+<!--        <menuitem action="wiz_mrp_proc0" id="mrp_Sched_all" parent="mrp.menu_mrp_scheduler" type="wizard" sequence="90"/>-->
         <!--
           <menuitem action="wiz_mrp_proc1" id="menu_wiz_mrp_proc1" parent="mrp.mrp_Sched_all" type="wizard"/>
         -->
diff --git a/addons/mrp/schedulers_all.xml b/addons/mrp/schedulers_all.xml
new file mode 100644
index 00000000000..246732cddbe
--- /dev/null
+++ b/addons/mrp/schedulers_all.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Compute Schedulers -->
+        
+		<record id="view_compute_schedulers_wizard" model="ir.ui.view">
+            <field name="name">Compute Schedulers</field>
+            <field name="model">mrp.procurement.compute.all</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Scheduler Parameters">
+				    <field name="automatic"/>
+				    <separator colspan="4"/>
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="procure_calculation" string="Compute Schedulers"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_compute_schedulers" model="ir.actions.act_window">
+            <field name="name">Compute Schedulers</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.procurement.compute.all</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="context">{'record_id' : active_id}</field>
+        </record>
+        
+       <record model="ir.values" id="compute_all_schedulers">
+            <field name="model_id" ref="mrp.model_mrp_procurement" />
+            <field name="object" eval="1" />
+            <field name="name">Compute Schedulers</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_compute_schedulers'))" />
+            <field name="key">action</field>
+            <field name="model">mrp.procurement</field>
+        </record>
+        
+        <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="menu_mrp_root" sequence="4"/>
+        <menuitem action="action_compute_schedulers" id="mrp_Sched_all" parent="mrp.menu_mrp_scheduler" sequence="90"/>
+		
+	</data>
+</openerp>	
\ No newline at end of file
diff --git a/addons/mrp/wizard/__init__.py b/addons/mrp/wizard/__init__.py
index 5ec6eae958a..57b1dee1a7c 100644
--- a/addons/mrp/wizard/__init__.py
+++ b/addons/mrp/wizard/__init__.py
@@ -19,9 +19,10 @@
 #
 ##############################################################################
 
-import wizard_orderpoint_procurement
+import make_procurement_product
+import orderpoint_procurement
+import schedulers_all
 import wizard_procurement
-import wizard_schedulers_all
 import wizard_price
 import wizard_workcenter_load
 import wizard_track_prod
diff --git a/addons/mrp/wizard/make_procurement.py b/addons/mrp/wizard/make_procurement.py
deleted file mode 100644
index 0cf12107181..00000000000
--- a/addons/mrp/wizard/make_procurement.py
+++ /dev/null
@@ -1,102 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import pooler
-import netsvc
-
-import time
-
-def _get_default(obj, cr, uid, data, context=None):
-    pool = pooler.get_pool(cr.dbname)
-    product = pool.get('product.product').browse(cr, uid, data['id'], context)
-    return {'product_id': product.id, 'uom_id':product.uom_id.id, 'qty':1.0}
-
-def make_procurement(obj, cr, uid, data, context=None):
-    '''Create procurement'''
-    pool = pooler.get_pool(cr.dbname)
-    wh = pool.get('stock.warehouse').browse(cr, uid, data['form']['warehouse_id'], context)
-    user = pool.get('res.users').browse(cr, uid, uid, context)
-    procure_id = pool.get('mrp.procurement').create(cr, uid, {
-        'name':'INT:'+str(user.login),
-        'date_planned':data['form']['date_planned'],
-        'product_id':data['form']['product_id'],
-        'product_qty':data['form']['qty'],
-        'product_uom':data['form']['uom_id'],
-        'location_id':wh.lot_stock_id.id,
-        'procure_method':'make_to_order',
-    }, context=context)
-    wf_service = netsvc.LocalService("workflow")
-    wf_service.trg_validate(uid, 'mrp.procurement', procure_id, 'button_confirm', cr)
-    return {}
-
-
-class MakeProcurement(wizard.interface):
-    '''Wizard that create a procurement from a product form'''
-
-    done_form = """<?xml version="1.0"?>
-<form string="Make Requisition">
-    <label string="Your procurement request has been sent !"/>
-</form>"""
-    procurement_form = """<?xml version="1.0"?>
-<form string="Internal Requisition Request">
-    <label string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders." align="0.0" colspan="4"/>
-    <field name="product_id"/>
-    <field name="warehouse_id"/>
-    <field name="qty"/>
-    <field name="uom_id"/>
-    <field name="date_planned"/>
-</form>"""
-    procurement_fields = {
-        'qty': {'string': 'Quantity', 'type': 'float', 'digits':(16,2), 'required': True},
-        'product_id': {'string': 'product', 'type': 'many2one', 'relation': 'product.product', 'required': True, 'readonly':1},
-        'uom_id': {'string': 'Unit of Measure', 'type': 'many2one', 'relation': 'product.uom', 'required':True},
-        'warehouse_id': {'string': 'Warehouse', 'type': 'many2one', 'relation':'stock.warehouse', 'required':True},
-        'date_planned': {'string': 'Planned Date', 'type': 'date', 'required':True, 'default': lambda *args: time.strftime('%Y-%m-%d')}
-    }
-
-    states = {
-        'init': {
-            'actions': [_get_default],
-            'result': {'type': 'form', 'arch': procurement_form, 'fields': procurement_fields,
-                'state': [
-                    ('end', 'Cancel'),
-                    ('create', 'Ask New Products')
-                ]
-            }
-        },
-        'done': {
-            'actions': [],
-            'result': {'type': 'form', 'arch': done_form, 'fields': {},
-                'state': [
-                    ('end', 'Close'),
-                ]
-            }
-        },
-        'create': {
-            'actions': [],
-            'result': {'type': 'action', 'action': make_procurement, 'state': 'done'}
-        }
-    }
-
-MakeProcurement('product.product.procurement')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/mrp/wizard/orderpoint_procurement.py b/addons/mrp/wizard/orderpoint_procurement.py
index e9bf9377d11..bfa67f337f1 100644
--- a/addons/mrp/wizard/orderpoint_procurement.py
+++ b/addons/mrp/wizard/orderpoint_procurement.py
@@ -27,7 +27,7 @@
 import threading
 from osv import fields,osv
 
-class procurement_compute(osv.osv):
+class procurement_compute(osv.osv_memory):
     _name = 'mrp.procurement.orderpoint.compute'
     _description = 'Automatic Order Point'
     
diff --git a/addons/mrp/wizard/schedulers_all.py b/addons/mrp/wizard/schedulers_all.py
new file mode 100644
index 00000000000..6e8dca9d636
--- /dev/null
+++ b/addons/mrp/wizard/schedulers_all.py
@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import threading
+from osv import osv, fields
+
+class procurement_compute(osv.osv_memory):
+    _name = 'mrp.procurement.compute.all'
+    _description = 'Compute all schedulers'
+    
+    _columns = {
+        'automatic': fields.boolean('Automatic orderpoint',help='Triggers an automatic procurement for all products that have a virtual stock under 0. You should probably not use this option, we suggest using a MTO configuration on products.'),
+    }
+    
+    _defaults ={
+         'automatic': lambda *a: False,
+    }
+    
+    def _procure_calculation_all(self, cr, uid, ids, context):
+        proc_obj = self.pool.get('mrp.procurement')
+        for proc in self.browse(cr, uid, ids):
+            proc_obj.run_scheduler(cr, uid, automatic=proc.automatic, use_new_cursor=cr.dbname,\
+                    context=context)
+        return {}
+    
+    def procure_calculation(self, cr, uid, ids, context):
+        threaded_calculation = threading.Thread(target=self._procure_calculation_all, args=(cr, uid, ids, context))
+        threaded_calculation.start()
+        return {}
+    
+procurement_compute()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/mrp/wizard/wizard_schedulers_all.py b/addons/mrp/wizard/wizard_schedulers_all.py
deleted file mode 100644
index e93e31c0599..00000000000
--- a/addons/mrp/wizard/wizard_schedulers_all.py
+++ /dev/null
@@ -1,64 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import threading
-import pooler
-
-parameter_form = '''<?xml version="1.0"?>
-<form string="Scheduler Parameters" colspan="4">
-    <field name="automatic" />
-</form>'''
-
-parameter_fields = {
-    'automatic': {'string': 'Automatic orderpoint', 'type': 'boolean', 'help': 'Triggers an automatic procurement for all products that have a virtual stock under 0. You should probably not use this option, we suggest using a MTO configuration on products.', 'default': lambda *a: False},
-}
-
-def _procure_calculation_all(self, db_name, uid, data, context):
-    db, pool = pooler.get_db_and_pool(db_name)
-    cr = db.cursor()
-    proc_obj = pool.get('mrp.procurement')
-    automatic = data['form']['automatic']
-    proc_obj.run_scheduler(cr, uid, automatic=automatic, use_new_cursor=cr.dbname,\
-            context=context)
-    cr.close()
-    return {}
-
-def _procure_calculation(self, cr, uid, data, context):
-    threaded_calculation = threading.Thread(target=_procure_calculation_all, args=(self, cr.dbname, uid, data, context))
-    threaded_calculation.start()
-    return {}
-
-class procurement_compute(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':parameter_form, 'fields': parameter_fields, 'state':[('end','Cancel'),('compute','Compute Stock') ]}
-        },
-        'compute': {
-            'actions': [_procure_calculation],
-            'result': {'type': 'state', 'state':'end'}
-        },
-    }
-procurement_compute('mrp.procurement.compute.all')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From a2b449f033e1788e46121650e70aac2f22f4f9a7 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Wed, 3 Mar 2010 19:14:05 +0530
Subject: [PATCH 028/251] [REF] mrp_repair: Converted 'Cancel Repair' wizard to
 osv_memory wizard.

bzr revid: uco@tinyerp.co.in-20100303134405-jssoxxdop0tuttyn
---
 addons/mrp_repair/__terp__.py                 |  3 +-
 addons/mrp_repair/mrp_repair_cancel_view.xml  | 47 +++++++++++
 addons/mrp_repair/mrp_repair_wizard.xml       | 17 ++--
 addons/mrp_repair/wizard/__init__.py          |  2 +-
 addons/mrp_repair/wizard/cancel_repair.py     | 62 ++++++++++++++
 .../mrp_repair/wizard/wizard_cancel_repair.py | 81 -------------------
 6 files changed, 121 insertions(+), 91 deletions(-)
 create mode 100644 addons/mrp_repair/mrp_repair_cancel_view.xml
 create mode 100644 addons/mrp_repair/wizard/cancel_repair.py
 delete mode 100644 addons/mrp_repair/wizard/wizard_cancel_repair.py

diff --git a/addons/mrp_repair/__terp__.py b/addons/mrp_repair/__terp__.py
index 2f44e257a80..5b20d6737d4 100644
--- a/addons/mrp_repair/__terp__.py
+++ b/addons/mrp_repair/__terp__.py
@@ -39,9 +39,10 @@
         'security/ir.model.access.csv',
         'mrp_repair_sequence.xml',
         'mrp_repair_wizard.xml',
+        'mrp_repair_cancel_view.xml',
         'mrp_repair_view.xml',
         'mrp_repair_workflow.xml',
-        'mrp_repair_report.xml'
+        'mrp_repair_report.xml',
     ],
     'demo_xml': [],
     'installable': True,
diff --git a/addons/mrp_repair/mrp_repair_cancel_view.xml b/addons/mrp_repair/mrp_repair_cancel_view.xml
new file mode 100644
index 00000000000..b865f5f5a77
--- /dev/null
+++ b/addons/mrp_repair/mrp_repair_cancel_view.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Cancel Repair -->
+        
+		<record id="view_cancel_repair" model="ir.ui.view">
+            <field name="name">Cancel Repair</field>
+            <field name="model">mrp.repair.cancel</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Requisition Request">
+				    <label string="This operation will cancel the Repair process, but will not cancel it's Invoice. Do you want to continue?" colspan="4"/>
+				    <field name="cancel"/>
+				    <field name="repair_id" invisible="1"/>
+				    <newline/>
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="No" />
+                		<button name="cancel_repair" string="Yes"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_cancel_repair" model="ir.actions.act_window">
+            <field name="name">Cancel Repair</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.repair.cancel</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="context">{'record_id' : active_id}</field>
+        </record>
+ 
+ 		<record model="ir.values" id="action_cancel_repair_related">
+ 			<field name="model_id" ref="mrp_repair.model_mrp_repair" />
+            <field name="object" eval="1" />
+            <field name="name">Cancel Repair</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_cancel_repair'))" />
+            <field name="key">action</field>
+            <field name="model">mrp.repair</field>
+        </record>
+        
+	</data>
+</openerp>	
diff --git a/addons/mrp_repair/mrp_repair_wizard.xml b/addons/mrp_repair/mrp_repair_wizard.xml
index 42383f517cc..fd7c04d5ece 100644
--- a/addons/mrp_repair/mrp_repair_wizard.xml
+++ b/addons/mrp_repair/mrp_repair_wizard.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-	    <wizard 
-	            id="action_cancel_repair" 
-	            model="mrp.repair" 
-	            name="mrp.repair.cancel"
-	            string="Cancel Repair"
-	            menu = "False"
-	            multi = "True"
-	            />
+<!--	    <wizard -->
+<!--	            id="action_cancel_repair" -->
+<!--	            model="mrp.repair" -->
+<!--	            name="mrp.repair.cancel"-->
+<!--	            string="Cancel Repair"-->
+<!--	            menu = "False"-->
+<!--	            multi = "True"-->
+<!--	            />-->
+
 		 <wizard
 				id="wizard_mrp_repair_make_invoice"
 				keyword="client_action_multi"
diff --git a/addons/mrp_repair/wizard/__init__.py b/addons/mrp_repair/wizard/__init__.py
index ec3063f01de..d111ac04f3f 100644
--- a/addons/mrp_repair/wizard/__init__.py
+++ b/addons/mrp_repair/wizard/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import wizard_cancel_repair
+import cancel_repair
 import wizard_make_invoice
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/mrp_repair/wizard/cancel_repair.py b/addons/mrp_repair/wizard/cancel_repair.py
new file mode 100644
index 00000000000..feff149c2a9
--- /dev/null
+++ b/addons/mrp_repair/wizard/cancel_repair.py
@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import netsvc
+from osv import osv,fields
+from tools.translate import _
+
+class repair_cancel(osv.osv_memory):
+    _name = 'mrp.repair.cancel'
+    _description = 'Cancel Repair'
+    
+    _columns = {
+        'repair_id': fields.many2one('mrp.repair', 'Repair ID', readonly=True),
+        'cancel': fields.boolean('Cancel Repair'),
+    }
+    
+    _defaults = {
+        'cancel': lambda *a: False,
+    }
+            
+    def cancel_repair(self, cr, uid, ids, context):
+        repair_cancel = self.browse(cr, uid, ids[0])
+        repair_obj = self.pool.get('mrp.repair').browse(cr, uid, [repair_cancel.repair_id.id])
+        if repair_obj[0].invoice_id and repair_cancel.cancel:
+            self.pool.get('mrp.repair').write(cr, uid, repair_cancel.repair_id.id, {'state':'cancel'})
+            mrp_line_obj = self.pool.get('mrp.repair.line')
+            for line in repair_obj:
+                mrp_line_obj.write(cr, uid, [l.id for l in line.operations], {'state': 'cancel'})
+        else:
+            raise osv.except_osv(_('Warning!'),_('Repair is not cancelled. It is not invoiced.'))
+        return {}
+    
+    def default_get(self, cr, uid, fields, context=None):
+        record_id = context and context.get('record_id', False) or False
+        res = super(repair_cancel, self).default_get(cr, uid, fields, context=context)
+        if record_id:
+            repair_id = self.pool.get('mrp.repair').browse(cr, uid, record_id, context=context)
+            res['repair_id'] = repair_id.id
+        return res
+   
+repair_cancel()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/mrp_repair/wizard/wizard_cancel_repair.py b/addons/mrp_repair/wizard/wizard_cancel_repair.py
deleted file mode 100644
index d895096ce6f..00000000000
--- a/addons/mrp_repair/wizard/wizard_cancel_repair.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-
-cancel_form = """<?xml version="1.0"?>
-<form string="Cancel Repair...??">
-    <label colspan="4" string="This operation  will  cancel the  Repair process, but  will not cancel it's Invoice.\nDo you want to continue?" />
-</form>
-"""
-
-cancel_fields = {}
-
-def check_state(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    repair_obj = pool.get('mrp.repair').browse(cr, uid, data['ids'])[0]
-    if repair_obj.invoice_id:
-        return 'display'
-    else:
-        pool.get('mrp.repair').write(cr,uid,data['ids'],{'state':'cancel'})
-        return 'end'
-        
-        
-def _cancel_repair(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    repair_obj = pool.get('mrp.repair').browse(cr, uid, data['ids'])
-    pool.get('mrp.repair').write(cr,uid,data['ids'],{'state':'cancel'})
-    mrp_line_obj = pool.get('mrp.repair.line')
-    for line in repair_obj:
-        mrp_line_obj.write(cr, uid, [l.id for l in line.operations], {'state': 'cancel'})
-    return {}
-
-class repair_cancel(wizard.interface):
-    states = {
-       'init' : {
-            'actions' : [],
-            'result' : {'type' : 'choice', 'next_state' : check_state}
-        },
-
-        'display' : {
-            'actions' : [],
-            'result' : {'type' : 'form',
-                    'arch' : cancel_form,
-                    'fields' : cancel_fields,
-                    'state' : [('end', 'No'),('yes', 'Yes') ]}
-        },
-        'yes' : {
-            'actions' : [],
-            'result' : {'type' : 'action',
-                    'action' : _cancel_repair,
-                    'state' : 'end'}
-        },
-         'end' : {
-            'actions' : [],
-            'result': {'type': 'state', 'state': 'end'},
-        },
-    }
-repair_cancel("mrp.repair.cancel")
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From 3a1cb289e0fb1fa2243f288683a89adec6bb9962 Mon Sep 17 00:00:00 2001
From: "ATP (OpenERP)" <>
Date: Thu, 4 Mar 2010 10:59:05 +0530
Subject: [PATCH 029/251] [IMP]: account_voucher: Minor improvement for button
 icon

bzr revid: rpa@openerp.co.in-20100304052905-mr0ycuha4tuyxu4j
---
 .../account_voucher/wizard/account_voucher_open.py | 14 +++++++-------
 .../wizard/account_voucher_open_view.xml           |  4 +++-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/addons/account_voucher/wizard/account_voucher_open.py b/addons/account_voucher/wizard/account_voucher_open.py
index 5c3448eb57f..508a2d1c275 100644
--- a/addons/account_voucher/wizard/account_voucher_open.py
+++ b/addons/account_voucher/wizard/account_voucher_open.py
@@ -19,14 +19,14 @@
 #
 ##############################################################################
 
-import time
-import netsvc
-from osv import fields, osv
-import ir
-import pooler
-import mx.DateTime
 from mx.DateTime import RelativeDateTime
+from osv import fields, osv
 from tools import config
+import ir
+import mx.DateTime
+import netsvc
+import pooler
+import time
 
 class account_voucher_open(osv.osv_memory):
     """
@@ -47,7 +47,7 @@ class account_voucher_open(osv.osv_memory):
         Open account voucher form.
         @param cr: the current row, from the database cursor.
         @param uid: the current user’s ID for security checks.
-        @param id: account voucher open’s ID or list of IDs if we want more than one.
+        @param id: List of account voucher open’s IDs.
         @param return:dictionary of account voucher on  given state ,type and account period id.
          """
         
diff --git a/addons/account_voucher/wizard/account_voucher_open_view.xml b/addons/account_voucher/wizard/account_voucher_open_view.xml
index c3ef1acf94e..5e71b20c6f4 100644
--- a/addons/account_voucher/wizard/account_voucher_open_view.xml
+++ b/addons/account_voucher/wizard/account_voucher_open_view.xml
@@ -16,11 +16,12 @@
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button string="Open Voucher Entries" name="_action_open_window" type="object"/>
+                    	<button icon="gtk-open" string="Open Voucher Entries" name="_action_open_window" type="object"/>
                    	</group>
                </form>
             </field>
         </record>
+        
         <record id="action_account_voucher_open" model="ir.actions.act_window">
             <field name="name">Open a Voucher Entry</field>
             <field name="res_model">account.voucher.open</field>
@@ -29,6 +30,7 @@
            <field name="view_id" ref="view_account_voucher_open_form"/> 
            <field name="target">new</field>
         </record>
+        
         <menuitem 
 	     	action="action_account_voucher_open" 
 	     	id="menu_wizard_account_voucher_open" 

From fb5b3adb20e0869227aa7029cb3c7914e51694f8 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Thu, 4 Mar 2010 12:08:57 +0530
Subject: [PATCH 030/251] [REF] mrp_repair: Correction in 'Cancel Repair'
 wizard. Removed unnecessary field.

bzr revid: uco@tinyerp.co.in-20100304063857-m47t1qp5wsufxxf2
---
 addons/mrp_repair/mrp_repair_cancel_view.xml |  1 -
 addons/mrp_repair/wizard/cancel_repair.py    | 31 ++++++++++++++------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair_cancel_view.xml b/addons/mrp_repair/mrp_repair_cancel_view.xml
index b865f5f5a77..3a01fd481a7 100644
--- a/addons/mrp_repair/mrp_repair_cancel_view.xml
+++ b/addons/mrp_repair/mrp_repair_cancel_view.xml
@@ -11,7 +11,6 @@
             <field name="arch" type="xml">
                 <form string="Requisition Request">
 				    <label string="This operation will cancel the Repair process, but will not cancel it's Invoice. Do you want to continue?" colspan="4"/>
-				    <field name="cancel"/>
 				    <field name="repair_id" invisible="1"/>
 				    <newline/>
 				    <group col="2" colspan="4">
diff --git a/addons/mrp_repair/wizard/cancel_repair.py b/addons/mrp_repair/wizard/cancel_repair.py
index feff149c2a9..2c4f2296b2d 100644
--- a/addons/mrp_repair/wizard/cancel_repair.py
+++ b/addons/mrp_repair/wizard/cancel_repair.py
@@ -29,18 +29,14 @@ class repair_cancel(osv.osv_memory):
     
     _columns = {
         'repair_id': fields.many2one('mrp.repair', 'Repair ID', readonly=True),
-        'cancel': fields.boolean('Cancel Repair'),
     }
     
-    _defaults = {
-        'cancel': lambda *a: False,
-    }
-            
     def cancel_repair(self, cr, uid, ids, context):
-        repair_cancel = self.browse(cr, uid, ids[0])
-        repair_obj = self.pool.get('mrp.repair').browse(cr, uid, [repair_cancel.repair_id.id])
-        if repair_obj[0].invoice_id and repair_cancel.cancel:
-            self.pool.get('mrp.repair').write(cr, uid, repair_cancel.repair_id.id, {'state':'cancel'})
+        cancel = self.browse(cr, uid, ids[0])
+        repair_obj = self.pool.get('mrp.repair').browse(cr, uid, [cancel.repair_id.id])
+        
+        if repair_obj[0].invoiced or repair_obj[0].invoice_method == 'none':
+            self.pool.get('mrp.repair').write(cr, uid, cancel.repair_id.id, {'state':'cancel'})
             mrp_line_obj = self.pool.get('mrp.repair.line')
             for line in repair_obj:
                 mrp_line_obj.write(cr, uid, [l.id for l in line.operations], {'state': 'cancel'})
@@ -48,6 +44,23 @@ class repair_cancel(osv.osv_memory):
             raise osv.except_osv(_('Warning!'),_('Repair is not cancelled. It is not invoiced.'))
         return {}
     
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        record_id = context and context.get('record_id', False) or False
+        res = super(repair_cancel, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
+        if record_id:
+            repair_obj = self.pool.get('mrp.repair').browse(cr, uid, [record_id])[0]
+            if not repair_obj.invoice_id:
+                res['arch'] = """ <form string="Cancel Repair" colspan="4">
+                                <field name="repair_id" invisible="1"/>
+                                <newline/>
+                                <group col="2" colspan="2">
+                                    <button icon="gtk-cancel" special="cancel" string="No" readonly="0"/>
+                                    <button name="cancel_repair" string="Yes" type="object" icon="gtk-ok"/>
+                                </group>
+                            </form>                             
+                        """
+        return res
+    
     def default_get(self, cr, uid, fields, context=None):
         record_id = context and context.get('record_id', False) or False
         res = super(repair_cancel, self).default_get(cr, uid, fields, context=context)

From dd224ef319598004e2948fc8de307b4f483db727 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Thu, 4 Mar 2010 13:10:44 +0530
Subject: [PATCH 031/251] [ADD, REF] mrp_repair: Added osv_memory wizard for
 'Make Invoices'. Optimized the code for 'Cancel Repair' wizard.

bzr revid: uco@tinyerp.co.in-20100304074044-kbb4m3ym2toh7a0a
---
 addons/mrp_repair/__terp__.py                 |  1 +
 addons/mrp_repair/mrp_repair_cancel_view.xml  |  1 -
 .../mrp_repair_make_invoice_view.xml          | 46 +++++++++++
 addons/mrp_repair/mrp_repair_wizard.xml       | 14 ++--
 addons/mrp_repair/wizard/__init__.py          |  2 +-
 addons/mrp_repair/wizard/cancel_repair.py     | 38 +++------
 addons/mrp_repair/wizard/make_invoice.py      | 52 ++++++++++++
 .../mrp_repair/wizard/wizard_make_invoice.py  | 81 -------------------
 8 files changed, 120 insertions(+), 115 deletions(-)
 create mode 100644 addons/mrp_repair/mrp_repair_make_invoice_view.xml
 create mode 100644 addons/mrp_repair/wizard/make_invoice.py
 delete mode 100644 addons/mrp_repair/wizard/wizard_make_invoice.py

diff --git a/addons/mrp_repair/__terp__.py b/addons/mrp_repair/__terp__.py
index 5b20d6737d4..0cb90558a0c 100644
--- a/addons/mrp_repair/__terp__.py
+++ b/addons/mrp_repair/__terp__.py
@@ -40,6 +40,7 @@
         'mrp_repair_sequence.xml',
         'mrp_repair_wizard.xml',
         'mrp_repair_cancel_view.xml',
+        'mrp_repair_make_invoice_view.xml',
         'mrp_repair_view.xml',
         'mrp_repair_workflow.xml',
         'mrp_repair_report.xml',
diff --git a/addons/mrp_repair/mrp_repair_cancel_view.xml b/addons/mrp_repair/mrp_repair_cancel_view.xml
index 3a01fd481a7..6e900939fd6 100644
--- a/addons/mrp_repair/mrp_repair_cancel_view.xml
+++ b/addons/mrp_repair/mrp_repair_cancel_view.xml
@@ -11,7 +11,6 @@
             <field name="arch" type="xml">
                 <form string="Requisition Request">
 				    <label string="This operation will cancel the Repair process, but will not cancel it's Invoice. Do you want to continue?" colspan="4"/>
-				    <field name="repair_id" invisible="1"/>
 				    <newline/>
 				    <group col="2" colspan="4">
                 		<button icon='gtk-cancel' special="cancel"
diff --git a/addons/mrp_repair/mrp_repair_make_invoice_view.xml b/addons/mrp_repair/mrp_repair_make_invoice_view.xml
new file mode 100644
index 00000000000..6d489e5704b
--- /dev/null
+++ b/addons/mrp_repair/mrp_repair_make_invoice_view.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Make Invoice -->
+        
+		<record id="view_make_invoice" model="ir.ui.view">
+            <field name="name">Make Invoice</field>
+            <field name="model">mrp.repair.make_invoice</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Create invoices">
+				    <separator colspan="4" string="Do you really want to create the invoices ?" />  
+				    <field name="group"/>
+				    <newline/>  
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="make_invoices" string="Create Invoice"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_make_invoice" model="ir.actions.act_window">
+            <field name="name">Make Invoice</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.repair.make_invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="context">{'active_ids' : active_ids}</field>
+        </record>
+ 
+ 		<record model="ir.values" id="action_make_invoice_related">
+            <field name="object" eval="1" />
+            <field name="name">Make Invoice</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_make_invoice'))" />
+            <field name="key2">client_action_multi</field>
+            <field name="key">action</field>
+            <field name="model">mrp.repair</field>
+        </record>
+        
+	</data>
+</openerp>	
diff --git a/addons/mrp_repair/mrp_repair_wizard.xml b/addons/mrp_repair/mrp_repair_wizard.xml
index fd7c04d5ece..b0b2c89d50d 100644
--- a/addons/mrp_repair/mrp_repair_wizard.xml
+++ b/addons/mrp_repair/mrp_repair_wizard.xml
@@ -10,13 +10,13 @@
 <!--	            multi = "True"-->
 <!--	            />-->
 
-		 <wizard
-				id="wizard_mrp_repair_make_invoice"
-				keyword="client_action_multi"
-				model="mrp.repair"
-				name="mrp.repair.make_invoice"
-				multi="True"
-				string="Make invoices"/>
+<!--		 <wizard-->
+<!--				id="wizard_mrp_repair_make_invoice"-->
+<!--				keyword="client_action_multi"-->
+<!--				model="mrp.repair"-->
+<!--				name="mrp.repair.make_invoice"-->
+<!--				multi="True"-->
+<!--				string="Make invoices"/>-->
 					
     </data>
 </openerp>
diff --git a/addons/mrp_repair/wizard/__init__.py b/addons/mrp_repair/wizard/__init__.py
index d111ac04f3f..4f3075f055c 100644
--- a/addons/mrp_repair/wizard/__init__.py
+++ b/addons/mrp_repair/wizard/__init__.py
@@ -20,6 +20,6 @@
 ##############################################################################
 
 import cancel_repair
-import wizard_make_invoice
+import make_invoice
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/mrp_repair/wizard/cancel_repair.py b/addons/mrp_repair/wizard/cancel_repair.py
index 2c4f2296b2d..423be2e27b3 100644
--- a/addons/mrp_repair/wizard/cancel_repair.py
+++ b/addons/mrp_repair/wizard/cancel_repair.py
@@ -26,22 +26,20 @@ from tools.translate import _
 class repair_cancel(osv.osv_memory):
     _name = 'mrp.repair.cancel'
     _description = 'Cancel Repair'
-    
-    _columns = {
-        'repair_id': fields.many2one('mrp.repair', 'Repair ID', readonly=True),
-    }
-    
+
     def cancel_repair(self, cr, uid, ids, context):
-        cancel = self.browse(cr, uid, ids[0])
-        repair_obj = self.pool.get('mrp.repair').browse(cr, uid, [cancel.repair_id.id])
+        record_id = context and context.get('record_id', False) or False
+        if record_id:
+            repair_obj = self.pool.get('mrp.repair').browse(cr, uid, [record_id])
+            
+            if repair_obj[0].invoiced or repair_obj[0].invoice_method == 'none':
+                self.pool.get('mrp.repair').write(cr, uid, record_id, {'state':'cancel'})
+                mrp_line_obj = self.pool.get('mrp.repair.line')
+                for line in repair_obj:
+                    mrp_line_obj.write(cr, uid, [l.id for l in line.operations], {'state': 'cancel'})
+            else:
+                raise osv.except_osv(_('Warning!'),_('Repair is not cancelled. It is not invoiced.'))
         
-        if repair_obj[0].invoiced or repair_obj[0].invoice_method == 'none':
-            self.pool.get('mrp.repair').write(cr, uid, cancel.repair_id.id, {'state':'cancel'})
-            mrp_line_obj = self.pool.get('mrp.repair.line')
-            for line in repair_obj:
-                mrp_line_obj.write(cr, uid, [l.id for l in line.operations], {'state': 'cancel'})
-        else:
-            raise osv.except_osv(_('Warning!'),_('Repair is not cancelled. It is not invoiced.'))
         return {}
     
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
@@ -51,8 +49,6 @@ class repair_cancel(osv.osv_memory):
             repair_obj = self.pool.get('mrp.repair').browse(cr, uid, [record_id])[0]
             if not repair_obj.invoice_id:
                 res['arch'] = """ <form string="Cancel Repair" colspan="4">
-                                <field name="repair_id" invisible="1"/>
-                                <newline/>
                                 <group col="2" colspan="2">
                                     <button icon="gtk-cancel" special="cancel" string="No" readonly="0"/>
                                     <button name="cancel_repair" string="Yes" type="object" icon="gtk-ok"/>
@@ -60,15 +56,7 @@ class repair_cancel(osv.osv_memory):
                             </form>                             
                         """
         return res
-    
-    def default_get(self, cr, uid, fields, context=None):
-        record_id = context and context.get('record_id', False) or False
-        res = super(repair_cancel, self).default_get(cr, uid, fields, context=context)
-        if record_id:
-            repair_id = self.pool.get('mrp.repair').browse(cr, uid, record_id, context=context)
-            res['repair_id'] = repair_id.id
-        return res
-   
+
 repair_cancel()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_repair/wizard/make_invoice.py b/addons/mrp_repair/wizard/make_invoice.py
new file mode 100644
index 00000000000..983ebabac25
--- /dev/null
+++ b/addons/mrp_repair/wizard/make_invoice.py
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import netsvc
+from osv import osv, fields 
+
+class make_invoice(osv.osv_memory):
+    _name = 'mrp.repair.make_invoice'
+    _description = 'Make Invoice'
+    
+    _columns = {
+	       'group': fields.boolean('Group by partner invoice address'),
+    }
+
+    def make_invoices(self, cr, uid, ids, context):
+        inv = self.browse(cr, uid, ids[0])
+        order_obj = self.pool.get('mrp.repair')       
+        newinv = order_obj.action_invoice_create(cr, uid, context['active_ids'], group=inv.group,context=context)    
+            
+        return {
+            'domain': [('id','in', newinv.values())],
+            'name': 'Invoices',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'account.invoice',
+            'view_id': False,
+            'context': "{'type':'out_invoice'}",
+            'type': 'ir.actions.act_window'
+        }
+
+make_invoice()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/mrp_repair/wizard/wizard_make_invoice.py b/addons/mrp_repair/wizard/wizard_make_invoice.py
deleted file mode 100644
index 71aefadfe4b..00000000000
--- a/addons/mrp_repair/wizard/wizard_make_invoice.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-
-invoice_form = """<?xml version="1.0"?>
-<form string="Create invoices">
-    <separator colspan="4" string="Do you really want to create the invoices ?" />  
-    <field name="group"/>  
-</form>
-"""
-invoice_fields = {	
-	'group': {
-		'string': 'Group by partner invoice address',
-		'type':'boolean'
-	},
-}
-
-ack_form = """<?xml version="1.0"?>
-<form string="Create invoices">
-    <separator string="Invoices created" />    
-</form>"""
-
-ack_fields = {}
-
-def _makeInvoices(self, cr, uid, data, context):
-    order_obj = pooler.get_pool(cr.dbname).get('mrp.repair')       
-    newinv = order_obj.action_invoice_create(cr, uid, data['ids'],group=data['form']['group'],context=context)    
-        
-    return {
-        'domain': [('id','in', newinv.values())],
-        'name': 'Invoices',
-        'view_type': 'form',
-        'view_mode': 'tree,form',
-        'res_model': 'account.invoice',
-        'view_id': False,
-        'context': "{'type':'out_refund'}",
-        'type': 'ir.actions.act_window'
-    }
-    
-
-class make_invoice(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'form',
-                    'arch' : invoice_form,
-                    'fields' : invoice_fields,
-                    'state' : [('end', 'Cancel'),('invoice', 'Create invoices') ]}
-        },
-        'invoice' : {
-            'actions' : [],
-            'result' : {'type' : 'action',
-                    'action' : _makeInvoices,
-                    'state' : 'end'}
-        },
-    }
-make_invoice("mrp.repair.make_invoice")
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From 72d4b7a0d89a9c6c3402f4d3c102c4081d18727c Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Thu, 4 Mar 2010 16:37:26 +0530
Subject: [PATCH 032/251] [IMP] product:wizard_price.py[old file] has been
 added and converted the wizard into osv_memory wizard

bzr revid: mso@mso-20100304110726-0yzgh3nt271qbe4y
---
 addons/product/product_wizard.xml             |  2 +
 addons/product/wizard/product_price_list.py   | 54 +++++++----------
 .../wizard/product_price_list_view.xml        | 58 +++++++++---------
 addons/product/wizard/wizard_price.py         | 59 +++++++++++++++++++
 4 files changed, 112 insertions(+), 61 deletions(-)
 create mode 100644 addons/product/wizard/wizard_price.py

diff --git a/addons/product/product_wizard.xml b/addons/product/product_wizard.xml
index f226cd4e543..77c65a8bd8c 100644
--- a/addons/product/product_wizard.xml
+++ b/addons/product/product_wizard.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" ?>
 <openerp>
 	<data>
+<!--
 	<wizard
 			 id="report_wizard_price"
 			 string="Price List"
 			 model="product.product"
 			 name="product.price_list"
 			 keyword="client_print_multi"/>
+-->	
 	</data>
 </openerp>
diff --git a/addons/product/wizard/product_price_list.py b/addons/product/wizard/product_price_list.py
index 12c810b802d..9e39b009445 100644
--- a/addons/product/wizard/product_price_list.py
+++ b/addons/product/wizard/product_price_list.py
@@ -19,41 +19,31 @@
 #
 ##############################################################################
 
+from osv import fields, osv
+from service import web_services
+import time
 import wizard
+import pooler
 
-qty1_form = '''<?xml version="1.0"?>
-<form string="Price list">
-    <field name="price_list" />
-    <field name="qty1" colspan="2" />
-    <field name="qty2" colspan="2" />
-    <field name="qty3" colspan="2" />
-    <field name="qty4" colspan="2" />
-    <field name="qty5" colspan="2" />
+class product_price_list(osv.osv_memory):
+    _name = "product.price.list"
+    _description = "Product Price List"
 
-</form>'''
-qty1_fields = {
-        'price_list' : {'string' : 'PriceList', 'type' : 'many2one', 'relation' : 'product.pricelist', 'required':True },
-        'qty1': {'string':'Quantity-1', 'type':'integer', 'default':0},
-        'qty2': {'string':'Quantity-2', 'type':'integer', 'default':0},
-        'qty3': {'string':'Quantity-3', 'type':'integer', 'default':0},
-        'qty4': {'string':'Quantity-4', 'type':'integer', 'default':0},
-        'qty5': {'string':'Quantity-5', 'type':'integer', 'default':0},
+    _columns = {
+        'price_list': fields.many2one('product.pricelist', 'PriceList', required=True), 
+        'qty1':fields.integer('Quantity-1'),
+	'qty2':fields.integer('Quantity-2'),
+        'qty3':fields.integer('Quantity-3'),
+        'qty4':fields.integer('Quantity-4'),
+        'qty5':fields.integer('Quantity-5'),
 }
 
-
-class wizard_qty(wizard.interface):
-
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type':'form', 'arch':qty1_form, 'fields':qty1_fields, 'state':[('end','Cancel'),('price','Print')]}
-        },
-        'price': {
-            'actions': [],
-            'result': {'type':'print', 'report':'product.pricelist', 'state':'end'}
-        }
-
-    }
-wizard_qty('product.price_list')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+    _defaults = {
+        'qty1': lambda *a:'0',
+	'qty2': lambda * a:'0',
+	'qty3': lambda *a:'0',
+	'qty4': lambda *a:'0',
+	'qty5': lambda *a:'0',
+     }
+product_price_list()
 
diff --git a/addons/product/wizard/product_price_list_view.xml b/addons/product/wizard/product_price_list_view.xml
index 5463b88c30a..370e04ff32e 100644
--- a/addons/product/wizard/product_price_list_view.xml
+++ b/addons/product/wizard/product_price_list_view.xml
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-	<record id="view_product_price_view" model="ir.ui.view">
-            <field name="name">Price list</field>
-            <field name="model">product.price.list</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-              <form string="Price list">
-	  	 <field name="price_list" colspan="2" />
-     		 <field name="qty1" colspan="2" />
-		 <field name="qty2" colspan="2" />
-         	 <field name="qty3" colspan="2" />
-		 <field name="qty4" colspan="2" />
-    		 <field name="qty5" colspan="2" />
-	           <separator string="" colspan="4" />
-    		     <label string="" colspan="2" />
-        	       <button special="cancel" string="Cancel" />
-	               <button string="Print" type="object"/> 
-             </form>
-           </field>
-	</record>
+	<data>
+		<record id="view_product_price_view" model="ir.ui.view">
+			<field name="name">Price list</field>
+			<field name="model">product.price.list</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Price list">
+					<field name="price_list" colspan="2" />
+					<field name="qty1" colspan="2" />
+					<field name="qty2" colspan="2" />
+					<field name="qty3" colspan="2" />
+					<field name="qty4" colspan="2" />
+					<field name="qty5" colspan="2" />
+					<separator string="" colspan="4" />
+					<label string="" colspan="2" />
+					<button special="cancel" string="Cancel" />
+					<button string="Print" type="object"/> 
+             			</form>
+			</field>
+		</record>
 	
-	<record id="action_product_price_view" model="ir.actions.act_window">
-            <field name="name">Price List </field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">product.price.list</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-	    <field name="view_id" ref="view_product_price_view"/>
-        </record>
+		<record id="action_product_price_view" model="ir.actions.act_window">
+			<field name="name">Price List </field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">product.price.list</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">form</field>
+			<field name="target">new</field>
+			<field name="view_id" ref="view_product_price_view"/>
+		</record>
 
     </data>
 </openerp>
diff --git a/addons/product/wizard/wizard_price.py b/addons/product/wizard/wizard_price.py
new file mode 100644
index 00000000000..12c810b802d
--- /dev/null
+++ b/addons/product/wizard/wizard_price.py
@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import wizard
+
+qty1_form = '''<?xml version="1.0"?>
+<form string="Price list">
+    <field name="price_list" />
+    <field name="qty1" colspan="2" />
+    <field name="qty2" colspan="2" />
+    <field name="qty3" colspan="2" />
+    <field name="qty4" colspan="2" />
+    <field name="qty5" colspan="2" />
+
+</form>'''
+qty1_fields = {
+        'price_list' : {'string' : 'PriceList', 'type' : 'many2one', 'relation' : 'product.pricelist', 'required':True },
+        'qty1': {'string':'Quantity-1', 'type':'integer', 'default':0},
+        'qty2': {'string':'Quantity-2', 'type':'integer', 'default':0},
+        'qty3': {'string':'Quantity-3', 'type':'integer', 'default':0},
+        'qty4': {'string':'Quantity-4', 'type':'integer', 'default':0},
+        'qty5': {'string':'Quantity-5', 'type':'integer', 'default':0},
+}
+
+
+class wizard_qty(wizard.interface):
+
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type':'form', 'arch':qty1_form, 'fields':qty1_fields, 'state':[('end','Cancel'),('price','Print')]}
+        },
+        'price': {
+            'actions': [],
+            'result': {'type':'print', 'report':'product.pricelist', 'state':'end'}
+        }
+
+    }
+wizard_qty('product.price_list')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

From 93a6ebff04c022be656ad3a5c03503696e6807f1 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 9 Mar 2010 11:17:35 +0530
Subject: [PATCH 033/251] [Fix] crm: Fix the problem of partner_id

bzr revid: sbh@tinyerp.com-20100309054735-mn8jhzewso7q9fdp
---
 addons/crm/crm_phonecall_view.xml            | 1 -
 addons/crm/wizard/crm_phonecall2phonecall.py | 9 +++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index cda27442350..53e3aa631d1 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -78,7 +78,6 @@
                         name="%(wizard_crm_phonecall_meeting_set)d"
                         icon="gtk-redo"
                         type="action" />
-                   
                     <field name="partner_phone"/>
                     <field name="duration"/>
                     <field name="section_id" colspan="1" widget="selection" />
diff --git a/addons/crm/wizard/crm_phonecall2phonecall.py b/addons/crm/wizard/crm_phonecall2phonecall.py
index b6ba9f9b4c3..245c3fecc40 100644
--- a/addons/crm/wizard/crm_phonecall2phonecall.py
+++ b/addons/crm/wizard/crm_phonecall2phonecall.py
@@ -46,8 +46,8 @@ class crm_phonecall2phonecall(osv.osv_memory):
         values['user_id']=this.user_id and this.user_id.id
         values['categ_id']=this.category_id and this.category_id.id
         values['section_id']=this.section_id and this.section_id.id or False,
-        values['description']=this.notes 
-        values['partner_id']=this.partner_id
+        values['description']=this.notes or ''
+        values['partner_id']=this.partner_id.id
         values['partner_address_id']=this.address_id.id
         phonecall_proxy = self.pool.get('crm.phonecall')
         phonecall_id = phonecall_proxy.create(cr, uid, values, context=context)  
@@ -75,17 +75,14 @@ class crm_phonecall2phonecall(osv.osv_memory):
     def default_get(self, cr, uid, fields, context=None):
         record_id = context and context.get('record_id', False) or False
         res = super(crm_phonecall2phonecall, self).default_get(cr, uid, fields, context=context)
-       
         if record_id:
             phonecall_id = self.pool.get('crm.phonecall').browse(cr, uid, record_id, context=context)
-            print ":::::::::",phonecall_id.section_id.id
             res['name']=phonecall_id.name
             res['user_id']=phonecall_id.user_id and phonecall_id.user_id.id
             res['section_id']=phonecall_id.section_id and phonecall_id.section_id.id
-            res['notes']=phonecall_id.description and phonecall_id.description
+            res['notes']=phonecall_id.description and phonecall_id.description or ''
             res['category_id']=phonecall_id.categ_id and phonecall_id.categ_id.id
             res['partner_id']=phonecall_id.partner_id and phonecall_id.partner_id.id
             res['address_id']=phonecall_id.partner_address_id and phonecall_id.partner_address_id.id
-             
         return res
 crm_phonecall2phonecall()
\ No newline at end of file

From 91d45aa7a112ae072ad0e9cbbe282af76235e589 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Tue, 9 Mar 2010 12:01:33 +0530
Subject: [PATCH 034/251] [IMP] stock,mrp:Changes in the way scrap products are
 handled.Considered as consumed product & Same products entries are created
 indicating that products are required for manufacturing.

bzr revid: mso@mso-20100309063133-giiqvwqewlg61nm2
---
 addons/mrp/mrp_view.xml |  2 +-
 addons/stock/stock.py   | 39 +++++++++++++++++++++++++++++++++++++--
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 29e37f9532b..6041bc5163c 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -506,7 +506,7 @@
 
                             <field colspan="2" name="move_lines2" nolabel="1"  domain="[('state','in', ('done', 'cancel'))]"
                            			widget="one2many_list" mode="tree,form" height="275">
-                           		<tree string="Consumed Products" editable="bottom">
+                           		<tree string="Consumed Products" editable="bottom" colors="red:state=='cancel';black:state=='done';">
                            			<field name="product_id" readonly="1"/>
                            			<field name="product_qty" readonly="1"/>
                            			<field name="product_uom" readonly="1" />
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index a403c141be4..f1b7e34d1d5 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1309,7 +1309,40 @@ class stock_move(osv.osv):
             wf_service.trg_trigger(uid, 'stock.move', id, cr)
         #self.action_cancel(cr,uid, ids2, context)
         return True
-
+    
+    def action_scrap(self, cr, uid, ids,context=None):
+        '''
+        add the damaged product into consumed product by updating its state to cancel and 
+        add same product since we need that product to manufacture the parent product.
+        
+        :param cr: the database cursor
+        :param uid: the user id
+        :param ids: ids of product object to be scraped
+        :param context: context arguments
+        :return: 
+        '''   
+#        to find the parent id(manufacturing order) of the active record(product to consume), 
+#        obtain active record id 1st and then get the production_id from mrp_production_move_ids
+        active_id=ids[0]
+        cr.execute("select production_id from mrp_production_move_ids where move_id=%s" % (active_id))
+#        it gives parent id in [list(tuple)] format so extract it [(21,)]
+        parent_id = int(cr.fetchall()[0][0])
+#        get the parent object
+        parent_obj = self.pool.get('mrp.production').browse(cr, uid, parent_id)
+#       create copy for multiple id processing for product to consume which r scraped 
+        for id in ids:
+            #create copy of the product records which are scraped due to damage since they are 
+            #still required to manufacture the product.
+            new_rec_id = self.copy(cr, uid, id, {'state': 'waiting'}, context)
+            
+            #assign all new products which will replace damaged product to the current manufacturing order
+            cr.execute('insert into mrp_production_move_ids (production_id,move_id) values (%s,%s)', (parent_id,  new_rec_id))
+        
+#        all damaged product needs to be in consumed product window having cancel state.
+        vals={'state': 'cancel', 'date_planned': time.strftime('%Y-%m-%d %H:%M:%S')}
+        self.pool.get('stock.move').write(cr, uid, ids,vals )      
+                  
+        return True
     def action_done(self, cr, uid, ids, context=None):
         track_flag = False
         picking_ids = []
@@ -1563,7 +1596,9 @@ class stock_move(osv.osv):
                     self.write(cr, uid, [move.id], update_val)
 
         if consume:
-            self.action_done(cr, uid, res)        
+            self.action_done(cr, uid, res)  
+        else:
+            self.action_scrap(cr, uid, res,context) 
         return res
 
     def scrap_moves(self, cr, uid, ids, quantity, location_dest_id, context=None):

From 2c4229fd1cf080c7520a566525f4a8394e66b691 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Tue, 9 Mar 2010 12:09:45 +0530
Subject: [PATCH 035/251] [IMP] mrp: Converted 'Requisition Request' wizard
 into osv_memory wizard.

bzr revid: uco@tinyerp.co.in-20100309063945-9o712w12gio5mcvs
---
 addons/mrp/__terp__.py                        |   1 +
 addons/mrp/mrp_wizard.xml                     |  12 +--
 addons/mrp/wizard/__init__.py                 |   2 +-
 addons/mrp/wizard/make_procurement.py         | 102 ------------------
 addons/mrp/wizard/make_procurement_product.py |  95 ++++++++++++++++
 addons/mrp/wizard/make_procurement_view.xml   |  51 +++++++++
 6 files changed, 154 insertions(+), 109 deletions(-)
 delete mode 100644 addons/mrp/wizard/make_procurement.py
 create mode 100644 addons/mrp/wizard/make_procurement_product.py
 create mode 100644 addons/mrp/wizard/make_procurement_view.xml

diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py
index a147266ce1d..9f5bc664be7 100644
--- a/addons/mrp/__terp__.py
+++ b/addons/mrp/__terp__.py
@@ -62,6 +62,7 @@
         'mrp_data.xml',
         'mrp_wizard_view.xml',
         'mrp_view.xml',
+        'wizard/make_procurement_view.xml',
         'mrp_wizard.xml',
         'mrp_report.xml',
         'company_view.xml',
diff --git a/addons/mrp/mrp_wizard.xml b/addons/mrp/mrp_wizard.xml
index 74001494c77..e1823092989 100644
--- a/addons/mrp/mrp_wizard.xml
+++ b/addons/mrp/mrp_wizard.xml
@@ -24,12 +24,12 @@
             <field eval="True" name="object"/>
         </record>
 
-        <wizard
-            string="Requisition Request"
-            model="product.product"
-            name="product.product.procurement"
-            keyword="client_action_multi"
-            id="product_procurement_wizard"/>
+<!--        <wizard-->
+<!--            string="Requisition Request"-->
+<!--            model="product.product"-->
+<!--            name="product.product.procurement"-->
+<!--            keyword="client_action_multi"-->
+<!--            id="product_procurement_wizard"/>-->
 
     </data>
 </openerp>
diff --git a/addons/mrp/wizard/__init__.py b/addons/mrp/wizard/__init__.py
index 240f25daa9d..a859d55b44e 100644
--- a/addons/mrp/wizard/__init__.py
+++ b/addons/mrp/wizard/__init__.py
@@ -26,7 +26,7 @@ import wizard_price
 import wizard_workcenter_load
 import wizard_track_prod
 import wizard_change_production_qty
-import make_procurement
+import make_procurement_product
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/mrp/wizard/make_procurement.py b/addons/mrp/wizard/make_procurement.py
deleted file mode 100644
index 0cf12107181..00000000000
--- a/addons/mrp/wizard/make_procurement.py
+++ /dev/null
@@ -1,102 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import pooler
-import netsvc
-
-import time
-
-def _get_default(obj, cr, uid, data, context=None):
-    pool = pooler.get_pool(cr.dbname)
-    product = pool.get('product.product').browse(cr, uid, data['id'], context)
-    return {'product_id': product.id, 'uom_id':product.uom_id.id, 'qty':1.0}
-
-def make_procurement(obj, cr, uid, data, context=None):
-    '''Create procurement'''
-    pool = pooler.get_pool(cr.dbname)
-    wh = pool.get('stock.warehouse').browse(cr, uid, data['form']['warehouse_id'], context)
-    user = pool.get('res.users').browse(cr, uid, uid, context)
-    procure_id = pool.get('mrp.procurement').create(cr, uid, {
-        'name':'INT:'+str(user.login),
-        'date_planned':data['form']['date_planned'],
-        'product_id':data['form']['product_id'],
-        'product_qty':data['form']['qty'],
-        'product_uom':data['form']['uom_id'],
-        'location_id':wh.lot_stock_id.id,
-        'procure_method':'make_to_order',
-    }, context=context)
-    wf_service = netsvc.LocalService("workflow")
-    wf_service.trg_validate(uid, 'mrp.procurement', procure_id, 'button_confirm', cr)
-    return {}
-
-
-class MakeProcurement(wizard.interface):
-    '''Wizard that create a procurement from a product form'''
-
-    done_form = """<?xml version="1.0"?>
-<form string="Make Requisition">
-    <label string="Your procurement request has been sent !"/>
-</form>"""
-    procurement_form = """<?xml version="1.0"?>
-<form string="Internal Requisition Request">
-    <label string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders." align="0.0" colspan="4"/>
-    <field name="product_id"/>
-    <field name="warehouse_id"/>
-    <field name="qty"/>
-    <field name="uom_id"/>
-    <field name="date_planned"/>
-</form>"""
-    procurement_fields = {
-        'qty': {'string': 'Quantity', 'type': 'float', 'digits':(16,2), 'required': True},
-        'product_id': {'string': 'product', 'type': 'many2one', 'relation': 'product.product', 'required': True, 'readonly':1},
-        'uom_id': {'string': 'Unit of Measure', 'type': 'many2one', 'relation': 'product.uom', 'required':True},
-        'warehouse_id': {'string': 'Warehouse', 'type': 'many2one', 'relation':'stock.warehouse', 'required':True},
-        'date_planned': {'string': 'Planned Date', 'type': 'date', 'required':True, 'default': lambda *args: time.strftime('%Y-%m-%d')}
-    }
-
-    states = {
-        'init': {
-            'actions': [_get_default],
-            'result': {'type': 'form', 'arch': procurement_form, 'fields': procurement_fields,
-                'state': [
-                    ('end', 'Cancel'),
-                    ('create', 'Ask New Products')
-                ]
-            }
-        },
-        'done': {
-            'actions': [],
-            'result': {'type': 'form', 'arch': done_form, 'fields': {},
-                'state': [
-                    ('end', 'Close'),
-                ]
-            }
-        },
-        'create': {
-            'actions': [],
-            'result': {'type': 'action', 'action': make_procurement, 'state': 'done'}
-        }
-    }
-
-MakeProcurement('product.product.procurement')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/mrp/wizard/make_procurement_product.py b/addons/mrp/wizard/make_procurement_product.py
new file mode 100644
index 00000000000..8a1306f1c8f
--- /dev/null
+++ b/addons/mrp/wizard/make_procurement_product.py
@@ -0,0 +1,95 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import netsvc
+import time
+
+from osv import fields, osv
+
+class make_procurement(osv.osv_memory):
+    _name = 'make.procurement'
+    _description = 'Make Procurements'
+    
+    def onchange_product_id(self, cr, uid, ids, prod_id):
+        product = self.pool.get('product.product').browse(cr, uid, prod_id)
+        return {'value': {'uom_id': product.uom_id.id}}
+    
+    _columns = {
+        'qty': fields.float('Quantity', digits=(16,2), required=True),
+        'product_id': fields.many2one('product.product', 'Product', required=True, readonly=1),
+        'uom_id': fields.many2one('product.uom', 'Unit of Measure', required=True),
+        'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True),
+        'date_planned': fields.date('Planned Date', required=True),
+    }
+    
+    _defaults = {
+            'date_planned': lambda *args: time.strftime('%Y-%m-%d'),
+            'qty': lambda *args: 1.0,
+    }
+    
+    def make_procurement(self, cr, uid, ids, context=None):
+        '''Create procurement'''
+        for proc in self.browse(cr, uid, ids):
+            wh = self.pool.get('stock.warehouse').browse(cr, uid, proc.warehouse_id.id, context)
+            user = self.pool.get('res.users').browse(cr, uid, uid, context)
+            procure_id = self.pool.get('mrp.procurement').create(cr, uid, {
+                'name':'INT:'+str(user.login),
+                'date_planned': proc.date_planned,
+                'product_id': proc.product_id.id,
+                'product_qty': proc.qty,
+                'product_uom': proc.uom_id.id,
+                'location_id': wh.lot_stock_id.id,
+                'procure_method':'make_to_order',
+            })
+            wf_service = netsvc.LocalService("workflow")
+            wf_service.trg_validate(uid, 'mrp.procurement', procure_id, 'button_confirm', cr)
+        
+        data_obj = self.pool.get('ir.model.data')
+        id2 = data_obj._get_id(cr, uid, 'mrp', 'mrp_procurement_tree_view')
+        id3 = data_obj._get_id(cr, uid, 'mrp', 'mrp_procurement_form_view')
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        if id3:
+            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+        
+        return {
+                'view_type': 'form',
+                'view_mode': 'tree,form',
+                'res_model': 'mrp.procurement',
+                'res_id' : procure_id,
+                'views': [(id3,'form'),(id2,'tree')],
+                'type': 'ir.actions.act_window',
+         }
+    
+    def default_get(self, cr, uid, fields, context=None):
+        record_id = context and context.get('record_id', False) or False
+
+        res = super(make_procurement, self).default_get(cr, uid, fields, context=context)
+
+        if record_id:
+            product_id = self.pool.get('product.product').browse(cr, uid, record_id, context=context).id
+            res['product_id'] = product_id
+
+        return res
+
+make_procurement()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/mrp/wizard/make_procurement_view.xml b/addons/mrp/wizard/make_procurement_view.xml
new file mode 100644
index 00000000000..e2488fece96
--- /dev/null
+++ b/addons/mrp/wizard/make_procurement_view.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Make Procurement -->
+        
+		<record id="view_make_procurment_wizard" model="ir.ui.view">
+            <field name="name">Requisition Request</field>
+            <field name="model">make.procurement</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Requisition Request">
+				    <label string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders." colspan="4"/>
+				    <field name="product_id" on_change="onchange_product_id(product_id)"/>
+				    <field name="qty"/>
+				    <field name="uom_id"/>
+				    <field name="date_planned"/>
+				    <field name="warehouse_id" colspan="4"/>
+				    <newline/>
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="make_procurement" string="Ask New Products"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_make_procurement" model="ir.actions.act_window">
+            <field name="name">Requisition Request</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">make.procurement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="context">{'record_id' : active_id}</field>
+        </record>
+        
+       <record model="ir.values" id="make_procurement_products">
+            <field name="model_id" ref="product.model_product_product" />
+            <field name="object" eval="1" />
+            <field name="name">Requisition Request</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_make_procurement'))"/>
+            <field name="key">action</field>
+            <field name="model">product.product</field>
+        </record>
+		
+	</data>
+</openerp>	

From 9fd8b8ad5a477a1a3b2eba88267d2dad48e64741 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Tue, 9 Mar 2010 13:12:38 +0530
Subject: [PATCH 036/251] [IMP] mrp: Converted 'Change Production Quantity'
 wizard into osv_memory wizard.

bzr revid: uco@tinyerp.co.in-20100309074238-9qher5ex154s3hlb
---
 addons/mrp/__terp__.py                        |   3 +-
 addons/mrp/mrp_view.xml                       |  16 +--
 addons/mrp/wizard/__init__.py                 |   2 +-
 addons/mrp/wizard/change_production_qty.py    |  87 +++++++++++++
 .../mrp/wizard/change_production_qty_view.xml |  45 +++++++
 .../wizard/wizard_change_production_qty.py    | 117 ------------------
 6 files changed, 143 insertions(+), 127 deletions(-)
 create mode 100644 addons/mrp/wizard/change_production_qty.py
 create mode 100644 addons/mrp/wizard/change_production_qty_view.xml
 delete mode 100644 addons/mrp/wizard/wizard_change_production_qty.py

diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py
index 9f5bc664be7..ff51c74a41a 100644
--- a/addons/mrp/__terp__.py
+++ b/addons/mrp/__terp__.py
@@ -61,8 +61,9 @@
         'mrp_workflow.xml',
         'mrp_data.xml',
         'mrp_wizard_view.xml',
-        'mrp_view.xml',
         'wizard/make_procurement_view.xml',
+        'wizard/change_production_qty_view.xml',
+        'mrp_view.xml',
         'mrp_wizard.xml',
         'mrp_report.xml',
         'company_view.xml',
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 6041bc5163c..061278771db 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -440,13 +440,13 @@
             </field>
         </record>
 
-        <wizard
-            string="Change Product Qty."
-            model="mrp.production"
-            name="change_production_qty"
-            id="mrp.wizard_change_production_qty"
-            keyword="client_action_multi"
-            multi="True"/>
+<!--        <wizard-->
+<!--            string="Change Product Qty."-->
+<!--            model="mrp.production"-->
+<!--            name="change_production_qty"-->
+<!--            id="mrp.wizard_change_production_qty"-->
+<!--            keyword="client_action_multi"-->
+<!--            multi="True"/>-->
 
         <record id="mrp_production_form_view" model="ir.ui.view">
             <field name="name">mrp.production.form</field>
@@ -462,7 +462,7 @@
                         <field name="product_qty"/>
                         <group colspan="2" col="3">
                         <field name="product_uom"/>
-                        <button type="action" name="%(mrp.wizard_change_production_qty)d" string="Change Qty" states="ready,confirmed,in_production"/>
+                        <button type="action" name="%(mrp.action_change_production_qty)d" string="Change Qty" states="ready,confirmed,in_production"/>
                         </group>
                         <label string="" colspan="2"/>
                         <field name="product_uos_qty" groups="product.group_uos"/>
diff --git a/addons/mrp/wizard/__init__.py b/addons/mrp/wizard/__init__.py
index a859d55b44e..462ec509e09 100644
--- a/addons/mrp/wizard/__init__.py
+++ b/addons/mrp/wizard/__init__.py
@@ -25,7 +25,7 @@ import wizard_schedulers_all
 import wizard_price
 import wizard_workcenter_load
 import wizard_track_prod
-import wizard_change_production_qty
+import change_production_qty
 import make_procurement_product
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/wizard/change_production_qty.py b/addons/mrp/wizard/change_production_qty.py
new file mode 100644
index 00000000000..56fd5fc2b53
--- /dev/null
+++ b/addons/mrp/wizard/change_production_qty.py
@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import time
+import ir
+from osv.osv import except_osv
+from osv import fields, osv
+import netsvc
+from tools.translate import _
+
+class change_production_qty(osv.osv_memory):
+    _name = 'change.production.qty'
+    _description = 'Change Quantity of Products'
+    
+    _columns = {
+        'product_qty': fields.float('Product Qty', required=True),
+    }
+
+    def default_get(self, cr, uid, ids, context):
+        record_id = context and context.get('record_id',False)
+        res = {}
+        prod_obj = self.pool.get('mrp.production')
+        prod = prod_obj.browse(cr, uid, record_id)
+        if prod.state in ('cancel', 'done'):
+            raise osv.except_osv(_('Warning !'), _('The production is in "%s" state. You can not change the production quantity anymore') % (prod.state).upper() )
+        if prod.state in ('draft'):
+            return res
+        if record_id:
+            res['product_qty'] = prod.product_qty
+        return res
+    
+    def change_prod_qty(self, cr, uid, ids, context):
+        record_id = context and context.get('record_id',False)
+        prod_obj = self.pool.get('mrp.production')
+        wiz_qty = self.browse(cr, uid, ids[0])
+        prod = prod_obj.browse(cr, uid,record_id)
+        prod_obj.write(cr, uid,prod.id, {'product_qty': wiz_qty.product_qty})
+        prod_obj.action_compute(cr, uid, [prod.id])
+    
+        move_lines_obj = self.pool.get('stock.move')
+        for move in prod.move_lines:
+            bom_point = prod.bom_id
+            bom_id = prod.bom_id.id
+            if not bom_point:
+                bom_id = self.pool.get('mrp.bom')._bom_find(cr, uid, prod.product_id.id, prod.product_uom.id)
+                if not bom_id:
+                    raise osv.except_osv(_('Error'), _("Couldn't find bill of material for product"))
+                prod_obj.write(cr, uid, [prod.id], {'bom_id': bom_id})
+                bom_point = self.pool.get('mrp.bom').browse(cr, uid, [bom_id])[0]
+    
+            if not bom_id:
+                raise osv.except_osv(_('Error'), _("Couldn't find bill of material for product"))
+    
+            factor = prod.product_qty * prod.product_uom.factor / bom_point.product_uom.factor
+            res = self.pool.get('mrp.bom')._bom_explode(cr, uid, bom_point, factor / bom_point.product_qty, [])
+            for r in res[0]:
+                if r['product_id']== move.product_id.id:
+                    move_lines_obj.write(cr, uid,move.id, {'product_qty' :  r['product_qty']})
+    
+        product_lines_obj = self.pool.get('mrp.production.product.line')
+    
+        for m in prod.move_created_ids:
+            move_lines_obj.write(cr, uid,m.id, {'product_qty': wiz_qty.product_qty})
+    
+        return {}
+    
+change_production_qty()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/wizard/change_production_qty_view.xml b/addons/mrp/wizard/change_production_qty_view.xml
new file mode 100644
index 00000000000..8b0e5ffd021
--- /dev/null
+++ b/addons/mrp/wizard/change_production_qty_view.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Change Product Quantity -->
+        
+		<record id="view_change_production_qty_wizard" model="ir.ui.view">
+            <field name="name">Change Product Qty</field>
+            <field name="model">change.production.qty</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Change Product Qty">
+				    <field name="product_qty"/>
+				    <newline/>
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="change_prod_qty" string="Validate"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_change_production_qty" model="ir.actions.act_window">
+            <field name="name">Change Product Qty</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">change.production.qty</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="context">{'record_id' : active_id}</field>
+        </record>
+
+       <record model="ir.values" id="values_change_production_qty">
+            <field name="model_id" ref="mrp.model_mrp_production" />
+            <field name="object" eval="1" />
+            <field name="name">Change Product Qty</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_change_production_qty'))"/>
+            <field name="key">action</field>
+            <field name="model">mrp.production</field>
+        </record>
+	</data>
+</openerp>	
diff --git a/addons/mrp/wizard/wizard_change_production_qty.py b/addons/mrp/wizard/wizard_change_production_qty.py
deleted file mode 100644
index a9a8387acdf..00000000000
--- a/addons/mrp/wizard/wizard_change_production_qty.py
+++ /dev/null
@@ -1,117 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import time
-import wizard
-import ir
-import pooler
-from osv.osv import except_osv
-from osv import fields,osv
-import netsvc
-from tools.translate import _
-
-
-form1 = '''<?xml version="1.0"?>
-<form string="Change Product Qty">
-    <field name="product_qty"/>
-</form>'''
-
-form1_fields={
-                'product_qty': {'string': 'Product Qty', 'type':'float', 'required':True},
-              }
-
-def _get_qty(self,cr,uid, data, state):
-    prod_obj = pooler.get_pool(cr.dbname).get('mrp.production')
-    prod = prod_obj.browse(cr, uid,data['ids'])[0]
-    form1_fields['product_qty']['default']=prod.product_qty
-    return {}
-def _get_states(self, cr, uid, data, context):
-    prod_obj = pooler.get_pool(cr.dbname).get('mrp.production')
-    prod = prod_obj.browse(cr, uid,data['ids'])[0]
-    if prod.state in  ('cancel', 'done'):
-        raise wizard.except_wizard(_('Warning !'), _('The production is in "%s" state. You can not change the production quantity anymore') % (prod.state).upper() )
-        return 'end'
-    if prod.state in  ('draft'):
-        #raise wizard.except_wizard('Warning !', 'The production is in "%s" state. You can change the production quantity directly...!!!' % (prod.state).upper() )
-        return 'end'
-    else:
-        return 'confirm'
-
-def _change_prod_qty(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    prod_obj = pool.get('mrp.production')
-    prod = prod_obj.browse(cr, uid,data['ids'])[0]
-    prod_obj.write(cr, uid,prod.id, {'product_qty' : data['form']['product_qty']})
-    prod_obj.action_compute(cr, uid, [prod.id])
-
-    move_lines_obj = pool.get('stock.move')
-    for move in prod.move_lines:
-        bom_point = prod.bom_id
-        bom_id = prod.bom_id.id
-        if not bom_point:
-            bom_id = pool.get('mrp.bom')._bom_find(cr, uid, prod.product_id.id, prod.product_uom.id)
-            if not bom_id:
-                raise osv.except_osv(_('Error'), _("Couldn't find bill of material for product"))
-            self.write(cr, uid, [prod.id], {'bom_id': bom_id})
-            bom_point = pool.get('mrp.bom').browse(cr, uid, [bom_id])[0]
-
-        if not bom_id:
-            raise osv.except_osv(_('Error'), _("Couldn't find bill of material for product"))
-
-        factor = prod.product_qty * prod.product_uom.factor / bom_point.product_uom.factor
-        res = pool.get('mrp.bom')._bom_explode(cr, uid, bom_point, factor / bom_point.product_qty, [])
-        for r in res[0]:
-            if r['product_id']== move.product_id.id:
-                move_lines_obj.write(cr, uid,move.id, {'product_qty' :  r['product_qty']})
-
-    product_lines_obj = pool.get('mrp.production.product.line')
-
-    for m in prod.move_created_ids:
-        move_lines_obj.write(cr, uid,m.id, {'product_qty' : data['form']['product_qty']})
-
-    return {}
-
-class change_production_qty(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'choice', 'next_state' : _get_states}
-        },
-
-        'confirm' : {
-            'actions' : [_get_qty],
-            'result': {'type': 'form', 'arch':form1, 'fields':form1_fields, 'state':[('end','Cancel'),('validate','Validate')]}
-        },
-
-        'validate': {
-            'actions': [],
-            'result': {'type':'action', 'action':_change_prod_qty, 'state':'end'}
-        },
-
-        'end' : {
-            'actions' : [],
-            'result': {'type': 'state', 'state': 'end'},
-        },
-    }
-
-change_production_qty('change_production_qty')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 87bd2e84b4407abfa48e74bfe244b49968e1ee12 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 9 Mar 2010 14:05:43 +0530
Subject: [PATCH 037/251] [Add] crm : Add the wizard of /phonecall2opportunity

bzr revid: sbh@tinyerp.com-20100309083543-uljqipt3i2r8rxzj
---
 addons/crm/__terp__.py                        |   4 +-
 addons/crm/crm_phonecall_view.xml             |   4 +-
 addons/crm/wizard/__init__.py                 |   3 +-
 addons/crm/wizard/phonecall2opportunity.xml   |  32 ++++++
 addons/crm/wizard/phonecall_to_opportunity.py | 106 ++++++++++++++++++
 5 files changed, 145 insertions(+), 4 deletions(-)
 create mode 100644 addons/crm/wizard/phonecall2opportunity.xml
 create mode 100644 addons/crm/wizard/phonecall_to_opportunity.py

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 0189cc11b2c..d1514a658cf 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -62,7 +62,9 @@ between mails and Open ERP.""",
 
     'update_xml': [
         'wizard/crm_phonecall2phonecall.xml',
-        'wizard/lead_to_partner_view.xml',           
+        'wizard/lead_to_partner_view.xml',
+        'wizard/phonecall2partner_view.xml',
+        'wizard/phonecall2opportunity.xml',
         'crm_wizard.xml', 
         'crm_view.xml',
          
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 53e3aa631d1..11516f3af56 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -49,7 +49,7 @@
                 <field name="partner_phone"/>                
                 <field name="user_id"/>
                 <button string="Opportunity" 
-                    name="%(wizard_crm_phonecall_opportunity_set)d"
+                    name="%(phonecall2opportunity_act)d"
                     states="draft,open,pending"
                     type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />
                 <button string="Meeting"
@@ -82,7 +82,7 @@
                     <field name="duration"/>
                     <field name="section_id" colspan="1" widget="selection" />
                     <button string="Convert to Opportunity"
-                        name="%(wizard_crm_phonecall_opportunity_set)d"
+                        name="%(phonecall2opportunity_act)d"
                         icon="gtk-index" type="action"
                         attrs="{'invisible':[('opportunity_id','!=',False)]}" />
 					<label colspan="6"  string=""/>                                 
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 56330ebfd72..6c52d09a558 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -29,7 +29,8 @@ import wizard_history_event
 import crm_phonecall2phonecall
 
 import lead_to_partner
-
+import phonecall2partner
+import phonecall_to_opportunity
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm/wizard/phonecall2opportunity.xml b/addons/crm/wizard/phonecall2opportunity.xml
new file mode 100644
index 00000000000..607db601433
--- /dev/null
+++ b/addons/crm/wizard/phonecall2opportunity.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="phonecall2opportunity_view">
+            <field name="name">crm.phonecall2opportunity.form</field>
+            <field name="model">crm.phonecall2opportunity</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Convert To Opportunity " col="2">
+                		<field name="name"/>
+						<field name="partner_id" />
+						<newline/>
+						<field name="planned_revenue"/>
+						<field name="probability"/>
+                    <group colspan="2" col="2" >
+                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button name="action_apply" type="object" string="_Apply" icon="gtk-apply" />
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record model="ir.actions.act_window" id="phonecall2opportunity_act">
+            <field name="name">Convert To Opportunity</field>
+            <field name="res_model">crm.phonecall2opportunity</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="phonecall2opportunity_view"/>
+            <field name="target">new</field>
+         	<field name="context">{'record_id' : active_id}</field>
+        </record>
+    </data>
+</openerp>   
\ No newline at end of file
diff --git a/addons/crm/wizard/phonecall_to_opportunity.py b/addons/crm/wizard/phonecall_to_opportunity.py
new file mode 100644
index 00000000000..025399c1040
--- /dev/null
+++ b/addons/crm/wizard/phonecall_to_opportunity.py
@@ -0,0 +1,106 @@
+# -*- encoding: utf-8 -*-
+############################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2008-2009 AJM Technologies S.A. (<http://www.ajm.lu). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+############################################################################################
+############################################################################################
+
+from osv import osv, fields
+import netsvc
+import time
+import tools
+import mx.DateTime
+from tools import config
+from tools.translate import _
+import tools
+
+class crm_phonecall2opportunity(osv.osv_memory):
+    _name = 'crm.phonecall2opportunity'
+    _description = 'Phonecall To Opportunity'
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        return {'type':'ir.actions.act_window_close'}
+
+    def action_apply(self, cr, uid, ids, context=None):
+        this = self.browse(cr, uid, ids[0], context=context)
+        record_id = context and context.get('record_id', False) or False
+        if record_id:
+            for case in self.pool.get('crm.phonecall').browse(cr, uid, [record_id], context=context):
+                 if case.state in ['done', 'cancel']:       
+                            raise osv.except_osv(_("Warning"),
+                                                 _("Closed/Cancelled Phone Call Could not convert into Opportunity"))
+                 else:
+                     data_obj = self.pool.get('ir.model.data')
+                     result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
+                     res = data_obj.read(cr, uid, result, ['res_id'])
+                     id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_oppor')
+                     id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_oppor')
+                     if id2:
+                        id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+                     if id3:
+                        id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+                        opportunity_case_obj = self.pool.get('crm.opportunity')
+                        phonecall_case_obj = self.pool.get('crm.phonecall')
+                        new_opportunity_id = opportunity_case_obj.create(cr, uid, {            
+                                'name': this.name,
+                                'planned_revenue': this.planned_revenue,
+                                'probability': this.probability,
+                                'partner_id': this.partner_id.id,                 
+                                'section_id': case.section_id.id,
+                                'description': case.description,         
+                                'phonecall_id': case.id,
+                                'priority': case.priority,
+                                'phone': case.partner_phone,
+                            })
+                        new_opportunity = opportunity_case_obj.browse(cr, uid, new_opportunity_id)
+                        vals = {
+                                'partner_id': this.partner_id.id, 
+                                'opportunity_id' : new_opportunity_id,                
+                                }            
+                        phonecall_case_obj.write(cr, uid, [case.id], vals)
+                        phonecall_case_obj.case_close(cr, uid, [case.id])
+                        phonecall_case_obj.case_open(cr, uid, [new_opportunity_id])
+            value = {            
+                'name': _('Opportunity'),
+                'view_type': 'form',
+                'view_mode': 'form,tree',
+                'res_model': 'crm.opportunity',
+                'res_id': int(new_opportunity_id),
+                'view_id': False,
+                'views': [(id2,'form'),(id3,'tree'),(False,'calendar'),(False,'graph')],
+                'type': 'ir.actions.act_window',
+                'search_view_id': res['res_id'] 
+            }
+            return value
+    _columns = {
+        'name' : fields.char('Opportunity Summary', size=64, required=True, select=1),
+        'probability': fields.float('Success Probability'),
+        'planned_revenue': fields.float('Expected Revenue'),
+        'partner_id': fields.many2one('res.partner', 'Partner'),
+    }
+    def default_get(self, cr, uid, fields, context=None):
+        record_id = context and context.get('record_id', False) or False
+        res = super(crm_phonecall2opportunity, self).default_get(cr, uid, fields, context=context)
+        if record_id:
+            phonecall_id = self.pool.get('crm.phonecall').browse(cr, uid, record_id, context=context)
+            res['name']=phonecall_id.name
+            res['partner_id']=phonecall_id.partner_id and phonecall_id.partner_id.id
+        return res
+crm_phonecall2opportunity()
\ No newline at end of file

From 31826907284b72d83cac2b15e91450c1fbbe358a Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Tue, 9 Mar 2010 14:11:59 +0530
Subject: [PATCH 038/251] [IMP] mrp: Converted 'Compute Stock Minimum Rules
 Only' wizard into osv_memory wizard.

bzr revid: uco@tinyerp.co.in-20100309084159-knxmex7nv6ezi4r2
---
 addons/mrp/__terp__.py                        |  1 +
 addons/mrp/mrp_wizard.xml                     |  2 +-
 addons/mrp/wizard/__init__.py                 |  2 +-
 addons/mrp/wizard/orderpoint_procurement.py   | 58 +++++++++++++++
 .../wizard/orderpoint_procurement_view.xml    | 46 ++++++++++++
 .../wizard/wizard_orderpoint_procurement.py   | 73 -------------------
 6 files changed, 107 insertions(+), 75 deletions(-)
 create mode 100644 addons/mrp/wizard/orderpoint_procurement.py
 create mode 100644 addons/mrp/wizard/orderpoint_procurement_view.xml
 delete mode 100644 addons/mrp/wizard/wizard_orderpoint_procurement.py

diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py
index ff51c74a41a..b8ca73b1d51 100644
--- a/addons/mrp/__terp__.py
+++ b/addons/mrp/__terp__.py
@@ -63,6 +63,7 @@
         'mrp_wizard_view.xml',
         'wizard/make_procurement_view.xml',
         'wizard/change_production_qty_view.xml',
+        'wizard/orderpoint_procurement_view.xml',
         'mrp_view.xml',
         'mrp_wizard.xml',
         'mrp_report.xml',
diff --git a/addons/mrp/mrp_wizard.xml b/addons/mrp/mrp_wizard.xml
index e1823092989..41d945f61a1 100644
--- a/addons/mrp/mrp_wizard.xml
+++ b/addons/mrp/mrp_wizard.xml
@@ -8,7 +8,7 @@
           <menuitem action="wiz_mrp_proc1" id="menu_wiz_mrp_proc1" parent="mrp.mrp_Sched_all" type="wizard"/>
         -->
 
-        <wizard id="wiz_mrp_proc2" model="mrp.procurement" string="Compute Stock Minimum Rules Only" name="mrp.procurement.orderpoint.compute"/>
+<!--        <wizard id="wiz_mrp_proc2" model="mrp.procurement" string="Compute Stock Minimum Rules Only" name="mrp.procurement.orderpoint.compute"/>-->
         <!--
              <menuitem action="wiz_mrp_proc2" id="menu_wiz_mrp_proc2" parent="mrp.mrp_Sched_all" type="wizard"/>
         -->
diff --git a/addons/mrp/wizard/__init__.py b/addons/mrp/wizard/__init__.py
index 462ec509e09..7affcdb9dc1 100644
--- a/addons/mrp/wizard/__init__.py
+++ b/addons/mrp/wizard/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import wizard_orderpoint_procurement
+import orderpoint_procurement
 import wizard_procurement
 import wizard_schedulers_all
 import wizard_price
diff --git a/addons/mrp/wizard/orderpoint_procurement.py b/addons/mrp/wizard/orderpoint_procurement.py
new file mode 100644
index 00000000000..623e8080e9c
--- /dev/null
+++ b/addons/mrp/wizard/orderpoint_procurement.py
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+#
+# Order Point Method:
+#    - Order if the virtual stock of today is bellow the min of the defined order point
+#
+
+import threading
+from osv import fields,osv
+
+class procurement_compute(osv.osv_memory):
+    _name = 'mrp.procurement.orderpoint.compute'
+    _description = 'Automatic Order Point'
+    
+    _columns = {
+           'automatic': fields.boolean('Automatic Orderpoint', help='If the stock of a product is under 0, it will act like an orderpoint'),     
+    }
+
+    _defaults = {
+            'automatic' : lambda *a: False,
+    }
+    
+    def _procure_calculation_orderpoint(self, cr, uid, ids, context):
+        try:
+            proc_obj = self.pool.get('mrp.procurement')
+            for proc in self.browse(cr, uid, ids):
+                proc_obj._procure_orderpoint_confirm(cr, uid, automatic=proc.automatic, use_new_cursor=cr.dbname, context=context)
+        finally:
+            cr.close()
+        return {}
+    
+    def procure_calculation(self, cr, uid, ids, context):
+        threaded_calculation = threading.Thread(target=self._procure_calculation_orderpoint, args=(cr, uid, ids, context))
+        threaded_calculation.start()
+        return {}
+
+procurement_compute()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/wizard/orderpoint_procurement_view.xml b/addons/mrp/wizard/orderpoint_procurement_view.xml
new file mode 100644
index 00000000000..65acca77d0d
--- /dev/null
+++ b/addons/mrp/wizard/orderpoint_procurement_view.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Compute Stock Minimum Rules Only -->
+        
+		<record id="view_procurement_compute_wizard" model="ir.ui.view">
+            <field name="name">Compute Stock Minimum Rules Only</field>
+            <field name="model">mrp.procurement.orderpoint.compute</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Parameters">
+				    <field name="automatic"/>
+				    <separator colspan="4"/>
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="procure_calculation" string="Compute Stock"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_procurement_compute" model="ir.actions.act_window">
+            <field name="name">Compute Stock Minimum Rules Only</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.procurement.orderpoint.compute</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="context">{'record_id' : active_id}</field>
+        </record>
+        
+       <record model="ir.values" id="procurement_compute_order_point">
+            <field name="model_id" ref="mrp.model_mrp_procurement" />
+            <field name="object" eval="1" />
+            <field name="name">Compute Stock Minimum Rules Only</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_procurement_compute'))" />
+            <field name="key">action</field>
+            <field name="model">mrp.procurement</field>
+        </record>
+		
+	</data>
+</openerp>	
diff --git a/addons/mrp/wizard/wizard_orderpoint_procurement.py b/addons/mrp/wizard/wizard_orderpoint_procurement.py
deleted file mode 100644
index a4fa57bb9a8..00000000000
--- a/addons/mrp/wizard/wizard_orderpoint_procurement.py
+++ /dev/null
@@ -1,73 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-#
-# Order Point Method:
-#    - Order if the virtual stock of today is bellow the min of the defined order point
-#
-
-import wizard
-import threading
-import pooler
-
-parameter_form = '''<?xml version="1.0"?>
-<form string="Parameters" colspan="4">
-    <field name="automatic" />
-</form>'''
-
-parameter_fields = {
-    'automatic': {'string': 'Automatic orderpoint', 'type': 'boolean', 'help': 'If the stock of a product is under 0, it will act like an orderpoint', 'default': lambda *a: False},
-}
-
-def _procure_calculation_orderpoint(self, db_name, uid, data, context):
-    db, pool = pooler.get_db_and_pool(db_name)
-    cr = db.cursor()
-    try:
-        proc_obj = pool.get('mrp.procurement')
-        automatic = data['form']['automatic']
-        proc_obj._procure_orderpoint_confirm(cr, uid, automatic=automatic,\
-                use_new_cursor=cr.dbname, context=context)
-    finally:
-        cr.close()
-    return {}
-
-def _procure_calculation(self, cr, uid, data, context):
-    threaded_calculation = threading.Thread(target=_procure_calculation_orderpoint, args=(self, cr.dbname, uid, data, context))
-    threaded_calculation.start()
-    return {}
-
-class procurement_compute(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':parameter_form, 'fields': parameter_fields, 'state':[('end','Cancel'),('compute','Compute Stock')]}
-        },
-        'compute': {
-            'actions': [_procure_calculation],
-            'result': {'type': 'state', 'state':'end'}
-        },
-    }
-procurement_compute('mrp.procurement.orderpoint.compute')
-
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From 79b9691bf4ba4ac47895c8975c982fde17224332 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 9 Mar 2010 14:23:54 +0530
Subject: [PATCH 039/251] crm : put comment

bzr revid: sbh@tinyerp.com-20100309085354-xkuql56lbiiw3s9l
---
 addons/crm/__terp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index d1514a658cf..4a88462c98f 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -63,7 +63,7 @@ between mails and Open ERP.""",
     'update_xml': [
         'wizard/crm_phonecall2phonecall.xml',
         'wizard/lead_to_partner_view.xml',
-        'wizard/phonecall2partner_view.xml',
+      #  'wizard/phonecall2partner_view.xml',
         'wizard/phonecall2opportunity.xml',
         'crm_wizard.xml', 
         'crm_view.xml',

From a753efb0bf5ea5bcd542870f786fdf0187b17c78 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Tue, 9 Mar 2010 14:24:06 +0530
Subject: [PATCH 040/251] [IMP] mrp: Converted 'Compute Schedulers' wizard into
 osv_memory wizard.

bzr revid: uco@tinyerp.co.in-20100309085406-cd2vk9u95n5h3v5n
---
 addons/mrp/__terp__.py                     |  1 +
 addons/mrp/mrp_wizard.xml                  |  6 +-
 addons/mrp/wizard/__init__.py              |  2 +-
 addons/mrp/wizard/schedulers_all.py        | 54 ++++++++++++++++++
 addons/mrp/wizard/schedulers_all_view.xml  | 49 +++++++++++++++++
 addons/mrp/wizard/wizard_schedulers_all.py | 64 ----------------------
 6 files changed, 108 insertions(+), 68 deletions(-)
 create mode 100644 addons/mrp/wizard/schedulers_all.py
 create mode 100644 addons/mrp/wizard/schedulers_all_view.xml
 delete mode 100644 addons/mrp/wizard/wizard_schedulers_all.py

diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py
index b8ca73b1d51..d898380822d 100644
--- a/addons/mrp/__terp__.py
+++ b/addons/mrp/__terp__.py
@@ -64,6 +64,7 @@
         'wizard/make_procurement_view.xml',
         'wizard/change_production_qty_view.xml',
         'wizard/orderpoint_procurement_view.xml',
+        'wizard/schedulers_all_view.xml',
         'mrp_view.xml',
         'mrp_wizard.xml',
         'mrp_report.xml',
diff --git a/addons/mrp/mrp_wizard.xml b/addons/mrp/mrp_wizard.xml
index 41d945f61a1..35b33186986 100644
--- a/addons/mrp/mrp_wizard.xml
+++ b/addons/mrp/mrp_wizard.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <wizard id="wiz_mrp_proc0" model="mrp.procurement" string="Compute Schedulers" name="mrp.procurement.compute.all"/>
-        <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="base.menu_mrp_root" sequence="4"/>
-        <menuitem action="wiz_mrp_proc0" id="mrp_Sched_all" parent="mrp.menu_mrp_scheduler" type="wizard" sequence="90"/>
+<!--        <wizard id="wiz_mrp_proc0" model="mrp.procurement" string="Compute Schedulers" name="mrp.procurement.compute.all"/>-->
+<!--        <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="base.menu_mrp_root" sequence="4"/>-->
+<!--        <menuitem action="wiz_mrp_proc0" id="mrp_Sched_all" parent="mrp.menu_mrp_scheduler" type="wizard" sequence="90"/>-->
         <!--
           <menuitem action="wiz_mrp_proc1" id="menu_wiz_mrp_proc1" parent="mrp.mrp_Sched_all" type="wizard"/>
         -->
diff --git a/addons/mrp/wizard/__init__.py b/addons/mrp/wizard/__init__.py
index 7affcdb9dc1..41709aa42a6 100644
--- a/addons/mrp/wizard/__init__.py
+++ b/addons/mrp/wizard/__init__.py
@@ -21,7 +21,7 @@
 
 import orderpoint_procurement
 import wizard_procurement
-import wizard_schedulers_all
+import schedulers_all
 import wizard_price
 import wizard_workcenter_load
 import wizard_track_prod
diff --git a/addons/mrp/wizard/schedulers_all.py b/addons/mrp/wizard/schedulers_all.py
new file mode 100644
index 00000000000..f1ef2501add
--- /dev/null
+++ b/addons/mrp/wizard/schedulers_all.py
@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import threading
+
+from osv import osv, fields
+
+class procurement_compute(osv.osv_memory):
+    _name = 'mrp.procurement.compute.all'
+    _description = 'Compute all schedulers'
+    
+    _columns = {
+        'automatic': fields.boolean('Automatic orderpoint',help='Triggers an automatic procurement for all products that have a virtual stock under 0. You should probably not use this option, we suggest using a MTO configuration on products.'),
+    }
+    
+    _defaults ={
+         'automatic': lambda *a: False,
+    }
+    
+    def _procure_calculation_all(self, cr, uid, ids, context):
+        proc_obj = self.pool.get('mrp.procurement')
+        for proc in self.browse(cr, uid, ids):
+            proc_obj.run_scheduler(cr, uid, automatic=proc.automatic, use_new_cursor=cr.dbname,\
+                    context=context)
+        return {}
+    
+    def procure_calculation(self, cr, uid, ids, context):
+        threaded_calculation = threading.Thread(target=self._procure_calculation_all, args=(cr, uid, ids, context))
+        threaded_calculation.start()
+        return {}
+    
+procurement_compute()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/mrp/wizard/schedulers_all_view.xml b/addons/mrp/wizard/schedulers_all_view.xml
new file mode 100644
index 00000000000..4574a965fbc
--- /dev/null
+++ b/addons/mrp/wizard/schedulers_all_view.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Compute Schedulers -->
+        
+		<record id="view_compute_schedulers_wizard" model="ir.ui.view">
+            <field name="name">Compute Schedulers</field>
+            <field name="model">mrp.procurement.compute.all</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Scheduler Parameters">
+				    <field name="automatic"/>
+				    <separator colspan="4"/>
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="procure_calculation" string="Compute Schedulers"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_compute_schedulers" model="ir.actions.act_window">
+            <field name="name">Compute Schedulers</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.procurement.compute.all</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="context">{'record_id' : active_id}</field>
+        </record>
+        
+       <record model="ir.values" id="compute_all_schedulers">
+            <field name="model_id" ref="mrp.model_mrp_procurement" />
+            <field name="object" eval="1" />
+            <field name="name">Compute Schedulers</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_compute_schedulers'))" />
+            <field name="key">action</field>
+            <field name="model">mrp.procurement</field>
+        </record>
+        
+        <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="base.menu_mrp_root" sequence="4"/>
+        <menuitem action="action_compute_schedulers" id="mrp_Sched_all" parent="mrp.menu_mrp_scheduler" sequence="90"/>
+		
+	</data>
+</openerp>	
diff --git a/addons/mrp/wizard/wizard_schedulers_all.py b/addons/mrp/wizard/wizard_schedulers_all.py
deleted file mode 100644
index e93e31c0599..00000000000
--- a/addons/mrp/wizard/wizard_schedulers_all.py
+++ /dev/null
@@ -1,64 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import threading
-import pooler
-
-parameter_form = '''<?xml version="1.0"?>
-<form string="Scheduler Parameters" colspan="4">
-    <field name="automatic" />
-</form>'''
-
-parameter_fields = {
-    'automatic': {'string': 'Automatic orderpoint', 'type': 'boolean', 'help': 'Triggers an automatic procurement for all products that have a virtual stock under 0. You should probably not use this option, we suggest using a MTO configuration on products.', 'default': lambda *a: False},
-}
-
-def _procure_calculation_all(self, db_name, uid, data, context):
-    db, pool = pooler.get_db_and_pool(db_name)
-    cr = db.cursor()
-    proc_obj = pool.get('mrp.procurement')
-    automatic = data['form']['automatic']
-    proc_obj.run_scheduler(cr, uid, automatic=automatic, use_new_cursor=cr.dbname,\
-            context=context)
-    cr.close()
-    return {}
-
-def _procure_calculation(self, cr, uid, data, context):
-    threaded_calculation = threading.Thread(target=_procure_calculation_all, args=(self, cr.dbname, uid, data, context))
-    threaded_calculation.start()
-    return {}
-
-class procurement_compute(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':parameter_form, 'fields': parameter_fields, 'state':[('end','Cancel'),('compute','Compute Stock') ]}
-        },
-        'compute': {
-            'actions': [_procure_calculation],
-            'result': {'type': 'state', 'state':'end'}
-        },
-    }
-procurement_compute('mrp.procurement.compute.all')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From 31487c201e1e84c872388885e83b0715a44e960f Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 9 Mar 2010 14:39:07 +0530
Subject: [PATCH 041/251] [IMP]: crm: changes for opening meetings related to
 opportunity

bzr revid: rpa@tinyerp.com-20100309090907-kxbr4h3x2p3yomao
---
 addons/crm/crm_opportunity_menu.xml         |  6 +++---
 addons/crm/wizard/crm_opportunity_wizard.py | 14 +++++---------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml
index dc7e100152a..49d0452167b 100644
--- a/addons/crm/crm_opportunity_menu.xml
+++ b/addons/crm/crm_opportunity_menu.xml
@@ -8,9 +8,9 @@
             name="Meetings"
             res_model="crm.meeting"
             src_model="crm.opportunity"
-            view_mode="calendar,tree,form"
-            context="{'default_duration': 4.0}"
-            domain="[('user_id','=',uid)]"
+            view_mode="tree,form,calendar,"
+            context="{'default_duration': 4.0, 'default_opportunity_id': active_id}"
+            domain="[('user_id','=',uid), ('opportunity_id', '=', active_id)]"
             view_type="form"/>
 
 	 <act_window
diff --git a/addons/crm/wizard/crm_opportunity_wizard.py b/addons/crm/wizard/crm_opportunity_wizard.py
index e2636027c92..d7ec0b72cb6 100644
--- a/addons/crm/wizard/crm_opportunity_wizard.py
+++ b/addons/crm/wizard/crm_opportunity_wizard.py
@@ -154,20 +154,16 @@ class opportunity2meeting(wizard.interface):
         partner_id = opportunity.partner_id and opportunity.partner_id.id or False
         name = opportunity.name
         email = opportunity.email_from
-        section_id = opportunity.section_id and opportunity.section_id.id or False
+        section_id = opportunity.section_id and opportunity.section_id.id or False        
         return {            
             'name': _('Meetings'),
-            'domain' : "[('user_id','=',%s), ('opportunity_id', '=', %s)]"%(uid, data['id']),  
-            'context': {'default_partner_id': partner_id, 
-                        'default_opportunity_id': data['id'], 
-                        'default_section_id': section_id, 
-                        'default_email_from': email, 
-                        'default_state':'open', 'default_name':name},
+            'domain' : "[('user_id','=',%s)]"%(uid),  
+            'context': {'default_partner_id': partner_id, 'default_section_id': section_id, 'default_email_from': email, 'default_state':'open', 'default_name':name},
             'view_type': 'form',
-            'view_mode': 'tree,form,calendar',
+            'view_mode': 'calendar,form,tree',
             'res_model': 'crm.meeting',
             'view_id': False,
-            'views': [(id3, 'tree'), (id2, 'form'), (id1, 'calendar')], 
+            'views': [(id1,'calendar'),(id2,'form'),(id3,'tree')],
             'type': 'ir.actions.act_window',
             'search_view_id': id['res_id']
             }

From 2feb455905f8e92aff39e0c3120b1f3fd99e44a4 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 9 Mar 2010 15:19:39 +0530
Subject: [PATCH 042/251] crm: Add the wizard of phonecall2meeting and improve
 the view of phonecall2phonecall

bzr revid: sbh@tinyerp.com-20100309094939-2w4am787wuls7mj4
---
 addons/crm/__terp__.py                        |  1 +
 addons/crm/crm_phonecall_view.xml             |  4 +-
 addons/crm/wizard/__init__.py                 |  1 +
 addons/crm/wizard/crm_phonecall2phonecall.py  | 63 ++++++++--------
 addons/crm/wizard/crm_phonecall2phonecall.xml |  9 +--
 addons/crm/wizard/phonecall2meeting.py        | 75 +++++++++++++++++++
 addons/crm/wizard/phonecall2meeting.xml       | 25 +++++++
 7 files changed, 138 insertions(+), 40 deletions(-)
 create mode 100644 addons/crm/wizard/phonecall2meeting.py
 create mode 100644 addons/crm/wizard/phonecall2meeting.xml

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 4a88462c98f..88a01d3285b 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -63,6 +63,7 @@ between mails and Open ERP.""",
     'update_xml': [
         'wizard/crm_phonecall2phonecall.xml',
         'wizard/lead_to_partner_view.xml',
+        'wizard/phonecall2meeting.xml',
       #  'wizard/phonecall2partner_view.xml',
         'wizard/phonecall2opportunity.xml',
         'crm_wizard.xml', 
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 11516f3af56..38d2b6149e9 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -54,7 +54,7 @@
                     type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />
                 <button string="Meeting"
                     states="draft,open,pending"
-                    name="%(wizard_crm_phonecall_meeting_set)d"  type="action" />
+                    name="%(phonecall2meeting_act)d"  type="action" />
                 <field name="state"/>
                 <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
                 <button name="case_close" string="Held" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
@@ -75,7 +75,7 @@
                     <field name="date" string="Planned Date"/>
                     <field name="user_id"/>
                     <button string="Schedule a Meeting"
-                        name="%(wizard_crm_phonecall_meeting_set)d"
+                        name="%(phonecall2meeting_act)d"
                         icon="gtk-redo"
                         type="action" />
                     <field name="partner_phone"/>
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 6c52d09a558..d9c1f6b32e9 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -30,6 +30,7 @@ import crm_phonecall2phonecall
 
 import lead_to_partner
 import phonecall2partner
+import phonecall2meeting
 import phonecall_to_opportunity
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_phonecall2phonecall.py b/addons/crm/wizard/crm_phonecall2phonecall.py
index 245c3fecc40..fb7f99f41d2 100644
--- a/addons/crm/wizard/crm_phonecall2phonecall.py
+++ b/addons/crm/wizard/crm_phonecall2phonecall.py
@@ -40,37 +40,41 @@ class crm_phonecall2phonecall(osv.osv_memory):
 
     def action_apply(self, cr, uid, ids, context=None):
         this = self.browse(cr, uid, ids)[0]
-        record_id = context and context.get('record_id', False) or False
         values={}
-        values['name']=this.name
-        values['user_id']=this.user_id and this.user_id.id
-        values['categ_id']=this.category_id and this.category_id.id
-        values['section_id']=this.section_id and this.section_id.id or False,
-        values['description']=this.notes or ''
-        values['partner_id']=this.partner_id.id
-        values['partner_address_id']=this.address_id.id
-        phonecall_proxy = self.pool.get('crm.phonecall')
-        phonecall_id = phonecall_proxy.create(cr, uid, values, context=context)  
-        value = {            
-            'name': _('Phone Call'),
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'crm.phonecall',
-            'view_id': False,
-            'type': 'ir.actions.act_window',
-            'res_id': phonecall_id
-            }
+        record_id = context and context.get('record_id', False) or False
+        if record_id:
+            for case in self.pool.get('crm.phonecall').browse(cr, uid, [record_id], context=context):
+                values['name']=this.name
+                values['user_id']=this.user_id and this.user_id.id
+                values['categ_id']=case.categ_id and case.categ_id.id or False
+                values['section_id']=case.section_id and case.section_id.id or False,
+                values['description']=case.description or ''
+                values['partner_id']=case.partner_id.id
+                values['partner_address_id']=case.partner_address_id.id
+                values['partner_mobile']=case.partner_mobile or False
+                values['priority']=case.priority
+                values['partner_phone']=case.partner_phone or False
+                values['date']=this.date
+                phonecall_proxy = self.pool.get('crm.phonecall')
+                phonecall_id = phonecall_proxy.create(cr, uid, values, context=context)
+                  
+            value = {            
+                'name': _('Phone Call'),
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'crm.phonecall',
+                'view_id': False,
+                'type': 'ir.actions.act_window',
+                'res_id': phonecall_id
+                }
         return value
 
     _columns = {
-        'name' : fields.char('Name', size=64, required=True, select=1),
+        'name' : fields.char('Call summary', size=64, required=True, select=1),
         'user_id' : fields.many2one('res.users',"Assign To"),
-        'deadline': fields.datetime('Deadline', readonly=True),
-        'category_id' : fields.many2one('crm.case.categ','Category',domain="[('object_id.model', '=', ''crm.phonecall')]"),
+        'date': fields.datetime('Date'),
         'section_id':fields.many2one('crm.case.section','Sales Team'),
-        'partner_id': fields.many2one('res.partner', 'Partner'),
-        'address_id': fields.many2one('res.partner.address', 'Partner Contact', domain="[('partner_id','=',partner_id)]"),        
-        'notes' : fields.text('Notes'),
+
     }
     def default_get(self, cr, uid, fields, context=None):
         record_id = context and context.get('record_id', False) or False
@@ -78,11 +82,8 @@ class crm_phonecall2phonecall(osv.osv_memory):
         if record_id:
             phonecall_id = self.pool.get('crm.phonecall').browse(cr, uid, record_id, context=context)
             res['name']=phonecall_id.name
-            res['user_id']=phonecall_id.user_id and phonecall_id.user_id.id
-            res['section_id']=phonecall_id.section_id and phonecall_id.section_id.id
-            res['notes']=phonecall_id.description and phonecall_id.description or ''
-            res['category_id']=phonecall_id.categ_id and phonecall_id.categ_id.id
-            res['partner_id']=phonecall_id.partner_id and phonecall_id.partner_id.id
-            res['address_id']=phonecall_id.partner_address_id and phonecall_id.partner_address_id.id
+            res['user_id']=phonecall_id.user_id and phonecall_id.user_id.id or False
+            res['date']=phonecall_id.date 
+            res['section_id']=phonecall_id.section_id and phonecall_id.section_id.id or False 
         return res
 crm_phonecall2phonecall()
\ No newline at end of file
diff --git a/addons/crm/wizard/crm_phonecall2phonecall.xml b/addons/crm/wizard/crm_phonecall2phonecall.xml
index c9a9d37ac9e..421ee7c9748 100644
--- a/addons/crm/wizard/crm_phonecall2phonecall.xml
+++ b/addons/crm/wizard/crm_phonecall2phonecall.xml
@@ -6,16 +6,11 @@
             <field name="model">crm.phonecall2phonecall</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Schedule Other Call " col="2">
+                <form string="Schedule Other Call" col="2">
                 		<field name="name"/>
 						<field name="user_id" />
-						<separator colspan="3" string="Contacts" />
-						<field name="partner_id"/>
-						<field name="address_id"/>
-						<separator colspan="3" string="" />
-						<field name="category_id" domain="[('object_id.model', '=', 'crm.phonecall')]" />
 						<field name="section_id"/>
-						<field name="notes"/>
+						<field name="date" string="Planned Date"/>
                     <group colspan="2" col="2" >
                         <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
                         <button name="action_apply" type="object" string="_Apply" icon="gtk-apply" />
diff --git a/addons/crm/wizard/phonecall2meeting.py b/addons/crm/wizard/phonecall2meeting.py
new file mode 100644
index 00000000000..502ad14f702
--- /dev/null
+++ b/addons/crm/wizard/phonecall2meeting.py
@@ -0,0 +1,75 @@
+# -*- encoding: utf-8 -*-
+############################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2008-2009 AJM Technologies S.A. (<http://www.ajm.lu). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+############################################################################################
+############################################################################################
+
+from osv import osv, fields
+import netsvc
+import time
+import tools
+import mx.DateTime
+from tools import config
+from tools.translate import _
+import tools
+
+class crm_phonecall2meeting(osv.osv_memory):
+    _name = 'crm.phonecall2meeting'
+    _description = 'Phonecall To Meeting'
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        return {'type':'ir.actions.act_window_close'}
+
+    def _makeMeeting(self, cr, uid, ids, context=None):
+        this = self.browse(cr, uid, ids[0], context=context)
+        record_id = context and context.get('record_id', False) or False
+        if record_id:
+            phonecall_case_obj = self.pool.get('crm.phonecall')                   
+            data_obj = self.pool.get('ir.model.data')
+            result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
+            id = data_obj.read(cr, uid, result, ['res_id'])
+            id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
+            id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
+            id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
+            if id1:
+                id1 = data_obj.browse(cr, uid, id1, context=context).res_id
+            if id2:
+                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+            if id3:
+                id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+            phonecall = phonecall_case_obj.browse(cr, uid, record_id, context=context)
+            partner_id = phonecall.partner_id and phonecall.partner_id.id or False
+            name = phonecall.name
+            email = phonecall.email_from
+            section_id = phonecall.section_id and phonecall.section_id.id or False      
+        return {            
+            'name': _('Meetings'),
+            'domain' : "[('user_id','=',%s)]"%(uid), 
+            'context': {'default_partner_id': partner_id, 'default_section_id': section_id, 'default_email_from': email, 'default_state':'open', 'default_name':name},        
+            'view_type': 'form',
+            'view_mode': 'calendar,form,tree',
+            'res_model': 'crm.meeting',
+            'view_id': False,
+            'views': [(id1,'calendar'),(id2,'form'),(id3,'tree')],
+            'type': 'ir.actions.act_window',
+            'search_view_id': id['res_id']
+            }
+crm_phonecall2meeting()
\ No newline at end of file
diff --git a/addons/crm/wizard/phonecall2meeting.xml b/addons/crm/wizard/phonecall2meeting.xml
new file mode 100644
index 00000000000..9505845a63a
--- /dev/null
+++ b/addons/crm/wizard/phonecall2meeting.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="phonecall2phonecall2meeting_view">
+            <field name="name">crm.phonecall2meeting.form</field>
+            <field name="model">crm.phonecall2meeting</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Convert To Meeting ">
+                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button name="_makeMeeting" type="object" string="_Apply" icon="gtk-apply" />
+                </form>
+            </field>
+        </record>
+        <record model="ir.actions.act_window" id="phonecall2meeting_act">
+            <field name="name">Convert To Meeting</field>
+            <field name="res_model">crm.phonecall2meeting</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="phonecall2phonecall2meeting_view"/>
+            <field name="target">new</field>
+         	<field name="context">{'record_id' : active_id}</field>
+        </record>
+    </data>
+</openerp>   
\ No newline at end of file

From 45309dff2c4d5d10376cdec38534d3e7f8c0ab37 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 9 Mar 2010 15:28:20 +0530
Subject: [PATCH 043/251] [IMP] crm: improve the view and fix the probelm of
 leadtopartner wizard

bzr revid: sbh@tinyerp.com-20100309095820-aajs2fedvcglyhjw
---
 addons/crm/wizard/crm_phonecall2phonecall.py  | 1 -
 addons/crm/wizard/crm_phonecall2phonecall.xml | 2 +-
 addons/crm/wizard/lead_to_partner.py          | 3 ++-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/crm/wizard/crm_phonecall2phonecall.py b/addons/crm/wizard/crm_phonecall2phonecall.py
index fb7f99f41d2..5fcfc9ecb69 100644
--- a/addons/crm/wizard/crm_phonecall2phonecall.py
+++ b/addons/crm/wizard/crm_phonecall2phonecall.py
@@ -57,7 +57,6 @@ class crm_phonecall2phonecall(osv.osv_memory):
                 values['date']=this.date
                 phonecall_proxy = self.pool.get('crm.phonecall')
                 phonecall_id = phonecall_proxy.create(cr, uid, values, context=context)
-                  
             value = {            
                 'name': _('Phone Call'),
                 'view_type': 'form',
diff --git a/addons/crm/wizard/crm_phonecall2phonecall.xml b/addons/crm/wizard/crm_phonecall2phonecall.xml
index 421ee7c9748..b4911e48b15 100644
--- a/addons/crm/wizard/crm_phonecall2phonecall.xml
+++ b/addons/crm/wizard/crm_phonecall2phonecall.xml
@@ -9,8 +9,8 @@
                 <form string="Schedule Other Call" col="2">
                 		<field name="name"/>
 						<field name="user_id" />
-						<field name="section_id"/>
 						<field name="date" string="Planned Date"/>
+						<field name="section_id"/>
                     <group colspan="2" col="2" >
                         <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
                         <button name="action_apply" type="object" string="_Apply" icon="gtk-apply" />
diff --git a/addons/crm/wizard/lead_to_partner.py b/addons/crm/wizard/lead_to_partner.py
index ad42ee951c7..bafb885ba98 100644
--- a/addons/crm/wizard/lead_to_partner.py
+++ b/addons/crm/wizard/lead_to_partner.py
@@ -56,6 +56,7 @@ class crm_lead2partner(osv.osv_memory):
         partner_obj = self.pool.get('res.partner')
         contact_obj = self.pool.get('res.partner.address')
         rec_ids = context and context.get('record_ids',False)
+        value={}
         for case in case_obj.browse(cr, uid, rec_ids):
             if case.partner_id:
                 raise wizard.except_wizard(_('Warning !'),
@@ -71,7 +72,7 @@ class crm_lead2partner(osv.osv_memory):
             partner_id = partner_ids and partner_ids[0] or False
         if not partner_id:
             value = self._make_partner(cr, uid, ids, context)           
-        return value or {}
+        return value 
 
     def _create_partner(self, cr, uid, ids, context):
         case_obj = self.pool.get('crm.lead')

From 4b8f2856ef4f7fb58a202ae0a11c9b97d61ccb40 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 9 Mar 2010 15:35:20 +0530
Subject: [PATCH 044/251] [Fix] crm: Fix the problem of crm_phonecall_wizard

bzr revid: sbh@tinyerp.com-20100309100520-c33ffn4pcc99xh26
---
 addons/crm/wizard/crm_phonecall_wizard.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/crm/wizard/crm_phonecall_wizard.py b/addons/crm/wizard/crm_phonecall_wizard.py
index 6ac2f30b994..9fcec41936e 100644
--- a/addons/crm/wizard/crm_phonecall_wizard.py
+++ b/addons/crm/wizard/crm_phonecall_wizard.py
@@ -78,15 +78,15 @@ class partner_create(wizard.interface):
         for case in case_obj.browse(cr, uid, data['ids']):
             if data['form']['action'] == 'create':
                 partner_id = partner_obj.create(cr, uid, {
-                    'name': case.partner_name or case.name,
+                    'name': case.partner_contact or case.name,
                     'user_id': case.user_id.id,
                     'comment': case.description,
                 })
                 contact_id = contact_obj.create(cr, uid, {
                     'partner_id': partner_id,
                     'name': case.name,
-                    'phone': case.phone,
-                    'mobile': case.mobile,
+                    'phone': case.partner_phone,
+                    'mobile': case.partner_mobile,
                     'email': case.email_from
                 })
 

From e3484bd692800540366428120c725802963dbc8c Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 9 Mar 2010 16:01:17 +0530
Subject: [PATCH 045/251] [IMP]: mrp: Put proper string in button of production
 lines

bzr revid: rpa@tinyerp.com-20100309103117-e939u7tpi3hvcbcz
---
 addons/mrp/mrp_view.xml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 061278771db..85c0a733a2c 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -462,7 +462,9 @@
                         <field name="product_qty"/>
                         <group colspan="2" col="3">
                         <field name="product_uom"/>
-                        <button type="action" name="%(mrp.action_change_production_qty)d" string="Change Qty" states="ready,confirmed,in_production"/>
+                        <button type="action"
+                        	name="%(mrp.action_change_production_qty)d"
+                        	string="Change Qty" states="ready,confirmed" />
                         </group>
                         <label string="" colspan="2"/>
                         <field name="product_uos_qty" groups="product.group_uos"/>
@@ -482,18 +484,18 @@
 
                             <field colspan="2" name="move_lines" nolabel="1" widget="one2many_list"
                                 mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
-                                <tree string="Products to Consume">
+                                <tree string="Products to Consume" colors="red:location_dest_id&lt;&gt;parent.location_dest_id">
                                     <field name="product_id" />
                                     <field name="product_qty" />
                                     <field name="product_uom" />
                                     <field name="state" invisible="1" />
                                     <button
                                         name="%(stock.move_consume)d"
-                                        string=">" type="action"
+                                        string="Consume Products" type="action"
                                         icon="gtk-go-forward" context="{'consume': True}"
                                         states="draft,waiting,confirmed,assigned"/>
                                     <button name="%(stock.move_scrap)d"
-                                        string="D" type="action"
+                                        string="Scrap Products" type="action"
                                         icon="gtk-justify-fill" context="{'scrap': True}"
                                         states="draft,waiting,confirmed,assigned" />
                                 </tree>
@@ -520,7 +522,7 @@
                            				states="done,cancel" />
                            			<button
                            				name="%(stock.move_scrap)d"
-                           				string="D" type="action"
+                           				string="Scrap Products" type="action"
                            				icon="gtk-convert"
                            				states="done,cancel" />
                            		</tree>
@@ -552,11 +554,11 @@
                                     <field name="state" invisible="1" />
                                     <button
                                         name="%(stock.move_consume)d"
-                                        string=">" type="action"
+                                        string="Consume Products" type="action"
                                         icon="gtk-go-forward"
                                         states="draft,waiting,confirmed,assigned"/>
                                     <button name="%(stock.move_scrap)d"
-                                        string="D" type="action"
+                                        string="Scrap Products" type="action"
                                         icon="gtk-justify-fill" context="{'scrap': True}"
                                         states="draft,waiting,confirmed,assigned" />
                                 </tree>
@@ -579,7 +581,7 @@
                            			<button name="%(stock.track_line)d"
                                             string="Split in production lots" type="action" icon="gtk-justify-fill" states="done,cancel"/>
                            			<button name="%(stock.move_scrap)d"
-                           				string="D" type="action" icon="gtk-go-forward"
+                           				string="Scrap Products" type="action" icon="gtk-go-forward"
                            				states="done,cancel" />
                            		</tree>
                            		<form string="Finished Products">

From 9f553e0026ebad2944693fb480a26c32d4b34cf8 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 9 Mar 2010 16:04:21 +0530
Subject: [PATCH 046/251] [IMP]: mrp: Consuming products in production lines
 should change order state in_production

bzr revid: rpa@tinyerp.com-20100309103421-0ul28oqz297z63d2
---
 addons/mrp/mrp.py     | 21 ++++++++++++++++++++-
 addons/stock/stock.py | 16 +++++++++++++++-
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 40fd2e46525..8629655085d 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -1385,13 +1385,32 @@ class StockMove(osv.osv):
     def consume_moves(self, cr, uid, ids, product_qty, location_id=False, location_dest_id=False, consume=True, context=None):
         res = []
         production_obj = self.pool.get('mrp.production')
+        wf_service = netsvc.LocalService("workflow")
         for move in self.browse(cr, uid, ids):
             new_moves = super(StockMove, self).consume_moves(cr, uid, [move.id], product_qty, location_id, location_dest_id, consume, context=context)
             production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
+            for prod in production_obj.browse(cr, uid, production_ids, context=context):
+                if prod.state == 'confirmed':
+                    production_obj.force_production(cr, uid, [prod.id])
+                wf_service.trg_validate(uid, 'mrp.production', prod.id, 'button_produce', cr)
             for new_move in new_moves:
                 production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]})
                 res.append(new_move)
-        return res  
+        return res
+    
+    def scrap_moves(self, cr, uid, ids, product_qty, location_id, context=None):
+        res = []
+        production_obj = self.pool.get('mrp.production')
+        wf_service = netsvc.LocalService("workflow")
+        for move in self.browse(cr, uid, ids):
+            new_moves = super(StockMove, self).scrap_moves(cr, uid, [move.id], product_qty, location_id, context=context)
+            production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
+            for prod_id in production_ids:
+                wf_service.trg_validate(uid, 'mrp.production', prod_id, 'button_produce', cr)
+            for new_move in new_moves:
+                production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]})
+                res.append(new_move)
+        return {}
 
 StockMove()
 
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index f1b7e34d1d5..31ffe5b6242 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1602,7 +1602,21 @@ class stock_move(osv.osv):
         return res
 
     def scrap_moves(self, cr, uid, ids, quantity, location_dest_id, context=None):
-        return self.consume_moves(cr, uid, ids, quantity, location_id=False, location_dest_id=location_dest_id, consume=False, context=context)
+        if quantity <= 0:
+            raise osv.except_osv(_('Warning!'), _('Please provide Proper Quantity !'))
+        res = []       
+        for move in self.browse(cr, uid, ids, context=context):            
+            move_qty = move.product_qty
+            uos_qty = quantity / move_qty * move.product_uos_qty
+            default_val = {
+                    'product_qty': quantity, 
+                    'product_uos_qty': uos_qty, 
+                    'state': move.state, 
+                    'location_dest_id': location_dest_id
+                }
+            new_move = self.copy(cr, uid, move.id, default_val)
+            res += [new_move]
+        return res
 
 stock_move()
 

From 3ea804d7fbf3a7d4c8c659dd32117c534ec7778f Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 9 Mar 2010 16:32:12 +0530
Subject: [PATCH 047/251] [IMP]: mrp: Improvement in production line view

bzr revid: rpa@tinyerp.com-20100309110212-5b6sdcviguxmm6tb
---
 addons/mrp/mrp_view.xml | 89 +++++++++++++++++------------------------
 1 file changed, 37 insertions(+), 52 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 85c0a733a2c..e0867ba6e8f 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -484,37 +484,31 @@
 
                             <field colspan="2" name="move_lines" nolabel="1" widget="one2many_list"
                                 mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
-                                <tree string="Products to Consume" colors="red:location_dest_id&lt;&gt;parent.location_dest_id">
-                                    <field name="product_id" />
-                                    <field name="product_qty" />
-                                    <field name="product_uom" />
-                                    <field name="state" invisible="1" />
-                                    <button
-                                        name="%(stock.move_consume)d"
-                                        string="Consume Products" type="action"
-                                        icon="gtk-go-forward" context="{'consume': True}"
-                                        states="draft,waiting,confirmed,assigned"/>
-                                    <button name="%(stock.move_scrap)d"
-                                        string="Scrap Products" type="action"
-                                        icon="gtk-justify-fill" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned" />
+                                <tree string="Products to Consume">
+                                    <field name="product_id" select="1"/>
+				                    <field name="product_qty" select="1" string="Qty"/>
+				                    <field name="product_uom" select="1" string="UOM"/>
+				                    <button name="%(stock.move_consume)d"
+				                    	string="Consume Products" type="action"
+				                    	icon="gtk-go-forward" context="{'consume': True}"
+				                    	states="draft,waiting,confirmed,assigned" />
+				                    <button name="%(stock.move_scrap)d"
+				                    	string="Scrap Products" type="action"
+				                    	icon="gtk-justify-fill" context="{'scrap': True}"
+				                    	states="draft,waiting,confirmed,assigned" />
+				                    <field name="state"/>
+				                    <field name="location_id" select="1" string="Source" />
+				                    <field name="location_dest_id" select="1" string="Destination"/>
+				                    <field name="prodlot_id" select="1"/>
                                 </tree>
-                                <form string="Products to Consume">
-                                    <field name="product_id" />
-                                    <field name="product_qty" />
-                                    <field name="product_uom" />
-                                </form>
                             </field>
 
                             <field colspan="2" name="move_lines2" nolabel="1"  domain="[('state','in', ('done', 'cancel'))]"
                            			widget="one2many_list" mode="tree,form" height="275">
                            		<tree string="Consumed Products" editable="bottom" colors="red:state=='cancel';black:state=='done';">
                            			<field name="product_id" readonly="1"/>
-                           			<field name="product_qty" readonly="1"/>
-                           			<field name="product_uom" readonly="1" />
-                           			<field name="state" invisible="1" />
-                           			<field name="location_id" readonly="1"/>
-                           			<field name="prodlot_id" />
+                           			<field name="product_qty" select="1" string="Qty"/>
+				                    <field name="product_uom" select="1" string="UOM"/>
                            			<button
                            				name="%(stock.track_line)d"
                            				string="Split in production lots"
@@ -525,12 +519,11 @@
                            				string="Scrap Products" type="action"
                            				icon="gtk-convert"
                            				states="done,cancel" />
+                           			<field name="state"/>
+				                    <field name="location_id" select="1" string="Source" />
+				                    <field name="location_dest_id" select="1" string="Destination"/>
+				                    <field name="prodlot_id" select="1"/>
                            		</tree>
-                           		<form string="Consumed Products">
-                           			<field name="product_id" />
-                           			<field name="product_qty" />
-                           			<field name="product_uom" />
-                           		</form>
                            	</field>
 
                             <group col="9" colspan="4">
@@ -548,25 +541,22 @@
                             <field colspan="2" name="move_created_ids" nolabel="1" widget="one2many_list"
                                 mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
                                 <tree string="Products to Finish">
-                                    <field name="product_id" />
-                                    <field name="product_qty" />
-                                    <field name="product_uom" />
-                                    <field name="state" invisible="1" />
-                                    <button
-                                        name="%(stock.move_consume)d"
-                                        string="Consume Products" type="action"
-                                        icon="gtk-go-forward"
-                                        states="draft,waiting,confirmed,assigned"/>
-                                    <button name="%(stock.move_scrap)d"
-                                        string="Scrap Products" type="action"
-                                        icon="gtk-justify-fill" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned" />
+                                    <field name="product_id" select="1"/>
+				                    <field name="product_qty" select="1" string="Qty"/>
+				                    <field name="product_uom" select="1" string="UOM"/>
+				                    <button name="%(stock.move_consume)d"
+				                    	string="Consume Products" type="action"
+				                    	icon="gtk-go-forward" context="{'consume': True}"
+				                    	states="draft,waiting,confirmed,assigned" />
+				                    <button name="%(stock.move_scrap)d"
+				                    	string="Scrap Products" type="action"
+				                    	icon="gtk-justify-fill" context="{'scrap': True}"
+				                    	states="draft,waiting,confirmed,assigned" />
+				                    <field name="state"/>
+				                    <field name="location_id" select="1" string="Source" />
+				                    <field name="location_dest_id" select="1" string="Destination"/>
+				                    <field name="prodlot_id" select="1"/>
                                 </tree>
-                                <form string="Products to Finish">
-                                    <field name="product_id" />
-                                    <field name="product_qty" />
-                                    <field name="product_uom" />
-                                </form>
                             </field>
 
                             <field colspan="2" name="move_created_ids2" nolabel="1"  domain="[('state','in', ('done', 'cancel'))]"
@@ -584,11 +574,6 @@
                            				string="Scrap Products" type="action" icon="gtk-go-forward"
                            				states="done,cancel" />
                            		</tree>
-                           		<form string="Finished Products">
-                           			<field name="product_id" />
-                           			<field name="product_qty" />
-                           			<field name="product_uom" />
-                           		</form>
                            	</field>
                         </page>
                         <page string="Work Orders">

From 56f657ec94abc23bb1c22714cca6a80a67de19ca Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Tue, 9 Mar 2010 16:52:51 +0530
Subject: [PATCH 048/251] [IMP, FIX] board_crm: (1) Renamed
 'board_crm_configuration' to 'board_crm'. (2) Rename menu 'Dashboards > CRM
 Configuration' with 'Dashboards > CRM'. (3) Fixed error of field.

bzr revid: uco@tinyerp.co.in-20100309112251-q5z0ikltbxzyvnnw
---
 addons/{board_crm_configuration => board_crm}/__init__.py     | 0
 addons/{board_crm_configuration => board_crm}/__terp__.py     | 4 ++--
 .../{board_crm_configuration => board_crm}/board_crm_demo.xml | 0
 .../board_crm_statistical_view.xml                            | 4 +---
 .../{board_crm_configuration => board_crm}/board_crm_view.xml | 2 +-
 addons/{board_crm_configuration => board_crm}/i18n/ar.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/bg.po      | 0
 .../i18n/board_crm_configuration.pot                          | 0
 addons/{board_crm_configuration => board_crm}/i18n/bs.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/ca.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/cs.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/de.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/el.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/es.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/es_AR.po   | 0
 addons/{board_crm_configuration => board_crm}/i18n/et.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/fr.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/hr.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/hu.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/id.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/it.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/ko.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/lt.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/nl.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/nl_BE.po   | 0
 addons/{board_crm_configuration => board_crm}/i18n/pl.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/pt.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/pt_BR.po   | 0
 addons/{board_crm_configuration => board_crm}/i18n/ro.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/ru.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/sk.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/sl.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/sq.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/sv.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/tlh.po     | 0
 addons/{board_crm_configuration => board_crm}/i18n/tr.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/uk.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/vi.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/zh_CN.po   | 0
 addons/{board_crm_configuration => board_crm}/i18n/zh_TW.po   | 0
 addons/crm/report/crm_opportunity_report.py                   | 3 ++-
 41 files changed, 6 insertions(+), 7 deletions(-)
 rename addons/{board_crm_configuration => board_crm}/__init__.py (100%)
 rename addons/{board_crm_configuration => board_crm}/__terp__.py (95%)
 rename addons/{board_crm_configuration => board_crm}/board_crm_demo.xml (100%)
 rename addons/{board_crm_configuration => board_crm}/board_crm_statistical_view.xml (96%)
 rename addons/{board_crm_configuration => board_crm}/board_crm_view.xml (98%)
 rename addons/{board_crm_configuration => board_crm}/i18n/ar.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/bg.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/board_crm_configuration.pot (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/bs.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/ca.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/cs.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/de.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/el.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/es.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/es_AR.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/et.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/fr.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/hr.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/hu.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/id.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/it.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/ko.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/lt.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/nl.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/nl_BE.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/pl.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/pt.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/pt_BR.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/ro.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/ru.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/sk.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/sl.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/sq.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/sv.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/tlh.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/tr.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/uk.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/vi.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/zh_CN.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/zh_TW.po (100%)

diff --git a/addons/board_crm_configuration/__init__.py b/addons/board_crm/__init__.py
similarity index 100%
rename from addons/board_crm_configuration/__init__.py
rename to addons/board_crm/__init__.py
diff --git a/addons/board_crm_configuration/__terp__.py b/addons/board_crm/__terp__.py
similarity index 95%
rename from addons/board_crm_configuration/__terp__.py
rename to addons/board_crm/__terp__.py
index 09bd6e25bc1..1742a491009 100644
--- a/addons/board_crm_configuration/__terp__.py
+++ b/addons/board_crm/__terp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Dashboard for CRM Configuration',
+    'name': 'Dashboard for CRM',
     'version': '1.0',
     'category': 'Board/CRM',
     'description': """
@@ -31,7 +31,7 @@ This module implements a dashboard for CRM that includes:
     * My Meetings (list)
     * Sales Pipeline by Stage (graph)
     * My Cases (list)
-    * Jobs Tracking (graph)
+    * Leads of the month by user (list)
     """,
     'author': 'Tiny',
     'depends': ['board', 'crm'],
diff --git a/addons/board_crm_configuration/board_crm_demo.xml b/addons/board_crm/board_crm_demo.xml
similarity index 100%
rename from addons/board_crm_configuration/board_crm_demo.xml
rename to addons/board_crm/board_crm_demo.xml
diff --git a/addons/board_crm_configuration/board_crm_statistical_view.xml b/addons/board_crm/board_crm_statistical_view.xml
similarity index 96%
rename from addons/board_crm_configuration/board_crm_statistical_view.xml
rename to addons/board_crm/board_crm_statistical_view.xml
index d6dd5b6d65b..9d738721821 100644
--- a/addons/board_crm_configuration/board_crm_statistical_view.xml
+++ b/addons/board_crm/board_crm_statistical_view.xml
@@ -12,7 +12,6 @@
                 <graph string="Leads By Stage" type="pie">
                     <field name="stage_id"/>
                     <field name="nbr" operator="+"/>
-                    <field name="state" group="True"/>
                 </graph>
             </field>
         </record>
@@ -25,7 +24,6 @@
                 <graph string="Opportunities" type="bar" orientation="horizontal">
                     <field name="categ_id"/>
                     <field name="nbr" operator="+"/>
-                    <field name="state" group="True"/>
                 </graph>
             </field>
         </record>
@@ -100,7 +98,7 @@
 
 		<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
         <menuitem
-            name="CRM Configuration" parent="base.dashboard"
+            name="CRM" parent="base.dashboard"
             id="menu_board_crm_config"
             groups="crm.group_crm_manager"/>
         <menuitem
diff --git a/addons/board_crm_configuration/board_crm_view.xml b/addons/board_crm/board_crm_view.xml
similarity index 98%
rename from addons/board_crm_configuration/board_crm_view.xml
rename to addons/board_crm/board_crm_view.xml
index b111aabc2b2..8905f9d8530 100644
--- a/addons/board_crm_configuration/board_crm_view.xml
+++ b/addons/board_crm/board_crm_view.xml
@@ -2,7 +2,7 @@
 <openerp>
 	<data>
 		<record model="board.note.type" id="note_crm_type">
-			<field name="name">CRM Configuration</field>
+			<field name="name">CRM</field>
 		</record>
 		
 		<record model="ir.ui.view" id="view_crm_opportunity_user_graph1">
diff --git a/addons/board_crm_configuration/i18n/ar.po b/addons/board_crm/i18n/ar.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/ar.po
rename to addons/board_crm/i18n/ar.po
diff --git a/addons/board_crm_configuration/i18n/bg.po b/addons/board_crm/i18n/bg.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/bg.po
rename to addons/board_crm/i18n/bg.po
diff --git a/addons/board_crm_configuration/i18n/board_crm_configuration.pot b/addons/board_crm/i18n/board_crm_configuration.pot
similarity index 100%
rename from addons/board_crm_configuration/i18n/board_crm_configuration.pot
rename to addons/board_crm/i18n/board_crm_configuration.pot
diff --git a/addons/board_crm_configuration/i18n/bs.po b/addons/board_crm/i18n/bs.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/bs.po
rename to addons/board_crm/i18n/bs.po
diff --git a/addons/board_crm_configuration/i18n/ca.po b/addons/board_crm/i18n/ca.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/ca.po
rename to addons/board_crm/i18n/ca.po
diff --git a/addons/board_crm_configuration/i18n/cs.po b/addons/board_crm/i18n/cs.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/cs.po
rename to addons/board_crm/i18n/cs.po
diff --git a/addons/board_crm_configuration/i18n/de.po b/addons/board_crm/i18n/de.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/de.po
rename to addons/board_crm/i18n/de.po
diff --git a/addons/board_crm_configuration/i18n/el.po b/addons/board_crm/i18n/el.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/el.po
rename to addons/board_crm/i18n/el.po
diff --git a/addons/board_crm_configuration/i18n/es.po b/addons/board_crm/i18n/es.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/es.po
rename to addons/board_crm/i18n/es.po
diff --git a/addons/board_crm_configuration/i18n/es_AR.po b/addons/board_crm/i18n/es_AR.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/es_AR.po
rename to addons/board_crm/i18n/es_AR.po
diff --git a/addons/board_crm_configuration/i18n/et.po b/addons/board_crm/i18n/et.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/et.po
rename to addons/board_crm/i18n/et.po
diff --git a/addons/board_crm_configuration/i18n/fr.po b/addons/board_crm/i18n/fr.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/fr.po
rename to addons/board_crm/i18n/fr.po
diff --git a/addons/board_crm_configuration/i18n/hr.po b/addons/board_crm/i18n/hr.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/hr.po
rename to addons/board_crm/i18n/hr.po
diff --git a/addons/board_crm_configuration/i18n/hu.po b/addons/board_crm/i18n/hu.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/hu.po
rename to addons/board_crm/i18n/hu.po
diff --git a/addons/board_crm_configuration/i18n/id.po b/addons/board_crm/i18n/id.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/id.po
rename to addons/board_crm/i18n/id.po
diff --git a/addons/board_crm_configuration/i18n/it.po b/addons/board_crm/i18n/it.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/it.po
rename to addons/board_crm/i18n/it.po
diff --git a/addons/board_crm_configuration/i18n/ko.po b/addons/board_crm/i18n/ko.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/ko.po
rename to addons/board_crm/i18n/ko.po
diff --git a/addons/board_crm_configuration/i18n/lt.po b/addons/board_crm/i18n/lt.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/lt.po
rename to addons/board_crm/i18n/lt.po
diff --git a/addons/board_crm_configuration/i18n/nl.po b/addons/board_crm/i18n/nl.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/nl.po
rename to addons/board_crm/i18n/nl.po
diff --git a/addons/board_crm_configuration/i18n/nl_BE.po b/addons/board_crm/i18n/nl_BE.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/nl_BE.po
rename to addons/board_crm/i18n/nl_BE.po
diff --git a/addons/board_crm_configuration/i18n/pl.po b/addons/board_crm/i18n/pl.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/pl.po
rename to addons/board_crm/i18n/pl.po
diff --git a/addons/board_crm_configuration/i18n/pt.po b/addons/board_crm/i18n/pt.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/pt.po
rename to addons/board_crm/i18n/pt.po
diff --git a/addons/board_crm_configuration/i18n/pt_BR.po b/addons/board_crm/i18n/pt_BR.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/pt_BR.po
rename to addons/board_crm/i18n/pt_BR.po
diff --git a/addons/board_crm_configuration/i18n/ro.po b/addons/board_crm/i18n/ro.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/ro.po
rename to addons/board_crm/i18n/ro.po
diff --git a/addons/board_crm_configuration/i18n/ru.po b/addons/board_crm/i18n/ru.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/ru.po
rename to addons/board_crm/i18n/ru.po
diff --git a/addons/board_crm_configuration/i18n/sk.po b/addons/board_crm/i18n/sk.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/sk.po
rename to addons/board_crm/i18n/sk.po
diff --git a/addons/board_crm_configuration/i18n/sl.po b/addons/board_crm/i18n/sl.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/sl.po
rename to addons/board_crm/i18n/sl.po
diff --git a/addons/board_crm_configuration/i18n/sq.po b/addons/board_crm/i18n/sq.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/sq.po
rename to addons/board_crm/i18n/sq.po
diff --git a/addons/board_crm_configuration/i18n/sv.po b/addons/board_crm/i18n/sv.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/sv.po
rename to addons/board_crm/i18n/sv.po
diff --git a/addons/board_crm_configuration/i18n/tlh.po b/addons/board_crm/i18n/tlh.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/tlh.po
rename to addons/board_crm/i18n/tlh.po
diff --git a/addons/board_crm_configuration/i18n/tr.po b/addons/board_crm/i18n/tr.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/tr.po
rename to addons/board_crm/i18n/tr.po
diff --git a/addons/board_crm_configuration/i18n/uk.po b/addons/board_crm/i18n/uk.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/uk.po
rename to addons/board_crm/i18n/uk.po
diff --git a/addons/board_crm_configuration/i18n/vi.po b/addons/board_crm/i18n/vi.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/vi.po
rename to addons/board_crm/i18n/vi.po
diff --git a/addons/board_crm_configuration/i18n/zh_CN.po b/addons/board_crm/i18n/zh_CN.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/zh_CN.po
rename to addons/board_crm/i18n/zh_CN.po
diff --git a/addons/board_crm_configuration/i18n/zh_TW.po b/addons/board_crm/i18n/zh_TW.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/zh_TW.po
rename to addons/board_crm/i18n/zh_TW.po
diff --git a/addons/crm/report/crm_opportunity_report.py b/addons/crm/report/crm_opportunity_report.py
index 5aa2a91e555..d6d3fb8a95b 100644
--- a/addons/crm/report/crm_opportunity_report.py
+++ b/addons/crm/report/crm_opportunity_report.py
@@ -14,7 +14,8 @@ class crm_opportunity_report(osv.osv):
         'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]", readonly=True),
         'stage_id':fields.many2one('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]", readonly=True),
         'partner_id': fields.many2one('res.partner', 'Partner',readonly=True),  
-        'company_id': fields.many2one('res.company', 'Company',readonly=True),  
+        'company_id': fields.many2one('res.company', 'Company',readonly=True),
+        'user_id':fields.many2one('res.users', 'User', readonly=True),  
     }
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'crm_opportunity_report')

From c5ec09bce6d31b3212351b4a933c211bee0e1d40 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 9 Mar 2010 17:00:37 +0530
Subject: [PATCH 049/251] [Add] crm: add the osv_memeory wizard of
 phonecall2partner

bzr revid: sbh@tinyerp.com-20100309113037-nvkzrjny7b69xd53
---
 addons/crm/__terp__.py                       |   2 +-
 addons/crm/crm_phonecall_view.xml            |   2 +-
 addons/crm/wizard/phonecall2partner.py       | 134 +++++++++++++++++++
 addons/crm/wizard/phonecall2partner_view.xml |  67 ++++++++++
 4 files changed, 203 insertions(+), 2 deletions(-)
 create mode 100644 addons/crm/wizard/phonecall2partner.py
 create mode 100644 addons/crm/wizard/phonecall2partner_view.xml

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 88a01d3285b..d0c954248d0 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -64,7 +64,7 @@ between mails and Open ERP.""",
         'wizard/crm_phonecall2phonecall.xml',
         'wizard/lead_to_partner_view.xml',
         'wizard/phonecall2meeting.xml',
-      #  'wizard/phonecall2partner_view.xml',
+        'wizard/phonecall2partner_view.xml',
         'wizard/phonecall2opportunity.xml',
         'crm_wizard.xml', 
         'crm_view.xml',
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 38d2b6149e9..416e0802b92 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -97,7 +97,7 @@
                     <field name="partner_id" />
                     <button string="Create a Partner"
                         icon="terp-crm"
-                        name="%(wizard_crm_phonecall_partner_create)d"
+                        name="%(action_crm_phonecall2partner)d"
                         type="action"
                         attrs="{'invisible':[('partner_id','!=',False)]}" />
                     <newline/>
diff --git a/addons/crm/wizard/phonecall2partner.py b/addons/crm/wizard/phonecall2partner.py
new file mode 100644
index 00000000000..7616a52b53d
--- /dev/null
+++ b/addons/crm/wizard/phonecall2partner.py
@@ -0,0 +1,134 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from mx.DateTime import now
+
+from osv import osv, fields
+import netsvc
+import ir
+import pooler
+from tools.translate import _
+
+class crm_phonecall2partner(osv.osv_memory):
+    _name = 'crm.phonecall2partner'
+    _description = 'Phone Call to Partner'
+    
+    _columns = {
+        'action': fields.selection([('exist','Link to an existing partner'),('create','Create a new partner')],'Action',required=True),
+        'partner_id': fields.many2one('res.partner','Partner'), 
+    }
+    _defaults = {
+        'action': lambda *a:'exist',
+    }
+    
+    def create_partner(self, cr, uid, ids, context):
+        view_obj = self.pool.get('ir.ui.view')
+        view_id = view_obj.search(cr,uid,[('model','=','crm.phonecall2partner'),('name','=','crm.phonecall2partner.view')])
+        return {
+            'view_mode': 'form',
+            'view_type': 'form',
+            'view_id': view_id or False,
+            'res_model': 'crm.phonecall2partner',
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+        }
+        
+    def selectPartner(self, cr, uid, ids, context):
+        case_obj = self.pool.get('crm.phonecall')
+        partner_obj = self.pool.get('res.partner')
+        contact_obj = self.pool.get('res.partner.address')
+        rec_ids = context and context.get('record_ids',False)
+        value={}
+        for case in case_obj.browse(cr, uid, rec_ids):
+            if case.partner_id:
+                raise wizard.except_wizard(_('Warning !'),
+                    _('A partner is already defined on this lead.'))
+           
+            partner_ids = partner_obj.search(cr, uid, [('name', '=', case.partner_contact or case.name)])            
+            if not partner_ids and case.email_from:
+                address_ids = contact_obj.search(cr, uid, [('email', '=', case.email_from)])
+                if address_ids:
+                    addresses = contact_obj.browse(cr, uid, address_ids)
+                    partner_ids = addresses and [addresses[0].partner_id.id] or False
+
+            partner_id = partner_ids and partner_ids[0] or False
+        if not partner_id:
+            value = self._make_partner(cr, uid, ids, context)           
+        return value 
+
+    def _create_partner(self, cr, uid, ids, context):
+        case_obj = self.pool.get('crm.phonecall')
+        partner_obj = self.pool.get('res.partner')
+        contact_obj = self.pool.get('res.partner.address')
+        datas = self.browse(cr, uid, ids)[0]
+        partner_ids = []
+        partner_id = False
+        contact_id = False
+        rec_ids = context and context.get('record_ids',False)
+        for case in case_obj.browse(cr, uid, rec_ids):
+            if datas.action == 'create':
+                partner_id = partner_obj.create(cr, uid, {
+                    'name': case.partner_contact or case.name,
+                    'user_id': case.user_id.id,
+                    'comment': case.description,
+                })
+                contact_id = contact_obj.create(cr, uid, {
+                    'partner_id': partner_id,
+                    'name': case.name,
+                    'phone': case.partner_phone,
+                    'mobile': case.partner_mobile,
+                    'email': case.email_from
+                })
+
+            else:
+                if datas.partner_id:
+                    partner = partner_obj.browse(cr,uid,datas.partner_id.id)
+                    partner_id = partner.id
+                    contact_id = partner.address and partner.address[0].id
+
+            partner_ids.append(partner_id)
+            vals = {}
+            if partner_id:
+                vals.update({'partner_id': partner_id})
+            if contact_id:
+                vals.update({'partner_address_id': contact_id})
+            case_obj.write(cr, uid, [case.id], vals)   
+        return partner_ids
+
+    def _make_partner(self, cr, uid, ids, context): 
+        partner_ids = self._create_partner(cr, uid, ids, context)
+        mod_obj = self.pool.get('ir.model.data') 
+        result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
+        res = mod_obj.read(cr, uid, result, ['res_id'])
+        value = {
+            'domain': "[]",
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': 'res.partner',
+            'res_id': partner_ids and int(partner_ids[0]) or False,
+            'view_id': False,
+            'type': 'ir.actions.act_window',
+            'search_view_id': res['res_id'] 
+        }
+        return value
+    
+crm_phonecall2partner()
+
diff --git a/addons/crm/wizard/phonecall2partner_view.xml b/addons/crm/wizard/phonecall2partner_view.xml
new file mode 100644
index 00000000000..cad1e421406
--- /dev/null
+++ b/addons/crm/wizard/phonecall2partner_view.xml
@@ -0,0 +1,67 @@
+<openerp>
+  	<data>
+  		<record id="view_crm_phonecall2partner_create" model="ir.ui.view">
+	      <field name="name">crm.phonecall2partner.view.create</field>
+	      <field name="model">crm.phonecall2partner</field>
+	      <field name="type">form</field>
+	      <field name="arch" type="xml">
+	      	<form string="Create a Partner">
+	      		<label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
+        		<label string="You may have to verify that this partner does not exist already." colspan="4"/>
+	      		<group col="4" colspan="4">
+	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	      			<button name="create_partner" string="Create Partner" type="object" icon="gtk-ok"/>
+	      		</group>
+	      	</form>
+	      </field>
+	   </record>
+	   <record id="action_crm_phonecall2partner_create" model="ir.actions.act_window">
+	      <field name="name">Create a Partner</field>
+	      <field name="type">ir.actions.act_window</field>
+	      <field name="res_model">crm.phonecall2partner</field>
+	      <field name="view_id" ref="view_crm_lead2partner_create"/>
+	      <field name="view_type">form</field>
+	      <field name="view_mode">form</field>
+	      <field name="target">new</field>
+	      <field name="context">{'record_ids' : active_ids}</field>
+	   </record>
+	   
+	   <record model="ir.values" id="values_crm_phonecall2partner_create">
+            <field name="model_id" ref="crm.model_crm_lead" />
+            <field name="object" eval="1" />
+            <field name="name">Create Partner</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_crm_phonecall2partner_create'))" />
+            <field name="key">action</field>
+            <field name="model">crm.phonecall</field>
+        </record>
+	   
+	   <record id="view_crm_phonecall2partner" model="ir.ui.view">
+	      <field name="name">crm.phonecall2partner.view</field>
+	      <field name="model">crm.phonecall2partner</field>
+	      <field name="type">form</field>
+	      <field name="arch" type="xml">
+	      	<form string="Create a Partner">
+	      		<field name="action"/>
+	      		<group attrs="{'invisible':[('action','!=','exist')]}">
+		            <field name="partner_id"/>
+		        </group>
+	      		<group col="4" colspan="4">
+	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	      			<button name="selectPartner" string="Continue" type="object" icon="gtk-ok"/>
+	      		</group>
+	      	</form>
+	      </field>
+	   </record>
+	   <record id="action_crm_phonecall2partner" model="ir.actions.act_window">
+	      <field name="name">Create a Partner</field>
+	      <field name="type">ir.actions.act_window</field>
+	      <field name="res_model">crm.phonecall2partner</field>
+	      <field name="view_id" ref="view_crm_phonecall2partner"/>
+	      <field name="view_type">form</field>
+	      <field name="view_mode">form</field>
+	      <field name="target">new</field>
+	      <field name="context">{'record_ids' : active_ids}</field>
+	   </record>
+ 	</data>
+</openerp>

From d4ac06e0c7a979fdb8f390a5807ffbea439c6a46 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Tue, 9 Mar 2010 17:30:43 +0530
Subject: [PATCH 050/251] [IMP] product_margin:Changes in wizard by converting
 them into OSV memory

bzr revid: mso@mso-20100309120043-kadkz0b2xdo47c3k
---
 addons/product_margin/__init__.py             |  1 -
 addons/product_margin/__terp__.py             |  2 +-
 addons/product_margin/product_margin_view.xml | 16 ++-
 addons/product_margin/wizard/__init__.py      |  2 +-
 .../product_margin/wizard/product_margin.py   | 98 +++++++++++++++++++
 .../wizard/product_margin_view.xml            | 31 ++++++
 .../wizard/wizard_product_margin.py           | 93 ------------------
 addons/purchase/purchase_view.xml             |  1 +
 8 files changed, 139 insertions(+), 105 deletions(-)
 create mode 100644 addons/product_margin/wizard/product_margin.py
 create mode 100644 addons/product_margin/wizard/product_margin_view.xml
 delete mode 100644 addons/product_margin/wizard/wizard_product_margin.py

diff --git a/addons/product_margin/__init__.py b/addons/product_margin/__init__.py
index 4edd4f91e3e..77821bbc692 100644
--- a/addons/product_margin/__init__.py
+++ b/addons/product_margin/__init__.py
@@ -18,7 +18,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
-
 import wizard
 import product_margin
 
diff --git a/addons/product_margin/__terp__.py b/addons/product_margin/__terp__.py
index b0e81f341a7..9272287371a 100644
--- a/addons/product_margin/__terp__.py
+++ b/addons/product_margin/__terp__.py
@@ -31,7 +31,7 @@ the report has several options to help you get the data you need.
 """,
     'author': 'Tiny',
     'depends': ['base', 'product', 'account'],
-    'update_xml': ['product_margin_view.xml'],
+    'update_xml': ['wizard/product_margin_view.xml','product_margin_view.xml'],
     'demo_xml': [],
     'installable': True,
     'active': False,
diff --git a/addons/product_margin/product_margin_view.xml b/addons/product_margin/product_margin_view.xml
index 03dfbdf2280..91ab522d62a 100644
--- a/addons/product_margin/product_margin_view.xml
+++ b/addons/product_margin/product_margin_view.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
-
-    <wizard id="action_open_margin" menu="False" model="product.product" name="product.margins" string="Product Margins"/>
-
-<!--    <menuitem id="menu_product_reporting"-->
-<!--        name="Reporting" parent ="product.menu_main_product"-->
-<!--        groups="product.group_product_manager"/>-->
-<!---->
-<!--    <menuitem icon="STOCK_JUSTIFY_FILL" action="action_open_margin" id="menu_action_product_margin" type="wizard" sequence="5" parent="menu_product_reporting" />-->
-
+	
+	<menuitem id="main" name="OSV Memory Wizard Test"/>
+	<menuitem
+            action="product_margin_action"
+            id="menu_mrp_property_action"
+            parent="main" />
+            
     <record model="ir.ui.view" id="view_product_margin_graph">
             <field name="name">product.margin.graph</field>
             <field name="model">product.product</field>
diff --git a/addons/product_margin/wizard/__init__.py b/addons/product_margin/wizard/__init__.py
index 4e2ecc2e39a..e1f1680bccb 100644
--- a/addons/product_margin/wizard/__init__.py
+++ b/addons/product_margin/wizard/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import wizard_product_margin
+import product_margin
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/product_margin/wizard/product_margin.py b/addons/product_margin/wizard/product_margin.py
new file mode 100644
index 00000000000..4e499eba2a5
--- /dev/null
+++ b/addons/product_margin/wizard/product_margin.py
@@ -0,0 +1,98 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+from osv import osv
+from osv import fields
+
+import netsvc
+import time
+from tools.translate import _
+class product_margin(osv.osv_memory):
+    '''
+    Product Margin
+    '''
+    _name = 'product.margin'
+    _description = 'Product Margin'
+
+    def _action_open_window(self, cr, uid, ids, context):
+        """
+            @summary:
+
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: the account  ID or list of IDs if we want more than one
+
+            @return:
+        """
+        mod_obj = self.pool.get('ir.model.data')
+        result = mod_obj._get_id(cr, uid, 'product', 'product_search_form_view')
+        id = mod_obj.read(cr, uid, result, ['res_id'])
+        cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('product.margin.graph', 'graph'))
+        view_res3 = cr.fetchone()[0]
+        cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('product.margin.form.inherit', 'form'))
+        view_res2 = cr.fetchone()[0]
+        cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('product.margin.tree', 'tree'))
+        view_res = cr.fetchone()[0]
+
+        #get the current product.margin object to obtain the values from it
+        product_margin_obj = self.browse(cr,uid,ids)[0]
+
+        return {
+            'name': _('Product Margins'),
+            'context':{'date_from':product_margin_obj.from_date,'date_to':product_margin_obj.to_date,'invoice_state' : product_margin_obj.invoice_state},
+            'view_type': 'form',
+            "view_mode": 'tree,form,graph',
+            'res_model':'product.product',
+            'type': 'ir.actions.act_window',
+            'views': [(view_res,'tree'), (view_res2,'form'), (view_res3,'graph')],
+            'view_id': False,
+            'search_view_id': id['res_id']
+        }
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        """
+            @summary:
+
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: the account  ID or list of IDs if we want more than one
+
+            @return:
+        """
+        return {'type':'ir.actions.act_window_close'}
+
+    _columns = {
+        #TODO : import time required to get currect date
+        'from_date': fields.date('From'),
+        #TODO : import time required to get currect date
+        'to_date': fields.date('To'),
+        'invoice_state':fields.selection([
+           ('paid','Paid'),
+           ('open_paid','Open and Paid'),
+           ('draft_open_paid','Draft, Open and Paid'),
+        ],'Invoice State', select=True, required=True),
+    }
+    _defaults = {
+        'from_date':  lambda *a:time.strftime('%Y-01-01'),
+        'to_date': lambda *a:time.strftime('%Y-01-01'),
+        'invoice_state': lambda *a:"open_paid",
+    }
+product_margin()
\ No newline at end of file
diff --git a/addons/product_margin/wizard/product_margin_view.xml b/addons/product_margin/wizard/product_margin_view.xml
new file mode 100644
index 00000000000..1d2a4746896
--- /dev/null
+++ b/addons/product_margin/wizard/product_margin_view.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+        <data>
+	     	<record id="product_margin_form_view" model="ir.ui.view">
+	            <field name="name">product.margin.form</field>
+	            <field name="model">product.margin</field>
+	            <field name="type">form</field>
+	            <field name="arch" type="xml">
+	                <form string="Properties categories">
+	                    <separator colspan="4" string="General Information"/>
+						<field name="from_date" />
+						<field name="to_date" />
+						<field name="invoice_state" />
+						<group col="4" colspan="2">
+						    	<button special="cancel" string="Cancel" type="object"/>
+						    	<button name="_action_open_window" string="Open Margins" type="object"/>
+						</group>
+	                </form>
+	            </field>
+	        </record>
+	        <record id="product_margin_action" model="ir.actions.act_window">
+	            <field name="name">Product Margine</field>
+	            <field name="type">ir.actions.act_window</field>
+	            <field name="target">new</field>
+	            <field name="res_model">product.margin</field>
+	            <field name="view_type">form</field>
+	            <field name="view_mode">form</field>
+	            <field name="view_id" ref="product_margin_form_view"/>
+	        </record>
+        </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/product_margin/wizard/wizard_product_margin.py b/addons/product_margin/wizard/wizard_product_margin.py
deleted file mode 100644
index 625cfd4c1df..00000000000
--- a/addons/product_margin/wizard/wizard_product_margin.py
+++ /dev/null
@@ -1,93 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import pooler
-import time
-
-from tools.translate import _
-
-def _action_open_window(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname) 
-    mod_obj = pool.get('ir.model.data') 
-    result = mod_obj._get_id(cr, uid, 'product', 'product_search_form_view')
-    id = mod_obj.read(cr, uid, result, ['res_id'])    
-    cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('product.margin.graph', 'graph'))
-    view_res3 = cr.fetchone()[0]
-    cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('product.margin.form.inherit', 'form'))
-    view_res2 = cr.fetchone()[0]
-    cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('product.margin.tree', 'tree'))
-    view_res = cr.fetchone()[0]
-    return {
-        'name': _('Product Margins'),
-        'context':{'date_from':data['form']['from_date'],'date_to':data['form']['to_date'],'invoice_state' : data['form']['invoice_state']},
-        'view_type': 'form',
-        "view_mode": 'tree,form,graph',
-        'res_model':'product.product',
-        'type': 'ir.actions.act_window',
-        'views': [(view_res,'tree'), (view_res2,'form'), (view_res3,'graph')],
-        'view_id': False,
-        'search_view_id': id['res_id'] 
-    }
-
-
-class product_margins(wizard.interface):
-    form1 = '''<?xml version="1.0"?>
-    <form string="View Stock of Products">
-        <separator string="Select " colspan="4"/>
-        <field name="from_date"/>
-        <field name="to_date"/>
-        <field name="invoice_state"/>
-    </form>'''
-    form1_fields = {
-             'from_date': {
-                'string': 'From',
-                'type': 'date',
-                'default': lambda *a:time.strftime('%Y-01-01'),
-
-        },
-             'to_date': {
-                'string': 'To',
-                'type': 'date',
-                'default': lambda *a:time.strftime('%Y-12-31'),
-
-        },
-         'invoice_state': {
-                'string': 'Invoice State',
-                'type': 'selection',
-                'selection': [('paid','Paid'),('open_paid','Open and Paid'),('draft_open_paid','Draft, Open and Paid'),],
-                'required': True,
-                'default': lambda *a:"open_paid",
-        },
-    }
-
-    states = {
-      'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':form1, 'fields':form1_fields, 'state': [('end', 'Cancel','gtk-cancel'),('open', 'Open Margins','gtk-ok')]}
-        },
-    'open': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _action_open_window, 'state':'end'}
-        }
-    }
-product_margins('product.margins')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index b8be61e1665..25e6048dd6e 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
         <!--<menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchase Management"
             groups="group_purchase_user"/>-->
        <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Procurement Management"

From d99f306b54f808fb0c50878cde1b072a5f350075 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 9 Mar 2010 17:40:57 +0530
Subject: [PATCH 051/251] [Add] crm: add the osv_memory wizard of
 opportunity2partner and fix the waring to all wizard

bzr revid: sbh@tinyerp.com-20100309121057-s6k80t13rb3t98tf
---
 addons/crm/__terp__.py                        |   1 +
 addons/crm/crm_opportunity_view.xml           |   9 +-
 addons/crm/wizard/__init__.py                 |   1 +
 addons/crm/wizard/lead_to_partner.py          |   2 +-
 addons/crm/wizard/opportunity2partner.py      | 133 ++++++++++++++++++
 .../crm/wizard/opportunity2partner_view.xml   |  67 +++++++++
 addons/crm/wizard/phonecall2partner.py        |   2 +-
 7 files changed, 211 insertions(+), 4 deletions(-)
 create mode 100644 addons/crm/wizard/opportunity2partner.py
 create mode 100644 addons/crm/wizard/opportunity2partner_view.xml

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index d0c954248d0..10b9cb4f5e7 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -66,6 +66,7 @@ between mails and Open ERP.""",
         'wizard/phonecall2meeting.xml',
         'wizard/phonecall2partner_view.xml',
         'wizard/phonecall2opportunity.xml',
+        'wizard/opportunity2partner_view.xml',
         'crm_wizard.xml', 
         'crm_view.xml',
          
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 9b6e3739dce..26ac48eefaf 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -72,9 +72,14 @@
                 </group>
                 <notebook colspan="4">
                 <page string="Opportunity">
-                    <group col="2" colspan="2">
-                        <separator colspan="2" string="Contacts"/>
+                    <group col="3" colspan="2">
+                        <separator colspan="3" string="Contacts"/>
                         <field name="partner_id" select="1" on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
+						<button string="Create a Partner"
+                        icon="terp-crm"
+                        name="%(action_crm_opportunity2partner)d"
+                        type="action"
+                        attrs="{'invisible':[('partner_id','!=',False)]}" />
                         <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
                         <field name="email_from" string="Email"/>
                         <field name="phone"/>
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index d9c1f6b32e9..67c86085467 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -32,6 +32,7 @@ import lead_to_partner
 import phonecall2partner
 import phonecall2meeting
 import phonecall_to_opportunity
+import opportunity2partner
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm/wizard/lead_to_partner.py b/addons/crm/wizard/lead_to_partner.py
index bafb885ba98..4d1a3d5468e 100644
--- a/addons/crm/wizard/lead_to_partner.py
+++ b/addons/crm/wizard/lead_to_partner.py
@@ -59,7 +59,7 @@ class crm_lead2partner(osv.osv_memory):
         value={}
         for case in case_obj.browse(cr, uid, rec_ids):
             if case.partner_id:
-                raise wizard.except_wizard(_('Warning !'),
+                 raise osv.except_osv(_('Warning !'),
                     _('A partner is already defined on this lead.'))
            
             partner_ids = partner_obj.search(cr, uid, [('name', '=', case.partner_name or case.name)])            
diff --git a/addons/crm/wizard/opportunity2partner.py b/addons/crm/wizard/opportunity2partner.py
new file mode 100644
index 00000000000..308898f71ad
--- /dev/null
+++ b/addons/crm/wizard/opportunity2partner.py
@@ -0,0 +1,133 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from mx.DateTime import now
+
+from osv import osv, fields
+import netsvc
+import ir
+import pooler
+from tools.translate import _
+
+class crm_opportunity2partner(osv.osv_memory):
+    _name = 'crm.opportunity2partner'
+    _description = 'Phone Call to Partner'
+    
+    _columns = {
+        'action': fields.selection([('exist','Link to an existing partner'),('create','Create a new partner')],'Action',required=True),
+        'partner_id': fields.many2one('res.partner','Partner'), 
+    }
+    _defaults = {
+        'action': lambda *a:'exist',
+    }
+    
+    def create_partner(self, cr, uid, ids, context):
+        view_obj = self.pool.get('ir.ui.view')
+        view_id = view_obj.search(cr,uid,[('model','=','crm.opportunity2partner'),('name','=','crm.opportunity2partner.view')])
+        return {
+            'view_mode': 'form',
+            'view_type': 'form',
+            'view_id': view_id or False,
+            'res_model': 'crm.opportunity2partner',
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+        }
+        
+    def selectPartner(self, cr, uid, ids, context):
+        case_obj = self.pool.get('crm.opportunity')
+        partner_obj = self.pool.get('res.partner')
+        contact_obj = self.pool.get('res.partner.address')
+        rec_ids = context and context.get('record_ids',False)
+        value={}
+        for case in case_obj.browse(cr, uid, rec_ids):
+            if case.partner_id:
+                raise osv.except_osv(_('Warning !'),
+                    _('A partner is already defined on this lead.'))
+           
+            partner_ids = partner_obj.search(cr, uid, [('name', '=', case.name)])            
+            if not partner_ids and case.email_from:
+                address_ids = contact_obj.search(cr, uid, [('email', '=', case.email_from)])
+                if address_ids:
+                    addresses = contact_obj.browse(cr, uid, address_ids)
+                    partner_ids = addresses and [addresses[0].partner_id.id] or False
+
+            partner_id = partner_ids and partner_ids[0] or False
+        if not partner_id:
+            value = self._make_partner(cr, uid, ids, context)           
+        return value 
+
+    def _create_partner(self, cr, uid, ids, context):
+        case_obj = self.pool.get('crm.opportunity')
+        partner_obj = self.pool.get('res.partner')
+        contact_obj = self.pool.get('res.partner.address')
+        datas = self.browse(cr, uid, ids)[0]
+        partner_ids = []
+        partner_id = False
+        contact_id = False
+        rec_ids = context and context.get('record_ids',False)
+        for case in case_obj.browse(cr, uid, rec_ids):
+            if datas.action == 'create':
+                partner_id = partner_obj.create(cr, uid, {
+                    'name':  case.name,
+                    'user_id': case.user_id.id,
+                    'comment': case.description,
+                })
+                contact_id = contact_obj.create(cr, uid, {
+                    'partner_id': partner_id,
+                    'name': case.name,
+                    'phone': case.phone,
+                    'email': case.email_from
+                })
+
+            else:
+                if datas.partner_id:
+                    partner = partner_obj.browse(cr,uid,datas.partner_id.id)
+                    partner_id = partner.id
+                    contact_id = partner.address and partner.address[0].id
+
+            partner_ids.append(partner_id)
+            vals = {}
+            if partner_id:
+                vals.update({'partner_id': partner_id})
+            if contact_id:
+                vals.update({'partner_address_id': contact_id})
+            case_obj.write(cr, uid, [case.id], vals)   
+        return partner_ids
+
+    def _make_partner(self, cr, uid, ids, context): 
+        partner_ids = self._create_partner(cr, uid, ids, context)
+        mod_obj = self.pool.get('ir.model.data') 
+        result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
+        res = mod_obj.read(cr, uid, result, ['res_id'])
+        value = {
+            'domain': "[]",
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': 'res.partner',
+            'res_id': partner_ids and int(partner_ids[0]) or False,
+            'view_id': False,
+            'type': 'ir.actions.act_window',
+            'search_view_id': res['res_id'] 
+        }
+        return value
+    
+crm_opportunity2partner()
+
diff --git a/addons/crm/wizard/opportunity2partner_view.xml b/addons/crm/wizard/opportunity2partner_view.xml
new file mode 100644
index 00000000000..04401bed80d
--- /dev/null
+++ b/addons/crm/wizard/opportunity2partner_view.xml
@@ -0,0 +1,67 @@
+<openerp>
+  	<data>
+  		<record id="view_crm_opportunity2partner_create" model="ir.ui.view">
+	      <field name="name">crm.opportunity2partner.view.create</field>
+	      <field name="model">crm.opportunity2partner</field>
+	      <field name="type">form</field>
+	      <field name="arch" type="xml">
+	      	<form string="Create a Partner">
+	      		<label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
+        		<label string="You may have to verify that this partner does not exist already." colspan="4"/>
+	      		<group col="4" colspan="4">
+	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	      			<button name="create_partner" string="Create Partner" type="object" icon="gtk-ok"/>
+	      		</group>
+	      	</form>
+	      </field>
+	   </record>
+	   <record id="action_crm_opportunity2partner_create" model="ir.actions.act_window">
+	      <field name="name">Create a Partner</field>
+	      <field name="type">ir.actions.act_window</field>
+	      <field name="res_model">crm.opportunity2partner</field>
+	      <field name="view_id" ref="view_crm_lead2partner_create"/>
+	      <field name="view_type">form</field>
+	      <field name="view_mode">form</field>
+	      <field name="target">new</field>
+	      <field name="context">{'record_ids' : active_ids}</field>
+	   </record>
+	   
+	   <record model="ir.values" id="values_crm_phonecall2partner_create">
+            <field name="model_id" ref="crm.model_crm_opportunity" />
+            <field name="object" eval="1" />
+            <field name="name">Create Partner</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_crm_opportunity2partner_create'))" />
+            <field name="key">action</field>
+            <field name="model">crm.opportunity</field>
+        </record>
+	   
+	   <record id="view_crm_opportunity2partner" model="ir.ui.view">
+	      <field name="name">crm.opportunity2partner.view</field>
+	      <field name="model">crm.opportunity2partner</field>
+	      <field name="type">form</field>
+	      <field name="arch" type="xml">
+	      	<form string="Create a Partner">
+	      		<field name="action"/>
+	      		<group attrs="{'invisible':[('action','!=','exist')]}">
+		            <field name="partner_id"/>
+		        </group>
+	      		<group col="4" colspan="4">
+	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	      			<button name="selectPartner" string="Continue" type="object" icon="gtk-ok"/>
+	      		</group>
+	      	</form>
+	      </field>
+	   </record>
+	   <record id="action_crm_opportunity2partner" model="ir.actions.act_window">
+	      <field name="name">Create a Partner</field>
+	      <field name="type">ir.actions.act_window</field>
+	      <field name="res_model">crm.opportunity2partner</field>
+	      <field name="view_id" ref="view_crm_opportunity2partner"/>
+	      <field name="view_type">form</field>
+	      <field name="view_mode">form</field>
+	      <field name="target">new</field>
+	      <field name="context">{'record_ids' : active_ids}</field>
+	   </record>
+ 	</data>
+</openerp>
diff --git a/addons/crm/wizard/phonecall2partner.py b/addons/crm/wizard/phonecall2partner.py
index 7616a52b53d..295a46f57a4 100644
--- a/addons/crm/wizard/phonecall2partner.py
+++ b/addons/crm/wizard/phonecall2partner.py
@@ -59,7 +59,7 @@ class crm_phonecall2partner(osv.osv_memory):
         value={}
         for case in case_obj.browse(cr, uid, rec_ids):
             if case.partner_id:
-                raise wizard.except_wizard(_('Warning !'),
+                raise osv.except_osv(_('Warning !'),
                     _('A partner is already defined on this lead.'))
            
             partner_ids = partner_obj.search(cr, uid, [('name', '=', case.partner_contact or case.name)])            

From 090a3d75b2ff8b3c89d42779fa63d54f018ff98f Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Tue, 9 Mar 2010 17:48:30 +0530
Subject: [PATCH 052/251] [FIX] mrp: Changed order of execution of xml files in
 __terp__.py

bzr revid: uco@tinyerp.co.in-20100309121830-a8smd2j8ou1719uc
---
 addons/mrp/__terp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py
index d898380822d..4907cadbe7a 100644
--- a/addons/mrp/__terp__.py
+++ b/addons/mrp/__terp__.py
@@ -64,8 +64,8 @@
         'wizard/make_procurement_view.xml',
         'wizard/change_production_qty_view.xml',
         'wizard/orderpoint_procurement_view.xml',
-        'wizard/schedulers_all_view.xml',
         'mrp_view.xml',
+        'wizard/schedulers_all_view.xml',
         'mrp_wizard.xml',
         'mrp_report.xml',
         'company_view.xml',

From 42c1d6d634b72435029c8acd032ec1bb3138af7c Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 9 Mar 2010 17:59:38 +0530
Subject: [PATCH 053/251] [Add] crm: add the osv_memory wizard of
 opportunity2meeting

bzr revid: sbh@tinyerp.com-20100309122938-x9a2c1hpnj7llqz3
---
 addons/crm/__terp__.py                        |  1 +
 addons/crm/crm_opportunity_view.xml           |  2 +-
 addons/crm/wizard/__init__.py                 |  1 +
 addons/crm/wizard/opportunity2meeting.py      | 78 +++++++++++++++++++
 addons/crm/wizard/opportunity2meeting.xml     | 25 ++++++
 .../crm/wizard/opportunity2partner_view.xml   |  2 +-
 6 files changed, 107 insertions(+), 2 deletions(-)
 create mode 100644 addons/crm/wizard/opportunity2meeting.py
 create mode 100644 addons/crm/wizard/opportunity2meeting.xml

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 10b9cb4f5e7..3143972509a 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -67,6 +67,7 @@ between mails and Open ERP.""",
         'wizard/phonecall2partner_view.xml',
         'wizard/phonecall2opportunity.xml',
         'wizard/opportunity2partner_view.xml',
+        'wizard/opportunity2meeting.xml',
         'crm_wizard.xml', 
         'crm_view.xml',
          
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 26ac48eefaf..32d2a0ac5a9 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -63,7 +63,7 @@
                     </group>
                     <field name="user_id"/>
                     <button string="Schedule Meeting"
-                        name="%(wizard_crm_opportunity_meeting_set)d" icon="gtk-redo" type="action" />
+                        name="%(opportunity2meeting_act)d" icon="gtk-redo" type="action" />
                     <field name="planned_revenue"/>
                     <field name="probability"/>
                     <field name="date_deadline" string="Expected Closing"/>
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 67c86085467..017ffe5b744 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -33,6 +33,7 @@ import phonecall2partner
 import phonecall2meeting
 import phonecall_to_opportunity
 import opportunity2partner
+import opportunity2meeting
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm/wizard/opportunity2meeting.py b/addons/crm/wizard/opportunity2meeting.py
new file mode 100644
index 00000000000..52aee7bd331
--- /dev/null
+++ b/addons/crm/wizard/opportunity2meeting.py
@@ -0,0 +1,78 @@
+# -*- encoding: utf-8 -*-
+############################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2008-2009 AJM Technologies S.A. (<http://www.ajm.lu). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+############################################################################################
+############################################################################################
+
+from osv import osv, fields
+import netsvc
+import time
+import tools
+import mx.DateTime
+from tools import config
+from tools.translate import _
+import tools
+
+class crm_opportunity2meeting(osv.osv_memory):
+    _name = 'crm.opportunity2meeting'
+    _description = 'Opportunity To Meeting'
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        return {'type':'ir.actions.act_window_close'}
+
+    def _makeMeeting(self, cr, uid, ids, context=None):
+        this = self.browse(cr, uid, ids[0], context=context)
+        record_id = context and context.get('record_id', False) or False
+        if record_id:
+            opportunity_case_obj = self.pool.get('crm.opportunity')                
+            data_obj = self.pool.get('ir.model.data')
+            result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
+            id = data_obj.read(cr, uid, result, ['res_id'])
+            id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
+            id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
+            id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
+            if id1:
+                id1 = data_obj.browse(cr, uid, id1, context=context).res_id
+            if id2:
+                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+            if id3:
+                id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+            opportunity = opportunity_case_obj.browse(cr, uid, record_id, context=context)
+            partner_id = opportunity.partner_id and opportunity.partner_id.id or False
+            name = opportunity.name
+            email = opportunity.email_from
+            section_id = opportunity.section_id and opportunity.section_id.id or False        
+            return {            
+                'name': _('Meetings'),
+                'domain' : "[('user_id','=',%s)]"%(uid),  
+                'context': {'default_partner_id': partner_id, 'default_section_id': section_id, 'default_email_from': email, 'default_state':'open', 'default_name':name},
+                'view_type': 'form',
+                'view_mode': 'calendar,form,tree',
+                'res_model': 'crm.meeting',
+                'view_id': False,
+                'views': [(id1,'calendar'),(id2,'form'),(id3,'tree')],
+                'type': 'ir.actions.act_window',
+                'search_view_id': id['res_id']
+                }
+        else:
+            return {}
+                
+crm_opportunity2meeting()
\ No newline at end of file
diff --git a/addons/crm/wizard/opportunity2meeting.xml b/addons/crm/wizard/opportunity2meeting.xml
new file mode 100644
index 00000000000..39a36df4896
--- /dev/null
+++ b/addons/crm/wizard/opportunity2meeting.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="opportunity2meeting_view">
+            <field name="name">crm.opportunity2meeting.form</field>
+            <field name="model">crm.opportunity2meeting</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Convert To Meeting ">
+                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button name="_makeMeeting" type="object" string="_Apply" icon="gtk-apply" />
+                </form>
+            </field>
+        </record>
+        <record model="ir.actions.act_window" id="opportunity2meeting_act">
+            <field name="name">Convert To Meeting</field>
+            <field name="res_model">crm.opportunity2meeting</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="opportunity2meeting_view"/>
+            <field name="target">new</field>
+         	<field name="context">{'record_id' : active_id}</field>
+        </record>
+    </data>
+</openerp>   
\ No newline at end of file
diff --git a/addons/crm/wizard/opportunity2partner_view.xml b/addons/crm/wizard/opportunity2partner_view.xml
index 04401bed80d..8a3e6780b59 100644
--- a/addons/crm/wizard/opportunity2partner_view.xml
+++ b/addons/crm/wizard/opportunity2partner_view.xml
@@ -19,7 +19,7 @@
 	      <field name="name">Create a Partner</field>
 	      <field name="type">ir.actions.act_window</field>
 	      <field name="res_model">crm.opportunity2partner</field>
-	      <field name="view_id" ref="view_crm_lead2partner_create"/>
+	      <field name="view_id" ref="view_crm_opportunity2partner_create"/>
 	      <field name="view_type">form</field>
 	      <field name="view_mode">form</field>
 	      <field name="target">new</field>

From 077e6dd3331135e6523d4f6f63966d0a0d24b9b9 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Tue, 9 Mar 2010 18:37:56 +0530
Subject: [PATCH 054/251] [IMP] delivery: Converted 'Create Delivery' wizard
 into osv_memory wizard.

bzr revid: uco@tinyerp.co.in-20100309130756-l082icxmetgecqzu
---
 addons/delivery/__terp__.py                   |  1 +
 addons/delivery/delivery_wizard.xml           |  2 +-
 addons/delivery/wizard/__init__.py            |  2 +-
 addons/delivery/wizard/delivery_sale_order.py | 96 -------------------
 .../wizard/delivery_sale_order_view.xml       | 46 +++++++++
 .../wizard/delivery_sale_order_wizard.py      | 83 ++++++++++++++++
 6 files changed, 132 insertions(+), 98 deletions(-)
 delete mode 100644 addons/delivery/wizard/delivery_sale_order.py
 create mode 100644 addons/delivery/wizard/delivery_sale_order_view.xml
 create mode 100644 addons/delivery/wizard/delivery_sale_order_wizard.py

diff --git a/addons/delivery/__terp__.py b/addons/delivery/__terp__.py
index 5897cdb2f99..fcceebe1560 100644
--- a/addons/delivery/__terp__.py
+++ b/addons/delivery/__terp__.py
@@ -30,6 +30,7 @@
     'init_xml': ['delivery_data.xml'],
     'update_xml': [
         'security/ir.model.access.csv',
+        'wizard/delivery_sale_order_view.xml',
         'delivery_view.xml',
         'delivery_wizard.xml',
         'partner_view.xml'
diff --git a/addons/delivery/delivery_wizard.xml b/addons/delivery/delivery_wizard.xml
index b497e6144d9..89c66e7ddc9 100644
--- a/addons/delivery/delivery_wizard.xml
+++ b/addons/delivery/delivery_wizard.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
         
-        <wizard id="wizard_deliver_line_add" keyword="client_action_multi" model="sale.order" name="delivery.sale.order" string="Delivery Costs"/>
+<!--        <wizard id="wizard_deliver_line_add" keyword="client_action_multi" model="sale.order" name="delivery.sale.order" string="Delivery Costs"/>-->
         
     </data>
 </openerp>
diff --git a/addons/delivery/wizard/__init__.py b/addons/delivery/wizard/__init__.py
index 3b35a3cd51e..b050192561a 100644
--- a/addons/delivery/wizard/__init__.py
+++ b/addons/delivery/wizard/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import delivery_sale_order
+import delivery_sale_order_wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/delivery/wizard/delivery_sale_order.py b/addons/delivery/wizard/delivery_sale_order.py
deleted file mode 100644
index c7870e43d85..00000000000
--- a/addons/delivery/wizard/delivery_sale_order.py
+++ /dev/null
@@ -1,96 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import time
-import wizard
-import ir
-import pooler
-from tools.translate import _
-
-from tools.misc import UpdateableStr
-
-delivery_form = UpdateableStr()
-
-delivery_fields = {
-    'carrier_id' : {'string':'Delivery Method', 'type':'many2one', 'relation': 'delivery.carrier','required':True}
-}
-
-def _delivery_default(self, cr, uid, data, context):
-    order_obj = pooler.get_pool(cr.dbname).get('sale.order')
-    order = order_obj.browse(cr, uid, data['ids'])[0]
-    delivery_form.string="""<?xml version="1.0"?>
-    <form string="Create deliveries">
-        <separator colspan="4" string="Delivery Method" />
-        <field name="carrier_id" context="{'order_id': %d}"/>
-    </form>
-    """ % (data['id'],)
-
-
-    if not order.state in ('draft'):
-        raise wizard.except_wizard(_('Order not in draft state !'), _('The order state have to be draft to add delivery lines.'))
-
-
-    carrier_id = order.partner_id.property_delivery_carrier.id
-    return {'carrier_id': carrier_id}
-
-def _delivery_set(self, cr, uid, data, context):
-    order_obj = pooler.get_pool(cr.dbname).get('sale.order')
-    line_obj = pooler.get_pool(cr.dbname).get('sale.order.line')
-    order_objs = order_obj.browse(cr, uid, data['ids'], context)
-
-    for order in order_objs:
-        grid_id = pooler.get_pool(cr.dbname).get('delivery.carrier').grid_get(cr, uid, [data['form']['carrier_id']],order.partner_shipping_id.id)
-        if not grid_id:
-            raise wizard.except_wizard(_('No grid avaible !'), _('No grid matching for this carrier !'))
-        grid_obj=pooler.get_pool(cr.dbname).get('delivery.grid')
-        grid = grid_obj.browse(cr, uid, [grid_id])[0]
-
-        taxes = grid.carrier_id.product_id.taxes_id
-        fpos = order.fiscal_position or False
-        taxes_ids = pooler.get_pool(cr.dbname).get('account.fiscal.position').map_tax(cr, uid, fpos, taxes)
-        line_obj.create(cr, uid, {
-            'order_id': order.id,
-            'name': grid.carrier_id.name,
-            'product_uom_qty': 1,
-            'product_uom': grid.carrier_id.product_id.uom_id.id,
-            'product_id': grid.carrier_id.product_id.id,
-            'price_unit': grid_obj.get_price(cr, uid, grid.id, order, time.strftime('%Y-%m-%d'), context),
-            'tax_id': [(6,0,taxes_ids)],
-            'type': 'make_to_stock'
-        })
-
-    return {}
-
-class make_delivery(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [_delivery_default],
-            'result' : {'type' : 'form', 'arch' : delivery_form, 'fields' : delivery_fields, 'state' : [('end', 'Cancel', 'gtk-cancel'),('delivery', 'Add Delivery Costs', 'gtk-ok') ]}
-        },
-        'delivery' : {
-            'actions' : [_delivery_set],
-            'result' : {'type' : 'state', 'state' : 'end'}
-        },
-    }
-make_delivery("delivery.sale.order")
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/delivery/wizard/delivery_sale_order_view.xml b/addons/delivery/wizard/delivery_sale_order_view.xml
new file mode 100644
index 00000000000..795ebb799d1
--- /dev/null
+++ b/addons/delivery/wizard/delivery_sale_order_view.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Delivery Sale Order -->
+        
+		<record id="view_make_delivery_wizard" model="ir.ui.view">
+            <field name="name">Create Deliveries</field>
+            <field name="model">delivery.sale.order</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Create Deliveries">
+                	<separator colspan="4" string="Delivery Method" />
+				    <field name="carrier_id"/>
+				    <newline/>
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="delivery_set" string="Add Delivery Costs"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_make_delivery" model="ir.actions.act_window">
+            <field name="name">Create Deliveries</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">delivery.sale.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="context">{'record_id': active_id, 'active_ids': active_ids}</field>
+        </record>
+
+       <record model="ir.values" id="values_make_delivery">
+            <field name="model_id" ref="sale.model_sale_order" />
+            <field name="object" eval="1" />
+            <field name="name">Create Deliveries</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_make_delivery'))"/>
+            <field name="key">action</field>
+            <field name="model">sale.order</field>
+        </record>
+	</data>
+</openerp>	
diff --git a/addons/delivery/wizard/delivery_sale_order_wizard.py b/addons/delivery/wizard/delivery_sale_order_wizard.py
new file mode 100644
index 00000000000..35c6a63821e
--- /dev/null
+++ b/addons/delivery/wizard/delivery_sale_order_wizard.py
@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import time
+import ir
+from tools.translate import _
+
+from osv import osv, fields
+
+class make_delivery(osv.osv_memory):
+    _name = "delivery.sale.order"
+    _description = 'Make Delievery'
+
+    _columns = {
+        'carrier_id': fields.many2one('delivery.carrier','Delivery Method', required=True),
+    }
+
+
+    def default_get(self, cr, uid, ids, context):
+        rec_id = context and context.get('record_id',False)
+        res = {}
+        order_obj = self.pool.get('sale.order')
+        order = order_obj.browse(cr, uid, rec_id)
+    
+        if not order.state in ('draft'):
+            raise osv.except_osv(_('Order not in draft state !'), _('The order state have to be draft to add delivery lines.'))
+    
+        carrier_id = order.partner_id.property_delivery_carrier.id
+        res['carrier_id'] = carrier_id
+        return res
+    
+    def delivery_set(self, cr, uid, ids, context):
+        rec_ids = context and context.get('active_ids',False)
+        order_obj = self.pool.get('sale.order')
+        line_obj = self.pool.get('sale.order.line')
+        order_objs = order_obj.browse(cr, uid, rec_ids, context)
+        datas = self.browse(cr, uid, ids[0])
+    
+        for order in order_objs:
+            grid_id = self.pool.get('delivery.carrier').grid_get(cr, uid, [datas.carrier_id.id],order.partner_shipping_id.id)
+            if not grid_id:
+                raise osv.except_osv(_('No grid avaible !'), _('No grid matching for this carrier !'))
+            grid_obj = self.pool.get('delivery.grid')
+            grid = grid_obj.browse(cr, uid, [grid_id])[0]
+    
+            taxes = grid.carrier_id.product_id.taxes_id
+            fpos = order.fiscal_position or False
+            taxes_ids = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, taxes)
+            line_obj.create(cr, uid, {
+                'order_id': order.id,
+                'name': grid.carrier_id.name,
+                'product_uom_qty': 1,
+                'product_uom': grid.carrier_id.product_id.uom_id.id,
+                'product_id': grid.carrier_id.product_id.id,
+                'price_unit': grid_obj.get_price(cr, uid, grid.id, order, time.strftime('%Y-%m-%d'), context),
+                'tax_id': [(6,0,taxes_ids)],
+                'type': 'make_to_stock'
+            })
+    
+        return {}
+
+make_delivery()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

From 7638ef6d8eb75f2e55900a7a43c64570c4b0e02e Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 9 Mar 2010 19:43:53 +0530
Subject: [PATCH 055/251] [IMP]: crm: Improvement in mailgateway script for
 history line

bzr revid: rpa@tinyerp.com-20100309141353-fm5iq1h6cu5vgfb6
---
 .../openerp_mailgate/openerp_mailgate.py      | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
index 85f5d24279d..27b84e4941b 100755
--- a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
+++ b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
@@ -29,7 +29,14 @@ import os
 import binascii
 import time, socket
 
-email_re = re.compile(r"[a-zA-Z][\w\.-]*[a-zA-Z0-9]@[a-zA-Z0-9][\w\.-]*\.[a-z]{2,3}",  re.VERBOSE)
+email_re = re.compile(r"""
+    ([a-zA-Z][\w\.-]*[a-zA-Z0-9]     # username part
+    @                                # mandatory @ sign
+    [a-zA-Z0-9][\w\.-]*              # domain must start with a letter ... Ged> why do we include a 0-9 then?
+     \.
+     [a-z]{2,3}                      # TLD
+    )
+    """, re.VERBOSE)
 case_re = re.compile(r"\[([0-9]+)\]", re.UNICODE)
 command_re = re.compile("^Set-([a-z]+) *: *(.+)$", re.I + re.UNICODE)
 reference_re = re.compile("<.*-tinycrm-(\\d+)@(.*)>", re.UNICODE)
@@ -124,8 +131,8 @@ class rpc_proxy(object):
         self.passwd = passwd
         self.dbname = dbname
 
-    def __call__(self, *request):
-        return self.rpc.execute(self.dbname, self.user_id, self.passwd, *request)
+    def __call__(self, *request, **kwargs):
+        return self.rpc.execute(self.dbname, self.user_id, self.passwd, *request, **kwargs)
 
 class email_parser(object):
     def __init__(self, uid, password, model, email, email_default, dbname, host, port):        
@@ -169,7 +176,6 @@ class email_parser(object):
             'canal_id': self.canal_id, 
             'user_id': False, 
             'description': message['body'], 
-            'history_line': [(0, 0, {'description': message['body'], 'email': msg['From'] })], 
         }
         try:
             data.update(self.partner_get(self._decode_header(msg['From'])))
@@ -179,7 +185,8 @@ class email_parser(object):
 
         try:
             id = self.rpc(self.model, 'create', data)
-            self.rpc(self.model, 'case_open', [id])    
+            self.rpc(self.model, 'history', [id], 'send', False, msg['From'], message['body'])
+            self.rpc(self.model, 'case_open', [id])
         except Exception, e:
             if getattr(e, 'faultCode', '') and 'AccessError' in e.faultCode:
                 e = '\n\nThe Specified user does not have an access to the CRM case.'
@@ -268,7 +275,6 @@ class email_parser(object):
 
         data = {
             'description': body['body'], 
-            'history_line': [(0, 0, {'description': body['body'], 'email': msg['From']})], 
         }
         act = 'case_pending'
         if 'state' in actions:
@@ -295,6 +301,7 @@ class email_parser(object):
 
         self.rpc(self.model, act, [id])
         self.rpc(self.model, 'write', [id], data)
+        self.rpc(self.model, 'history', [id], 'send', False, msg['From'], message['body'])
         return id
 
     def msg_send(self, msg, emails, priority=None):
@@ -324,9 +331,9 @@ class email_parser(object):
         body2 = '\n'.join(map(lambda l: '> '+l, (body or '').split('\n')))
         data = {
             'description':body, 
-            'history_line': [(0, 0, {'description': body, 'email': msg['From'][:84]})], 
         }
         self.rpc(self.model, 'write', [id], data)
+        self.rpc(self.model, 'history', [id], 'send', False, msg['From'], message['body'])
         return id
 
     def msg_test(self, msg, case_str):
@@ -385,7 +392,6 @@ if __name__ == '__main__':
         "This program parse a mail from standard input and communicate "
         "with the Open ERP server for case management in the CRM module.")
     parser.add_option_group(group)
-
     parser.add_option("-u", "--user", dest="userid", help="ID of the user in Open ERP", default=1, type='int')
     parser.add_option("-p", "--password", dest="password", help="Password of the user in Open ERP", default='admin')
     parser.add_option("-e", "--email", dest="email", help="Email address used in the From field of outgoing messages")

From 9d06d1140d344d1def1b1bdf92c01fbf5dd7adbf Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 9 Mar 2010 19:44:54 +0530
Subject: [PATCH 056/251] [IMP]: crm: added function for history from
 mailgateway

bzr revid: rpa@tinyerp.com-20100309141454-gxonhn0uocr8xrvm
---
 addons/crm/crm.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 6cd8952a804..d61eee136d5 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -336,6 +336,12 @@ class crm_case(osv.osv):
             if case.email_from:
                 value['email_from'] = case.email_from
         return {'value': value}
+    
+    def history(self, cr, uid, ids, keyword, history=False, email=False, details=None, context={}):
+        cases = self.browse(cr, uid, ids, context=context)
+        return self.__history(cr, uid, cases, keyword=keyword,\
+                               history=history, email=email, details=details,\
+                               context=context)
 
     def __history(self, cr, uid, cases, keyword, history=False, email=False, details=None, context={}):
         model_obj = self.pool.get('ir.model')          

From 5324e660c1fed06564e4e143e9c8a14c3df810ba Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 10 Mar 2010 11:17:17 +0530
Subject: [PATCH 057/251] crm: add the missing file and add the wizard of
 opportunity2phonecall

bzr revid: sbh@tinyerp.com-20100310054717-taqd558s8p75hinr
---
 addons/crm/__terp__.py                        |   1 +
 addons/crm/wizard/__init__.py                 |   1 +
 addons/crm/wizard/crm_phonecall2phonecall.xml |  31 ++++
 addons/crm/wizard/lead_to_partner.py          | 143 ++++++++++++++++++
 addons/crm/wizard/lead_to_partner_view.xml    |  67 ++++++++
 addons/crm/wizard/opportunity2meeting.py      |   2 +-
 addons/crm/wizard/opportunity2meeting.xml     |   2 +-
 addons/crm/wizard/opportunity2phonecall.py    | 105 +++++++++++++
 addons/crm/wizard/opportunity2phonecall.xml   |  31 ++++
 9 files changed, 381 insertions(+), 2 deletions(-)
 create mode 100644 addons/crm/wizard/crm_phonecall2phonecall.xml
 create mode 100644 addons/crm/wizard/lead_to_partner.py
 create mode 100644 addons/crm/wizard/lead_to_partner_view.xml
 create mode 100644 addons/crm/wizard/opportunity2phonecall.py
 create mode 100644 addons/crm/wizard/opportunity2phonecall.xml

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 3143972509a..3bcfabd6aa9 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -68,6 +68,7 @@ between mails and Open ERP.""",
         'wizard/phonecall2opportunity.xml',
         'wizard/opportunity2partner_view.xml',
         'wizard/opportunity2meeting.xml',
+        'wizard/opportunity2phonecall.xml',
         'crm_wizard.xml', 
         'crm_view.xml',
          
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 017ffe5b744..fac5ce98a26 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -34,6 +34,7 @@ import phonecall2meeting
 import phonecall_to_opportunity
 import opportunity2partner
 import opportunity2meeting
+import opportunity2phonecall
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm/wizard/crm_phonecall2phonecall.xml b/addons/crm/wizard/crm_phonecall2phonecall.xml
new file mode 100644
index 00000000000..b4911e48b15
--- /dev/null
+++ b/addons/crm/wizard/crm_phonecall2phonecall.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="phonecall_to_phonecall_view">
+            <field name="name">crm.phonecall2phonecall.form</field>
+            <field name="model">crm.phonecall2phonecall</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Schedule Other Call" col="2">
+                		<field name="name"/>
+						<field name="user_id" />
+						<field name="date" string="Planned Date"/>
+						<field name="section_id"/>
+                    <group colspan="2" col="2" >
+                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button name="action_apply" type="object" string="_Apply" icon="gtk-apply" />
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record model="ir.actions.act_window" id="phonecall_to_phonecall_act">
+            <field name="name">Schedule Other Call</field>
+            <field name="res_model">crm.phonecall2phonecall</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="phonecall_to_phonecall_view"/>
+            <field name="target">new</field>
+         	<field name="context">{'record_id' : active_id}</field>
+        </record>
+    </data>
+</openerp>   
\ No newline at end of file
diff --git a/addons/crm/wizard/lead_to_partner.py b/addons/crm/wizard/lead_to_partner.py
new file mode 100644
index 00000000000..4d1a3d5468e
--- /dev/null
+++ b/addons/crm/wizard/lead_to_partner.py
@@ -0,0 +1,143 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from mx.DateTime import now
+
+from osv import osv, fields
+import netsvc
+import ir
+import pooler
+from tools.translate import _
+
+class crm_lead2partner(osv.osv_memory):
+    _name = 'crm.lead2partner'
+    _description = 'Lead to Partner'
+    
+    _columns = {
+        'action': fields.selection([('exist','Link to an existing partner'),('create','Create a new partner')],'Action',required=True),
+        'partner_id': fields.many2one('res.partner','Partner'), 
+    }
+    _defaults = {
+        'action': lambda *a:'exist',
+    }
+    
+    def create_partner(self, cr, uid, ids, context):
+        view_obj = self.pool.get('ir.ui.view')
+        view_id = view_obj.search(cr,uid,[('model','=','crm.lead2partner'),('name','=','crm.lead2partner.view')])
+        return {
+            'view_mode': 'form',
+            'view_type': 'form',
+            'view_id': view_id or False,
+            'res_model': 'crm.lead2partner',
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+        }
+        
+    def selectPartner(self, cr, uid, ids, context):
+        case_obj = self.pool.get('crm.lead')
+        partner_obj = self.pool.get('res.partner')
+        contact_obj = self.pool.get('res.partner.address')
+        rec_ids = context and context.get('record_ids',False)
+        value={}
+        for case in case_obj.browse(cr, uid, rec_ids):
+            if case.partner_id:
+                 raise osv.except_osv(_('Warning !'),
+                    _('A partner is already defined on this lead.'))
+           
+            partner_ids = partner_obj.search(cr, uid, [('name', '=', case.partner_name or case.name)])            
+            if not partner_ids and case.email_from:
+                address_ids = contact_obj.search(cr, uid, [('email', '=', case.email_from)])
+                if address_ids:
+                    addresses = contact_obj.browse(cr, uid, address_ids)
+                    partner_ids = addresses and [addresses[0].partner_id.id] or False
+
+            partner_id = partner_ids and partner_ids[0] or False
+        if not partner_id:
+            value = self._make_partner(cr, uid, ids, context)           
+        return value 
+
+    def _create_partner(self, cr, uid, ids, context):
+        case_obj = self.pool.get('crm.lead')
+        partner_obj = self.pool.get('res.partner')
+        contact_obj = self.pool.get('res.partner.address')
+        datas = self.browse(cr, uid, ids)[0]
+        partner_ids = []
+        partner_id = False
+        contact_id = False
+        rec_ids = context and context.get('record_ids',False)
+        for case in case_obj.browse(cr, uid, rec_ids):
+            if datas.action == 'create':
+                partner_id = partner_obj.create(cr, uid, {
+                    'name': case.partner_name or case.name,
+                    'user_id': case.user_id.id,
+                    'comment': case.description,
+                })
+                contact_id = contact_obj.create(cr, uid, {
+                    'partner_id': partner_id,
+                    'name': case.name,
+                    'phone': case.phone,
+                    'mobile': case.mobile,
+                    'email': case.email_from,
+                    'fax': case.fax,
+                    'title': case.title,
+                    'function': case.function and case.function.id or False,
+                    'street': case.street,
+                    'street2': case.street2,
+                    'zip': case.zip,
+                    'city': case.city,
+                    'country_id': case.country_id and case.country_id.id or False,
+                    'state_id': case.state_id and case.state_id.id or False,
+                })
+
+            else:
+                if datas.partner_id:
+                    partner = partner_obj.browse(cr,uid,datas.partner_id.id)
+                    partner_id = partner.id
+                    contact_id = partner.address and partner.address[0].id
+
+            partner_ids.append(partner_id)
+            vals = {}
+            if partner_id:
+                vals.update({'partner_id': partner_id})
+            if contact_id:
+                vals.update({'partner_address_id': contact_id})
+            case_obj.write(cr, uid, [case.id], vals)   
+        return partner_ids
+
+    def _make_partner(self, cr, uid, ids, context): 
+        partner_ids = self._create_partner(cr, uid, ids, context)
+        mod_obj = self.pool.get('ir.model.data') 
+        result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
+        res = mod_obj.read(cr, uid, result, ['res_id'])
+        value = {
+            'domain': "[]",
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': 'res.partner',
+            'res_id': partner_ids and int(partner_ids[0]) or False,
+            'view_id': False,
+            'type': 'ir.actions.act_window',
+            'search_view_id': res['res_id'] 
+        }
+        return value
+    
+crm_lead2partner()
+
diff --git a/addons/crm/wizard/lead_to_partner_view.xml b/addons/crm/wizard/lead_to_partner_view.xml
new file mode 100644
index 00000000000..b11b90bb534
--- /dev/null
+++ b/addons/crm/wizard/lead_to_partner_view.xml
@@ -0,0 +1,67 @@
+<openerp>
+  	<data>
+  		<record id="view_crm_lead2partner_create" model="ir.ui.view">
+	      <field name="name">crm.lead2partner.view.create</field>
+	      <field name="model">crm.lead2partner</field>
+	      <field name="type">form</field>
+	      <field name="arch" type="xml">
+	      	<form string="Create a Partner">
+	      		<label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
+        		<label string="You may have to verify that this partner does not exist already." colspan="4"/>
+	      		<group col="4" colspan="4">
+	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	      			<button name="create_partner" string="Create Partner" type="object" icon="gtk-ok"/>
+	      		</group>
+	      	</form>
+	      </field>
+	   </record>
+	   <record id="action_crm_lead2partner_create" model="ir.actions.act_window">
+	      <field name="name">Create a Partner</field>
+	      <field name="type">ir.actions.act_window</field>
+	      <field name="res_model">crm.lead2partner</field>
+	      <field name="view_id" ref="view_crm_lead2partner_create"/>
+	      <field name="view_type">form</field>
+	      <field name="view_mode">form</field>
+	      <field name="target">new</field>
+	      <field name="context">{'record_ids' : active_ids}</field>
+	   </record>
+	   
+	   <record model="ir.values" id="values_crm_lead2partner_create">
+            <field name="model_id" ref="crm.model_crm_lead" />
+            <field name="object" eval="1" />
+            <field name="name">Create Partner</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_crm_lead2partner_create'))" />
+            <field name="key">action</field>
+            <field name="model">crm.lead</field>
+        </record>
+	   
+	   <record id="view_crm_lead2partner" model="ir.ui.view">
+	      <field name="name">crm.lead2partner.view</field>
+	      <field name="model">crm.lead2partner</field>
+	      <field name="type">form</field>
+	      <field name="arch" type="xml">
+	      	<form string="Create a Partner">
+	      		<field name="action"/>
+	      		<group attrs="{'invisible':[('action','!=','exist')]}">
+		            <field name="partner_id"/>
+		        </group>
+	      		<group col="4" colspan="4">
+	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	      			<button name="selectPartner" string="Continue" type="object" icon="gtk-ok"/>
+	      		</group>
+	      	</form>
+	      </field>
+	   </record>
+	   <record id="action_crm_lead2partner" model="ir.actions.act_window">
+	      <field name="name">Create a Partner</field>
+	      <field name="type">ir.actions.act_window</field>
+	      <field name="res_model">crm.lead2partner</field>
+	      <field name="view_id" ref="view_crm_lead2partner"/>
+	      <field name="view_type">form</field>
+	      <field name="view_mode">form</field>
+	      <field name="target">new</field>
+	      <field name="context">{'record_ids' : active_ids}</field>
+	   </record>
+ 	</data>
+</openerp>
diff --git a/addons/crm/wizard/opportunity2meeting.py b/addons/crm/wizard/opportunity2meeting.py
index 52aee7bd331..9c0628429df 100644
--- a/addons/crm/wizard/opportunity2meeting.py
+++ b/addons/crm/wizard/opportunity2meeting.py
@@ -38,7 +38,7 @@ class crm_opportunity2meeting(osv.osv_memory):
     def action_cancel(self, cr, uid, ids, context=None):
         return {'type':'ir.actions.act_window_close'}
 
-    def _makeMeeting(self, cr, uid, ids, context=None):
+    def action_makeMeeting(self, cr, uid, ids, context=None):
         this = self.browse(cr, uid, ids[0], context=context)
         record_id = context and context.get('record_id', False) or False
         if record_id:
diff --git a/addons/crm/wizard/opportunity2meeting.xml b/addons/crm/wizard/opportunity2meeting.xml
index 39a36df4896..a8851c53d2c 100644
--- a/addons/crm/wizard/opportunity2meeting.xml
+++ b/addons/crm/wizard/opportunity2meeting.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Convert To Meeting ">
                         <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
-                        <button name="_makeMeeting" type="object" string="_Apply" icon="gtk-apply" />
+                        <button name="action_makeMeeting" type="object" string="_Apply" icon="gtk-apply" />
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/opportunity2phonecall.py b/addons/crm/wizard/opportunity2phonecall.py
new file mode 100644
index 00000000000..6bebf5da6be
--- /dev/null
+++ b/addons/crm/wizard/opportunity2phonecall.py
@@ -0,0 +1,105 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from mx.DateTime import now
+
+from osv import osv, fields
+import netsvc
+import ir
+import pooler
+from tools.translate import _
+
+class crm_opportunity2phonecall(osv.osv_memory):
+    _name = 'crm.opportunity2phonecall'
+    _description = 'Opportunity to Phonecall'
+    _columns = {
+        'name' : fields.char('Call summary', size=64, required=True, select=1),
+        'user_id' : fields.many2one('res.users',"Assign To"),
+        'date': fields.datetime('Date' ,required=True),
+        'section_id':fields.many2one('crm.case.section','Sales Team'),
+
+    }
+    def default_get(self, cr, uid, fields, context=None):
+        record_id = context and context.get('record_id', False) or False
+        res = super(crm_opportunity2phonecall, self).default_get(cr, uid, fields, context=context)
+        if record_id:
+            opportunity = self.pool.get('crm.opportunity').browse(cr, uid, record_id, context=context)
+            res['name']=opportunity.name
+            res['user_id']=opportunity.user_id and opportunity.user_id.id or False
+            res['section_id']=opportunity.section_id and opportunity.section_id.id or False 
+        return res
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        return {'type':'ir.actions.act_window_close'}
+
+    def action_apply(self, cr, uid, ids, context=None):
+        this = self.browse(cr, uid, ids[0], context=context)
+        mod_obj =self.pool.get('ir.model.data') 
+        result = mod_obj._get_id(cr, uid, 'crm', 'view_crm_case_phonecalls_filter')
+        res = mod_obj.read(cr, uid, result, ['res_id'])
+        phonecall_case_obj = self.pool.get('crm.phonecall')
+        opportunity_case_obj = self.pool.get('crm.opportunity') 
+        # Select the view
+        record_id = context and context.get('record_id', False) or False
+        data_obj = self.pool.get('ir.model.data')
+        id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_tree_view')
+        id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_form_view')
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        if id3:
+            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+
+        opportunites = opportunity_case_obj.browse(cr, uid, [record_id])
+        for opportunity in opportunites:            
+            new_case = phonecall_case_obj.create(cr, uid, {
+                    'name' : opportunity.name,
+                    'case_id' : opportunity.id,
+                    'user_id' : this.user_id,
+                    'categ_id' : opportunity.categ_id,
+                    'description' : opportunity.description,
+                    'date' : this.date,
+                    'section_id' : opportunity.section_id and opportunity.section_id.id or False,
+                    'partner_id': opportunity.partner_id and opportunity.partner_id.id or False,
+                    'partner_address_id':opportunity.partner_address_id and opportunity.partner_address_id.id or False,
+                    'description': opportunity.description or '',
+                    'partner_phone' : opportunity.phone or (opportunity.partner_address_id and opportunity.partner_address_id.phone or False),
+                    'partner_mobile' : opportunity.partner_address_id and opportunity.partner_address_id.mobile or False,
+                    'priority': opportunity.priority,
+                    'opportunity_id':opportunity.id
+            }, context=context)
+            vals = {}
+
+            phonecall_case_obj.case_open(cr, uid, [new_case])        
+            
+        value = {            
+            'name': _('Phone Call'),
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'crm.phonecall',
+            'res_id' : new_case,
+            'views': [(id3,'form'),(id2,'tree'),(False,'calendar'),(False,'graph')],
+            'type': 'ir.actions.act_window',
+            'search_view_id': res['res_id']
+        }
+        return value
+        
+    
+crm_opportunity2phonecall()   
\ No newline at end of file
diff --git a/addons/crm/wizard/opportunity2phonecall.xml b/addons/crm/wizard/opportunity2phonecall.xml
new file mode 100644
index 00000000000..9f24e5e37be
--- /dev/null
+++ b/addons/crm/wizard/opportunity2phonecall.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="opportunity2phonecall_view">
+            <field name="name">crm.opportunity2phonecall.form</field>
+            <field name="model">crm.opportunity2phonecall</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Schedule Other Call" col="2">
+                		<field name="name"/>
+						<field name="user_id" />
+						<field name="date" string="Planned Date"/>
+						<field name="section_id"/>
+                    <group colspan="2" col="2" >
+                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button name="action_apply" type="object" string="_Apply" icon="gtk-apply" />
+                    </group>
+                </form>
+            </field>
+        </record>
+ 		<record model="ir.actions.act_window" id="opportunity2phonecall_act">
+            <field name="name">Schedule Other Call</field>
+            <field name="res_model">crm.opportunity2phonecall</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="opportunity2phonecall_view"/>
+            <field name="target">new</field>
+         	<field name="context">{'record_id' : active_id}</field>
+        </record>
+    </data>
+</openerp>   
\ No newline at end of file

From 3f72e8afc50144c8e65b26486d0e86b369fd6aaa Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 10 Mar 2010 11:43:42 +0530
Subject: [PATCH 058/251] [Add] crm: add the missing file

bzr revid: sbh@tinyerp.com-20100310061342-g9ktwu597g9i6u2e
---
 addons/crm/wizard/crm_phonecall2phonecall.py | 88 ++++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 addons/crm/wizard/crm_phonecall2phonecall.py

diff --git a/addons/crm/wizard/crm_phonecall2phonecall.py b/addons/crm/wizard/crm_phonecall2phonecall.py
new file mode 100644
index 00000000000..5fcfc9ecb69
--- /dev/null
+++ b/addons/crm/wizard/crm_phonecall2phonecall.py
@@ -0,0 +1,88 @@
+# -*- encoding: utf-8 -*-
+############################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2008-2009 AJM Technologies S.A. (<http://www.ajm.lu). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+############################################################################################
+############################################################################################
+
+from osv import osv, fields
+import netsvc
+import time
+import tools
+import mx.DateTime
+from tools import config
+from tools.translate import _
+import tools
+
+class crm_phonecall2phonecall(osv.osv_memory):
+    _name = 'crm.phonecall2phonecall'
+    _description = 'Phonecall To Phonecall'
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        return {'type':'ir.actions.act_window_close'}
+
+    def action_apply(self, cr, uid, ids, context=None):
+        this = self.browse(cr, uid, ids)[0]
+        values={}
+        record_id = context and context.get('record_id', False) or False
+        if record_id:
+            for case in self.pool.get('crm.phonecall').browse(cr, uid, [record_id], context=context):
+                values['name']=this.name
+                values['user_id']=this.user_id and this.user_id.id
+                values['categ_id']=case.categ_id and case.categ_id.id or False
+                values['section_id']=case.section_id and case.section_id.id or False,
+                values['description']=case.description or ''
+                values['partner_id']=case.partner_id.id
+                values['partner_address_id']=case.partner_address_id.id
+                values['partner_mobile']=case.partner_mobile or False
+                values['priority']=case.priority
+                values['partner_phone']=case.partner_phone or False
+                values['date']=this.date
+                phonecall_proxy = self.pool.get('crm.phonecall')
+                phonecall_id = phonecall_proxy.create(cr, uid, values, context=context)
+            value = {            
+                'name': _('Phone Call'),
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'crm.phonecall',
+                'view_id': False,
+                'type': 'ir.actions.act_window',
+                'res_id': phonecall_id
+                }
+        return value
+
+    _columns = {
+        'name' : fields.char('Call summary', size=64, required=True, select=1),
+        'user_id' : fields.many2one('res.users',"Assign To"),
+        'date': fields.datetime('Date'),
+        'section_id':fields.many2one('crm.case.section','Sales Team'),
+
+    }
+    def default_get(self, cr, uid, fields, context=None):
+        record_id = context and context.get('record_id', False) or False
+        res = super(crm_phonecall2phonecall, self).default_get(cr, uid, fields, context=context)
+        if record_id:
+            phonecall_id = self.pool.get('crm.phonecall').browse(cr, uid, record_id, context=context)
+            res['name']=phonecall_id.name
+            res['user_id']=phonecall_id.user_id and phonecall_id.user_id.id or False
+            res['date']=phonecall_id.date 
+            res['section_id']=phonecall_id.section_id and phonecall_id.section_id.id or False 
+        return res
+crm_phonecall2phonecall()
\ No newline at end of file

From 4859b719225a683a1440942b7afba0acf5fcba72 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 10 Mar 2010 11:51:30 +0530
Subject: [PATCH 059/251] [FIX]: crm: solved problem of datetime in crm.py

bzr revid: rpa@tinyerp.com-20100310062130-gocgnacbvmztyw66
---
 addons/crm/crm.py | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index d61eee136d5..1742f4856c2 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -19,14 +19,6 @@
 #
 ##############################################################################
 
-import time
-import re
-import os
-import base64
-import tools
-import mx.DateTime
-import datetime
-
 from datetime import datetime
 from datetime import timedelta
 from osv import fields
@@ -34,7 +26,12 @@ from osv import orm
 from osv import osv
 from osv.orm import except_orm
 from tools.translate import _
-
+import base64
+import mx.DateTime
+import os
+import re
+import time
+import tools
 
 
 MAX_LEVEL = 15

From 0f0e3ccb96b2c5173c7637906082ccaa057436b4 Mon Sep 17 00:00:00 2001
From: "KSA (OpenERP)" <>
Date: Wed, 10 Mar 2010 11:55:59 +0530
Subject: [PATCH 060/251] [IMP]: crm(lead): Added 2 function fields to compute
 days to Open and days to close the lead

bzr revid: rpa@tinyerp.com-20100310062559-l73a200pue9mezyk
---
 addons/crm/crm_lead.py       | 67 +++++++++++++++++++++++++++++-------
 addons/crm/crm_lead_view.xml |  5 +++
 2 files changed, 59 insertions(+), 13 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index da9f2ed7230..6424030dc66 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -19,28 +19,69 @@
 #
 ##############################################################################
 
-from osv import fields,osv,orm
+from osv import fields, osv, orm
+from datetime import datetime, timedelta
 import crm
+import math
 
 class crm_lead(osv.osv):
     _name = "crm.lead"
     _description = "Leads Cases"
     _order = "priority desc, id desc"
-    _inherit = ['res.partner.address','crm.case']
+    _inherit = ['res.partner.address', 'crm.case']
+
+    def _compute_openday(self, cr, uid, ids, name, args, context={}):
+        result = {}
+        for r in self.browse(cr, uid, ids , context):
+            result[r.id] = 0
+            model_id = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'crm.lead')])
+            log_obj = self.pool.get('crm.case.log')
+            hist_id = log_obj.search(cr, uid, [('model_id', '=', model_id[0]), \
+                                                     ('res_id', '=', r.id), \
+                                                     ('name', '=', 'Open')])
+
+            if hist_id:
+                # Considering last log for opening case
+                log = log_obj.browse(cr, uid, hist_id[-1])
+                date_lead_open = datetime.strptime(r.create_date, "%Y-%m-%d %H:%M:%S")
+                date_log_open = datetime.strptime(log.date, "%Y-%m-%d %H:%M:%S")
+                ans = date_lead_open - date_log_open
+                duration =  float(ans.days) + (float(ans.seconds) / 86400)
+                result[r.id] = abs(int(duration))
+        return result
+
+    def _compute_closeday(self, cr, uid, ids, name, args, context={}):
+        result = {}
+        for r in self.browse(cr, uid, ids , context):
+            result[r.id] = 0
+            if r.date_closed:
+                date_create = datetime.strptime(r.create_date, "%Y-%m-%d %H:%M:%S")
+                date_close = datetime.strptime(r.date_closed, "%Y-%m-%d %H:%M:%S")
+                ans = date_close - date_create
+                duration =  float(ans.days) + (float(ans.seconds) / 86400)
+                result[r.id] = abs(int(duration))
+        return result
+
     _columns = {
-        'categ_id': fields.many2one('crm.case.categ', 'Lead Source', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"),
-        'type_id': fields.many2one('crm.case.resource.type', 'Lead Type', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]"),
-        'partner_name': fields.char("Lead Name", size=64),
+        'categ_id': fields.many2one('crm.case.categ', 'Lead Source', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"), 
+        'type_id': fields.many2one('crm.case.resource.type', 'Lead Type', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]"), 
+        'partner_name': fields.char("Lead Name", size=64), 
 
-        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
-        'date_closed': fields.datetime('Closed', readonly=True),
-        'stage_id': fields.many2one('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]"),
-        'opportunity_id': fields.many2one('crm.opportunity', 'Opportunity'),
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 
+        'date_closed': fields.datetime('Closed', readonly=True), 
+        'stage_id': fields.many2one('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]"), 
+        'opportunity_id': fields.many2one('crm.opportunity', 'Opportunity'), 
+
+        'user_id': fields.many2one('res.users', 'Salesman'), 
+        'referred': fields.char('Referred By', size=32), 
+        'day_open': fields.function(_compute_openday, string='Days to Open', \
+                                method=True, type="integer", store=True), 
+        'day_close': fields.function(_compute_closeday, string='Days to Close', \
+                                method=True, type="integer", store=True), 
+        }
 
-        'user_id': fields.many2one('res.users', 'Salesman'),
-        'referred': fields.char('Referred By', size=32),
-    }
     _defaults = {
-        'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c),
+        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c), 
     }
+
 crm_lead()
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 61763ce41ce..508929c7ec1 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -155,6 +155,11 @@
                         <field name="write_date"/>
                         <field name="date_closed"/>
                     </group>
+                    <group colspan="2" col="2">
+                        <separator string="Statistics" colspan="2" col="2"/>
+                        <field name="day_open"/>
+                        <field name="day_close"/>
+                    </group>
                  </page>
                 </notebook>
             </form>

From a36a2c70c1e4a50cd616f0db05433d213c3e5de5 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 10 Mar 2010 12:16:24 +0530
Subject: [PATCH 061/251] [IMP] crm: improve the view of opportunity2phonecall
 and fix the field value in wizard

bzr revid: sbh@tinyerp.com-20100310064624-dlwt4rh32kl2ooqn
---
 addons/crm/crm_opportunity_view.xml         | 2 +-
 addons/crm/wizard/__init__.py               | 3 ++-
 addons/crm/wizard/opportunity2phonecall.py  | 9 ++++-----
 addons/crm/wizard/opportunity2phonecall.xml | 8 +++++---
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 32d2a0ac5a9..d05de45790e 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -68,7 +68,7 @@
                     <field name="probability"/>
                     <field name="date_deadline" string="Expected Closing"/>
                     <button string="Schedule Call"
-                        name="%(wizard_crm_opportunity_reschedule_phone_call)d" icon="gtk-redo" type="action"  />
+                        name="%(opportunity2phonecall_act)d" icon="gtk-redo" type="action"  />
                 </group>
                 <notebook colspan="4">
                 <page string="Opportunity">
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index fac5ce98a26..72dfccad6de 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -26,9 +26,10 @@ import crm_phonecall_wizard
 import wizard_crm_send_email
 import wizard_crm_new_send_email
 import wizard_history_event
-import crm_phonecall2phonecall
+
 
 import lead_to_partner
+import crm_phonecall2phonecall
 import phonecall2partner
 import phonecall2meeting
 import phonecall_to_opportunity
diff --git a/addons/crm/wizard/opportunity2phonecall.py b/addons/crm/wizard/opportunity2phonecall.py
index 6bebf5da6be..25ac0d43524 100644
--- a/addons/crm/wizard/opportunity2phonecall.py
+++ b/addons/crm/wizard/opportunity2phonecall.py
@@ -71,15 +71,14 @@ class crm_opportunity2phonecall(osv.osv_memory):
         for opportunity in opportunites:            
             new_case = phonecall_case_obj.create(cr, uid, {
                     'name' : opportunity.name,
-                    'case_id' : opportunity.id,
-                    'user_id' : this.user_id,
-                    'categ_id' : opportunity.categ_id,
-                    'description' : opportunity.description,
+                    'case_id' : opportunity.id ,
+                    'user_id' : this.user_id and this.user_id.id or Flase,
+                    'categ_id' : opportunity.categ_id and opportunity.categ_id.id or Flase,
+                    'description' : opportunity.description or False,
                     'date' : this.date,
                     'section_id' : opportunity.section_id and opportunity.section_id.id or False,
                     'partner_id': opportunity.partner_id and opportunity.partner_id.id or False,
                     'partner_address_id':opportunity.partner_address_id and opportunity.partner_address_id.id or False,
-                    'description': opportunity.description or '',
                     'partner_phone' : opportunity.phone or (opportunity.partner_address_id and opportunity.partner_address_id.phone or False),
                     'partner_mobile' : opportunity.partner_address_id and opportunity.partner_address_id.mobile or False,
                     'priority': opportunity.priority,
diff --git a/addons/crm/wizard/opportunity2phonecall.xml b/addons/crm/wizard/opportunity2phonecall.xml
index 9f24e5e37be..4823e54ce7f 100644
--- a/addons/crm/wizard/opportunity2phonecall.xml
+++ b/addons/crm/wizard/opportunity2phonecall.xml
@@ -6,12 +6,14 @@
             <field name="model">crm.opportunity2phonecall</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Schedule Other Call" col="2">
+                <form string="Schedule Other Call">
+					<group colspan="2" >
                 		<field name="name"/>
+                		<field name="date" string="Planned Date"/>
+                		<newline/>
 						<field name="user_id" />
-						<field name="date" string="Planned Date"/>
 						<field name="section_id"/>
-                    <group colspan="2" col="2" >
+						<label string ="" colspan="2"/>
                         <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
                         <button name="action_apply" type="object" string="_Apply" icon="gtk-apply" />
                     </group>

From 13fd1480b472183d7c8791433d7b482da0ad7435 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Wed, 10 Mar 2010 12:29:59 +0530
Subject: [PATCH 062/251] [ADD] mrp: Added Docstrings for methods used in
 wizard files.

bzr revid: uco@tinyerp.co.in-20100310065959-u1uaajtouzj3wyok
---
 addons/mrp/wizard/change_production_qty.py    | 26 +++++++++++-
 addons/mrp/wizard/make_procurement_product.py | 41 +++++++++++++++++--
 addons/mrp/wizard/orderpoint_procurement.py   | 15 +++++++
 addons/mrp/wizard/schedulers_all.py           | 14 +++++++
 4 files changed, 92 insertions(+), 4 deletions(-)

diff --git a/addons/mrp/wizard/change_production_qty.py b/addons/mrp/wizard/change_production_qty.py
index 56fd5fc2b53..292e8a323a6 100644
--- a/addons/mrp/wizard/change_production_qty.py
+++ b/addons/mrp/wizard/change_production_qty.py
@@ -34,7 +34,19 @@ class change_production_qty(osv.osv_memory):
         'product_qty': fields.float('Product Qty', required=True),
     }
 
-    def default_get(self, cr, uid, ids, context):
+    def default_get(self, cr, uid, fields, context):
+        """ 
+             @summary: To get default values for the object.
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param fields: List of fields for which we want default values 
+             @param context: A standard dictionary 
+             
+             @return: A dictionary which of fields with values. 
+        
+        """
         record_id = context and context.get('record_id',False)
         res = {}
         prod_obj = self.pool.get('mrp.production')
@@ -48,6 +60,18 @@ class change_production_qty(osv.osv_memory):
         return res
     
     def change_prod_qty(self, cr, uid, ids, context):
+        """ 
+             @summary: Changes the Quantity of Product.
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: List of IDs selected 
+             @param context: A standard dictionary 
+             
+             @return:  
+        
+        """
         record_id = context and context.get('record_id',False)
         prod_obj = self.pool.get('mrp.production')
         wiz_qty = self.browse(cr, uid, ids[0])
diff --git a/addons/mrp/wizard/make_procurement_product.py b/addons/mrp/wizard/make_procurement_product.py
index 8a1306f1c8f..77c4959cdd3 100644
--- a/addons/mrp/wizard/make_procurement_product.py
+++ b/addons/mrp/wizard/make_procurement_product.py
@@ -29,6 +29,18 @@ class make_procurement(osv.osv_memory):
     _description = 'Make Procurements'
     
     def onchange_product_id(self, cr, uid, ids, prod_id):
+        """ 
+             @summary: On Change of Product ID getting the value of related UoM.
+        
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: List of IDs selected 
+             @param prod_id: Changed ID of Product 
+             
+             @return: A dictionary which gives the UoM of the changed Product 
+        
+        """
         product = self.pool.get('product.product').browse(cr, uid, prod_id)
         return {'value': {'uom_id': product.uom_id.id}}
     
@@ -46,12 +58,23 @@ class make_procurement(osv.osv_memory):
     }
     
     def make_procurement(self, cr, uid, ids, context=None):
-        '''Create procurement'''
+        """ 
+             @summary: Creates procurement order for selected product.
+        
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: List of IDs selected 
+             @param context: A standard dictionary 
+             
+             @return: A dictionary which loads Procurement form view. 
+        
+        """
+        user = self.pool.get('res.users').browse(cr, uid, uid, context).login
         for proc in self.browse(cr, uid, ids):
             wh = self.pool.get('stock.warehouse').browse(cr, uid, proc.warehouse_id.id, context)
-            user = self.pool.get('res.users').browse(cr, uid, uid, context)
             procure_id = self.pool.get('mrp.procurement').create(cr, uid, {
-                'name':'INT:'+str(user.login),
+                'name':'INT: '+str(user),
                 'date_planned': proc.date_planned,
                 'product_id': proc.product_id.id,
                 'product_qty': proc.qty,
@@ -80,6 +103,18 @@ class make_procurement(osv.osv_memory):
          }
     
     def default_get(self, cr, uid, fields, context=None):
+        """ 
+             @summary: To get default values for the object.
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param fields: List of fields for which we want default values 
+             @param context: A standard dictionary 
+             
+             @return: A dictionary which of fields with values. 
+        
+        """
         record_id = context and context.get('record_id', False) or False
 
         res = super(make_procurement, self).default_get(cr, uid, fields, context=context)
diff --git a/addons/mrp/wizard/orderpoint_procurement.py b/addons/mrp/wizard/orderpoint_procurement.py
index 623e8080e9c..86b4b3c8aa6 100644
--- a/addons/mrp/wizard/orderpoint_procurement.py
+++ b/addons/mrp/wizard/orderpoint_procurement.py
@@ -40,6 +40,13 @@ class procurement_compute(osv.osv_memory):
     }
     
     def _procure_calculation_orderpoint(self, cr, uid, ids, context):
+        """ 
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: List of IDs selected 
+             @param context: A standard dictionary 
+        """
         try:
             proc_obj = self.pool.get('mrp.procurement')
             for proc in self.browse(cr, uid, ids):
@@ -49,6 +56,14 @@ class procurement_compute(osv.osv_memory):
         return {}
     
     def procure_calculation(self, cr, uid, ids, context):
+        """ 
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: List of IDs selected 
+             @param context: A standard dictionary 
+        
+        """
         threaded_calculation = threading.Thread(target=self._procure_calculation_orderpoint, args=(cr, uid, ids, context))
         threaded_calculation.start()
         return {}
diff --git a/addons/mrp/wizard/schedulers_all.py b/addons/mrp/wizard/schedulers_all.py
index f1ef2501add..62497564905 100644
--- a/addons/mrp/wizard/schedulers_all.py
+++ b/addons/mrp/wizard/schedulers_all.py
@@ -36,6 +36,13 @@ class procurement_compute(osv.osv_memory):
     }
     
     def _procure_calculation_all(self, cr, uid, ids, context):
+        """ 
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: List of IDs selected 
+             @param context: A standard dictionary 
+        """
         proc_obj = self.pool.get('mrp.procurement')
         for proc in self.browse(cr, uid, ids):
             proc_obj.run_scheduler(cr, uid, automatic=proc.automatic, use_new_cursor=cr.dbname,\
@@ -43,6 +50,13 @@ class procurement_compute(osv.osv_memory):
         return {}
     
     def procure_calculation(self, cr, uid, ids, context):
+        """ 
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: List of IDs selected 
+             @param context: A standard dictionary 
+        """
         threaded_calculation = threading.Thread(target=self._procure_calculation_all, args=(cr, uid, ids, context))
         threaded_calculation.start()
         return {}

From de122606b07e9f5e8de698a27078a0cc1d0c09e8 Mon Sep 17 00:00:00 2001
From: "KSA (OpenERP)" <>
Date: Wed, 10 Mar 2010 12:44:57 +0530
Subject: [PATCH 063/251] [IMP]: crm(opportunity), project_issue: Added 2
 function fields to compute days to Open and days to close the opportunity and
 issue

bzr revid: rpa@tinyerp.com-20100310071457-78269x47pg5py0fd
---
 addons/crm/crm_opportunity.py               | 48 +++++++++++++++--
 addons/crm/crm_opportunity_view.xml         |  2 +
 addons/project_issue/project_issue.py       | 59 +++++++++++++++++----
 addons/project_issue/project_issue_view.xml |  2 +
 4 files changed, 97 insertions(+), 14 deletions(-)

diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index ea70e850ed8..d2fff629c5a 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+from datetime import datetime
 from osv import fields,osv,orm
 import crm
 
@@ -35,6 +36,39 @@ class crm_opportunity(osv.osv):
     _description = "Opportunity Cases"
     _order = "id desc"
     _inherit = 'crm.case'
+
+    def _compute_openday(self, cr, uid, ids, name, args, context={}):
+        result = {}
+        for r in self.browse(cr, uid, ids , context):
+            result[r.id] = 0
+            model_id = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'crm.opportunity')])
+            log_obj = self.pool.get('crm.case.log')
+            hist_id = log_obj.search(cr, uid, [('model_id', '=', model_id[0]), \
+                                                     ('res_id', '=', r.id), \
+                                                     ('name', '=', 'Open')])
+
+            if hist_id:
+                # Considering last log for opening case
+                log = log_obj.browse(cr, uid, hist_id[-1])
+                date_lead_open = datetime.strptime(r.create_date, "%Y-%m-%d %H:%M:%S")
+                date_log_open = datetime.strptime(log.date, "%Y-%m-%d %H:%M:%S")
+                ans = date_lead_open - date_log_open
+                duration =  float(ans.days) + (float(ans.seconds) / 86400)
+                result[r.id] = abs(int(duration))
+        return result
+
+    def _compute_closeday(self, cr, uid, ids, name, args, context={}):
+        result = {}
+        for r in self.browse(cr, uid, ids , context):
+            result[r.id] = 0
+            if r.date_closed:
+                date_create = datetime.strptime(r.create_date, "%Y-%m-%d %H:%M:%S")
+                date_close = datetime.strptime(r.date_closed, "%Y-%m-%d %H:%M:%S")
+                ans = date_close - date_create
+                duration =  float(ans.days) + (float(ans.seconds) / 86400)
+                result[r.id] = abs(int(duration))
+        return result
+
     _columns = {
         'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"),
         'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"),
@@ -52,7 +86,13 @@ class crm_opportunity(osv.osv):
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
                                   \nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
-    }
+
+        'day_open': fields.function(_compute_openday, string='Days to Open', \
+                                method=True, type="integer", store=True),
+        'day_close': fields.function(_compute_closeday, string='Days to Close', \
+                                method=True, type="integer", store=True),
+       }
+
     def onchange_stage_id(self, cr, uid, ids, stage_id, context={}):
         if not stage_id:
             return {'value':{}}
@@ -64,16 +104,16 @@ class crm_opportunity(osv.osv):
     def stage_next(self, cr, uid, ids, context={}):
         res = super(crm_opportunity, self).stage_next(cr, uid, ids, context=context)
         for case in self.browse(cr, uid, ids, context):
-            if case.stage_id and case.stage_id.on_change:                                
+            if case.stage_id and case.stage_id.on_change:
                 self.write(cr, uid, [case.id], {'probability': case.stage_id.probability})
         return res
 
     def stage_previous(self, cr, uid, ids, context={}):
         res = super(crm_opportunity, self).stage_previous(cr, uid, ids, context=context)
         for case in self.browse(cr, uid, ids, context):
-            if case.stage_id and case.stage_id.on_change:                                
+            if case.stage_id and case.stage_id.on_change:
                 self.write(cr, uid, [case.id], {'probability': case.stage_id.probability})
-        return res 
+        return res
 
     _defaults = {
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.opportunity', context=c),
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index d05de45790e..f1faf00ad5d 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -117,6 +117,8 @@
                     <group col="2" colspan="2">
                         <separator string="Misc" colspan="2"/>
                         <field name="active"/>
+                        <field name="day_open"/>
+                        <field name="day_close"/>
                     </group>
                     <separator colspan="4" string="References"/>
                     <field name="ref"/>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index f0441c0263c..cfb6961d112 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -29,8 +29,10 @@ from tools.translate import _
 import tools
 from osv import fields,osv,orm
 from osv.orm import except_orm
+from datetime import datetime, timedelta
 
 from crm import crm
+import time
 
 
 class project_issue(osv.osv):
@@ -38,6 +40,39 @@ class project_issue(osv.osv):
     _description = "Project Issue"
     _order = "priority, id desc"
     _inherit = 'crm.case'
+
+    def _compute_openday(self, cr, uid, ids, name, args, context={}):
+        result = {}
+        for r in self.browse(cr, uid, ids , context):
+            result[r.id] = 0
+            model_id = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'project.issue')])
+            log_obj = self.pool.get('crm.case.log')
+            hist_id = log_obj.search(cr, uid, [('model_id', '=', model_id[0]), \
+                                                     ('res_id', '=', r.id), \
+                                                     ('name', '=', 'Open')])
+
+            if hist_id:
+                # Considering last log for opening case
+                log = log_obj.browse(cr, uid, hist_id[-1])
+                date_lead_open = datetime.strptime(r.create_date, "%Y-%m-%d %H:%M:%S")
+                date_log_open = datetime.strptime(log.date, "%Y-%m-%d %H:%M:%S")
+                ans = date_lead_open - date_log_open
+                duration =  float(ans.days) + (float(ans.seconds) / 86400)
+                result[r.id] = abs(int(duration))
+        return result
+
+    def _compute_closeday(self, cr, uid, ids, name, args, context={}):
+        result = {}
+        for r in self.browse(cr, uid, ids , context):
+            result[r.id] = 0
+            if r.date_closed:
+                date_create = datetime.strptime(r.create_date, "%Y-%m-%d %H:%M:%S")
+                date_close = datetime.strptime(r.date_closed, "%Y-%m-%d %H:%M:%S")
+                ans = date_close - date_create
+                duration =  float(ans.days) + (float(ans.seconds) / 86400)
+                result[r.id] = abs(int(duration))
+        return result
+
     _columns = {
         'date_closed': fields.datetime('Closed', readonly=True),
         'date': fields.datetime('Date'),
@@ -59,27 +94,31 @@ class project_issue(osv.osv):
         'partner_phone': fields.char('Phone', size=32),
         'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('object_id.model', '=', 'project.issue')]"),
         'project_id':fields.many2one('project.project', 'Project'),
-        'duration': fields.float('Duration'),        
+        'duration': fields.float('Duration'),
         'probability': fields.float('Probability (%)'),
-        'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]")
+        'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"),
+        'day_open': fields.function(_compute_openday, string='Days to Open', \
+                                method=True, type="integer", store=True),
+        'day_close': fields.function(_compute_closeday, string='Days to Close', \
+                                method=True, type="integer", store=True),
     }
 
     def _get_project(self, cr, uid, context):
        user = self.pool.get('res.users').browse(cr,uid,uid, context=context)
        if user.context_project_id:
            return user.context_project_id
-       return False  
+       return False
 
     def _convert(self, cr, uid, ids, xml_id, context=None):
         data_obj = self.pool.get('ir.model.data')
-        id2 = data_obj._get_id(cr, uid, 'project_issue', xml_id)        
+        id2 = data_obj._get_id(cr, uid, 'project_issue', xml_id)
         categ_id = False
         if id2:
-            categ_id = data_obj.browse(cr, uid, id2, context=context).res_id    
+            categ_id = data_obj.browse(cr, uid, id2, context=context).res_id
         if categ_id:
             self.write(cr, uid, ids, {'categ_id': categ_id})
         return True
-   
+
     def convert_to_feature(self, cr, uid, ids, context=None):
         return self._convert(cr, uid, ids, 'feature_request_categ', context=context)
 
@@ -95,10 +134,10 @@ class project_issue(osv.osv):
         return {'value':{'probability':stage.probability}}
 
     _defaults = {
-           'project_id':_get_project,    
-           'probability':lambda *a:0.0,       
-           'planned_cost':lambda *a:0.0,    
-           'planned_revenue':lambda *a:0.0,    
+           'project_id':_get_project,
+           'probability':lambda *a:0.0,
+           'planned_cost':lambda *a:0.0,
+           'planned_revenue':lambda *a:0.0,
           }
 
 project_issue()
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 305db272f4c..8d6bbae0b5a 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -97,6 +97,8 @@
                     <separator colspan="4" string="Dates"/>
                     <field name="create_date"/>
                     <field name="date_closed"/>
+                    <field name="day_open"/>
+                    <field name="day_close"/>
                     <separator colspan="4" string="Estimates"/>
                     <field name="planned_revenue"/>
                     <field name="planned_cost"/>

From 9ac93ecf4d12ee3fc421906cd8fbfb749d936842 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Wed, 10 Mar 2010 12:47:18 +0530
Subject: [PATCH 064/251] [ADD] mrp_repair: Added Docstrings for functions in
 wizard files.

bzr revid: uco@tinyerp.co.in-20100310071718-buqy83c4bh0wjc7p
---
 addons/mrp_repair/__terp__.py                 |  4 +--
 addons/mrp_repair/wizard/cancel_repair.py     | 25 +++++++++++++++++++
 addons/mrp_repair/wizard/make_invoice.py      | 12 +++++++++
 .../{ => wizard}/mrp_repair_cancel_view.xml   |  0
 .../mrp_repair_make_invoice_view.xml          |  0
 5 files changed, 39 insertions(+), 2 deletions(-)
 rename addons/mrp_repair/{ => wizard}/mrp_repair_cancel_view.xml (100%)
 rename addons/mrp_repair/{ => wizard}/mrp_repair_make_invoice_view.xml (100%)

diff --git a/addons/mrp_repair/__terp__.py b/addons/mrp_repair/__terp__.py
index 0cb90558a0c..c6a7a53b6fc 100644
--- a/addons/mrp_repair/__terp__.py
+++ b/addons/mrp_repair/__terp__.py
@@ -39,8 +39,8 @@
         'security/ir.model.access.csv',
         'mrp_repair_sequence.xml',
         'mrp_repair_wizard.xml',
-        'mrp_repair_cancel_view.xml',
-        'mrp_repair_make_invoice_view.xml',
+        'wizard/mrp_repair_cancel_view.xml',
+        'wizard/mrp_repair_make_invoice_view.xml',
         'mrp_repair_view.xml',
         'mrp_repair_workflow.xml',
         'mrp_repair_report.xml',
diff --git a/addons/mrp_repair/wizard/cancel_repair.py b/addons/mrp_repair/wizard/cancel_repair.py
index 423be2e27b3..dbc1e0a04c1 100644
--- a/addons/mrp_repair/wizard/cancel_repair.py
+++ b/addons/mrp_repair/wizard/cancel_repair.py
@@ -28,6 +28,18 @@ class repair_cancel(osv.osv_memory):
     _description = 'Cancel Repair'
 
     def cancel_repair(self, cr, uid, ids, context):
+        """ 
+             @summary: Cancels the repair
+        
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: List of IDs selected 
+             @param context: A standard dictionary 
+             
+             @return:  
+        
+        """
         record_id = context and context.get('record_id', False) or False
         if record_id:
             repair_obj = self.pool.get('mrp.repair').browse(cr, uid, [record_id])
@@ -43,6 +55,17 @@ class repair_cancel(osv.osv_memory):
         return {}
     
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        """ 
+             @summary: Changes the view dynamically
+        
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary 
+             
+             @return: New arch of view.
+        
+        """
         record_id = context and context.get('record_id', False) or False
         res = super(repair_cancel, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
         if record_id:
@@ -50,6 +73,8 @@ class repair_cancel(osv.osv_memory):
             if not repair_obj.invoice_id:
                 res['arch'] = """ <form string="Cancel Repair" colspan="4">
                                 <group col="2" colspan="2">
+                                    <label string="Do you want to continue?" colspan="4"/>
+                                    <separator colspan="4"/>
                                     <button icon="gtk-cancel" special="cancel" string="No" readonly="0"/>
                                     <button name="cancel_repair" string="Yes" type="object" icon="gtk-ok"/>
                                 </group>
diff --git a/addons/mrp_repair/wizard/make_invoice.py b/addons/mrp_repair/wizard/make_invoice.py
index 983ebabac25..cc82f0590da 100644
--- a/addons/mrp_repair/wizard/make_invoice.py
+++ b/addons/mrp_repair/wizard/make_invoice.py
@@ -31,6 +31,18 @@ class make_invoice(osv.osv_memory):
     }
 
     def make_invoices(self, cr, uid, ids, context):
+        """ 
+             @summary: Generates invoice(s) of selected records.
+        
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: List of IDs selected 
+             @param context: A standard dictionary 
+             
+             @return: Loads the view of new invoice(s).
+        
+        """
         inv = self.browse(cr, uid, ids[0])
         order_obj = self.pool.get('mrp.repair')       
         newinv = order_obj.action_invoice_create(cr, uid, context['active_ids'], group=inv.group,context=context)    
diff --git a/addons/mrp_repair/mrp_repair_cancel_view.xml b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
similarity index 100%
rename from addons/mrp_repair/mrp_repair_cancel_view.xml
rename to addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
diff --git a/addons/mrp_repair/mrp_repair_make_invoice_view.xml b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
similarity index 100%
rename from addons/mrp_repair/mrp_repair_make_invoice_view.xml
rename to addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml

From 484fdd21602fd19d7339accb3af75977f6ad8d69 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Wed, 10 Mar 2010 12:53:18 +0530
Subject: [PATCH 065/251] [ADD] delivery: Added Docstrings for functions in
 wizard files.

bzr revid: uco@tinyerp.co.in-20100310072318-w1x0cznvt17aor0w
---
 .../wizard/delivery_sale_order_wizard.py      | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/addons/delivery/wizard/delivery_sale_order_wizard.py b/addons/delivery/wizard/delivery_sale_order_wizard.py
index 35c6a63821e..195fdb20083 100644
--- a/addons/delivery/wizard/delivery_sale_order_wizard.py
+++ b/addons/delivery/wizard/delivery_sale_order_wizard.py
@@ -34,7 +34,19 @@ class make_delivery(osv.osv_memory):
     }
 
 
-    def default_get(self, cr, uid, ids, context):
+    def default_get(self, cr, uid, fields, context):
+        """ 
+             @summary: To get default values for the object.
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param fields: List of fields for which we want default values 
+             @param context: A standard dictionary 
+             
+             @return: A dictionary which of fields with values. 
+        
+        """
         rec_id = context and context.get('record_id',False)
         res = {}
         order_obj = self.pool.get('sale.order')
@@ -48,6 +60,18 @@ class make_delivery(osv.osv_memory):
         return res
     
     def delivery_set(self, cr, uid, ids, context):
+        """ 
+             @summary: Adds delivery costs to Sale Order Line.
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: List of IDs selected 
+             @param context: A standard dictionary 
+             
+             @return:  
+        
+        """
         rec_ids = context and context.get('active_ids',False)
         order_obj = self.pool.get('sale.order')
         line_obj = self.pool.get('sale.order.line')

From 41901b83ed0623ed07b7bb3497bda0464bb0f85c Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 10 Mar 2010 14:19:23 +0530
Subject: [PATCH 066/251] [FIX]: mrp: Fixed problem of mrp root menu

bzr revid: rpa@tinyerp.com-20100310084923-z03xw5tjxczomj8r
---
 addons/mrp/schedulers_all.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp/schedulers_all.xml b/addons/mrp/schedulers_all.xml
index 246732cddbe..84d6be3cbd4 100644
--- a/addons/mrp/schedulers_all.xml
+++ b/addons/mrp/schedulers_all.xml
@@ -42,7 +42,7 @@
             <field name="model">mrp.procurement</field>
         </record>
         
-        <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="menu_mrp_root" sequence="4"/>
+        <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="base.menu_mrp_root" sequence="4"/>
         <menuitem action="action_compute_schedulers" id="mrp_Sched_all" parent="mrp.menu_mrp_scheduler" sequence="90"/>
 		
 	</data>

From d6eb52eb5e65cb7d283a58c8b562c5c1f157332a Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 10 Mar 2010 14:20:16 +0530
Subject: [PATCH 067/251] [IMP]: sale: Converted wizards to osv_memory wizards

bzr revid: rpa@tinyerp.com-20100310085016-ww0jyuowcqib3zdd
---
 addons/sale/__terp__.py                       |   6 +-
 addons/sale/sale_view.xml                     |  17 +-
 addons/sale/sale_wizard.xml                   |  18 +-
 addons/sale/wizard/__init__.py                |  11 +-
 addons/sale/wizard/make_invoice_advance.py    | 157 ------------------
 addons/sale/wizard/sale_line_invoice.py       | 100 +++++++++++
 addons/sale/wizard/sale_line_invoice.xml      |  40 +++++
 .../sale/wizard/sale_make_invoice_advance.py  | 154 +++++++++++++++++
 .../sale/wizard/sale_make_invoice_advance.xml |  70 ++++++++
 .../sale/wizard/wizard_sale_line_invoice.py   | 121 --------------
 10 files changed, 396 insertions(+), 298 deletions(-)
 delete mode 100644 addons/sale/wizard/make_invoice_advance.py
 create mode 100644 addons/sale/wizard/sale_line_invoice.py
 create mode 100644 addons/sale/wizard/sale_line_invoice.xml
 create mode 100644 addons/sale/wizard/sale_make_invoice_advance.py
 create mode 100644 addons/sale/wizard/sale_make_invoice_advance.xml
 delete mode 100644 addons/sale/wizard/wizard_sale_line_invoice.py

diff --git a/addons/sale/__terp__.py b/addons/sale/__terp__.py
index 70d9f084afb..f08a548fcf7 100644
--- a/addons/sale/__terp__.py
+++ b/addons/sale/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.
 #
 ##############################################################################
 
@@ -45,6 +45,8 @@
     'depends': ['product', 'stock', 'mrp', 'process'],
     'init_xml': [],
     'update_xml': [
+        'wizard/sale_make_invoice_advance.xml',
+        'wizard/sale_line_invoice.xml',
         'security/sale_security.xml',
         'security/ir.model.access.csv',
         'sale_workflow.xml',
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index b3cec7496e4..2508ae0d6df 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -149,7 +149,12 @@
                                             <field name="state" select="2"/>
                                             <group col="3" colspan="2">
                                                 <field name="invoiced" select="2"/>
-                                                <button colspan="1" name="%(wizard_sale_order_line_invoice)d" states="confirmed" string="Make Invoice" type="action" icon="gtk-print"/>
+                                                <button colspan="1"
+                                                	name="%(action_view_sale_order_line_make_invoice)d"
+                                                	states="confirmed"
+                                                	string="Make Invoice"
+                                                	type="action"
+                                                	icon="gtk-print" />
                                             </group>
                                         </page>
                                         <page groups="base.group_extended" string="Extra Info">
@@ -379,8 +384,14 @@
                             <separator colspan="4" string="States"/>
                             <field name="state" select="2"/>
                             <group col="2" colspan="2">
-                                <button name="button_done" states="confirmed,exception" string="Done" type="object" icon="gtk-jump-to"/>
-                                <button name="button_cancel" states="confirmed,exception" string="Cancel" type="object" icon="gtk-cancel" />
+                                <button name="button_done"
+                                	states="confirmed,exception"
+                                	string="Done" type="object"
+                                	icon="gtk-jump-to" />
+                                <button name="button_cancel"
+                                	states="confirmed,exception"
+                                	string="Cancel" type="object"
+                                	icon="gtk-cancel" />
                             </group>
                         </page>
                         <page string="Properties">
diff --git a/addons/sale/sale_wizard.xml b/addons/sale/sale_wizard.xml
index 9df05e8e5dd..c364c419857 100644
--- a/addons/sale/sale_wizard.xml
+++ b/addons/sale/sale_wizard.xml
@@ -10,19 +10,19 @@
             multi="True"
             string="Make invoices"/>
 
-        <wizard
-            id="wizard_sale_order_line_invoice"
-            keyword="client_action_multi"
-            model="sale.order.line"
-            name="sale.order.line.make_invoice"
-            multi="True"
-            string="Make invoices"/>
+<!--        <wizard-->
+<!--            id="wizard_sale_order_line_invoice"-->
+<!--            keyword="client_action_multi"-->
+<!--            model="sale.order.line"-->
+<!--            name="sale.order.line.make_invoice"-->
+<!--            multi="True"-->
+<!--            string="Make invoices"/>-->
 
-        <wizard string="Advance Invoice"
+      <!--   <wizard string="Advance Invoice"
             model="sale.order"
             name="sale.advance_payment_inv"
             id="sale.advance_payment"
-            menu="True"/>
+            menu="True"/> -->
 
     </data>
 </openerp>
diff --git a/addons/sale/wizard/__init__.py b/addons/sale/wizard/__init__.py
index 6141e90b83b..07c5ceea83d 100644
--- a/addons/sale/wizard/__init__.py
+++ b/addons/sale/wizard/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,13 +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/>.
 #
 ##############################################################################
 
-from make_invoice import make_invoice
+#remaining make_invoice
+import sale_line_invoice
+import sale_make_invoice_advance
 
-import wizard_sale_line_invoice
-import make_invoice_advance
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/sale/wizard/make_invoice_advance.py b/addons/sale/wizard/make_invoice_advance.py
deleted file mode 100644
index eaa1fc4a14b..00000000000
--- a/addons/sale/wizard/make_invoice_advance.py
+++ /dev/null
@@ -1,157 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import pooler
-from osv import fields, osv
-from tools.translate import _
-
-form = """<?xml version="1.0"?>
-<form string="Advance Payment">
-    <field name="product_id"/>
-    <newline />
-    <field name="qtty"/>
-    <field name="amount"/>
-    <newline />
-</form>
-"""
-fields = {
-        'product_id': {'string':'Product', 'type':'many2one','relation':'product.product','required':True},
-        'amount': {'string':'Unit Price', 'type':'float', 'size':(16,2),'required':True},
-        'qtty': {'string':'Quantity', 'type':'float', 'size':(16,2),'required':True, 'default': lambda *a: 1},
-}
-
-form_msg = """<?xml version="1.0"?>
-<form string="Invoices">
-   <label string="You invoice has been successfully created !"/>
-</form>
-"""
-fields_msg = {}
-
-def _createInvoices(self, cr, uid, data, context={}):
-    list_inv = []
-    pool_obj = pooler.get_pool(cr.dbname)
-    obj_sale = pool_obj.get('sale.order')
-    data_sale = obj_sale.browse(cr,uid,data['ids'])
-    obj_lines = pool_obj.get('account.invoice.line')
-    for sale in data_sale:
-        address_contact = False
-        address_invoice = False
-        create_ids = []
-        ids_inv = []
-        if sale.order_policy == 'postpaid':
-            raise osv.except_osv(
-                _('Error'),
-                _("You cannot make an advance on a sale order that is defined as 'Automatic Invoice after delivery'."))
-        val = obj_lines.product_id_change(cr, uid, [], data['form']['product_id'],uom = False, partner_id = sale.partner_id.id, fposition_id=sale.fiscal_position.id)
-        line_id =obj_lines.create(cr, uid, {
-            'name': val['value']['name'],
-            'account_id':val['value']['account_id'],
-            'price_unit': data['form']['amount'],
-            'quantity': data['form']['qtty'],
-            'discount': False,
-            'uos_id': val['value']['uos_id'],
-            'product_id':data['form']['product_id'],
-            'invoice_line_tax_id': [(6,0,val['value']['invoice_line_tax_id'])],
-            'account_analytic_id': sale.project_id and sale.project_id.id or False,
-            'note':'',
-        })
-        create_ids.append(line_id)
-        inv = {
-            'name': sale.name,
-            'origin': sale.name,
-            'type': 'out_invoice',
-            'reference': False,
-            'account_id': sale.partner_id.property_account_receivable.id,
-            'partner_id': sale.partner_id.id,
-            'address_invoice_id':sale.partner_invoice_id.id,
-            'address_contact_id':sale.partner_order_id.id,
-            'invoice_line': [(6,0,create_ids)],
-            'currency_id' :sale.pricelist_id.currency_id.id,
-            'comment': '',
-            'payment_term':sale.payment_term.id,
-            'fiscal_position': sale.partner_id.property_account_position.id
-            }
-        inv_obj = pool_obj.get('account.invoice')
-        inv_id = inv_obj.create(cr, uid, inv)
-
-        for inv in sale.invoice_ids:
-            ids_inv.append(inv.id)
-        ids_inv.append(inv_id)
-        obj_sale.write(cr,uid,sale.id,{'invoice_ids':[(6,0,ids_inv)]})
-        list_inv.append(inv_id)
-#
-# If invoice on picking: add the cost on the SO
-# If not, the advance will be deduced when generating the final invoice
-#
-        if sale.order_policy=='picking':
-            pool_obj.get('sale.order.line').create(cr, uid, {
-                'order_id': sale.id,
-                'name': val['value']['name'],
-                'price_unit': -data['form']['amount'],
-                'product_uom_qty': data['form']['qtty'],
-                'product_uos_qty': data['form']['qtty'],
-                'product_uos': val['value']['uos_id'],
-                'product_uom': val['value']['uos_id'],
-                'product_id':data['form']['product_id'],
-                'discount': False,
-                'tax_id': [(6,0,val['value']['invoice_line_tax_id'])],
-            }, context)
-    return {'invoice_ids':list_inv}
-
-class sale_advance_payment(wizard.interface):
-    def _open_invoice(self, cr, uid, data, context):
-        pool_obj = pooler.get_pool(cr.dbname)
-        mod_obj = pool_obj.get('ir.model.data') 
-        result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
-        id = mod_obj.read(cr, uid, result, ['res_id'])        
-        model_data_ids = pool_obj.get('ir.model.data').search(cr,uid,[('model','=','ir.ui.view'),('name','=','invoice_form')])
-        resource_id = pool_obj.get('ir.model.data').read(cr,uid,model_data_ids,fields=['res_id'])[0]['res_id']
-        return {
-            'domain': "[('id','in', ["+','.join(map(str,data['form']['invoice_ids']))+"])]",
-            'name': 'Invoices',
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'res_model': 'account.invoice',
-            'views': [(False,'tree'),(resource_id,'form')],
-            'context': "{'type':'out_invoice'}",
-            'type': 'ir.actions.act_window',
-            'search_view_id': id['res_id']
-        }
-
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'form' ,   'arch' : form,'fields' : fields,'state' : [('end','Cancel','gtk-cancel'),('create','Create Advance Invoice','gtk-ok')]}
-        },
-        'create': {
-            'actions': [_createInvoices],
-            'result': {'type' : 'form' ,'arch' : form_msg,'fields' : fields_msg, 'state':[('end','Close','gtk-close'),('open','Open Advance Invoice','gtk-open')]}
-        },
-        'open': {
-            'actions': [],
-            'result': {'type':'action', 'action':_open_invoice, 'state':'end'}
-        }
-    }
-
-sale_advance_payment("sale.advance_payment_inv")
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py
new file mode 100644
index 00000000000..7dd7fef78cb
--- /dev/null
+++ b/addons/sale/wizard/sale_line_invoice.py
@@ -0,0 +1,100 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from service import web_services
+import wizard
+import netsvc
+import ir
+import pooler
+
+class sale_order_line_make_invoice(osv.osv_memory):
+    _name = "sale.order.line.make.invoice"
+    _description = "Sale OrderLine Make_invoice"
+    _columns = {
+        'grouped': fields.boolean('Group the invoices'),
+    }
+    _default = {
+        'grouped' : lambda *a: False
+               }
+
+    def makeInvoices(self, cr, uid, ids, context):
+        res = False
+        invoices = {}
+
+    #TODO: merge with sale.py/make_invoice
+        def make_invoice(order, lines):
+            a = order.partner_id.property_account_receivable.id
+            if order.partner_id and order.partner_id.property_payment_term.id:
+                pay_term = order.partner_id.property_payment_term.id
+            else:
+                pay_term = False
+            inv = {
+                'name': order.name,
+                'origin': order.name,
+                'type': 'out_invoice',
+                'reference': "P%dSO%d" % (order.partner_id.id, order.id),
+                'account_id': a,
+                'partner_id': order.partner_id.id,
+                'address_invoice_id': order.partner_invoice_id.id,
+                'address_contact_id': order.partner_invoice_id.id,
+                'invoice_line': [(6,0,lines)],
+                'currency_id' : order.pricelist_id.currency_id.id,
+                'comment': order.note,
+                'payment_term': pay_term,
+                'fiscal_position': order.partner_id.property_account_position.id
+            }
+            inv_id = self.pool.get('account.invoice').create(cr, uid, inv)
+            return inv_id
+
+        for line in self.pool.get('sale.order.line').browse(cr,uid,context['active_ids']):
+            if (not line.invoiced) and (line.state not in ('draft','cancel')):
+                if not line.order_id.id in invoices:
+                    invoices[line.order_id.id] = []
+                line_id = self.pool.get('sale.order.line').invoice_line_create(cr, uid,
+                        [line.id])
+                for lid in line_id:
+                    invoices[line.order_id.id].append((line, lid))
+                self.pool.get('sale.order.line').write(cr, uid, [line.id],
+                        {'invoiced': True})
+            flag = True
+            data_sale = self.pool.get('sale.order').browse(cr,uid,line.order_id.id)
+            for line in data_sale.order_line:
+                if not line.invoiced:
+                    flag = False
+                    break
+            if flag:
+                wf_service = netsvc.LocalService('workflow')
+                wf_service.trg_validate(uid, 'sale.order', line.order_id.id, 'all_lines', cr)
+                self.pool.get('sale.order').write(cr,uid,[line.order_id.id],{'state' : 'progress'})
+
+        for result in invoices.values():
+            order = result[0][0].order_id
+            il = map(lambda x: x[1], result)
+            res = make_invoice(order, il)
+            cr.execute('INSERT INTO sale_order_invoice_rel \
+                    (order_id,invoice_id) values (%s,%s)', (order.id, res))
+        return {}
+
+
+sale_order_line_make_invoice()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml
new file mode 100644
index 00000000000..823b5a04662
--- /dev/null
+++ b/addons/sale/wizard/sale_line_invoice.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_sale_order_line_make_invoice" model="ir.ui.view">
+            <field name="name">Sale OrderLine Make Invoice</field>
+            <field name="model">sale.order.line.make.invoice</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+             <form string="Create invoices">
+    			<separator colspan="4" string="Do you really want to create the invoices ?" />
+    			<field name="grouped" />
+             	<separator string="" colspan="6" />
+              	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+               	<button name="makeInvoices" string="Create Invoices" type="object" icon="gtk-ok"/>
+             </form>
+            </field>
+		</record>
+
+		<record id="action_view_sale_order_line_make_invoice" model="ir.actions.act_window">
+            <field name="name">Make Invoices</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.order.line.make.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+    		<field name="context">{'record_id' : active_id}</field>
+     	</record>
+
+        <record model="ir.values" id="sale_make_invoice">
+            <field name="model_id" ref="sale.model_sale_order_line" />
+            <field name="object" eval="1" />
+            <field name="name">Make Invoices</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_view_sale_order_line_make_invoice'))" />
+            <field name="key">action</field>
+            <field name="model">sale.order.line</field>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
new file mode 100644
index 00000000000..9a079c4f8ec
--- /dev/null
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -0,0 +1,154 @@
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from service import web_services
+from tools.translate import _
+import ir
+import netsvc
+import pooler
+import wizard
+
+
+class sale_advance_payment_inv(osv.osv_memory):
+    _name = "sale.advance.payment.inv"
+    _description = "Sale Advance Payment Invoice"
+    _columns = {
+        'product_id': fields.many2one('product.product', 'Product', required=True),
+        'amount': fields.float('Unit Price', size=(16, 2), required=True),
+        'qtty': fields.float('Quantity', size=(16, 2), required=True),
+    }
+    _default = {
+        'qtty' : lambda *a: 1
+               }
+    def createInvoices(self, cr, uid, ids, context={}):
+        list_inv = []
+        obj_sale = self.pool.get('sale.order')
+        obj_lines = self.pool.get('account.invoice.line')
+        for sale_adv_obj in self.browse(cr, uid, ids):
+            for sale in obj_sale.browse(cr, uid, context['active_ids']):
+                address_contact = False
+                address_invoice = False
+                create_ids = []
+                ids_inv = []
+                if sale.order_policy == 'postpaid':
+                    raise osv.except_osv(
+                        _('Error'),
+                        _("You cannot make an advance on a sale order \
+                             that is defined as 'Automatic Invoice after delivery'."))
+                val = obj_lines.product_id_change(cr, uid, [], sale_adv_obj.product_id.id,
+                        uom = False, partner_id = sale.partner_id.id, fposition_id=sale.fiscal_position.id)
+                line_id =obj_lines.create(cr, uid, {
+                    'name': val['value']['name'],
+                    'account_id': val['value']['account_id'],
+                    'price_unit': sale_adv_obj.amount,
+                    'quantity': sale_adv_obj.qtty,
+                    'discount': False,
+                    'uos_id': val['value']['uos_id'],
+                    'product_id': sale_adv_obj.product_id.id,
+                    'invoice_line_tax_id': [(6, 0, val['value']['invoice_line_tax_id'])],
+                    'account_analytic_id': sale.project_id.id or False,
+                    #'note':'',
+                })
+                create_ids.append(line_id)
+                inv = {
+                    'name': sale.name,
+                    'origin': sale.name,
+                    'type': 'out_invoice',
+                    'reference': False,
+                    'account_id': sale.partner_id.property_account_receivable.id,
+                    'partner_id': sale.partner_id.id,
+                    'address_invoice_id':sale.partner_invoice_id.id,
+                    'address_contact_id':sale.partner_order_id.id,
+                    'invoice_line': [(6, 0, create_ids)],
+                    'currency_id' :sale.pricelist_id.currency_id.id,
+                    'comment': '',
+                    'payment_term':sale.payment_term.id,
+                    'fiscal_position': sale.partner_id.property_account_position.id
+                    }
+                inv_obj = self.pool.get('account.invoice')
+                inv_id = inv_obj.create(cr, uid, inv)
+
+                for inv in sale.invoice_ids:
+                    ids_inv.append(inv.id)
+                ids_inv.append(inv_id)
+                obj_sale.write(cr, uid, sale.id, {'invoice_ids':[(6, 0, ids_inv)]})
+                list_inv.append(inv_id)
+        #
+        # If invoice on picking: add the cost on the SO
+        # If not, the advance will be deduced when generating the final invoice
+        #
+                if sale.order_policy=='picking':
+                    self.pool.get('sale.order.line').create(cr, uid, {
+                        'order_id': sale.id,
+                        'name': val['value']['name'],
+                        'price_unit': -sale_adv_obj.amount,
+                        'product_uom_qty': sale_adv_obj.qtty,
+                        'product_uos_qty': sale_adv_obj.qtty,
+                        'product_uos': val['value']['uos_id'],
+                        'product_uom': val['value']['uos_id'],
+                        'product_id': sale_adv_obj.product_id.id,
+                        'discount': False,
+                        'tax_id': [(6, 0, val['value']['invoice_line_tax_id'])],
+                    }, context)
+
+        return {#'invoice_ids':list_inv,
+                'name': 'Open Invoice',
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'sale.open.invoice',
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'context': "{'invoice_ids'=%s}" % (list_inv)
+                }
+
+sale_advance_payment_inv()
+
+class sale_open_invoice(osv.osv_memory):
+    _name = "sale.open.invoice"
+    _description = "Sale Open Invoice"
+    _columns = {
+    }
+
+    def open_invoice(self, cr, uid, ids, context):
+        mod_obj = self.pool.get('ir.model.data')
+        invoices = []
+        #TODO: Can not get invoice ids here
+        for advance_pay in self.browse(cr, uid, ids):
+            result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
+            id = mod_obj.read(cr, uid, result, ['res_id'])
+            model_data_ids = self.pool.get('ir.model.data').search(cr, uid,
+                             [('model', '=', 'ir.ui.view'), ('name', '=', 'invoice_form')])
+            resource_id = self.pool.get('ir.model.data').read(cr, uid, model_data_ids,
+                                            fields=['res_id'])[0]['res_id']
+        return {
+#            'domain': "[('id','in', ["+','.join(map(str, invoices))+"])]", # TODO
+            'name': 'Invoices',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'account.invoice',
+            'views': [(False, 'tree'), (resource_id, 'form')],
+            'context': "{'type':'out_invoice'}",
+            'type': 'ir.actions.act_window',
+            'search_view_id': id['res_id']
+         }
+sale_open_invoice()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
new file mode 100644
index 00000000000..eb333f42b64
--- /dev/null
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_sale_advance_payment_inv" model="ir.ui.view">
+            <field name="name">Sale Advance Payment Invoive</field>
+            <field name="model">sale.advance.payment.inv</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+             <form string="Advance Payment">
+			    <field name="product_id"/>
+			    <newline />
+			    <field name="qtty"/>
+			    <field name="amount"/>
+			    <newline />
+             	<separator string="" colspan="4"/>
+             	<label string=""  colspan="2" />
+              	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+               	<button name="createInvoices" string="Create Advance Invoice" type="object" icon="gtk-ok"/>
+             </form>
+            </field>
+		</record>
+
+		<record id="action_view_sale_advance_payment_inv" model="ir.actions.act_window">
+            <field name="name">Advance Invoice</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.advance.payment.inv</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+     		<field name="context">{'record_id' : active_id}</field>
+     	</record>
+
+    	 <record model="ir.values" id="sale_advance_payment_inv1">
+            <field name="model_id" ref="sale.model_sale_order" />
+            <field name="object" eval="1" />
+            <field name="name">Advance Invoice</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_view_sale_advance_payment_inv'))" />
+            <field name="key">action</field>
+            <field name="model">sale.order</field>
+        </record>
+
+
+    	<record id="view_sale_open_invoice" model="ir.ui.view">
+            <field name="name">Open Invoice</field>
+            <field name="model">sale.open.invoice</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+             <form string="Invoices">
+             	<label string="You invoice has been successfully created!" />
+             	 <newline />
+             	<separator string="" colspan="4"/>
+             	<group colspan="4">
+              	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+               	<button name="open_invoice" string="Open Invoice" type="object" icon="gtk-open"/>
+               	</group>
+             </form>
+            </field>
+		</record>
+
+		<record id="action_view_sale_open_invoice" model="ir.actions.act_window">
+            <field name="name">Open Invoice</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.open.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+    	</record>
+    </data>
+</openerp>
diff --git a/addons/sale/wizard/wizard_sale_line_invoice.py b/addons/sale/wizard/wizard_sale_line_invoice.py
deleted file mode 100644
index 8e1e49ab22d..00000000000
--- a/addons/sale/wizard/wizard_sale_line_invoice.py
+++ /dev/null
@@ -1,121 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import ir
-import pooler
-
-invoice_form = """<?xml version="1.0"?>
-<form string="Create invoices">
-    <separator colspan="4" string="Do you really want to create the invoices ?" />
-    <field name="grouped" />
-</form>
-"""
-
-invoice_fields = {
-    'grouped' : {'string':'Group the invoices', 'type':'boolean', 'default': lambda *a: False}
-}
-
-def _makeInvoices(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    res = False
-    invoices = {}
-
-    #TODO: merge with sale.py/make_invoice
-    def make_invoice(order, lines):
-        a = order.partner_id.property_account_receivable.id
-        if order.partner_id and order.partner_id.property_payment_term.id:
-            pay_term = order.partner_id.property_payment_term.id
-        else:
-            pay_term = False
-        inv = {
-            'name': order.name,
-            'origin': order.name,
-            'type': 'out_invoice',
-            'reference': "P%dSO%d" % (order.partner_id.id, order.id),
-            'account_id': a,
-            'partner_id': order.partner_id.id,
-            'address_invoice_id': order.partner_invoice_id.id,
-            'address_contact_id': order.partner_invoice_id.id,
-            'invoice_line': [(6,0,lines)],
-            'currency_id' : order.pricelist_id.currency_id.id,
-            'comment': order.note,
-            'payment_term': pay_term,
-            'fiscal_position': order.partner_id.property_account_position.id
-        }
-        inv_id = pool.get('account.invoice').create(cr, uid, inv)
-        return inv_id
-
-    for line in pool.get('sale.order.line').browse(cr,uid,data['ids']):
-        if (not line.invoiced) and (line.state not in ('draft','cancel')):
-            if not line.order_id.id in invoices:
-                invoices[line.order_id.id] = []
-            line_id = pool.get('sale.order.line').invoice_line_create(cr, uid,
-                    [line.id])
-            for lid in line_id:
-                invoices[line.order_id.id].append((line, lid))
-            pool.get('sale.order.line').write(cr, uid, [line.id],
-                    {'invoiced': True})
-        flag = True
-        data_sale = pool.get('sale.order').browse(cr,uid,line.order_id.id)
-        for line in data_sale.order_line:
-            if not line.invoiced:
-                flag = False
-                break
-        if flag:
-            wf_service = netsvc.LocalService('workflow')
-            wf_service.trg_validate(uid, 'sale.order', line.order_id.id, 'all_lines', cr)
-            pool.get('sale.order').write(cr,uid,[line.order_id.id],{'state' : 'progress'})
-
-    for result in invoices.values():
-        order = result[0][0].order_id
-        il = map(lambda x: x[1], result)
-        res = make_invoice(order, il)
-        cr.execute('INSERT INTO sale_order_invoice_rel \
-                (order_id,invoice_id) values (%s,%s)', (order.id, res))
-    return {}
-
-
-class line_make_invoice(wizard.interface):
-    states = {
-        'init' : {
-            'actions': [],
-            'result': {
-                'type': 'form',
-                'arch': invoice_form,
-                'fields': invoice_fields,
-                'state': [
-                    ('end', 'Cancel'),
-                    ('invoice', 'Create invoices')
-                ]
-            }
-        },
-        'invoice' : {
-            'actions' : [_makeInvoices],
-            'result' : {'type': 'state', 'state': 'end'}
-        },
-    }
-
-line_make_invoice("sale.order.line.make_invoice")
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From d6e1fdc64ddfeb44a6eb2534ac1beee88a25c79b Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 10 Mar 2010 14:26:56 +0530
Subject: [PATCH 068/251] [IMP]: sale: Converted wizards to osv_memory wizards

bzr revid: rpa@tinyerp.com-20100310085656-p505ostos149b3r3
---
 addons/sale/__terp__.py                       |   8 +-
 addons/sale/sale_view.xml                     |  17 +-
 addons/sale/sale_wizard.xml                   |  28 ----
 addons/sale/wizard/__init__.py                |  11 +-
 addons/sale/wizard/make_invoice_advance.py    | 157 ------------------
 addons/sale/wizard/sale_line_invoice.py       | 100 +++++++++++
 .../sale/wizard/sale_make_invoice_advance.py  | 154 +++++++++++++++++
 .../sale/wizard/wizard_sale_line_invoice.py   | 121 --------------
 8 files changed, 277 insertions(+), 319 deletions(-)
 delete mode 100644 addons/sale/sale_wizard.xml
 delete mode 100644 addons/sale/wizard/make_invoice_advance.py
 create mode 100644 addons/sale/wizard/sale_line_invoice.py
 create mode 100644 addons/sale/wizard/sale_make_invoice_advance.py
 delete mode 100644 addons/sale/wizard/wizard_sale_line_invoice.py

diff --git a/addons/sale/__terp__.py b/addons/sale/__terp__.py
index 70d9f084afb..9b2bc14021c 100644
--- a/addons/sale/__terp__.py
+++ b/addons/sale/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.
 #
 ##############################################################################
 
@@ -45,16 +45,16 @@
     'depends': ['product', 'stock', 'mrp', 'process'],
     'init_xml': [],
     'update_xml': [
+        'wizard/sale_make_invoice_advance.xml',
+        'wizard/sale_line_invoice.xml',
         'security/sale_security.xml',
         'security/ir.model.access.csv',
         'sale_workflow.xml',
         'sale_sequence.xml',
         'sale_data.xml',
-        'sale_wizard.xml',
         'sale_view.xml',
         'sale_report_view.xml',
         'sale_report.xml',
-        'sale_wizard.xml',
         'stock_view.xml',
         'report_sale_view.xml',
         'process/sale_process.xml',
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index b3cec7496e4..2508ae0d6df 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -149,7 +149,12 @@
                                             <field name="state" select="2"/>
                                             <group col="3" colspan="2">
                                                 <field name="invoiced" select="2"/>
-                                                <button colspan="1" name="%(wizard_sale_order_line_invoice)d" states="confirmed" string="Make Invoice" type="action" icon="gtk-print"/>
+                                                <button colspan="1"
+                                                	name="%(action_view_sale_order_line_make_invoice)d"
+                                                	states="confirmed"
+                                                	string="Make Invoice"
+                                                	type="action"
+                                                	icon="gtk-print" />
                                             </group>
                                         </page>
                                         <page groups="base.group_extended" string="Extra Info">
@@ -379,8 +384,14 @@
                             <separator colspan="4" string="States"/>
                             <field name="state" select="2"/>
                             <group col="2" colspan="2">
-                                <button name="button_done" states="confirmed,exception" string="Done" type="object" icon="gtk-jump-to"/>
-                                <button name="button_cancel" states="confirmed,exception" string="Cancel" type="object" icon="gtk-cancel" />
+                                <button name="button_done"
+                                	states="confirmed,exception"
+                                	string="Done" type="object"
+                                	icon="gtk-jump-to" />
+                                <button name="button_cancel"
+                                	states="confirmed,exception"
+                                	string="Cancel" type="object"
+                                	icon="gtk-cancel" />
                             </group>
                         </page>
                         <page string="Properties">
diff --git a/addons/sale/sale_wizard.xml b/addons/sale/sale_wizard.xml
deleted file mode 100644
index 9df05e8e5dd..00000000000
--- a/addons/sale/sale_wizard.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <wizard
-            id="wizard_sale_order_make_invoice"
-            keyword="client_action_multi"
-            model="sale.order"
-            name="sale.order.make_invoice"
-            multi="True"
-            string="Make invoices"/>
-
-        <wizard
-            id="wizard_sale_order_line_invoice"
-            keyword="client_action_multi"
-            model="sale.order.line"
-            name="sale.order.line.make_invoice"
-            multi="True"
-            string="Make invoices"/>
-
-        <wizard string="Advance Invoice"
-            model="sale.order"
-            name="sale.advance_payment_inv"
-            id="sale.advance_payment"
-            menu="True"/>
-
-    </data>
-</openerp>
diff --git a/addons/sale/wizard/__init__.py b/addons/sale/wizard/__init__.py
index 6141e90b83b..07c5ceea83d 100644
--- a/addons/sale/wizard/__init__.py
+++ b/addons/sale/wizard/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,13 +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/>.
 #
 ##############################################################################
 
-from make_invoice import make_invoice
+#remaining make_invoice
+import sale_line_invoice
+import sale_make_invoice_advance
 
-import wizard_sale_line_invoice
-import make_invoice_advance
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/sale/wizard/make_invoice_advance.py b/addons/sale/wizard/make_invoice_advance.py
deleted file mode 100644
index eaa1fc4a14b..00000000000
--- a/addons/sale/wizard/make_invoice_advance.py
+++ /dev/null
@@ -1,157 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import pooler
-from osv import fields, osv
-from tools.translate import _
-
-form = """<?xml version="1.0"?>
-<form string="Advance Payment">
-    <field name="product_id"/>
-    <newline />
-    <field name="qtty"/>
-    <field name="amount"/>
-    <newline />
-</form>
-"""
-fields = {
-        'product_id': {'string':'Product', 'type':'many2one','relation':'product.product','required':True},
-        'amount': {'string':'Unit Price', 'type':'float', 'size':(16,2),'required':True},
-        'qtty': {'string':'Quantity', 'type':'float', 'size':(16,2),'required':True, 'default': lambda *a: 1},
-}
-
-form_msg = """<?xml version="1.0"?>
-<form string="Invoices">
-   <label string="You invoice has been successfully created !"/>
-</form>
-"""
-fields_msg = {}
-
-def _createInvoices(self, cr, uid, data, context={}):
-    list_inv = []
-    pool_obj = pooler.get_pool(cr.dbname)
-    obj_sale = pool_obj.get('sale.order')
-    data_sale = obj_sale.browse(cr,uid,data['ids'])
-    obj_lines = pool_obj.get('account.invoice.line')
-    for sale in data_sale:
-        address_contact = False
-        address_invoice = False
-        create_ids = []
-        ids_inv = []
-        if sale.order_policy == 'postpaid':
-            raise osv.except_osv(
-                _('Error'),
-                _("You cannot make an advance on a sale order that is defined as 'Automatic Invoice after delivery'."))
-        val = obj_lines.product_id_change(cr, uid, [], data['form']['product_id'],uom = False, partner_id = sale.partner_id.id, fposition_id=sale.fiscal_position.id)
-        line_id =obj_lines.create(cr, uid, {
-            'name': val['value']['name'],
-            'account_id':val['value']['account_id'],
-            'price_unit': data['form']['amount'],
-            'quantity': data['form']['qtty'],
-            'discount': False,
-            'uos_id': val['value']['uos_id'],
-            'product_id':data['form']['product_id'],
-            'invoice_line_tax_id': [(6,0,val['value']['invoice_line_tax_id'])],
-            'account_analytic_id': sale.project_id and sale.project_id.id or False,
-            'note':'',
-        })
-        create_ids.append(line_id)
-        inv = {
-            'name': sale.name,
-            'origin': sale.name,
-            'type': 'out_invoice',
-            'reference': False,
-            'account_id': sale.partner_id.property_account_receivable.id,
-            'partner_id': sale.partner_id.id,
-            'address_invoice_id':sale.partner_invoice_id.id,
-            'address_contact_id':sale.partner_order_id.id,
-            'invoice_line': [(6,0,create_ids)],
-            'currency_id' :sale.pricelist_id.currency_id.id,
-            'comment': '',
-            'payment_term':sale.payment_term.id,
-            'fiscal_position': sale.partner_id.property_account_position.id
-            }
-        inv_obj = pool_obj.get('account.invoice')
-        inv_id = inv_obj.create(cr, uid, inv)
-
-        for inv in sale.invoice_ids:
-            ids_inv.append(inv.id)
-        ids_inv.append(inv_id)
-        obj_sale.write(cr,uid,sale.id,{'invoice_ids':[(6,0,ids_inv)]})
-        list_inv.append(inv_id)
-#
-# If invoice on picking: add the cost on the SO
-# If not, the advance will be deduced when generating the final invoice
-#
-        if sale.order_policy=='picking':
-            pool_obj.get('sale.order.line').create(cr, uid, {
-                'order_id': sale.id,
-                'name': val['value']['name'],
-                'price_unit': -data['form']['amount'],
-                'product_uom_qty': data['form']['qtty'],
-                'product_uos_qty': data['form']['qtty'],
-                'product_uos': val['value']['uos_id'],
-                'product_uom': val['value']['uos_id'],
-                'product_id':data['form']['product_id'],
-                'discount': False,
-                'tax_id': [(6,0,val['value']['invoice_line_tax_id'])],
-            }, context)
-    return {'invoice_ids':list_inv}
-
-class sale_advance_payment(wizard.interface):
-    def _open_invoice(self, cr, uid, data, context):
-        pool_obj = pooler.get_pool(cr.dbname)
-        mod_obj = pool_obj.get('ir.model.data') 
-        result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
-        id = mod_obj.read(cr, uid, result, ['res_id'])        
-        model_data_ids = pool_obj.get('ir.model.data').search(cr,uid,[('model','=','ir.ui.view'),('name','=','invoice_form')])
-        resource_id = pool_obj.get('ir.model.data').read(cr,uid,model_data_ids,fields=['res_id'])[0]['res_id']
-        return {
-            'domain': "[('id','in', ["+','.join(map(str,data['form']['invoice_ids']))+"])]",
-            'name': 'Invoices',
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'res_model': 'account.invoice',
-            'views': [(False,'tree'),(resource_id,'form')],
-            'context': "{'type':'out_invoice'}",
-            'type': 'ir.actions.act_window',
-            'search_view_id': id['res_id']
-        }
-
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'form' ,   'arch' : form,'fields' : fields,'state' : [('end','Cancel','gtk-cancel'),('create','Create Advance Invoice','gtk-ok')]}
-        },
-        'create': {
-            'actions': [_createInvoices],
-            'result': {'type' : 'form' ,'arch' : form_msg,'fields' : fields_msg, 'state':[('end','Close','gtk-close'),('open','Open Advance Invoice','gtk-open')]}
-        },
-        'open': {
-            'actions': [],
-            'result': {'type':'action', 'action':_open_invoice, 'state':'end'}
-        }
-    }
-
-sale_advance_payment("sale.advance_payment_inv")
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py
new file mode 100644
index 00000000000..7dd7fef78cb
--- /dev/null
+++ b/addons/sale/wizard/sale_line_invoice.py
@@ -0,0 +1,100 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from service import web_services
+import wizard
+import netsvc
+import ir
+import pooler
+
+class sale_order_line_make_invoice(osv.osv_memory):
+    _name = "sale.order.line.make.invoice"
+    _description = "Sale OrderLine Make_invoice"
+    _columns = {
+        'grouped': fields.boolean('Group the invoices'),
+    }
+    _default = {
+        'grouped' : lambda *a: False
+               }
+
+    def makeInvoices(self, cr, uid, ids, context):
+        res = False
+        invoices = {}
+
+    #TODO: merge with sale.py/make_invoice
+        def make_invoice(order, lines):
+            a = order.partner_id.property_account_receivable.id
+            if order.partner_id and order.partner_id.property_payment_term.id:
+                pay_term = order.partner_id.property_payment_term.id
+            else:
+                pay_term = False
+            inv = {
+                'name': order.name,
+                'origin': order.name,
+                'type': 'out_invoice',
+                'reference': "P%dSO%d" % (order.partner_id.id, order.id),
+                'account_id': a,
+                'partner_id': order.partner_id.id,
+                'address_invoice_id': order.partner_invoice_id.id,
+                'address_contact_id': order.partner_invoice_id.id,
+                'invoice_line': [(6,0,lines)],
+                'currency_id' : order.pricelist_id.currency_id.id,
+                'comment': order.note,
+                'payment_term': pay_term,
+                'fiscal_position': order.partner_id.property_account_position.id
+            }
+            inv_id = self.pool.get('account.invoice').create(cr, uid, inv)
+            return inv_id
+
+        for line in self.pool.get('sale.order.line').browse(cr,uid,context['active_ids']):
+            if (not line.invoiced) and (line.state not in ('draft','cancel')):
+                if not line.order_id.id in invoices:
+                    invoices[line.order_id.id] = []
+                line_id = self.pool.get('sale.order.line').invoice_line_create(cr, uid,
+                        [line.id])
+                for lid in line_id:
+                    invoices[line.order_id.id].append((line, lid))
+                self.pool.get('sale.order.line').write(cr, uid, [line.id],
+                        {'invoiced': True})
+            flag = True
+            data_sale = self.pool.get('sale.order').browse(cr,uid,line.order_id.id)
+            for line in data_sale.order_line:
+                if not line.invoiced:
+                    flag = False
+                    break
+            if flag:
+                wf_service = netsvc.LocalService('workflow')
+                wf_service.trg_validate(uid, 'sale.order', line.order_id.id, 'all_lines', cr)
+                self.pool.get('sale.order').write(cr,uid,[line.order_id.id],{'state' : 'progress'})
+
+        for result in invoices.values():
+            order = result[0][0].order_id
+            il = map(lambda x: x[1], result)
+            res = make_invoice(order, il)
+            cr.execute('INSERT INTO sale_order_invoice_rel \
+                    (order_id,invoice_id) values (%s,%s)', (order.id, res))
+        return {}
+
+
+sale_order_line_make_invoice()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
new file mode 100644
index 00000000000..9a079c4f8ec
--- /dev/null
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -0,0 +1,154 @@
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from service import web_services
+from tools.translate import _
+import ir
+import netsvc
+import pooler
+import wizard
+
+
+class sale_advance_payment_inv(osv.osv_memory):
+    _name = "sale.advance.payment.inv"
+    _description = "Sale Advance Payment Invoice"
+    _columns = {
+        'product_id': fields.many2one('product.product', 'Product', required=True),
+        'amount': fields.float('Unit Price', size=(16, 2), required=True),
+        'qtty': fields.float('Quantity', size=(16, 2), required=True),
+    }
+    _default = {
+        'qtty' : lambda *a: 1
+               }
+    def createInvoices(self, cr, uid, ids, context={}):
+        list_inv = []
+        obj_sale = self.pool.get('sale.order')
+        obj_lines = self.pool.get('account.invoice.line')
+        for sale_adv_obj in self.browse(cr, uid, ids):
+            for sale in obj_sale.browse(cr, uid, context['active_ids']):
+                address_contact = False
+                address_invoice = False
+                create_ids = []
+                ids_inv = []
+                if sale.order_policy == 'postpaid':
+                    raise osv.except_osv(
+                        _('Error'),
+                        _("You cannot make an advance on a sale order \
+                             that is defined as 'Automatic Invoice after delivery'."))
+                val = obj_lines.product_id_change(cr, uid, [], sale_adv_obj.product_id.id,
+                        uom = False, partner_id = sale.partner_id.id, fposition_id=sale.fiscal_position.id)
+                line_id =obj_lines.create(cr, uid, {
+                    'name': val['value']['name'],
+                    'account_id': val['value']['account_id'],
+                    'price_unit': sale_adv_obj.amount,
+                    'quantity': sale_adv_obj.qtty,
+                    'discount': False,
+                    'uos_id': val['value']['uos_id'],
+                    'product_id': sale_adv_obj.product_id.id,
+                    'invoice_line_tax_id': [(6, 0, val['value']['invoice_line_tax_id'])],
+                    'account_analytic_id': sale.project_id.id or False,
+                    #'note':'',
+                })
+                create_ids.append(line_id)
+                inv = {
+                    'name': sale.name,
+                    'origin': sale.name,
+                    'type': 'out_invoice',
+                    'reference': False,
+                    'account_id': sale.partner_id.property_account_receivable.id,
+                    'partner_id': sale.partner_id.id,
+                    'address_invoice_id':sale.partner_invoice_id.id,
+                    'address_contact_id':sale.partner_order_id.id,
+                    'invoice_line': [(6, 0, create_ids)],
+                    'currency_id' :sale.pricelist_id.currency_id.id,
+                    'comment': '',
+                    'payment_term':sale.payment_term.id,
+                    'fiscal_position': sale.partner_id.property_account_position.id
+                    }
+                inv_obj = self.pool.get('account.invoice')
+                inv_id = inv_obj.create(cr, uid, inv)
+
+                for inv in sale.invoice_ids:
+                    ids_inv.append(inv.id)
+                ids_inv.append(inv_id)
+                obj_sale.write(cr, uid, sale.id, {'invoice_ids':[(6, 0, ids_inv)]})
+                list_inv.append(inv_id)
+        #
+        # If invoice on picking: add the cost on the SO
+        # If not, the advance will be deduced when generating the final invoice
+        #
+                if sale.order_policy=='picking':
+                    self.pool.get('sale.order.line').create(cr, uid, {
+                        'order_id': sale.id,
+                        'name': val['value']['name'],
+                        'price_unit': -sale_adv_obj.amount,
+                        'product_uom_qty': sale_adv_obj.qtty,
+                        'product_uos_qty': sale_adv_obj.qtty,
+                        'product_uos': val['value']['uos_id'],
+                        'product_uom': val['value']['uos_id'],
+                        'product_id': sale_adv_obj.product_id.id,
+                        'discount': False,
+                        'tax_id': [(6, 0, val['value']['invoice_line_tax_id'])],
+                    }, context)
+
+        return {#'invoice_ids':list_inv,
+                'name': 'Open Invoice',
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'sale.open.invoice',
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'context': "{'invoice_ids'=%s}" % (list_inv)
+                }
+
+sale_advance_payment_inv()
+
+class sale_open_invoice(osv.osv_memory):
+    _name = "sale.open.invoice"
+    _description = "Sale Open Invoice"
+    _columns = {
+    }
+
+    def open_invoice(self, cr, uid, ids, context):
+        mod_obj = self.pool.get('ir.model.data')
+        invoices = []
+        #TODO: Can not get invoice ids here
+        for advance_pay in self.browse(cr, uid, ids):
+            result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
+            id = mod_obj.read(cr, uid, result, ['res_id'])
+            model_data_ids = self.pool.get('ir.model.data').search(cr, uid,
+                             [('model', '=', 'ir.ui.view'), ('name', '=', 'invoice_form')])
+            resource_id = self.pool.get('ir.model.data').read(cr, uid, model_data_ids,
+                                            fields=['res_id'])[0]['res_id']
+        return {
+#            'domain': "[('id','in', ["+','.join(map(str, invoices))+"])]", # TODO
+            'name': 'Invoices',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'account.invoice',
+            'views': [(False, 'tree'), (resource_id, 'form')],
+            'context': "{'type':'out_invoice'}",
+            'type': 'ir.actions.act_window',
+            'search_view_id': id['res_id']
+         }
+sale_open_invoice()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/wizard/wizard_sale_line_invoice.py b/addons/sale/wizard/wizard_sale_line_invoice.py
deleted file mode 100644
index 8e1e49ab22d..00000000000
--- a/addons/sale/wizard/wizard_sale_line_invoice.py
+++ /dev/null
@@ -1,121 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import ir
-import pooler
-
-invoice_form = """<?xml version="1.0"?>
-<form string="Create invoices">
-    <separator colspan="4" string="Do you really want to create the invoices ?" />
-    <field name="grouped" />
-</form>
-"""
-
-invoice_fields = {
-    'grouped' : {'string':'Group the invoices', 'type':'boolean', 'default': lambda *a: False}
-}
-
-def _makeInvoices(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    res = False
-    invoices = {}
-
-    #TODO: merge with sale.py/make_invoice
-    def make_invoice(order, lines):
-        a = order.partner_id.property_account_receivable.id
-        if order.partner_id and order.partner_id.property_payment_term.id:
-            pay_term = order.partner_id.property_payment_term.id
-        else:
-            pay_term = False
-        inv = {
-            'name': order.name,
-            'origin': order.name,
-            'type': 'out_invoice',
-            'reference': "P%dSO%d" % (order.partner_id.id, order.id),
-            'account_id': a,
-            'partner_id': order.partner_id.id,
-            'address_invoice_id': order.partner_invoice_id.id,
-            'address_contact_id': order.partner_invoice_id.id,
-            'invoice_line': [(6,0,lines)],
-            'currency_id' : order.pricelist_id.currency_id.id,
-            'comment': order.note,
-            'payment_term': pay_term,
-            'fiscal_position': order.partner_id.property_account_position.id
-        }
-        inv_id = pool.get('account.invoice').create(cr, uid, inv)
-        return inv_id
-
-    for line in pool.get('sale.order.line').browse(cr,uid,data['ids']):
-        if (not line.invoiced) and (line.state not in ('draft','cancel')):
-            if not line.order_id.id in invoices:
-                invoices[line.order_id.id] = []
-            line_id = pool.get('sale.order.line').invoice_line_create(cr, uid,
-                    [line.id])
-            for lid in line_id:
-                invoices[line.order_id.id].append((line, lid))
-            pool.get('sale.order.line').write(cr, uid, [line.id],
-                    {'invoiced': True})
-        flag = True
-        data_sale = pool.get('sale.order').browse(cr,uid,line.order_id.id)
-        for line in data_sale.order_line:
-            if not line.invoiced:
-                flag = False
-                break
-        if flag:
-            wf_service = netsvc.LocalService('workflow')
-            wf_service.trg_validate(uid, 'sale.order', line.order_id.id, 'all_lines', cr)
-            pool.get('sale.order').write(cr,uid,[line.order_id.id],{'state' : 'progress'})
-
-    for result in invoices.values():
-        order = result[0][0].order_id
-        il = map(lambda x: x[1], result)
-        res = make_invoice(order, il)
-        cr.execute('INSERT INTO sale_order_invoice_rel \
-                (order_id,invoice_id) values (%s,%s)', (order.id, res))
-    return {}
-
-
-class line_make_invoice(wizard.interface):
-    states = {
-        'init' : {
-            'actions': [],
-            'result': {
-                'type': 'form',
-                'arch': invoice_form,
-                'fields': invoice_fields,
-                'state': [
-                    ('end', 'Cancel'),
-                    ('invoice', 'Create invoices')
-                ]
-            }
-        },
-        'invoice' : {
-            'actions' : [_makeInvoices],
-            'result' : {'type': 'state', 'state': 'end'}
-        },
-    }
-
-line_make_invoice("sale.order.line.make_invoice")
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From 1fe8691588ec2723da0af4c7c65abf7db1d131d7 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 10 Mar 2010 14:55:11 +0530
Subject: [PATCH 069/251] [IMP]: stock: Improvment in wizards for putting it
 properly on right side, removed _ from function called from button

bzr revid: rpa@tinyerp.com-20100310092511-mmkho4c4w2g2ql7f
---
 addons/stock/__terp__.py                      |  2 +-
 addons/stock/stock_view.xml                   | 25 ++++-----------
 addons/stock/stock_wizard.xml                 | 28 -----------------
 addons/stock/wizard/__init__.py               |  2 +-
 addons/stock/wizard/stock_fill_inventory.py   | 31 ++++++++++---------
 .../wizard/stock_fill_inventory_view.xml      | 12 ++++++-
 .../wizard/stock_inventory_line_split.py      |  2 +-
 .../stock_inventory_line_split_view.xml       |  2 +-
 ...o.py => stock_inventory_set_stock_zero.py} |  0
 ...> stock_inventory_set_stock_zero_view.xml} | 11 +++++++
 .../stock/wizard/stock_invoice_onshipping.py  |  2 +-
 .../wizard/stock_invoice_onshipping_view.xml  | 15 +++++++--
 addons/stock/wizard/stock_location_product.py |  2 +-
 .../wizard/stock_location_product_view.xml    | 12 ++++++-
 14 files changed, 74 insertions(+), 72 deletions(-)
 rename addons/stock/wizard/{inventory_merge_stock_zero.py => stock_inventory_set_stock_zero.py} (100%)
 rename addons/stock/wizard/{inventory_merge_stock_zero_view.xml => stock_inventory_set_stock_zero_view.xml} (68%)

diff --git a/addons/stock/__terp__.py b/addons/stock/__terp__.py
index ff47ac55d8b..ba5e435fcbb 100644
--- a/addons/stock/__terp__.py
+++ b/addons/stock/__terp__.py
@@ -42,7 +42,7 @@ Thanks to the double entry management, the inventory controlling is powerful and
     "demo_xml" : ["stock_demo.xml"],
     "update_xml" : [
         "stock_data.xml",
-        "wizard/inventory_merge_stock_zero_view.xml",
+        "wizard/stock_inventory_set_stock_zero_view.xml",
         "wizard/stock_fill_inventory_view.xml",
         "wizard/stock_invoice_onshipping_view.xml",
         "wizard/stock_location_product_view.xml",
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 6129c345b1c..c112ab44d5e 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -33,9 +33,12 @@
                     <field name="product_uom"/>
                     <field name="prod_lot_id"/>
                     <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>
-                    <button name="%(stock.action_view_stock_inventory_line_split)d"
-                     		 				string="Split inventory lines"
-                      		 				type="action" icon="gtk-justify-fill"/>
+                  <!--   <button name="%(split_inventory_lots)d"
+                    	string="Split Inventory Lines" type="action"
+                    	icon="gtk-justify-fill" /> -->
+                    	 <button name="%(stock.action_view_stock_inventory_line_split)d"
+                    		 		string="Split inventory lines"
+                      		 		type="action" icon="gtk-justify-fill"/>
                 </form>
             </field>
         </record>
@@ -110,16 +113,6 @@
                         <button name="action_done" states="draft" string="Confirm Inventory" type="object" icon="gtk-apply"/>
                         <button name="action_cancel" states="cancel" string="Set to Draft" type="object" icon="gtk-cancel"/>
                         <button name="action_cancel_inventary" states="draft" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
-                         <group col="4" colspan="2">
-                        	<button name="%(stock.action_view_inventory_merge_stock_zero)d"
-                     		 string="Set Stock to Zero"
-                      		 type="action"/>
-                      		<button name="%(stock.action_view_stock_fill_inventory)d"
-                     		 string="Fill Inventory"
-                      		 type="action"/>
-						</group>
-
-
                     </group>
 
                 </form>
@@ -429,9 +422,6 @@
                     </group>
                     <separator string="Additional Information" colspan="4"/>
                     <field colspan="4" name="comment" nolabel="1"/>
-                    <button name="%(stock.action_view_stock_location_product)d"
-                     		 string="Products by Location"
-                      		 type="action"/>
                 </form>
             </field>
         </record>
@@ -919,9 +909,6 @@
                     <field name="state"/>
                     <button name="%(partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-go-forward" help="Validate Picking"/>
                     <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the picking.    Do you want to continue?"/>
-                    <button name="%(wizard_invoice_onshipping)d" states="done" string="Invoice" type="action"
-                    			icon="gtk-execute" help="Create invoice"
-                    			attrs="{'invisible': [('invoice_state', '!=', '2binvoiced')]}" />
                 </tree>
             </field>
         </record>
diff --git a/addons/stock/stock_wizard.xml b/addons/stock/stock_wizard.xml
index 88952bdb91e..d562ddfbb9f 100644
--- a/addons/stock/stock_wizard.xml
+++ b/addons/stock/stock_wizard.xml
@@ -43,20 +43,6 @@
         name="stock.return.picking"
         string="Return picking"/>
 
-    <wizard
-        id="wizard_invoice_onshipping"
-        keyword="client_action_multi"
-        model="stock.picking"
-        name="stock.invoice_onshipping"
-        string="Create invoice"/>
-
-    <wizard
-        string="Set Stock to 0"
-        model="stock.inventory"
-        name="inventory.merge.stock.zero"
-        keyword="client_action_multi"
-        id="wizard_merge_inventory_zero"/>
-
     <wizard
         string="Merge inventories"
         model="stock.inventory"
@@ -65,19 +51,5 @@
         multi="True"
         id="wizard_merge_inventory"/>
 
-    <wizard
-        string="Fill Inventory"
-        model="stock.inventory"
-        name="stock.fill_inventory"
-        keyword="client_action_multi"
-        id="wizard_fill_inventory"
-    />
-
-    <wizard
-        id="location_product"
-        model="stock.location"
-        name="stock.location.products"
-        string="Products by Location"/>
-
    </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py
index 87f1f30b626..c489f880fdf 100644
--- a/addons/stock/wizard/__init__.py
+++ b/addons/stock/wizard/__init__.py
@@ -29,7 +29,7 @@ import wizard_split_lot_line
 import wizard_ups
 import inventory_merge
 
-import inventory_merge_stock_zero
+import stock_inventory_set_stock_zero
 import stock_fill_inventory
 import stock_inventory_line_split
 import stock_invoice_onshipping
diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index 3de4b9e1aea..246aff9eabf 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -33,25 +33,26 @@ class stock_fill_inventory(osv.osv_memory):
     _name = "stock.fill.inventory"
     _description = "Fill Inventory"
     _columns = {
-            'location_id': fields.many2one('stock.location', 'Location', required=True), 
-            'recursive': fields.boolean("Include all childs for the location"), 
+            'location_id': fields.many2one('stock.location', 'Location', required=True),
+            'recursive': fields.boolean("Include all childs for the location"),
             }
 
-    def _fill_inventory(self, cr, uid, ids, context):
+    def fill_inventory(self, cr, uid, ids, context):
         inventory_line_obj = self.pool.get('stock.inventory.line')
         location_obj = self.pool.get('stock.location')
         for fill_inventory in self.browse(cr, uid, ids):
             res = {}
             res_location = {}
             if fill_inventory.recursive :
-                location_ids = location_obj.search(cr, uid, [('location_id', 
+                location_ids = location_obj.search(cr, uid, [('location_id',
                                  'child_of', fill_inventory.location_id.id)])
                 for location in location_ids :
                     res = location_obj._product_get(cr, uid, location)
                     res_location[location] = res
             else:
                 context.update({'compute_child': False})
-                res = location_obj._product_get(cr, uid, fill_inventory.location_id.id, context=context)
+                res = location_obj._product_get(cr, uid,
+                            fill_inventory.location_id.id, context=context)
                 res_location[fill_inventory.location_id.id] = res
 
                 product_ids = []
@@ -61,21 +62,21 @@ class stock_fill_inventory(osv.osv_memory):
                         prod = self.pool.get('product.product').browse(cr, uid, [product_id])[0]
                         uom = prod.uom_id.id
                         context.update({'uom': uom})
-                        amount = self.pool.get('stock.location')._product_get(cr, uid, 
+                        amount = self.pool.get('stock.location')._product_get(cr, uid,
                                  location, [product_id], context=context)[product_id]
 
                         if(amount):
-                            line_ids=inventory_line_obj.search(cr, uid, 
-                                [('inventory_id', '=', context['active_ids']), 
-                                 ('location_id', '=', location), 
-                                 ('product_id', '=', product_id), 
-                                 ('product_uom', '=', uom), 
+                            line_ids=inventory_line_obj.search(cr, uid,
+                                [('inventory_id', '=', context['active_ids']),
+                                 ('location_id', '=', location),
+                                 ('product_id', '=', product_id),
+                                 ('product_uom', '=', uom),
                                 ('product_qty', '=', amount)])
                             if not len(line_ids):
-                                inventory_line = {'inventory_id': context['active_ids'][0], 
-                                                'location_id': location, 
-                                                'product_id': product_id, 
-                                                'product_uom': uom, 
+                                inventory_line = {'inventory_id': context['active_ids'][0],
+                                                'location_id': location,
+                                                'product_id': product_id,
+                                                'product_uom': uom,
                                                 'product_qty': amount}
                                 inventory_line_obj.create(cr, uid, inventory_line)
                             product_ids.append(product_id)
diff --git a/addons/stock/wizard/stock_fill_inventory_view.xml b/addons/stock/wizard/stock_fill_inventory_view.xml
index e321300ccf2..5ac6732b533 100644
--- a/addons/stock/wizard/stock_fill_inventory_view.xml
+++ b/addons/stock/wizard/stock_fill_inventory_view.xml
@@ -14,7 +14,7 @@
     				<newline/>
         	        <separator string="" colspan="4" />
 					<button special="cancel" string="Cancel" />
-            	    <button name="_fill_inventory" string="Fill Inventory" type="object"/>
+            	    <button name="fill_inventory" string="Fill Inventory" type="object"/>
              </form>
             </field>
 		</record>
@@ -29,5 +29,15 @@
             <field name="context">{'record_id' : active_id}</field>
         </record>
 
+        <record model="ir.values" id="wiki_stock_fill_inventory">
+            <field name="model_id" ref="stock.model_stock_inventory" />
+            <field name="object" eval="1" />
+            <field name="name">Fill Inventory</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_view_stock_fill_inventory'))" />
+            <field name="key">action</field>
+            <field name="model">stock.inventory</field>
+        </record>
+
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/stock/wizard/stock_inventory_line_split.py b/addons/stock/wizard/stock_inventory_line_split.py
index 1769385cda7..1723f7b3032 100644
--- a/addons/stock/wizard/stock_inventory_line_split.py
+++ b/addons/stock/wizard/stock_inventory_line_split.py
@@ -49,7 +49,7 @@ inventory lines, make sure the production lot is assigned to this product.'))
             'prefix': _check_production_lot, 
             }
 
-    def _split_lines(self, cr, uid, ids, context):
+    def split_lines(self, cr, uid, ids, context):
         inv_id = context['active_id']
         inv_line_obj = self.pool.get('stock.inventory.line')
         prodlot_obj = self.pool.get('stock.production.lot')
diff --git a/addons/stock/wizard/stock_inventory_line_split_view.xml b/addons/stock/wizard/stock_inventory_line_split_view.xml
index cc191105bd6..a2c9f2d065a 100644
--- a/addons/stock/wizard/stock_inventory_line_split_view.xml
+++ b/addons/stock/wizard/stock_inventory_line_split_view.xml
@@ -13,7 +13,7 @@
  					<separator string="" colspan="4" />
         			<label string=""/>
 					<button special="cancel" string="Cancel" icon="gtk-cancel" />
-           	    	<button name="_split_lines" string="Ok" type="object" icon="gtk-ok"/>
+           	    	<button name="split_lines" string="Ok" type="object" icon="gtk-ok"/>
     			</form>
             </field>
 		</record>
diff --git a/addons/stock/wizard/inventory_merge_stock_zero.py b/addons/stock/wizard/stock_inventory_set_stock_zero.py
similarity index 100%
rename from addons/stock/wizard/inventory_merge_stock_zero.py
rename to addons/stock/wizard/stock_inventory_set_stock_zero.py
diff --git a/addons/stock/wizard/inventory_merge_stock_zero_view.xml b/addons/stock/wizard/stock_inventory_set_stock_zero_view.xml
similarity index 68%
rename from addons/stock/wizard/inventory_merge_stock_zero_view.xml
rename to addons/stock/wizard/stock_inventory_set_stock_zero_view.xml
index d71df8dc4ef..2948b3005ea 100644
--- a/addons/stock/wizard/inventory_merge_stock_zero_view.xml
+++ b/addons/stock/wizard/stock_inventory_set_stock_zero_view.xml
@@ -26,6 +26,17 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
+         	<field name="context">{'record_id' : active_id}</field>
+    	</record>
+
+      	 <record model="ir.values" id="wiki_merge_stock_zero">
+            <field name="model_id" ref="stock.model_stock_inventory" />
+            <field name="object" eval="1" />
+            <field name="name">Set Stock to Zero</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_view_inventory_merge_stock_zero'))" />
+            <field name="key">action</field>
+            <field name="model">stock.inventory</field>
         </record>
         
     </data>
diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py
index 110a55c6aef..82043fc0532 100644
--- a/addons/stock/wizard/stock_invoice_onshipping.py
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@@ -68,7 +68,7 @@ class stock_invoice_onshipping(osv.osv_memory):
             'type': _get_type,
         }
 
-    def _create_invoice(self, cr, uid, ids, context):
+    def create_invoice(self, cr, uid, ids, context):
         result = []
         for onshipdata_obj in self.read(cr, uid, ids, ['journal_id', 'group', 'type', 'invoice_date']):
             if context.get('new_picking', False):
diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml
index 77988aab94a..c4bec603120 100644
--- a/addons/stock/wizard/stock_invoice_onshipping_view.xml
+++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml
@@ -17,18 +17,29 @@
 					<field name="invoice_date" />
 			   	    <separator string="" colspan="4" />
 					<button special="cancel" string="Cancel" />
-			       	<button name="_create_invoice" string="Create Invoices" type="object"/>
+			       	<button name="create_invoice" string="Create Invoices" type="object"/>
              </form>
             </field>
 		</record>
 
 		<record id="action_stock_invoice_onshipping" model="ir.actions.act_window">
-            <field name="name">Stock Invoice Onshipping</field>
+            <field name="name">Create Invoice</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">stock.invoice.onshipping</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
+        	<field name="context">{'record_id' : active_id}</field>
+    	</record>
+
+     	 <record model="ir.values" id="stock_stock_invoice_onshipping">
+            <field name="model_id" ref="stock.model_stock_picking" />
+            <field name="object" eval="1" />
+            <field name="name">Create Invoice</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_stock_invoice_onshipping'))" />
+            <field name="key">action</field>
+            <field name="model">stock.picking</field>
         </record>
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/stock/wizard/stock_location_product.py b/addons/stock/wizard/stock_location_product.py
index 6240e34c80d..44f6cb4dc7f 100755
--- a/addons/stock/wizard/stock_location_product.py
+++ b/addons/stock/wizard/stock_location_product.py
@@ -36,7 +36,7 @@ class stock_location_product(osv.osv_memory):
                 'to_date': fields.datetime('To'), 
                 }
 
-    def _action_open_window(self, cr, uid, ids, context):
+    def action_open_window(self, cr, uid, ids, context):
         mod_obj = self.pool.get('ir.model.data')
         for location_obj in self.read(cr, uid, ids, ['from_date', 'to_date']):
             result = mod_obj._get_id(cr, uid, 'product', 'product_search_form_view')
diff --git a/addons/stock/wizard/stock_location_product_view.xml b/addons/stock/wizard/stock_location_product_view.xml
index 8bafa8f4750..5d54ee874aa 100644
--- a/addons/stock/wizard/stock_location_product_view.xml
+++ b/addons/stock/wizard/stock_location_product_view.xml
@@ -17,7 +17,7 @@
         			<separator string="" colspan="4" />
         			<label string=""/>
 					<button special="cancel" string="Cancel" icon="gtk-cancel" />
-           	    	<button name="_action_open_window" string="Open Product" type="object" icon="gtk-ok"/>
+           	    	<button name="action_open_window" string="Open Product" type="object" icon="gtk-ok"/>
     			</form>
             </field>
 		</record>
@@ -29,7 +29,17 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
+    		<field name="context">{'record_id' : active_id}</field>
     	</record>
 
+     	 <record model="ir.values" id="stock_location_product">
+            <field name="model_id" ref="stock.model_stock_location" />
+            <field name="object" eval="1" />
+            <field name="name">Products by Location</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_view_stock_location_product'))" />
+            <field name="key">action</field>
+            <field name="model">stock.location</field>
+        </record>
     </data>
 </openerp>
\ No newline at end of file

From 66812e6cae722e5af1b6b684545152068ad91a08 Mon Sep 17 00:00:00 2001
From: "KSA (OpenERP)" <>
Date: Wed, 10 Mar 2010 15:01:52 +0530
Subject: [PATCH 070/251] [ADD]: sale: Remaining view files

bzr revid: rpa@tinyerp.com-20100310093152-bxut63jzox6aqtkv
---
 addons/sale/wizard/sale_line_invoice.xml      | 40 +++++++++++
 .../sale/wizard/sale_make_invoice_advance.xml | 70 +++++++++++++++++++
 2 files changed, 110 insertions(+)
 create mode 100644 addons/sale/wizard/sale_line_invoice.xml
 create mode 100644 addons/sale/wizard/sale_make_invoice_advance.xml

diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml
new file mode 100644
index 00000000000..823b5a04662
--- /dev/null
+++ b/addons/sale/wizard/sale_line_invoice.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_sale_order_line_make_invoice" model="ir.ui.view">
+            <field name="name">Sale OrderLine Make Invoice</field>
+            <field name="model">sale.order.line.make.invoice</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+             <form string="Create invoices">
+    			<separator colspan="4" string="Do you really want to create the invoices ?" />
+    			<field name="grouped" />
+             	<separator string="" colspan="6" />
+              	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+               	<button name="makeInvoices" string="Create Invoices" type="object" icon="gtk-ok"/>
+             </form>
+            </field>
+		</record>
+
+		<record id="action_view_sale_order_line_make_invoice" model="ir.actions.act_window">
+            <field name="name">Make Invoices</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.order.line.make.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+    		<field name="context">{'record_id' : active_id}</field>
+     	</record>
+
+        <record model="ir.values" id="sale_make_invoice">
+            <field name="model_id" ref="sale.model_sale_order_line" />
+            <field name="object" eval="1" />
+            <field name="name">Make Invoices</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_view_sale_order_line_make_invoice'))" />
+            <field name="key">action</field>
+            <field name="model">sale.order.line</field>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
new file mode 100644
index 00000000000..eb333f42b64
--- /dev/null
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_sale_advance_payment_inv" model="ir.ui.view">
+            <field name="name">Sale Advance Payment Invoive</field>
+            <field name="model">sale.advance.payment.inv</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+             <form string="Advance Payment">
+			    <field name="product_id"/>
+			    <newline />
+			    <field name="qtty"/>
+			    <field name="amount"/>
+			    <newline />
+             	<separator string="" colspan="4"/>
+             	<label string=""  colspan="2" />
+              	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+               	<button name="createInvoices" string="Create Advance Invoice" type="object" icon="gtk-ok"/>
+             </form>
+            </field>
+		</record>
+
+		<record id="action_view_sale_advance_payment_inv" model="ir.actions.act_window">
+            <field name="name">Advance Invoice</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.advance.payment.inv</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+     		<field name="context">{'record_id' : active_id}</field>
+     	</record>
+
+    	 <record model="ir.values" id="sale_advance_payment_inv1">
+            <field name="model_id" ref="sale.model_sale_order" />
+            <field name="object" eval="1" />
+            <field name="name">Advance Invoice</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_view_sale_advance_payment_inv'))" />
+            <field name="key">action</field>
+            <field name="model">sale.order</field>
+        </record>
+
+
+    	<record id="view_sale_open_invoice" model="ir.ui.view">
+            <field name="name">Open Invoice</field>
+            <field name="model">sale.open.invoice</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+             <form string="Invoices">
+             	<label string="You invoice has been successfully created!" />
+             	 <newline />
+             	<separator string="" colspan="4"/>
+             	<group colspan="4">
+              	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+               	<button name="open_invoice" string="Open Invoice" type="object" icon="gtk-open"/>
+               	</group>
+             </form>
+            </field>
+		</record>
+
+		<record id="action_view_sale_open_invoice" model="ir.actions.act_window">
+            <field name="name">Open Invoice</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.open.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+    	</record>
+    </data>
+</openerp>

From e97cd87fcd5965d510155d727d3e4e04f77f92c8 Mon Sep 17 00:00:00 2001
From: "KSA (Open ERP)" <>
Date: Wed, 10 Mar 2010 15:12:47 +0530
Subject: [PATCH 071/251] [IMP] stock: Converted wizards into osv_memory
 wizard.

bzr revid: rpa@tinyerp.com-20100310094247-0gi9qlre6r82244w
---
 addons/stock/__init__.py                      |   6 +-
 addons/stock/__terp__.py                      |   9 +-
 addons/stock/security/ir.model.access.csv     |   6 +
 addons/stock/stock_view.xml                   |  50 ++++--
 addons/stock/stock_wizard.xml                 |  32 +---
 addons/stock/wizard/__init__.py               |  15 +-
 addons/stock/wizard/inventory_merge.py        |   1 +
 addons/stock/wizard/inventory_merge_zero.py   |  94 ----------
 addons/stock/wizard/stock_fill_inventory.py   |  90 ++++++++++
 .../wizard/stock_fill_inventory_view.xml      |  43 +++++
 .../wizard/stock_inventory_line_split.py      | 105 +++++++++++
 .../stock_inventory_line_split_view.xml       |  31 ++++
 .../wizard/stock_inventory_set_stock_zero.py  |  72 ++++++++
 .../stock_inventory_set_stock_zero_view.xml   |  43 +++++
 .../stock/wizard/stock_invoice_onshipping.py  | 111 ++++++++++++
 .../wizard/stock_invoice_onshipping_view.xml  |  45 +++++
 addons/stock/wizard/stock_location_product.py |  59 +++++++
 .../wizard/stock_location_product_view.xml    |  45 +++++
 addons/stock/wizard/stock_traceability.py     |   4 +-
 addons/stock/wizard/wizard_inventory.py       | 111 ------------
 .../stock/wizard/wizard_invoice_onshipping.py | 167 ------------------
 .../stock/wizard/wizard_location_product.py   |  76 --------
 .../wizard/wizard_split_inventory_lots.py     |  98 ----------
 23 files changed, 706 insertions(+), 607 deletions(-)
 delete mode 100644 addons/stock/wizard/inventory_merge_zero.py
 create mode 100644 addons/stock/wizard/stock_fill_inventory.py
 create mode 100644 addons/stock/wizard/stock_fill_inventory_view.xml
 create mode 100644 addons/stock/wizard/stock_inventory_line_split.py
 create mode 100644 addons/stock/wizard/stock_inventory_line_split_view.xml
 create mode 100644 addons/stock/wizard/stock_inventory_set_stock_zero.py
 create mode 100644 addons/stock/wizard/stock_inventory_set_stock_zero_view.xml
 create mode 100644 addons/stock/wizard/stock_invoice_onshipping.py
 create mode 100644 addons/stock/wizard/stock_invoice_onshipping_view.xml
 create mode 100755 addons/stock/wizard/stock_location_product.py
 create mode 100644 addons/stock/wizard/stock_location_product_view.xml
 delete mode 100644 addons/stock/wizard/wizard_inventory.py
 delete mode 100644 addons/stock/wizard/wizard_invoice_onshipping.py
 delete mode 100755 addons/stock/wizard/wizard_location_product.py
 delete mode 100644 addons/stock/wizard/wizard_split_inventory_lots.py

diff --git a/addons/stock/__init__.py b/addons/stock/__init__.py
index d728efbf2fe..12a218a31be 100644
--- a/addons/stock/__init__.py
+++ b/addons/stock/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.
 #
 ##############################################################################
 
@@ -26,9 +26,9 @@ import product
 import report
 import wizard
 import report_stock
-
 import stock_wizard
 
 
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/stock/__terp__.py b/addons/stock/__terp__.py
index 8081c4b6738..ba5e435fcbb 100644
--- a/addons/stock/__terp__.py
+++ b/addons/stock/__terp__.py
@@ -41,11 +41,16 @@ Thanks to the double entry management, the inventory controlling is powerful and
     "init_xml" : [],
     "demo_xml" : ["stock_demo.xml"],
     "update_xml" : [
-        "stock_workflow.xml",
         "stock_data.xml",
+        "wizard/stock_inventory_set_stock_zero_view.xml",
+        "wizard/stock_fill_inventory_view.xml",
+        "wizard/stock_invoice_onshipping_view.xml",
+        "wizard/stock_location_product_view.xml",
+        "wizard/stock_inventory_line_split_view.xml",
+        "stock_workflow.xml",
         "stock_incoterms.xml",
         "stock_wizard.xml",
-        "stock_wizard_view.xml", 
+        "stock_wizard_view.xml",
         "stock_view.xml",
         "stock_report.xml",
         "stock_sequence.xml",
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index eea058ebde1..581308694b8 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -22,4 +22,10 @@
 "access_stock_move_consume","stock.move.consume","model_stock_move_consume","stock.group_stock_user",1,0,0,0
 "access_stock_move_scrap","stock.move.scrap","model_stock_move_scrap","stock.group_stock_user",1,0,0,0
 "access_stock_move_split","stock.move.split","model_stock_move_split","stock.group_stock_user",1,0,0,0
+"access_stock_move_split_lines","stock.move.split.lines","model_stock_move_split_lines","stock.group_stock_user",1,0,0,0"access_report_products_to_received_planned","report.products.to.received.planned","model_report_products_to_received_planned","stock.group_stock_user",1,0,0,0
+"access_report_delivery_products_planned","report.delivery.products.planned","model_report_delivery_products_planned","stock.group_stock_user",1,0,0,0
+"access_stock_move_track","stock.move.track","model_stock_move_track","stock.group_stock_user",1,0,0,0
+"access_stock_move_consume","stock.move.consume","model_stock_move_consume","stock.group_stock_user",1,0,0,0
+"access_stock_move_scrap","stock.move.scrap","model_stock_move_scrap","stock.group_stock_user",1,0,0,0
+"access_stock_move_split","stock.move.split","model_stock_move_split","stock.group_stock_user",1,0,0,0
 "access_stock_move_split_lines","stock.move.split.lines","model_stock_move_split_lines","stock.group_stock_user",1,0,0,0
\ No newline at end of file
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 3cada5cbb6d..c112ab44d5e 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -33,7 +33,12 @@
                     <field name="product_uom"/>
                     <field name="prod_lot_id"/>
                     <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>
-                    <button name="%(split_inventory_lots)d" string="Split Inventory Lines" type="action" icon="gtk-justify-fill"/>
+                  <!--   <button name="%(split_inventory_lots)d"
+                    	string="Split Inventory Lines" type="action"
+                    	icon="gtk-justify-fill" /> -->
+                    	 <button name="%(stock.action_view_stock_inventory_line_split)d"
+                    		 		string="Split inventory lines"
+                      		 		type="action" icon="gtk-justify-fill"/>
                 </form>
             </field>
         </record>
@@ -50,6 +55,7 @@
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     </group>
                 </search>
+
             </field>
         </record>
 
@@ -64,6 +70,7 @@
                     <field name="state"/>
                 </tree>
             </field>
+
         </record>
         <record id="view_inventory_form" model="ir.ui.view">
             <field name="name">stock.inventory.form</field>
@@ -89,11 +96,12 @@
                                 <field name="product_qty"/>
                                 <field name="product_uom"/>
                                 <field  domain="[('usage','=','internal')]" name="location_id" select="1"/>
+                                <field name="prod_lot_id"/>
                                 <group colspan="2" col="3">
-	                                <field name="prod_lot_id"/>
-	                                <button name="%(split_inventory_lots)d" string="Split in Production Lots" type="action" icon="gtk-justify-fill"/>
-                                </group>
-
+                                   <button name="%(stock.action_view_stock_inventory_line_split)d"
+                     		 				string="Split inventory lines"
+                      		 				type="action" icon="gtk-justify-fill"/>
+								</group>
                             </form>
                         </field>
                     </page><page string="Posted Inventory">
@@ -106,6 +114,7 @@
                         <button name="action_cancel" states="cancel" string="Set to Draft" type="object" icon="gtk-cancel"/>
                         <button name="action_cancel_inventary" states="draft" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
                     </group>
+
                 </form>
             </field>
         </record>
@@ -138,6 +147,9 @@
                     <field name="name" select="1"/>
                     <field name="serial" select="1"/>
                     <field name="date" select="1"/>
+                    <field name="active" select="1"/>
+                    <group colspan="4">
+                    </group>
                     <field name="active" />
                 </form>
             </field>
@@ -524,7 +536,7 @@
             <field name="auto_refresh" eval="1"/>
             <field name="target">new</field>
             <field name="context">{'action_id': active_id}</field>
-        </record>    	
+        </record>
 
         <record model="ir.ui.view" id="stock_picking_calendar">
             <field name="name">stock.picking.calendar</field>
@@ -585,7 +597,7 @@
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
-                                    <field name="state"/> 
+                                    <field name="state"/>
                                     <button
                            				name="%(stock.track_line)d"
                            				string="Split in production lots"
@@ -662,6 +674,9 @@
                             <field name="move_type"/>
                         </page>
                     </notebook>
+                    <button
+                    	name="%(stock.action_stock_invoice_onshipping)d"
+                    	string="Create Invoices" type="action" />
                 </form>
             </field>
         </record>
@@ -726,6 +741,7 @@
                         <field name="min_date" select="1"/>
                         <field name="type"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+
                     </group>
                         <notebook colspan="4">
                         <page string="General Information">
@@ -740,7 +756,7 @@
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
-                                    <field name="state"/> 
+                                    <field name="state"/>
                                     <button
                            				name="%(stock.track_line)d"
                            				string="Split in production lots"
@@ -812,6 +828,9 @@
                             <field name="move_type"/>
                         </page>
                     </notebook>
+					<button
+                     	name="%(stock.action_stock_invoice_onshipping)d"
+                     	string="Create Invoice" type="action" />
                 </form>
             </field>
         </record>
@@ -890,9 +909,6 @@
                     <field name="state"/>
                     <button name="%(partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-go-forward" help="Validate Picking"/>
                     <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the picking.    Do you want to continue?"/>
-                    <button name="%(wizard_invoice_onshipping)d" states="done" string="Invoice" type="action" 
-                    			icon="gtk-execute" help="Create invoice" 
-                    			attrs="{'invisible': [('invoice_state', '!=', '2binvoiced')]}" />
                 </tree>
             </field>
         </record>
@@ -925,7 +941,7 @@
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
-                                    <field name="state"/> 
+                                    <field name="state"/>
                                     <button
                            				name="%(stock.track_line)d"
                            				string="Split in production lots"
@@ -1110,8 +1126,8 @@
                            				name="%(stock.move_scrap)d"
                            				string="D" type="action"
                            				icon="gtk-convert"
-                           				states="draft,waiting,confirmed,assigned" />
-                                </tree>                                
+                           				states="done,cancel" />
+                                </tree>
                                 <form string="Stock Moves">
                                 	<notebook colspan="4">
                                 		<page string="General Information">
@@ -1278,7 +1294,7 @@
                     <field name="location_id"/>
                     <field name="location_dest_id"/>
                     <field name="date_planned"/>
-                    <field name="state"/>                    
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
@@ -1317,7 +1333,7 @@
                                 <field name="date"/>
                                 <field name="date_planned"/>
                                 <field name="priority"/>
-                            </group> 
+                            </group>
 
                             <group colspan="2" col="4">
                                 <separator string="Tracability" colspan="4" />
@@ -1327,7 +1343,7 @@
                                     domain="[('product_id','=?',product_id)]"
                                     on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
                                 <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill" colspan="2" />
-                            </group> 
+                            </group>
                         </page>
                         <page string="Return Picking History">
                             <field name="move_stock_return_history" nolabel="1"/>
diff --git a/addons/stock/stock_wizard.xml b/addons/stock/stock_wizard.xml
index 5db1269d42c..d562ddfbb9f 100644
--- a/addons/stock/stock_wizard.xml
+++ b/addons/stock/stock_wizard.xml
@@ -43,20 +43,6 @@
         name="stock.return.picking"
         string="Return picking"/>
 
-    <wizard
-        id="wizard_invoice_onshipping"
-        keyword="client_action_multi"
-        model="stock.picking"
-        name="stock.invoice_onshipping"
-        string="Create invoice"/>
-
-    <wizard
-        string="Set Stock to 0"
-        model="stock.inventory"
-        name="inventory.merge.stock.zero"
-        keyword="client_action_multi"
-        id="wizard_merge_inventory_zero"/>
-
     <wizard
         string="Merge inventories"
         model="stock.inventory"
@@ -65,19 +51,5 @@
         multi="True"
         id="wizard_merge_inventory"/>
 
-    <wizard
-        string="Fill Inventory"
-        model="stock.inventory"
-        name="stock.fill_inventory"
-        keyword="client_action_multi"
-        id="wizard_fill_inventory"
-    />
-
-    <wizard
-        id="location_product"
-        model="stock.location"
-        name="stock.location.products"
-        string="Products by Location"/>
-            
-   </data>        
-</openerp>
+   </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py
index 6a15449a151..c489f880fdf 100644
--- a/addons/stock/wizard/__init__.py
+++ b/addons/stock/wizard/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.
 #
 ##############################################################################
 
@@ -27,12 +27,13 @@ import wizard_replacement
 import wizard_return
 import wizard_split_lot_line
 import wizard_ups
-import wizard_invoice_onshipping
-import wizard_location_product
-import wizard_inventory
-import wizard_split_inventory_lots
-import inventory_merge_zero
 import inventory_merge
 
+import stock_inventory_set_stock_zero
+import stock_fill_inventory
+import stock_inventory_line_split
+import stock_invoice_onshipping
+import stock_location_product
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/stock/wizard/inventory_merge.py b/addons/stock/wizard/inventory_merge.py
index 7be8eb2b3e3..b32ad83bec3 100644
--- a/addons/stock/wizard/inventory_merge.py
+++ b/addons/stock/wizard/inventory_merge.py
@@ -41,6 +41,7 @@ def do_merge(self, cr, uid, data, context):
     invent_lines = {}
 
     if len(data['ids']) < 2:
+       
         raise wizard.except_wizard(_('Warning'),
             _('Please select at least two inventories.'))
 
diff --git a/addons/stock/wizard/inventory_merge_zero.py b/addons/stock/wizard/inventory_merge_zero.py
deleted file mode 100644
index 3aa2b1e9fd9..00000000000
--- a/addons/stock/wizard/inventory_merge_zero.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-
-import wizard
-import pooler
-from tools.translate import _
-
-
-_form = """<?xml version="1.0"?>
-<form string="Set Stock to Zero">
-    <separator colspan="4" string="Set Stocks to Zero" />
-    <field name="location_id"/>
-    <newline/>
-    <label colspan="4" string="Do you want to set stocks to zero ?"/>
-</form>
-"""
-_inventory_fields = {
-    'location_id' : {
-        'string':'Location',
-        'type':'many2one',
-        'relation':'stock.location',
-        'required':True
-        }
-}
-
-
-def do_merge(self, cr, uid, data, context):
-    invent_obj = pooler.get_pool(cr.dbname).get('stock.inventory')
-    invent_line_obj = pooler.get_pool(cr.dbname).get('stock.inventory.line')
-    prod_obj =  pooler.get_pool(cr.dbname).get('product.product')
-
-    if len(data['ids']) <> 1:
-        raise wizard.except_wizard(_('Warning'),
-                                   _('Please select one and only one inventory !'))
-
-    loc = str(data['form']['location_id'])
-
-    cr.execute('select distinct location_id,product_id from stock_inventory_line where inventory_id=%s', (data['ids'][0],))
-    inv = cr.fetchall()
-    cr.execute('select distinct product_id from stock_move where location_dest_id=%s or location_id=%s',(loc,loc,))
-    stock = cr.fetchall()
-    for s in stock:
-        if (loc,s[0]) not in inv:
-            p = prod_obj.browse(cr, uid, s[0])
-            invent_line_obj.create(cr, uid, {
-                'inventory_id': data['ids'][0],
-                'location_id': loc,
-                'product_id': s[0],
-                'product_uom': p.uom_id.id,
-                'product_qty': 0.0,
-                })
-    return {}
-
-
-class merge_inventory(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'form',
-                    'arch' : _form,
-                    'fields' : _inventory_fields,
-                    'state' : [('end', 'Cancel', 'gtk-cancel'),
-                               ('merge', 'Set to Zero', 'gtk-apply', True) ]}
-        },
-        'merge' : {
-            'actions' : [],
-            'result' : {'type' : 'action',
-                        'action': do_merge,
-                        'state' : 'end'}
-        },
-    }
-merge_inventory("inventory.merge.stock.zero")
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
new file mode 100644
index 00000000000..246aff9eabf
--- /dev/null
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -0,0 +1,90 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from service import web_services
+from tools.misc import UpdateableStr, UpdateableDict
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import wizard
+
+
+class stock_fill_inventory(osv.osv_memory):
+    _name = "stock.fill.inventory"
+    _description = "Fill Inventory"
+    _columns = {
+            'location_id': fields.many2one('stock.location', 'Location', required=True),
+            'recursive': fields.boolean("Include all childs for the location"),
+            }
+
+    def fill_inventory(self, cr, uid, ids, context):
+        inventory_line_obj = self.pool.get('stock.inventory.line')
+        location_obj = self.pool.get('stock.location')
+        for fill_inventory in self.browse(cr, uid, ids):
+            res = {}
+            res_location = {}
+            if fill_inventory.recursive :
+                location_ids = location_obj.search(cr, uid, [('location_id',
+                                 'child_of', fill_inventory.location_id.id)])
+                for location in location_ids :
+                    res = location_obj._product_get(cr, uid, location)
+                    res_location[location] = res
+            else:
+                context.update({'compute_child': False})
+                res = location_obj._product_get(cr, uid,
+                            fill_inventory.location_id.id, context=context)
+                res_location[fill_inventory.location_id.id] = res
+
+                product_ids = []
+                for location in res_location.keys():
+                    res = res_location[location]
+                    for product_id in res.keys():
+                        prod = self.pool.get('product.product').browse(cr, uid, [product_id])[0]
+                        uom = prod.uom_id.id
+                        context.update({'uom': uom})
+                        amount = self.pool.get('stock.location')._product_get(cr, uid,
+                                 location, [product_id], context=context)[product_id]
+
+                        if(amount):
+                            line_ids=inventory_line_obj.search(cr, uid,
+                                [('inventory_id', '=', context['active_ids']),
+                                 ('location_id', '=', location),
+                                 ('product_id', '=', product_id),
+                                 ('product_uom', '=', uom),
+                                ('product_qty', '=', amount)])
+                            if not len(line_ids):
+                                inventory_line = {'inventory_id': context['active_ids'][0],
+                                                'location_id': location,
+                                                'product_id': product_id,
+                                                'product_uom': uom,
+                                                'product_qty': amount}
+                                inventory_line_obj.create(cr, uid, inventory_line)
+                            product_ids.append(product_id)
+
+                if(len(product_ids) == 0):
+                    raise osv.except_osv(_('Message !'), _('No product in this location.'))
+                return {}
+
+stock_fill_inventory()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/stock_fill_inventory_view.xml b/addons/stock/wizard/stock_fill_inventory_view.xml
new file mode 100644
index 00000000000..5ac6732b533
--- /dev/null
+++ b/addons/stock/wizard/stock_fill_inventory_view.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+   		<record id="view_stock_fill_inventory" model="ir.ui.view">
+            <field name="name">Fill Inventory</field>
+            <field name="model">stock.fill.inventory</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Fill Inventory">
+             		<separator string="Fill Inventory for specific location" colspan="4" />
+                	<field name="location_id"/>
+                	<newline/>
+                	<field name="recursive"/>
+    				<newline/>
+        	        <separator string="" colspan="4" />
+					<button special="cancel" string="Cancel" />
+            	    <button name="fill_inventory" string="Fill Inventory" type="object"/>
+             </form>
+            </field>
+		</record>
+
+		<record id="action_view_stock_fill_inventory" model="ir.actions.act_window">
+            <field name="name">Fill Inventory</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.fill.inventory</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="context">{'record_id' : active_id}</field>
+        </record>
+
+        <record model="ir.values" id="wiki_stock_fill_inventory">
+            <field name="model_id" ref="stock.model_stock_inventory" />
+            <field name="object" eval="1" />
+            <field name="name">Fill Inventory</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_view_stock_fill_inventory'))" />
+            <field name="key">action</field>
+            <field name="model">stock.inventory</field>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/stock/wizard/stock_inventory_line_split.py b/addons/stock/wizard/stock_inventory_line_split.py
new file mode 100644
index 00000000000..1723f7b3032
--- /dev/null
+++ b/addons/stock/wizard/stock_inventory_line_split.py
@@ -0,0 +1,105 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from service import web_services
+from tools.misc import UpdateableStr, UpdateableDict
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import wizard
+
+class stock_inventory_line_split(osv.osv_memory):
+    _name = "stock.inventory.line.split"
+    _description = "Split inventory lines"
+    _columns = {
+            'prefix': fields.char('Prefix', size=64), 
+            'quantity': fields.float('Quantity per lot'), 
+            }
+
+    def _check_production_lot(self, cr, uid, context):
+        for inv_obj in self.pool.get('stock.inventory.line').browse(cr, uid, \
+                            context['active_ids']):
+            if not inv_obj.prod_lot_id:
+                raise osv.except_osv(_('Caution!'), _('Before splitting the \
+inventory lines, make sure the production lot is assigned to this product.'))
+            return
+
+    _defaults = {
+            'quantity': lambda *a: '1', 
+            'prefix': _check_production_lot, 
+            }
+
+    def split_lines(self, cr, uid, ids, context):
+        inv_id = context['active_id']
+        inv_line_obj = self.pool.get('stock.inventory.line')
+        prodlot_obj = self.pool.get('stock.production.lot')
+        for linesplit_obj in self.browse(cr, uid, ids):
+            ir_sequence_obj = self.pool.get('ir.sequence')
+
+            sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
+            if not sequence:
+                raise wizard.except_wizard(_('Error!'), _('No production sequence defined'))
+            if linesplit_obj.prefix:
+                sequence = linesplit_obj.prefix + '/' + (sequence or '')
+
+            inv = inv_line_obj.browse(cr, uid, [inv_id])[0]
+            quantity = linesplit_obj.quantity
+            prodlot_obj.write(cr, uid, inv.prod_lot_id.id, {'name': sequence})
+
+            if quantity <= 0 or inv.product_qty == 0:
+                return {}
+
+            quantity_rest = inv.product_qty % quantity
+
+            update_val = {
+                    'product_qty': quantity, 
+            }
+
+            new_line = []
+            for idx in range(int(inv.product_qty // quantity)):
+                if idx:
+                    current_line = inv_line_obj.copy(cr, uid, inv.id, 
+                                 {'prod_lot_id': inv.prod_lot_id.id})
+                    new_line.append(current_line)
+                else:
+                    current_line = inv.id
+                    inv_line_obj.write(cr, uid, [current_line], update_val)
+
+            if quantity_rest > 0:
+                idx = int(inv.product_qty // quantity)
+                update_val['product_qty'] = quantity_rest
+
+                if idx:
+                    current_line = inv_line_obj.copy(cr, uid, inv.id, 
+                                 {'prod_lot_id': inv.prod_lot_id.id})
+                    new_line.append(current_line)
+                else:
+                    current_line = inv_line_obj.id
+                inv_line_obj.write(cr, uid, [current_line], update_val)
+
+            return {}
+
+stock_inventory_line_split()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/stock/wizard/stock_inventory_line_split_view.xml b/addons/stock/wizard/stock_inventory_line_split_view.xml
new file mode 100644
index 00000000000..a2c9f2d065a
--- /dev/null
+++ b/addons/stock/wizard/stock_inventory_line_split_view.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+     	<record id="view_stock_inventory_line_split" model="ir.ui.view">
+            <field name="name">Split inventory lines</field>
+            <field name="model">stock.inventory.line.split</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+               <form string="Split Inventory Line">
+ 					<field name="prefix"/>
+ 					<newline/>
+ 					<field name="quantity"/>
+ 					<separator string="" colspan="4" />
+        			<label string=""/>
+					<button special="cancel" string="Cancel" icon="gtk-cancel" />
+           	    	<button name="split_lines" string="Ok" type="object" icon="gtk-ok"/>
+    			</form>
+            </field>
+		</record>
+
+		<record id="action_view_stock_inventory_line_split" model="ir.actions.act_window">
+            <field name="name">Split inventory lines</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.inventory.line.split</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+    	</record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/stock/wizard/stock_inventory_set_stock_zero.py b/addons/stock/wizard/stock_inventory_set_stock_zero.py
new file mode 100644
index 00000000000..cfb1d4a0ac9
--- /dev/null
+++ b/addons/stock/wizard/stock_inventory_set_stock_zero.py
@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from service import web_services
+from tools.misc import UpdateableStr, UpdateableDict
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import wizard
+
+
+class inventory_merge_stock_zero(osv.osv_memory):
+    _name = "stock.inventory.merge.stock.zero"
+    _description = "Set Stock to 0"
+    _columns = {
+            'location_id': fields.many2one('stock.location', 'Location', required=True), 
+            }
+    
+    def do_merge(self, cr, uid, ids, context):
+        invent_obj = pooler.get_pool(cr.dbname).get('stock.inventory')
+        invent_line_obj = pooler.get_pool(cr.dbname).get('stock.inventory.line')
+        prod_obj =  pooler.get_pool(cr.dbname).get('product.product')
+    
+        if len(context['active_ids']) <> 1:
+            raise wizard.except_wizard(_('Warning'), 
+                                       _('Please select one and only one inventory !'))
+        for id in ids:
+            datas = self.read(cr, uid, id)
+            loc = str(datas['location_id'])
+        
+            cr.execute('select distinct location_id,product_id \
+                        from stock_inventory_line \
+                        where inventory_id=%s', (context['active_ids'][0],))
+            inv = cr.fetchall()
+            cr.execute('select distinct product_id from stock_move where \
+                        location_dest_id=%s or location_id=%s', (loc, loc,))
+            stock = cr.fetchall()
+            for s in stock:
+                if (loc, s[0]) not in inv:
+                    p = prod_obj.browse(cr, uid, s[0])
+                    invent_line_obj.create(cr, uid, {
+                        'inventory_id': context['active_ids'][0], 
+                        'location_id': loc, 
+                        'product_id': s[0], 
+                        'product_uom': p.uom_id.id, 
+                        'product_qty': 0.0, 
+                        })
+        return {}
+
+inventory_merge_stock_zero()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/stock_inventory_set_stock_zero_view.xml b/addons/stock/wizard/stock_inventory_set_stock_zero_view.xml
new file mode 100644
index 00000000000..2948b3005ea
--- /dev/null
+++ b/addons/stock/wizard/stock_inventory_set_stock_zero_view.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    	<record id="view_inventory_merge_stock_zero" model="ir.ui.view">
+            <field name="name">Set Stock to Zero</field>
+            <field name="model">stock.inventory.merge.stock.zero</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Set Stock to Zero">
+             		<separator string="Set Stocks to Zero" colspan="4" />
+                	<field name="location_id"/>
+    				<newline/>
+    				<label colspan="4" string="Do you want to set stocks to zero ?"/>
+        	        <separator string="" colspan="4" />
+					<button special="cancel" string="Cancel" />
+            	    <button name="do_merge" string="Set Stock to Zero" type="object"/>
+             </form>
+            </field>
+		</record>
+
+		<record id="action_view_inventory_merge_stock_zero" model="ir.actions.act_window">
+            <field name="name">Set Stock to Zero</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.inventory.merge.stock.zero</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+         	<field name="context">{'record_id' : active_id}</field>
+    	</record>
+
+      	 <record model="ir.values" id="wiki_merge_stock_zero">
+            <field name="model_id" ref="stock.model_stock_inventory" />
+            <field name="object" eval="1" />
+            <field name="name">Set Stock to Zero</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_view_inventory_merge_stock_zero'))" />
+            <field name="key">action</field>
+            <field name="model">stock.inventory</field>
+        </record>
+        
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py
new file mode 100644
index 00000000000..82043fc0532
--- /dev/null
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@@ -0,0 +1,111 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from service import web_services
+from tools.misc import UpdateableStr, UpdateableDict
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import wizard
+
+class stock_invoice_onshipping(osv.osv_memory):
+    _name = "stock.invoice.onshipping"
+    _description = "Stock Invoice Onshipping"
+    _columns = {
+            'journal_id': fields.many2one('account.journal', 'Destination Journal', required=True),
+            'group': fields.boolean("Group by partner"),
+            'type': fields.selection([('out_invoice', 'Customer Invoice'),
+                        ('in_invoice', 'Supplier Invoice'),
+                        ('out_refund', 'Customer Refund'),
+                        ('in_refund', 'Supplier Refund')] , 'Type', required=True),
+            'invoice_date': fields.date('Invoiced date'),
+            }
+
+    def _get_type(self, cr, uid, context):
+        picking_obj = self.pool.get('stock.picking')
+        usage = 'customer'
+        pick = picking_obj.browse(cr, uid, context['active_id'])
+        if pick.invoice_state == 'invoiced':
+            raise osv.except_osv(_('UserError'), _('Invoice is already created.'))
+        if pick.invoice_state == 'none':
+            raise osv.except_osv(_('UserError'), _('Invoice cannot be created from Picking.'))
+        if pick.move_lines:
+            usage = pick.move_lines[0].location_id.usage
+
+        if pick.type == 'out' and usage == 'supplier':
+            type = 'in_refund'
+        elif pick.type == 'out' and usage == 'customer':
+            type = 'out_invoice'
+        elif pick.type == 'in' and usage == 'supplier':
+            type = 'in_invoice'
+        elif pick.type == 'in' and usage == 'customer':
+            type = 'out_refund'
+        else:
+            type = 'out_invoice'
+        return type
+
+    _defaults = {
+            'type': _get_type,
+        }
+
+    def create_invoice(self, cr, uid, ids, context):
+        result = []
+        for onshipdata_obj in self.read(cr, uid, ids, ['journal_id', 'group', 'type', 'invoice_date']):
+            if context.get('new_picking', False):
+                onshipdata_obj[id] = onshipdata_obj.new_picking
+                onshipdata_obj[ids] = onshipdata_obj.new_picking
+
+            picking_obj = self.pool.get('stock.picking')
+            mod_obj = self.pool.get('ir.model.data')
+            act_obj = self.pool.get('ir.actions.act_window')
+
+            type = onshipdata_obj['type']
+            context['date_inv'] = onshipdata_obj['invoice_date']
+            res = picking_obj.action_invoice_create(cr, uid,context['active_ids'],
+                  journal_id = onshipdata_obj['journal_id'],
+                  group=onshipdata_obj['group'],
+                  type=type,
+                  context=context)
+            invoice_ids = res.values()
+            if not invoice_ids:
+                raise  osv.except_osv(_('Error'), _('Invoice is not created'))
+
+            if type == 'out_invoice':
+                xml_id = 'action_invoice_tree1'
+            elif type == 'in_invoice':
+                xml_id = 'action_invoice_tree2'
+            elif type == 'out_refund':
+                xml_id = 'action_invoice_tree3'
+            else:
+                xml_id = 'action_invoice_tree4'
+
+            result = mod_obj._get_id(cr, uid, 'account', xml_id)
+            id = mod_obj.read(cr, uid, result, ['res_id'])
+            result = act_obj.read(cr, uid, id['res_id'])
+            result['res_id'] = invoice_ids
+            return result
+
+stock_invoice_onshipping()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml
new file mode 100644
index 00000000000..c4bec603120
--- /dev/null
+++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_stock_invoice_onshipping" model="ir.ui.view">
+            <field name="name">Stock Invoice Onshipping</field>
+            <field name="model">stock.invoice.onshipping</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Create invoices">
+					<separator colspan="4" string="Create invoices" />
+    				<field name="journal_id"/>
+    				<newline/>
+					<field name="group"/>
+					<newline/>
+					<field name="type"/>
+					<newline/>
+					<field name="invoice_date" />
+			   	    <separator string="" colspan="4" />
+					<button special="cancel" string="Cancel" />
+			       	<button name="create_invoice" string="Create Invoices" type="object"/>
+             </form>
+            </field>
+		</record>
+
+		<record id="action_stock_invoice_onshipping" model="ir.actions.act_window">
+            <field name="name">Create Invoice</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.invoice.onshipping</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        	<field name="context">{'record_id' : active_id}</field>
+    	</record>
+
+     	 <record model="ir.values" id="stock_stock_invoice_onshipping">
+            <field name="model_id" ref="stock.model_stock_picking" />
+            <field name="object" eval="1" />
+            <field name="name">Create Invoice</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_stock_invoice_onshipping'))" />
+            <field name="key">action</field>
+            <field name="model">stock.picking</field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/stock/wizard/stock_location_product.py b/addons/stock/wizard/stock_location_product.py
new file mode 100755
index 00000000000..44f6cb4dc7f
--- /dev/null
+++ b/addons/stock/wizard/stock_location_product.py
@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from service import web_services
+from tools.misc import UpdateableStr, UpdateableDict
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import wizard
+
+class stock_location_product(osv.osv_memory):
+    _name = "stock.location.product"
+    _description = "Products by Location"
+    _columns = {
+                'from_date': fields.datetime('From'), 
+                'to_date': fields.datetime('To'), 
+                }
+
+    def action_open_window(self, cr, uid, ids, context):
+        mod_obj = self.pool.get('ir.model.data')
+        for location_obj in self.read(cr, uid, ids, ['from_date', 'to_date']):
+            result = mod_obj._get_id(cr, uid, 'product', 'product_search_form_view')
+            id = mod_obj.read(cr, uid, result, ['res_id'])
+            return {
+                    'name': 'product', 
+                    'view_type': 'form', 
+                    'view_mode': 'tree,form', 
+                    'res_model': 'product.product', 
+                    'type': 'ir.actions.act_window', 
+                    'context': {'location': context['active_ids'][0], 
+                           'from_date': location_obj['from_date'], 
+                           'to_date': location_obj['to_date']}, 
+                    'domain': [('type', '<>', 'service')], 
+                    'search_view_id': id['res_id']
+                    }
+
+stock_location_product()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/stock_location_product_view.xml b/addons/stock/wizard/stock_location_product_view.xml
new file mode 100644
index 00000000000..5d54ee874aa
--- /dev/null
+++ b/addons/stock/wizard/stock_location_product_view.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_stock_location_product" model="ir.ui.view">
+            <field name="name">Products by Location</field>
+            <field name="model">stock.location.product</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+               <form string="View Stock of Products">
+        			<separator string="Stock Location Analysis" colspan="4"/>
+       				<field name="from_date" colspan="4"/>
+       				<newline/>
+       				<field name="to_date" colspan="4"/>
+       				<newline/>
+       				<label string=""/>
+       				<label string="(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to filter all resources of the day for the 'From' date and 23:59:59 for the 'To' date)" align="0.0" colspan="3"/>
+        			<separator string="" colspan="4" />
+        			<label string=""/>
+					<button special="cancel" string="Cancel" icon="gtk-cancel" />
+           	    	<button name="action_open_window" string="Open Product" type="object" icon="gtk-ok"/>
+    			</form>
+            </field>
+		</record>
+
+		<record id="action_view_stock_location_product" model="ir.actions.act_window">
+            <field name="name">Products by Location</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.location.product</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+    		<field name="context">{'record_id' : active_id}</field>
+    	</record>
+
+     	 <record model="ir.values" id="stock_location_product">
+            <field name="model_id" ref="stock.model_stock_location" />
+            <field name="object" eval="1" />
+            <field name="name">Products by Location</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_view_stock_location_product'))" />
+            <field name="key">action</field>
+            <field name="model">stock.location</field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/stock/wizard/stock_traceability.py b/addons/stock/wizard/stock_traceability.py
index 58cc26a3224..3fc65ff74c0 100644
--- a/addons/stock/wizard/stock_traceability.py
+++ b/addons/stock/wizard/stock_traceability.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.
 #
 ##############################################################################
 
diff --git a/addons/stock/wizard/wizard_inventory.py b/addons/stock/wizard/wizard_inventory.py
deleted file mode 100644
index 42345353866..00000000000
--- a/addons/stock/wizard/wizard_inventory.py
+++ /dev/null
@@ -1,111 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import time
-import wizard
-import ir
-import pooler
-from osv.osv import except_osv
-from osv import fields,osv
-import netsvc
-from tools.translate import _
-
-inventory_form = """<?xml version="1.0"?>
-<form string="Fill Inventory">
-    <separator colspan="4" string="Fill Inventory for specific location" />
-    <field name="location_id"/>
-    <newline/>
-    <field name="recursive"/>
-    <newline/>
-
-</form>
-"""
-
-inventory_fields = {
-    'location_id' : {
-        'string':'Location',
-        'type':'many2one',
-        'relation':'stock.location',
-        'required':True
-    },
-    'recursive' : {'string':'Include all childs for the location', 'type':'boolean'}
-}
-
-
-
-def _fill_inventory(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    inventory_line_obj = pooler.get_pool(cr.dbname).get('stock.inventory.line')
-    location_obj = pooler.get_pool(cr.dbname).get('stock.location')
-    res={}
-    res_location={}
-    if data['form']['recursive'] :
-        location_ids = location_obj.search(cr, uid, [('location_id', 'child_of', [data['form']['location_id']])])
-        for location in location_ids :
-            res=location_obj._product_get(cr, uid, location)
-            res_location[location]=res
-    else:
-        context.update({'compute_child':False})
-        res=location_obj._product_get(cr, uid, data['form']['location_id'],context=context)
-        res_location[data['form']['location_id']]=res
-
-    product_ids=[]
-    for location in res_location.keys():
-        res=res_location[location]
-        for product_id in res.keys():
-            #product_ids.append(product_id)
-            prod = pool.get('product.product').browse(cr, uid, [product_id])[0]
-            uom = prod.uom_id.id
-            context.update({'uom': uom})
-            amount=pool.get('stock.location')._product_get(cr, uid, location, [product_id], context=context)[product_id]
-
-            if(amount):
-                line_ids=inventory_line_obj.search(cr,uid,[('inventory_id','=',data['id']),('location_id','=',location),('product_id','=',product_id),('product_uom','=',uom),('product_qty','=',amount)])
-                if not len(line_ids):
-                    inventory_line={'inventory_id':data['id'],'location_id':location,'product_id':product_id,'product_uom':uom,'product_qty':amount}
-                    inventory_line_obj.create(cr, uid, inventory_line)
-                product_ids.append(product_id)
-
-    if(len(product_ids)==0):
-        raise wizard.except_wizard(_('Message !'), _('No product in this location.'))
-    return {}
-
-
-
-class fill_inventory(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'form',
-                    'arch' : inventory_form,
-                    'fields' : inventory_fields,
-                    'state' : [('end', 'Cancel', 'gtk-cancel'),('fill_inventory', 'Fill Inventory', 'gtk-apply', True) ]}
-        },
-        'fill_inventory' : {
-            'actions' : [],
-            'result' : {'type' : 'action', 'action': _fill_inventory, 'state' : 'end'}
-        },
-    }
-fill_inventory("stock.fill_inventory")
-
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/wizard_invoice_onshipping.py b/addons/stock/wizard/wizard_invoice_onshipping.py
deleted file mode 100644
index 22cdbc97e70..00000000000
--- a/addons/stock/wizard/wizard_invoice_onshipping.py
+++ /dev/null
@@ -1,167 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import pooler
-from tools.translate import _
-
-invoice_form = """<?xml version="1.0"?>
-<form string="Create invoices">
-    <separator colspan="4" string="Create invoices" />
-    <field name="journal_id"/>
-    <newline/>
-    <field name="group"/>
-    <newline/>
-    <field name="type"/>
-    <newline/>
-    <field name="invoice_date" />
-</form>
-"""
-
-invoice_fields = {
-    'journal_id': {
-        'string': 'Destination Journal',
-        'type': 'many2one',
-        'relation': 'account.journal',
-        'required': True
-    },
-    'group': {
-        'string': 'Group by partner',
-        'type': 'boolean'
-    },
-    'type': {
-        'string': 'Type',
-        'type': 'selection',
-        'selection': [],
-        'required': True
-    },
-    'invoice_date': {'string': 'Invoiced date', 'type':'date' }
-}
-
-
-def _get_type(obj, cr, uid, data, context):
-    picking_obj = pooler.get_pool(cr.dbname).get('stock.picking')
-    usage = 'customer'
-    pick = picking_obj.browse(cr, uid, data['id'], context)
-    if pick.invoice_state == 'invoiced':
-        raise wizard.except_wizard(_('UserError'), _('Invoice is already created.'))
-    if pick.invoice_state == 'none':
-        raise wizard.except_wizard(_('UserError'), _('Invoice cannot be created from Picking.'))
-
-    if pick.move_lines:
-        usage = pick.move_lines[0].location_id.usage
-
-    if pick.type =='out':
-        invoice_fields['type']['selection'] = [
-            ('out_invoice', 'Customer Invoice'),
-            ('in_refund', 'Supplier Refund'),
-            ]
-    elif pick.type =='in':
-        invoice_fields['type']['selection'] = [
-            ('in_invoice', 'Supplier Invoice'),
-            ('out_refund', 'Customer Refund'),
-            ]
-    else:
-        invoice_fields['type']['selection']=[
-            ('out_invoice', 'Customer Invoice'),
-            ('in_invoice', 'Supplier Invoice'),
-            ('out_refund', 'Customer Refund'),
-            ('in_refund', 'Supplier Refund'),
-            ]
-
-    if pick.type == 'out' and usage == 'supplier':
-        type = 'in_refund'
-    elif pick.type == 'out' and usage == 'customer':
-        type = 'out_invoice'
-    elif pick.type == 'in' and usage == 'supplier':
-        type = 'in_invoice'
-    elif pick.type == 'in' and usage == 'customer':
-        type = 'out_refund'
-    else:
-        type = 'out_invoice'
-    return {'type': type}
-
-
-def _create_invoice(obj, cr, uid, data, context):
-    if data['form'].get('new_picking', False):
-        data['id'] = data['form']['new_picking']
-        data['ids'] = [data['form']['new_picking']]
-    pool = pooler.get_pool(cr.dbname)
-    picking_obj = pooler.get_pool(cr.dbname).get('stock.picking')
-    mod_obj = pool.get('ir.model.data')
-    act_obj = pool.get('ir.actions.act_window')
-
-    type = data['form']['type']
-
-    context['date_inv'] = data['form']['invoice_date']
-    res = picking_obj.action_invoice_create(cr, uid, data['ids'],
-            journal_id = data['form']['journal_id'], group=data['form']['group'],
-            type=type, context= context)
-
-    invoice_ids = res.values()
-    if not invoice_ids:
-        raise  wizard.except_wizard(_('Error'), _('Invoice is not created'))
-
-    if type == 'out_invoice':
-        xml_id = 'action_invoice_tree1'
-    elif type == 'in_invoice':
-        xml_id = 'action_invoice_tree2'
-    elif type == 'out_refund':
-        xml_id = 'action_invoice_tree3'
-    else:
-        xml_id = 'action_invoice_tree4'
-
-    result = mod_obj._get_id(cr, uid, 'account', xml_id)
-    id = mod_obj.read(cr, uid, result, ['res_id'])
-    result = act_obj.read(cr, uid, id['res_id'])
-    result['res_id'] = invoice_ids
-    return result
-
-
-class make_invoice_onshipping(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_get_type],
-            'result': {
-                'type': 'form',
-                'arch': invoice_form,
-                'fields': invoice_fields,
-                'state': [
-                    ('end', 'Cancel', 'gtk-cancel'),
-                    ('create_invoice', 'Create invoice', 'gtk-apply', True)
-                ]
-            }
-        },
-        'create_invoice': {
-            'actions': [],
-            'result': {
-                'type': 'action',
-                'action': _create_invoice,
-                'state': 'end'
-            }
-        },
-    }
-
-make_invoice_onshipping("stock.invoice_onshipping")
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/stock/wizard/wizard_location_product.py b/addons/stock/wizard/wizard_location_product.py
deleted file mode 100755
index c423c426832..00000000000
--- a/addons/stock/wizard/wizard_location_product.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import pooler
-import time
-
-def _action_open_window(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname) 
-    mod_obj = pool.get('ir.model.data') 
-    result = mod_obj._get_id(cr, uid, 'product', 'product_search_form_view')
-    id = mod_obj.read(cr, uid, result, ['res_id'])          
-    return {
-        'name': False,
-        'view_type': 'form',
-        "view_mode": 'tree,form',
-        'res_model': 'product.product',
-        'type': 'ir.actions.act_window',
-        'context':{'location': data['ids'][0],'from_date':data['form']['from_date'],'to_date':data['form']['to_date']},
-        'domain':[('type','<>','service')],
-        'search_view_id': id['res_id'] 
-    }
-
-
-class product_by_location(wizard.interface):
-    form1 = '''<?xml version="1.0"?>
-    <form string="View Stock of Products">
-        <separator string="Stock Location Analysis" colspan="4"/>
-        <field name="from_date"/>
-        <newline/>
-        <field name="to_date"/>
-        <newline/>
-        <label string=""/>
-        <label string="(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to filter all resources of the day for the 'From' date and 23:59:59 for the 'To' date)" align="0.0" colspan="3"/>
-    </form>'''
-    form1_fields = {
-             'from_date': {
-                'string': 'From',
-                'type': 'datetime',
-        },
-             'to_date': {
-                'string': 'To',
-                'type': 'datetime',
-        },
-    }
-
-    states = {
-      'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':form1, 'fields':form1_fields, 'state': [('end', 'Cancel', 'gtk-cancel'),('open', 'Open Products', 'gtk-apply', True)]}
-        },
-    'open': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _action_open_window, 'state':'end'}
-        }
-    }
-product_by_location('stock.location.products')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/wizard_split_inventory_lots.py b/addons/stock/wizard/wizard_split_inventory_lots.py
deleted file mode 100644
index 92963f0b145..00000000000
--- a/addons/stock/wizard/wizard_split_inventory_lots.py
+++ /dev/null
@@ -1,98 +0,0 @@
-import wizard
-import netsvc
-import pooler
-
-import time
-from osv import osv
-from tools.translate import _
-
-inv_form = '''<?xml version="1.0"?>
-<form string="Split Inventory Line">
- <field name="prefix"/>
- <newline/>
- <field name="quantity"/>
-</form>
-'''
-inv_fields = {
-        'prefix': {
-            'string': 'Prefix',
-            'type': 'char',
-            'size': 64,
-        },
-        'quantity': {
-            'string': 'Quantity per lot',
-            'type': 'float',
-            'default': 1,
-        }
-}
-
-def _check_production_lot(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    inv_obj = pool.get('stock.inventory.line').browse(cr, uid, data['id'])
-    if not inv_obj.prod_lot_id:
-        raise wizard.except_wizard(_('Caution!'), _('Before splitting the inventory lines, make sure the production lot is assigned to this product.'))
-    return data['form']
-
-def _split_lines(self, cr, uid, data, context):
-    inv_id = data['id']
-
-    pool = pooler.get_pool(cr.dbname)
-    inv_line_obj = pool.get('stock.inventory.line')
-    prodlot_obj = pool.get('stock.production.lot')
-
-    ir_sequence_obj = pool.get('ir.sequence')
-
-    sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
-    if not sequence:
-        raise wizard.except_wizard(_('Error!'), _('No production sequence defined'))
-    if data['form']['prefix']:
-        sequence=data['form']['prefix']+'/'+(sequence or '')
-        
-    inv = inv_line_obj.browse(cr, uid, [inv_id])[0]
-    quantity=data['form']['quantity']
-    prodlot_obj.write(cr, uid, inv.prod_lot_id.id, {'name':sequence})
-    
-    if quantity <= 0 or inv.product_qty == 0:
-        return {}
-
-    quantity_rest = inv.product_qty%quantity
-
-    update_val = {
-        'product_qty': quantity,
-    }
-
-    new_line = []
-    for idx in range(int(inv.product_qty//quantity)):
-        if idx:
-            current_line = inv_line_obj.copy(cr, uid, inv.id, {'prod_lot_id': inv.prod_lot_id.id})
-            new_line.append(current_line)
-        else:
-            current_line = inv.id
-        inv_line_obj.write(cr, uid, [current_line], update_val)
-    
-    if quantity_rest > 0:
-        idx = int(inv.product_qty//quantity)
-        update_val['product_qty']=quantity_rest
-        
-        if idx:
-            current_line = inv_line_obj.copy(cr, uid, inv.id, {'prod_lot_id': inv.prod_lot_id.id})
-            new_line.append(current_line)
-        else:
-            current_line = inv.id
-        inv_line_obj.write(cr, uid, [current_line], update_val)
-        
-    return {}
-
-class wizard_split_inventory_lots(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_check_production_lot],
-            'result': {'type': 'form', 'arch': inv_form, 'fields': inv_fields, 'state': [('end', 'Cancel', 'gtk-cancel'), ('split', 'Ok', 'gtk-apply', True)]},
-            },
-        'split': {
-            'actions': [_split_lines],
-            'result': {'type':'state', 'state':'end'}
-        }
-    }
-
-wizard_split_inventory_lots('stock.inventory.line.split')
\ No newline at end of file

From 65ae50792394464228fd54066cafa56fbfe13dd2 Mon Sep 17 00:00:00 2001
From: "Ysa (Open ERP)" <ysa@tinyerp.co.in>
Date: Wed, 10 Mar 2010 16:23:34 +0530
Subject: [PATCH 072/251] [IMP] document :- docuemnt parent_id retrun False
 instead of None, and improvement in content_index file

bzr revid: ysa@tinyerp.co.in-20100310105334-arawdstqdjeiqmtf
---
 addons/document/content_index.py      | 3 ++-
 addons/document/document_directory.py | 6 +++---
 addons/document/nodes.py              | 5 +++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/addons/document/content_index.py b/addons/document/content_index.py
index 9fc0023e833..9e47621b4c3 100644
--- a/addons/document/content_index.py
+++ b/addons/document/content_index.py
@@ -158,7 +158,8 @@ class contentIndex():
                     os.write(fd, content)
                     os.close(fd)
             
-                fp = Popen(['file','-b','--mime-type',fname], shell=False, stdout=PIPE).stdout
+                #fp = Popen(['file','-b','--mime-type',fname], shell=False, stdout=PIPE).stdout
+                fp = Popen(['file','-b',fname], shell=False, stdout=PIPE).stdout
                 result = fp.read()
                 fp.close()
                 mime2 = result.strip()
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index bcb86d589d2..17c3dfb66d9 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -65,14 +65,14 @@ class document_directory(osv.osv):
         objid=self.pool.get('ir.model.data')
         try:
             mid = objid._get_id(cr, uid, 'document', 'dir_root')
-            return None # TODO: check why not display root dir 
+            return False # TODO: check why not display root dir 
             if not mid:
-                return None
+                return False
         except Exception, e:
             import netsvc
             logger = netsvc.Logger()
             logger.notifyChannel("document", netsvc.LOG_WARNING, 'Cannot set directory root:'+ str(e))
-            return None
+            return False
         return objid.browse(cr, uid, mid, context=context).res_id
 
     def _get_def_storage(self,cr,uid,context=None):
diff --git a/addons/document/nodes.py b/addons/document/nodes.py
index c6e2f1b10d1..13bd1784562 100644
--- a/addons/document/nodes.py
+++ b/addons/document/nodes.py
@@ -631,6 +631,11 @@ class node_file(node_class):
             the browse object. """
         # this is where storage kicks in..
         stor = self.storage_id
+        if not stor:
+            data_obj = self.context._dirobj.pool.get('ir.model.data')
+            data_id = data_obj._get_id(cr, self.context.uid, 'document', 'storage_db')
+            if data_id:
+                stor = data_obj.browse(cr, self.context.uid, data_id, context=self.context.context).res_id 
         assert stor
         stobj = self.context._dirobj.pool.get('document.storage')
         return stobj.set_data(cr,self.context.uid,stor, self, data, self.context.context, fil_obj)

From a80894f4022f2f8170b9926168d7a64f7ddbb528 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 10 Mar 2010 16:30:44 +0530
Subject: [PATCH 073/251] [Add] crm: Add the osv_memory wizard of
 lead_opportunity and change the name of function

bzr revid: sbh@tinyerp.com-20100310110044-79cyfknveptf6so4
---
 addons/crm/__terp__.py                  | 1 +
 addons/crm/crm_lead_view.xml            | 2 +-
 addons/crm/wizard/__init__.py           | 1 +
 addons/crm/wizard/lead_to_partner.py    | 5 -----
 addons/crm/wizard/phonecall2meeting.py  | 2 +-
 addons/crm/wizard/phonecall2meeting.xml | 2 +-
 6 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 3bcfabd6aa9..851d0a238ad 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -69,6 +69,7 @@ between mails and Open ERP.""",
         'wizard/opportunity2partner_view.xml',
         'wizard/opportunity2meeting.xml',
         'wizard/opportunity2phonecall.xml',
+        'wizard/lead2opportunity.xml',
         'crm_wizard.xml', 
         'crm_view.xml',
          
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 508929c7ec1..f5fb3349705 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -46,7 +46,7 @@
                     <field name="priority"/>
                     <field name="date_deadline"/>
                     <button
-                            name="%(wizard_crm_lead_opportunity_set)d" 
+                            name="%(action_crm_lead2opportunity)d" 
                             string="Convert"
                             help="Convert into Opportunity"
                             icon="gtk-index" 
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 72dfccad6de..4155dfa69ea 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -29,6 +29,7 @@ import wizard_history_event
 
 
 import lead_to_partner
+import lead2opportunity
 import crm_phonecall2phonecall
 import phonecall2partner
 import phonecall2meeting
diff --git a/addons/crm/wizard/lead_to_partner.py b/addons/crm/wizard/lead_to_partner.py
index 4d1a3d5468e..a7ba5848f05 100644
--- a/addons/crm/wizard/lead_to_partner.py
+++ b/addons/crm/wizard/lead_to_partner.py
@@ -19,12 +19,7 @@
 #
 ##############################################################################
 
-from mx.DateTime import now
-
 from osv import osv, fields
-import netsvc
-import ir
-import pooler
 from tools.translate import _
 
 class crm_lead2partner(osv.osv_memory):
diff --git a/addons/crm/wizard/phonecall2meeting.py b/addons/crm/wizard/phonecall2meeting.py
index 502ad14f702..89c0537aadd 100644
--- a/addons/crm/wizard/phonecall2meeting.py
+++ b/addons/crm/wizard/phonecall2meeting.py
@@ -38,7 +38,7 @@ class crm_phonecall2meeting(osv.osv_memory):
     def action_cancel(self, cr, uid, ids, context=None):
         return {'type':'ir.actions.act_window_close'}
 
-    def _makeMeeting(self, cr, uid, ids, context=None):
+    def action_makeMeeting(self, cr, uid, ids, context=None):
         this = self.browse(cr, uid, ids[0], context=context)
         record_id = context and context.get('record_id', False) or False
         if record_id:
diff --git a/addons/crm/wizard/phonecall2meeting.xml b/addons/crm/wizard/phonecall2meeting.xml
index 9505845a63a..fe90bbe5cd6 100644
--- a/addons/crm/wizard/phonecall2meeting.xml
+++ b/addons/crm/wizard/phonecall2meeting.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Convert To Meeting ">
                         <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
-                        <button name="_makeMeeting" type="object" string="_Apply" icon="gtk-apply" />
+                        <button name="action_makeMeeting" type="object" string="_Apply" icon="gtk-apply" />
                 </form>
             </field>
         </record>

From 579a2589ced3b3caa01845e1ac645d54a86b8c35 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 10 Mar 2010 16:59:36 +0530
Subject: [PATCH 074/251] [Fix] crm: Fix the section_id problem in
 phonecall_to_opportunity and improve the view

bzr revid: sbh@tinyerp.com-20100310112936-ucnz9kfgcjfx4fty
---
 addons/crm/wizard/opportunity2phonecall.py    |  4 ++--
 addons/crm/wizard/opportunity2phonecall.xml   |  2 +-
 addons/crm/wizard/phonecall_to_opportunity.py | 24 ++++++++++---------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/addons/crm/wizard/opportunity2phonecall.py b/addons/crm/wizard/opportunity2phonecall.py
index 25ac0d43524..587a7f2dfa2 100644
--- a/addons/crm/wizard/opportunity2phonecall.py
+++ b/addons/crm/wizard/opportunity2phonecall.py
@@ -72,8 +72,8 @@ class crm_opportunity2phonecall(osv.osv_memory):
             new_case = phonecall_case_obj.create(cr, uid, {
                     'name' : opportunity.name,
                     'case_id' : opportunity.id ,
-                    'user_id' : this.user_id and this.user_id.id or Flase,
-                    'categ_id' : opportunity.categ_id and opportunity.categ_id.id or Flase,
+                    'user_id' : this.user_id and this.user_id.id or False,
+                    'categ_id' : opportunity.categ_id and opportunity.categ_id.id or False,
                     'description' : opportunity.description or False,
                     'date' : this.date,
                     'section_id' : opportunity.section_id and opportunity.section_id.id or False,
diff --git a/addons/crm/wizard/opportunity2phonecall.xml b/addons/crm/wizard/opportunity2phonecall.xml
index 4823e54ce7f..905f761e08a 100644
--- a/addons/crm/wizard/opportunity2phonecall.xml
+++ b/addons/crm/wizard/opportunity2phonecall.xml
@@ -15,7 +15,7 @@
 						<field name="section_id"/>
 						<label string ="" colspan="2"/>
                         <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
-                        <button name="action_apply" type="object" string="_Apply" icon="gtk-apply" />
+                        <button name="action_apply" type="object" string="Schedule Other Call" icon="gtk-ok" />
                     </group>
                 </form>
             </field>
diff --git a/addons/crm/wizard/phonecall_to_opportunity.py b/addons/crm/wizard/phonecall_to_opportunity.py
index 025399c1040..004e0c8debc 100644
--- a/addons/crm/wizard/phonecall_to_opportunity.py
+++ b/addons/crm/wizard/phonecall_to_opportunity.py
@@ -58,17 +58,19 @@ class crm_phonecall2opportunity(osv.osv_memory):
                         id3 = data_obj.browse(cr, uid, id3, context=context).res_id
                         opportunity_case_obj = self.pool.get('crm.opportunity')
                         phonecall_case_obj = self.pool.get('crm.phonecall')
-                        new_opportunity_id = opportunity_case_obj.create(cr, uid, {            
-                                'name': this.name,
-                                'planned_revenue': this.planned_revenue,
-                                'probability': this.probability,
-                                'partner_id': this.partner_id.id,                 
-                                'section_id': case.section_id.id,
-                                'description': case.description,         
-                                'phonecall_id': case.id,
-                                'priority': case.priority,
-                                'phone': case.partner_phone,
-                            })
+                        for phonecall in phonecall_case_obj.browse(cr, uid, record_id):   
+                            new_opportunity_id = opportunity_case_obj.create(cr, uid, {            
+                                    'name': this.name,
+                                    'case'
+                                    'planned_revenue': this.planned_revenue,
+                                    'probability': this.probability,
+                                    'partner_id': this.partner_id and  this.partner_id.id or False,                 
+                                    'section_id': phonecall.section_id and phonecall.section_id.id or False,
+                                    'description': phonecall.description or False,         
+                                    'phonecall_id': phonecall.id,
+                                    'priority': phonecall.priority,
+                                    'phone': phonecall.partner_phone or False,
+                                })
                         new_opportunity = opportunity_case_obj.browse(cr, uid, new_opportunity_id)
                         vals = {
                                 'partner_id': this.partner_id.id, 

From 6fb04a9673bb3f9cc9f4cdd57eb9dd58557e9865 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 10 Mar 2010 17:09:47 +0530
Subject: [PATCH 075/251] [Fix] crm: Fix the section_id problem in
 phonecall_to_opportunity and improve the view and add the missing file

bzr revid: sbh@tinyerp.com-20100310113947-st57rxcufx8322vd
---
 addons/crm/wizard/lead2opportunity.py  | 117 +++++++++++++++++++++++++
 addons/crm/wizard/lead2opportunity.xml |  36 ++++++++
 2 files changed, 153 insertions(+)
 create mode 100644 addons/crm/wizard/lead2opportunity.py
 create mode 100644 addons/crm/wizard/lead2opportunity.xml

diff --git a/addons/crm/wizard/lead2opportunity.py b/addons/crm/wizard/lead2opportunity.py
new file mode 100644
index 00000000000..ff630419f29
--- /dev/null
+++ b/addons/crm/wizard/lead2opportunity.py
@@ -0,0 +1,117 @@
+# -*- encoding: utf-8 -*-
+############################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2008-2009 AJM Technologies S.A. (<http://www.ajm.lu). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+############################################################################################
+
+from osv import osv, fields
+import netsvc
+import time
+import tools
+import mx.DateTime
+from tools import config
+from tools.translate import _
+import tools
+
+class crm_lead2opportunity(osv.osv_memory):
+    _name = 'crm.lead2opportunity'
+    _description = 'Lead To Opportunity'
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        return {'type':'ir.actions.act_window_close'}
+
+    def action_apply(self, cr, uid, ids, context=None):
+        
+        this = self.browse(cr, uid, ids[0], context=context)
+        value={}
+        record_id = context and context.get('record_id', False) or False
+        if record_id:
+            for case in self.pool.get('crm.lead').browse(cr, uid, record_id, context=context):
+                 if case.state in ['done', 'cancel']:       
+                            raise osv.except_osv(_("Warning"),
+                                                 _("Closed/Cancelled Phone Call Could not convert into Opportunity"))
+                 else:
+                    data_obj = self.pool.get('ir.model.data')
+                    result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
+                    res = data_obj.read(cr, uid, result, ['res_id'])
+                    
+            
+                    id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_oppor')
+                    id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_oppor')
+                    if id2:
+                        id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+                    if id3:
+                        id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+            
+                    lead_case_obj = self.pool.get('crm.lead')
+                    opportunity_case_obj =self. pool.get('crm.opportunity')        
+                    new_opportunity_id = opportunity_case_obj.create(cr, uid, {            
+                            'name': this.name,
+                            'planned_revenue': this.planned_revenue,
+                            'probability': this.probability,
+                            'partner_id': case.partner_id and case.partner_id.id or False ,
+                            'section_id':case.section_id and case.section_id.id or False,
+                            'description':case.description or False,
+                            'date_deadline': case.date_deadline or False,
+                            'partner_address_id':case.partner_address_id and case.partner_address_id.id or False ,
+                            'priority': case.priority,
+                            'phone': case.phone,                
+                            'email_from': case.email_from
+                        })       
+                        
+                    new_opportunity = opportunity_case_obj.browse(cr, uid, new_opportunity_id)
+                    vals = {
+                            'partner_id': this.partner_id and this.partner_id.id or False,                
+                            }
+                    if not case.opportunity_id:
+                            vals.update({'opportunity_id' : new_opportunity.id})
+            
+                    lead_case_obj.write(cr, uid, [case.id], vals)
+                    lead_case_obj.case_close(cr, uid, [case.id])
+                    opportunity_case_obj.case_open(cr, uid, [new_opportunity_id])
+                    
+            value = {            
+                        'name': _('Opportunity'),
+                        'view_type': 'form',
+                        'view_mode': 'form,tree',
+                        'res_model': 'crm.opportunity',
+                        'res_id': int(new_opportunity_id),
+                        'view_id': False,
+                        'views': [(id2,'form'),(id3,'tree'),(False,'calendar'),(False,'graph')],
+                        'type': 'ir.actions.act_window',
+                        'search_view_id': res['res_id'] 
+                    }
+        return value
+    _columns = {
+        'name' : fields.char('Opportunity Summary', size=64, required=True, select=1),
+        'probability': fields.float('Success Probability'),
+        'planned_revenue': fields.float('Expected Revenue'),
+        'partner_id': fields.many2one('res.partner', 'Partner'),
+    }
+    def default_get(self, cr, uid, fields, context=None):
+        record_id = context and context.get('record_id', False) or False
+        res = super(crm_lead2opportunity, self).default_get(cr, uid, fields, context=context)
+        if record_id:
+            for lead in self.pool.get('crm.lead').browse(cr, uid, record_id, context=context):
+                res['name']= lead.partner_name
+                res['partner_id']=lead.partner_id and lead.partner_id.id or False
+        return res
+    
+crm_lead2opportunity()
\ No newline at end of file
diff --git a/addons/crm/wizard/lead2opportunity.xml b/addons/crm/wizard/lead2opportunity.xml
new file mode 100644
index 00000000000..c50723de25e
--- /dev/null
+++ b/addons/crm/wizard/lead2opportunity.xml
@@ -0,0 +1,36 @@
+<openerp>
+  	<data>
+
+	    
+	   <record id="action_crm_lead2opportunity" model="ir.actions.act_window">
+	      <field name="name">Create Opportunity</field>
+	      <field name="type">ir.actions.act_window</field>
+	      <field name="res_model">crm.lead2opportunity</field>
+	      <field name="view_type">form</field>
+	      <field name="view_mode">form</field>
+	      <field name="target">new</field>
+	      <field name="context">{'record_id' : active_ids}</field>
+	   </record>
+	    
+  		<record id="view_crm_lead2opportunity_create" model="ir.ui.view">
+	      <field name="name">crm.lead2opportunity.create</field>
+	      <field name="model">crm.lead2opportunity</field>
+	      <field name="type">form</field>
+	      <field name="arch" type="xml">
+	      	<form string="Convert To Opportunity">
+		        <field name="name"/>
+		        <field name="partner_id"/>
+		        <newline/>
+		        <field name="planned_revenue"/>
+		        <field name="probability"/>
+		        <group col="4" colspan="4">
+	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	      			<button name="action_apply" string="Create Opportunity" type="object" icon="gtk-ok"/>
+	      		</group>
+		    </form>
+	      </field>
+	   </record>
+	   
+	   
+ 	</data>
+</openerp>

From f2d2800ca8e1fa4719498353573732e009570828 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 10 Mar 2010 17:24:30 +0530
Subject: [PATCH 076/251] [IMP] : improve the code of phonecall_to_opportunity

bzr revid: sbh@tinyerp.com-20100310115430-pbc2joqlblua121p
---
 addons/crm/wizard/opportunity2meeting.py      |  1 -
 addons/crm/wizard/phonecall_to_opportunity.py | 47 +++++++++----------
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/addons/crm/wizard/opportunity2meeting.py b/addons/crm/wizard/opportunity2meeting.py
index 9c0628429df..324b694ac0c 100644
--- a/addons/crm/wizard/opportunity2meeting.py
+++ b/addons/crm/wizard/opportunity2meeting.py
@@ -20,7 +20,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ############################################################################################
-############################################################################################
 
 from osv import osv, fields
 import netsvc
diff --git a/addons/crm/wizard/phonecall_to_opportunity.py b/addons/crm/wizard/phonecall_to_opportunity.py
index 004e0c8debc..f2cd3897fa6 100644
--- a/addons/crm/wizard/phonecall_to_opportunity.py
+++ b/addons/crm/wizard/phonecall_to_opportunity.py
@@ -43,42 +43,41 @@ class crm_phonecall2opportunity(osv.osv_memory):
         record_id = context and context.get('record_id', False) or False
         if record_id:
             for case in self.pool.get('crm.phonecall').browse(cr, uid, [record_id], context=context):
-                 if case.state in ['done', 'cancel']:       
+                if case.state in ['done', 'cancel']:       
                             raise osv.except_osv(_("Warning"),
                                                  _("Closed/Cancelled Phone Call Could not convert into Opportunity"))
-                 else:
-                     data_obj = self.pool.get('ir.model.data')
-                     result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
-                     res = data_obj.read(cr, uid, result, ['res_id'])
-                     id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_oppor')
-                     id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_oppor')
-                     if id2:
+                else:
+                    data_obj = self.pool.get('ir.model.data')
+                    result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
+                    res = data_obj.read(cr, uid, result, ['res_id'])
+                    id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_oppor')
+                    id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_oppor')
+                    if id2:
                         id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-                     if id3:
+                    if id3:
                         id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-                        opportunity_case_obj = self.pool.get('crm.opportunity')
-                        phonecall_case_obj = self.pool.get('crm.phonecall')
-                        for phonecall in phonecall_case_obj.browse(cr, uid, record_id):   
-                            new_opportunity_id = opportunity_case_obj.create(cr, uid, {            
+                    opportunity_case_obj = self.pool.get('crm.opportunity')
+                    phonecall_case_obj = self.pool.get('crm.phonecall')
+                           
+                    new_opportunity_id = opportunity_case_obj.create(cr, uid, {            
                                     'name': this.name,
-                                    'case'
                                     'planned_revenue': this.planned_revenue,
                                     'probability': this.probability,
                                     'partner_id': this.partner_id and  this.partner_id.id or False,                 
-                                    'section_id': phonecall.section_id and phonecall.section_id.id or False,
-                                    'description': phonecall.description or False,         
-                                    'phonecall_id': phonecall.id,
-                                    'priority': phonecall.priority,
-                                    'phone': phonecall.partner_phone or False,
+                                    'section_id': case.section_id and case.section_id.id or False,
+                                    'description': case.description or False,         
+                                    'phonecall_id': case.id,
+                                    'priority': case.priority,
+                                    'phone': case.partner_phone or False,
                                 })
-                        new_opportunity = opportunity_case_obj.browse(cr, uid, new_opportunity_id)
-                        vals = {
+                    new_opportunity = opportunity_case_obj.browse(cr, uid, new_opportunity_id)
+                    vals = {
                                 'partner_id': this.partner_id.id, 
                                 'opportunity_id' : new_opportunity_id,                
                                 }            
-                        phonecall_case_obj.write(cr, uid, [case.id], vals)
-                        phonecall_case_obj.case_close(cr, uid, [case.id])
-                        phonecall_case_obj.case_open(cr, uid, [new_opportunity_id])
+                    phonecall_case_obj.write(cr, uid, [case.id], vals)
+                    phonecall_case_obj.case_close(cr, uid, [case.id])
+                    phonecall_case_obj.case_open(cr, uid, [new_opportunity_id])
             value = {            
                 'name': _('Opportunity'),
                 'view_type': 'form',

From 874dccea6a8c37afd1941675b2fbde26fc948ea9 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 10 Mar 2010 17:34:43 +0530
Subject: [PATCH 077/251] [IMP] : put the comment of wizard file

bzr revid: sbh@tinyerp.com-20100310120443-m0zf9tb3qjkviwnd
---
 addons/crm/__terp__.py       | 6 +++---
 addons/crm/crm_lead_view.xml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 851d0a238ad..7f6d8c75aaf 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -74,16 +74,16 @@ between mails and Open ERP.""",
         'crm_view.xml',
          
         'crm_action_rule_view.xml', 
-        'crm_lead_wizard.xml', 
+        #'crm_lead_wizard.xml', 
         'crm_lead_view.xml', 
         'crm_lead_menu.xml', 
         'crm_meeting_wizard.xml', 
         'crm_meeting_view.xml', 
         'crm_meeting_menu.xml', 
-        'crm_phonecall_wizard.xml', 
+        #'crm_phonecall_wizard.xml', 
         'crm_phonecall_view.xml', 
         'crm_phonecall_menu.xml',         
-        'crm_opportunity_wizard.xml', 
+        #'crm_opportunity_wizard.xml', 
         'crm_opportunity_view.xml', 
         'crm_opportunity_menu.xml', 
         'crm_fund_view.xml', 
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index f5fb3349705..c884ad7afc7 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -90,7 +90,7 @@
                         <separator string="Links" colspan="4" col="3"/>
                         <field name="partner_id"/>
                         <button
-                            name="%(wizard_crm_lead_partner_create)d" 
+                            name="%(action_crm_lead2partner)d" 
                             icon="gtk-index" type="action"
                             string="Create"
                             attrs="{'invisible':[('partner_id','!=',False)]}"/>
@@ -190,7 +190,7 @@
                 <field name="state"/>
                 <button name="case_open" string="Open" states="draft,pending" type="object"  icon="gtk-go-forward"/>
                 <button name="case_close" string="Close" states="open,draft,pending" type="object"  icon="gtk-close"/>
-                <button string="Convert to Opportunity" name="%(wizard_crm_lead_opportunity_set)d" states="draft,open,pending" icon="gtk-index" type="action"/>
+                <button string="Convert to Opportunity" name="%(action_crm_lead2opportunity)d" states="draft,open,pending" icon="gtk-index" type="action"/>
                 <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"  icon="gtk-go-up"/>
                 <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
             </tree>

From 25332c92874d2e95a945833ecdb786bab6b90e9f Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Wed, 10 Mar 2010 18:10:24 +0530
Subject: [PATCH 078/251] [IMP] delivery: Improved code of 'Delivery Sale
 Order' wizard.

bzr revid: uco@tinyerp.co.in-20100310124024-netz8a8okgy30omv
---
 addons/delivery/wizard/delivery_sale_order_wizard.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/delivery/wizard/delivery_sale_order_wizard.py b/addons/delivery/wizard/delivery_sale_order_wizard.py
index 195fdb20083..308cc6873e8 100644
--- a/addons/delivery/wizard/delivery_sale_order_wizard.py
+++ b/addons/delivery/wizard/delivery_sale_order_wizard.py
@@ -75,19 +75,22 @@ class make_delivery(osv.osv_memory):
         rec_ids = context and context.get('active_ids',False)
         order_obj = self.pool.get('sale.order')
         line_obj = self.pool.get('sale.order.line')
+        grid_obj = self.pool.get('delivery.grid')
+        carrier_obj = self.pool.get('delivery.carrier')
+        acc_fp_obj = self.pool.get('account.fiscal.position')
         order_objs = order_obj.browse(cr, uid, rec_ids, context)
         datas = self.browse(cr, uid, ids[0])
     
         for order in order_objs:
-            grid_id = self.pool.get('delivery.carrier').grid_get(cr, uid, [datas.carrier_id.id],order.partner_shipping_id.id)
+            grid_id = carrier_obj.grid_get(cr, uid, [datas.carrier_id.id],order.partner_shipping_id.id)
             if not grid_id:
-                raise osv.except_osv(_('No grid avaible !'), _('No grid matching for this carrier !'))
-            grid_obj = self.pool.get('delivery.grid')
+                raise osv.except_osv(_('No grid available !'), _('No grid matching for this carrier !'))
+            
             grid = grid_obj.browse(cr, uid, [grid_id])[0]
     
             taxes = grid.carrier_id.product_id.taxes_id
             fpos = order.fiscal_position or False
-            taxes_ids = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, taxes)
+            taxes_ids = acc_fp_obj.map_tax(cr, uid, fpos, taxes)
             line_obj.create(cr, uid, {
                 'order_id': order.id,
                 'name': grid.carrier_id.name,

From bc22b5f593bd1fd6ed94c37eaf6aa3f1ae5b3b21 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Wed, 10 Mar 2010 18:50:40 +0530
Subject: [PATCH 079/251] [IMP]: Improvements in views, access rules in mrp,
 product and stock modules.

bzr revid: uco@tinyerp.co.in-20100310132040-3suqwihxmfdmu5sz
---
 addons/mrp/mrp.py                       |  4 +++-
 addons/mrp/mrp_view.xml                 | 20 +++++++++++++-------
 addons/mrp/security/ir.model.access.csv |  4 ++++
 addons/product/product.py               |  2 +-
 addons/stock/report_stock_view.xml      |  1 +
 addons/stock/stock_view.xml             | 12 ++++++++++--
 6 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 8629655085d..f1e42fad819 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -189,6 +189,7 @@ class mrp_bom(osv.osv):
         'child_ids': fields.function(_child_compute,relation='mrp.bom', method=True, string="BoM Hierarchy", type='many2many'),
         'child_complete_ids': fields.function(_child_compute,relation='mrp.bom', method=True, string="BoM Hierarchy", type='many2many'),
         'company_id': fields.many2one('res.company','Company',required=True),
+        'multi_level_bom': fields.boolean('Multi-level BoM'),
     }
     _defaults = {
         'active': lambda *a: 1,
@@ -196,7 +197,8 @@ class mrp_bom(osv.osv):
         'product_qty': lambda *a: 1.0,
         'product_rounding': lambda *a: 1.0,
         'type': lambda *a: 'normal',
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'mrp.bom', context=c)
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'mrp.bom', context=c),
+        'multi_level_bom': lambda *a: 0, 
     }
     _order = "sequence"
     _sql_constraints = [
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index e0867ba6e8f..8c9054fe5f1 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -242,19 +242,21 @@
             <field name="arch" type="xml">
                 <form string="Bill of Material">
                     <group colspan="4" col="6">
-                      <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
-                      <field name="name" select="1"/>
-                      <field name="code" select="1"/>
-                      <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+	                    <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
+	                    <field name="name" select="1"/>
+	                    <field name="code" select="1"/>
+	                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <newline/>
-                    <field name="product_uom"/>
-                    <field name="product_qty"/>
-                    <newline/>
                     <field name="product_uos" groups="product.group_uos"/>
                     <field name="product_uos_qty" groups="product.group_uos"/>
                     <field name="routing_id" select="2" groups="base.group_extended"/>
                     <field name="type" groups="base.group_extended"/>
+                    <group colspan="4" col="6">
+	                    <field name="product_uom"/>
+	                   	<field name="product_qty"/>
+	                    <field name="multi_level_bom"/>
+	                </group>
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="bom_lines" nolabel="1" widget="one2many_list"/>
@@ -274,6 +276,9 @@
                             <field name="product_efficiency"/>
                             <field colspan="4" name="property_ids" nolabel="2" groups="base.group_extended"/>
                         </page>
+                        <page string="Multi-Level BoM" attrs="{'invisible':[('multi_level_bom','=',False)]}">
+                        	<field colspan="4" name="child_ids" nolabel="1" string="BoM Hierarchy"/>
+                        </page>
                     </notebook>
                 </form>
             </field>
@@ -287,6 +292,7 @@
             <field name="arch" type="xml">
                 <tree string="BoM Structure" colors="blue:method">
                     <field name="name"/>
+                    <field name="sequence" invisible="1"/>
                     <field name="code"/>
                     <field name="product_id"/>
                     <field name="product_qty"/>
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index cdc658ff7c0..2e7c5d062e7 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -32,3 +32,7 @@
 "access_mrp_production_stock_worker","mrp.production stock_worker","model_mrp_production","stock.group_stock_user",1,0,0,0
 "access_mrp_installer","mrp.installer","model_mrp_installer","mrp.group_mrp_user",1,0,0,0
 "access_mrp_product_produce","mrp.product.produce","model_mrp_product_produce","mrp.group_mrp_user",1,0,0,0
+"access_mrp_make_procurement","make.procurement","model_make_procurement","mrp.group_mrp_user",1,0,0,0
+"access_mrp_change_production_qty","change.production.qty","model_change_production_qty","mrp.group_mrp_user",1,0,0,0
+"access_mrp_procurement_compute_all","mrp.procurement.compute.all","model_mrp_procurement_compute_all","mrp.group_mrp_user",1,0,0,0
+"access_mrp_procurement_orderpoint_compute","mrp.procurement.orderpoint.compute","model_mrp_procurement_orderpoint_compute","mrp.group_mrp_user",1,0,0,0
diff --git a/addons/product/product.py b/addons/product/product.py
index 87b0622ae9e..bc78a2ca037 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -82,7 +82,7 @@ class product_uom(osv.osv):
         'name': fields.char('Name', size=64, required=True, translate=True),
         'category_id': fields.many2one('product.uom.categ', 'UoM Category', required=True, ondelete='cascade',
             help="Unit of Measure of a category can be converted between each others in the same category."),
-        'factor': fields.float('Rate', digits=(12, 6), required=True,
+        'factor': fields.float('Ratio', digits=(12, 6), required=True,
             help='The coefficient for the formula:\n' \
                     '1 (base unit) = coeff (this unit). Rate = 1 / Factor.'),
         'factor_inv': fields.function(_factor, digits=(12, 6),
diff --git a/addons/stock/report_stock_view.xml b/addons/stock/report_stock_view.xml
index 21f7d91a806..a5e4a3a616d 100644
--- a/addons/stock/report_stock_view.xml
+++ b/addons/stock/report_stock_view.xml
@@ -16,6 +16,7 @@
                         <field name="location_id" select="1" />
                         <field name="product_id" select="1" />
                     </group>
+                    <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="10">
                         <filter string="Location" icon="terp-stock" domain="[]"  context="{'group_by':'location_id'}"/>
                         <filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index c112ab44d5e..56372ba87f5 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -271,6 +271,7 @@
                         <field name="product_id" select="1"/>
                         <field name="date" select="1"/>
                     </group>
+                    <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
                     </group>
@@ -699,6 +700,7 @@
                         <field name="name" select="1"/>
                         <field name="address_id" select="1"/>
                     </group>
+                    <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
                         <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
@@ -851,6 +853,7 @@
                         <field name="address_id" select="1"/>
                         <field name="origin" select="1"/>
                     </group>
+                    <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="10">
                         <filter string="Partner" icon="terp-stock" domain="[]"  context="{'group_by':'address_id'}"/>
                         <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
@@ -1033,6 +1036,7 @@
                         <field name="address_id" select="1"/>
                         <field name="company_id" select="1" widget="selection"/>
                    </group>
+                   <newline/>
                     <group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
                         <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
                         <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
@@ -1204,6 +1208,7 @@
                         <field name="address_id" select="1"/>
                         <field name="company_id" select="1" widget="selection" groups="base.group_multi_company" />
                     </group>
+                    <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
                         <filter string="Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
@@ -1257,6 +1262,7 @@
                         <field name="origin" select="1"/>
                         <field name="company_id" select="1" widget="selection"/>
                     </group>
+                    <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
                         <filter string="Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
@@ -1376,6 +1382,7 @@
                         <field name="location_dest_id" select="1"/>
                         <field name="product_id" select="1"/>
                     </group>
+                    <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="Product" icon="terp-stock" domain="[]"  context="{'group_by':'product_id'}"/>
                         <filter string="Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
@@ -1426,7 +1433,7 @@
             <field name="arch" type="xml">
                 <tree colors="grey:state in ('cancel','done');black:state not in ('cancel','done')" string="Moves">
                     <field name="picking_id" string="Reference"/>
-                    <field name="origin" string="Purchase Order"/>
+                    <field name="origin" string="Latest Requisition"/>
                     <field name="partner_id" string="Supplier"/>
                     <field name="product_id"/>
                     <field name="product_qty" />
@@ -1504,10 +1511,11 @@
 	            		<filter icon="terp-stock" string="Back Orders" domain="[('backorder_id','!=',False)]" help="Back Orders"/>
 	            		<filter icon="terp-stock" string="Planned Today" domain="[('date_planned::date','=',time.strftime('%%Y-%%m-%%d'))]" help="Orders planned for today"/>
 	            		<separator orientation="vertical"/>
-                        <field name="origin" string="Purchase Order" select="1"/>
+                        <field name="origin" string="Latest Requisition" select="1"/>
 	            		<field name="partner_id" string="Supplier" select="1"/>
 	                    <field name="product_id"/>
                     </group>
+                    <newline/>
                     <group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
 						<filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
 						<filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>

From 8233a57725615846c87cc11ecc4eaaca3a8e0eff Mon Sep 17 00:00:00 2001
From: "ATP (Open ERP)" <>
Date: Wed, 10 Mar 2010 19:11:56 +0530
Subject: [PATCH 080/251] [IMP]: auction: Converted wizards to osv_memory
 wizards

bzr revid: rpa@tinyerp.com-20100310134156-965ifa1c3qo9i0a9
---
 addons/auction/__terp__.py                    |  10 ++
 addons/auction/auction.py                     |   8 +-
 addons/auction/auction_view.xml               |   9 +-
 addons/auction/auction_wizard.xml             |  88 +---------
 addons/auction/wizard/__init__.py             |  41 ++---
 addons/auction/wizard/auction_lots_able.py    |  44 +++++
 .../auction/wizard/auction_lots_able_view.xml |  43 +++++
 .../wizard/auction_lots_auction_move.py       |  84 ++++++++++
 .../wizard/auction_lots_auction_move_view.xml |  45 ++++++
 addons/auction/wizard/auction_lots_enable.py  |  47 ++++++
 .../wizard/auction_lots_enable_view.xml       |  45 ++++++
 .../wizard/auction_lots_make_invoice.py       |  93 +++++++++++
 .../wizard/auction_lots_make_invoice_buyer.py | 109 +++++++++++++
 .../auction_lots_make_invoice_buyer_view.xml  |  49 ++++++
 .../wizard/auction_lots_make_invoice_view.xml |  45 ++++++
 .../auction/wizard/auction_lots_sms_send.py   |  67 ++++++++
 .../wizard/auction_lots_sms_send_view.xml     |  49 ++++++
 addons/auction/wizard/auction_pay_buy.py      | 105 ++++++++++++
 .../auction/wizard/auction_pay_buy_view.xml   |  51 ++++++
 addons/auction/wizard/auction_pay_sel.py      |  51 ++++++
 .../auction/wizard/auction_pay_sel_view.xml   |  35 ++++
 ...ard_able_taken.py => auction_payer_sel.py} |  65 ++++----
 .../auction/wizard/auction_payer_sel_view.xml |  55 +++++++
 addons/auction/wizard/auction_taken.py        |  57 +++++++
 addons/auction/wizard/auction_taken_view.xml  |  42 +++++
 .../wizard/auction_wizard_enable_taken.py     |  61 -------
 .../wizard/wizard_auction_invoice_buyer.py    | 111 -------------
 .../auction/wizard/wizard_auction_journal.py  | 105 ------------
 addons/auction/wizard/wizard_emporte.py       |  73 ---------
 addons/auction/wizard/wizard_lot_date_move.py |  96 -----------
 addons/auction/wizard/wizard_lots_pay.py      | 103 ------------
 addons/auction/wizard/wizard_lots_sms.py      | 150 ------------------
 addons/auction/wizard/wizard_pay.py           | 109 -------------
 addons/auction/wizard/wizard_payer.py         |  79 ---------
 34 files changed, 1192 insertions(+), 1032 deletions(-)
 create mode 100644 addons/auction/wizard/auction_lots_able.py
 create mode 100644 addons/auction/wizard/auction_lots_able_view.xml
 create mode 100644 addons/auction/wizard/auction_lots_auction_move.py
 create mode 100644 addons/auction/wizard/auction_lots_auction_move_view.xml
 create mode 100644 addons/auction/wizard/auction_lots_enable.py
 create mode 100644 addons/auction/wizard/auction_lots_enable_view.xml
 create mode 100644 addons/auction/wizard/auction_lots_make_invoice.py
 create mode 100644 addons/auction/wizard/auction_lots_make_invoice_buyer.py
 create mode 100644 addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
 create mode 100644 addons/auction/wizard/auction_lots_make_invoice_view.xml
 create mode 100644 addons/auction/wizard/auction_lots_sms_send.py
 create mode 100644 addons/auction/wizard/auction_lots_sms_send_view.xml
 create mode 100644 addons/auction/wizard/auction_pay_buy.py
 create mode 100644 addons/auction/wizard/auction_pay_buy_view.xml
 create mode 100644 addons/auction/wizard/auction_pay_sel.py
 create mode 100644 addons/auction/wizard/auction_pay_sel_view.xml
 rename addons/auction/wizard/{auction_wizard_able_taken.py => auction_payer_sel.py} (51%)
 create mode 100644 addons/auction/wizard/auction_payer_sel_view.xml
 create mode 100644 addons/auction/wizard/auction_taken.py
 create mode 100644 addons/auction/wizard/auction_taken_view.xml
 delete mode 100644 addons/auction/wizard/auction_wizard_enable_taken.py
 delete mode 100644 addons/auction/wizard/wizard_auction_invoice_buyer.py
 delete mode 100644 addons/auction/wizard/wizard_auction_journal.py
 delete mode 100644 addons/auction/wizard/wizard_emporte.py
 delete mode 100644 addons/auction/wizard/wizard_lot_date_move.py
 delete mode 100644 addons/auction/wizard/wizard_lots_pay.py
 delete mode 100644 addons/auction/wizard/wizard_lots_sms.py
 delete mode 100644 addons/auction/wizard/wizard_pay.py
 delete mode 100644 addons/auction/wizard/wizard_payer.py

diff --git a/addons/auction/__terp__.py b/addons/auction/__terp__.py
index 83064640266..c3f9058f070 100644
--- a/addons/auction/__terp__.py
+++ b/addons/auction/__terp__.py
@@ -34,6 +34,16 @@
     'init_xml': ['auction_sequence.xml'],
     'update_xml': [
         'security/ir.model.access.csv',
+        'wizard/auction_lots_able_view.xml',
+        'wizard/auction_lots_enable_view.xml',
+        'wizard/auction_lots_make_invoice_buyer_view.xml',
+        'wizard/auction_lots_make_invoice_view.xml',
+        'wizard/auction_taken_view.xml',
+        'wizard/auction_lots_auction_move_view.xml',
+        'wizard/auction_pay_buy_view.xml',
+        'wizard/auction_payer_sel_view.xml',
+        'wizard/auction_lots_sms_send_view.xml',
+        
         'auction_view.xml',
         'auction_report.xml',
         'auction_wizard.xml'
diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index 0ece4690d9f..979f2c6cf42 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -478,13 +478,15 @@ class auction_lots(osv.osv):
         result = [ (r['id'], str(r['obj_num'])+' - '+r['name']) for r in self.read(cr, user, ids, ['name','obj_num'])]
         return result
 
-    def name_search(self, cr, user, name, args=[], operator='ilike', context={}):
+    def name_search(self, cr, user, name, args=None, operator='ilike', context={}):
+        if not args:
+            args = []
         try:
-            ids = self.search(cr, user, [('obj_num','=',int(name))]+ args)
+            ids = self.search(cr, user, [('obj_num','=',int(name))] + args)
         except:
             ids = []
         if not ids:
-            ids = self.search(cr, user, [('name',operator,name)]+ args)
+            ids = self.search(cr, user, [('name',operator,name)] + args)
         return self.name_get(cr, user, ids)
 
     def _sum_taxes_by_type_and_id(self, taxes):
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index 2189253f3ce..ee1004ab0f3 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -3,7 +3,8 @@
 <data>
 	<menuitem name="Auction Management" id="auction_menu_root" icon="terp-purchase"/>
 	<menuitem name="Configuration" parent="auction_menu_root" id="auction_config_menu" sequence="7"/>
-
+	<menuitem name="Tools Bar Codes" id="auction_outils_menu" parent="auction_menu_root" sequence="5" />
+    <menuitem name="Deliveries Management" action="action_auction_taken" id="menu_wizard_emporte" parent="auction_outils_menu"/>
 	=======================================================
 	Auction Management/Configuration/artist
 	=======================================================
@@ -203,6 +204,7 @@
 				<field name="lot_est2"/>
 				<field name="product_id"/>
 				<field name="state" readonly="1"/>
+				
 			</form>
 		</field>
 	</record>
@@ -277,7 +279,7 @@
 					<separator string="Description" colspan="4"/>
 					<field name="obj_desc" colspan="4" nolabel="1" select="2"/>
 					<field name="state" colspan="1" select="2"/>
-				 	<group col="4" colspan="2">
+				 	<group col="8" colspan="2">
 				 	   <button name="button_bought" string="Sold" states="draft" type="object" icon="gtk-jump-to"/>
                        <button name="button_not_bought" string="Not sold" states="draft" type="object" icon="gtk-undo"/>
                        <button name="button_taken_away" string="Taken away" states="sold" type="object" icon="gtk-goto-last"/>
@@ -330,7 +332,6 @@
 							<field name="date"/>
 						</tree>
 					</field>
-
 				</page>
 			<page string="Bids">
 				<field name="bid_lines" colspan="4" nolabel="1" editable="top">
@@ -340,9 +341,7 @@
 							<field name="call"/>
 						</tree>
 					</field>
-
 			</page>
-
 				</notebook>
 			</form>
 		</field>
diff --git a/addons/auction/auction_wizard.xml b/addons/auction/auction_wizard.xml
index 0a93799cc20..ab1b051add5 100644
--- a/addons/auction/auction_wizard.xml
+++ b/addons/auction/auction_wizard.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <openerp>
 	<data>
-	    <!--<delete model="ir.actions.wizard" search="[('wiz_name','like','auction.lots.')]"/>-->
-
+<!--	Following wizard is remaining to implement in osv_memory-->
+		<!--  
 		<wizard string="Send to website"
 			model="auction.lots"
 			name="auction.lots.send.aie"
@@ -20,45 +20,6 @@
 		multi="1"
 		id="wizard_map_user"/>
 
-		<wizard string="Change Auction Date"
-		 model="auction.lots"
-		 name="auction.lots.auction_move"
-		multi="1"
-		 id="wizard_change_auction"/>
-
-		<!--wizard string="Pay objects of the seller"
-		model="auction.lots"
-		name="auction.pay.sel"
-		id="wizard_lots_pay"/-->
-		<wizard string="Pay objects of the buyer"
-		model="auction.lots"
-		name="auction.pay.buy"
-		id="wizard_pay"/>
-
-		<wizard
-			string="Gestion emporte"
-			model="auction.dates"
-			name="auction.taken"
-			multi="1"
-			id="wizard_emporte"/>
-
-	<menuitem name="Tools Bar Codes"
-		id="auction_outils_menu"
-		parent="auction_menu_root" sequence="5"
-		/>
-
-	<menuitem name="Deliveries Management"
-		action="wizard_emporte"
-		type="wizard"
-		id="menu_wizard_emporte"
-		parent="auction_outils_menu"
-		/>
-
-		<!--wizard string="Cancel payment"
-		model="auction.lots"
-		name="auction.lots.cancel"
-		multi="1"
-		id="wizard_cancel_pay"/-->
 
 		<wizard string="Numerotation (per lot)"
 		model="auction.lots"
@@ -72,56 +33,13 @@
 		 multi="1"
 		id="wizard_numerotate_automatic"/>
 
-		<wizard string="SMS Send"
-		 model="auction.lots"
-		 name="auction.lots.sms_send"
-		multi="1"
- 		id="wizard_sms"/>
-
-		 <!--wizard string="Invoice"
-		 model="auction.lots"
-		 name="auction.lots.invoice"
-		 multi="1"
-		 id="wizard_invoicing"/-->
-
-
-		<wizard string="Invoice Seller objects"
-			model="auction.lots"
-			name="auction.lots.make_invoice"
-		multi="1"
-			id="wizard_invoice"/>
-
-		<wizard string="Invoice Buyer objects"
-			model="auction.lots"
-			name="auction.lots.make_invoice_buyer"
-			id="wizard_invoice_buyer1"/>
-
-		<wizard string="Unmark as taken away"
-			model="auction.lots"
-			name="auction.lots.enable"
-			multi="1"
-			id="auction_wizard_enable_taken"/>
-
-		<wizard string="Mark as taken away"
-			model="auction.lots"
-			name="auction.lots.able"
-			multi="1"
-			id="auction_wizard_able_taken"/>
-
 			<wizard
 			id="auction_catalog_flagy"
 			string="Auction Catalog Flagey"
 			model="auction.dates"
 			name="auction.catalog.flagey"
 			keyword="client_print_multi"/>
-
-<wizard string="Mark as paid for seller"
-			model="auction.lots"
-			name="auction.payer.sel"
-			multi="1"
-			id="auction_wizard_payer_sel"/>
-
-
+ -->
 
 	</data>
 </openerp>
diff --git a/addons/auction/wizard/__init__.py b/addons/auction/wizard/__init__.py
index ec07ef6e04f..b82dcda5307 100644
--- a/addons/auction/wizard/__init__.py
+++ b/addons/auction/wizard/__init__.py
@@ -19,24 +19,27 @@
 #
 ##############################################################################
 
-import wizard_aie_send
-import wizard_aie_send_result
-import wizard_lots_buyer_map
-import wizard_lots_cancel
-import wizard_lots_invoice
-import wizard_lots_numerotate
-import wizard_lots_pay
-import wizard_pay
-import wizard_lots_sms
-import wizard_lot_date_move
-import wizard_auction_journal
-import wizard_auction_invoice_buyer
-import wizard_transfer_unsold_object
-import auction_wizard_enable_taken
-import auction_wizard_able_taken
-import auction_catalog_flagey
-#import wizard_lots_barcode
-import wizard_emporte
-import wizard_payer
+#import wizard_aie_send
+#import wizard_aie_send_result
+#import wizard_lots_buyer_map
+#import wizard_lots_cancel
+#import wizard_lots_invoice
+#import wizard_lots_numerotate
+#import wizard_lots_pay
+#import wizard_pay
+#import wizard_lot_date_move
+#import wizard_transfer_unsold_object
+#import auction_catalog_flagey
+
+import auction_lots_able
+import auction_lots_enable
+import auction_lots_make_invoice_buyer
+import auction_lots_make_invoice
+import auction_taken
+import auction_lots_auction_move
+import auction_pay_buy
+import auction_payer_sel
+import auction_lots_sms_send
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/auction/wizard/auction_lots_able.py b/addons/auction/wizard/auction_lots_able.py
new file mode 100644
index 00000000000..686d26c0341
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_able.py
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+
+class auction_lots_able(osv.osv_memory):
+    
+    _name = "auction.lots.able"
+    _description = "Lots able"
+    
+    def _confirm_able(self, cr, uid, ids, context={}):
+        """
+            This function Update auction lots object and set taken away field true.
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of auction lots able’s IDs.
+        """
+        self.pool.get('auction.lots').write(cr, uid, context['active_ids'], {'ach_emp':True})
+        return {}
+    
+auction_lots_able()
diff --git a/addons/auction/wizard/auction_lots_able_view.xml b/addons/auction/wizard/auction_lots_able_view.xml
new file mode 100644
index 00000000000..374390a1404
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_able_view.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_lots_able" model="ir.ui.view">
+            <field name="name">auction.lots.able.form</field>
+            <field name="model">auction.lots.able</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Confirm">
+                	<group colspan="4" >
+                		 <separator string="Confirmation set taken away" colspan="4"/>
+              			 <newline/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon="gtk-goto-last" string="Able Taken away" name="_confirm_able" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_auction_lots_able" model="ir.actions.act_window">
+            <field name="name">Mark as taken away</field>
+            <field name="res_model">auction.lots.able</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_auction_lots_able"/> 
+           <field name="target">new</field>
+           <field name="context">{'record_id' : active_id}</field>
+        </record>
+        
+        <record id="auction_lots_able_values" model="ir.values">
+            <field name="model_id" ref="auction.model_auction_lots" />
+            <field name="object" eval="1" />
+            <field name="name">Mark as taken away</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_auction_lots_able'))" />
+            <field name="key">action</field> 
+            <field name="model">auction.lots</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/auction/wizard/auction_lots_auction_move.py b/addons/auction/wizard/auction_lots_auction_move.py
new file mode 100644
index 00000000000..71e2b16e8e0
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_auction_move.py
@@ -0,0 +1,84 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+
+class auction_lots_auction_move(osv.osv_memory):
+    
+    _name = "auction.lots.auction.move"
+    _description = "Auction move "
+    _columns= {
+               'auction_id':fields.many2one('auction.dates', 'Auction Date', required=True), 
+               }
+    
+    def _top(self, cr, uid, ids, context={}):
+        refs = self.pool.get('auction.lots')
+        rec_ids = refs.browse(cr, uid, context['active_ids'])
+        for rec in rec_ids:
+            if not rec.auction_id:
+                raise osv.except_osv('Error !', 'You can not move a lot that has no auction date')
+        return {}
+    
+    def _auction_move_set(self, cr, uid, ids, context={}):
+        """
+        This Function update auction date on auction lots to given auction date.
+        erase the auction lots's object adjudication price and its buyer and change state to draft.
+        create new entry in auction lot history.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of auction lots auction move’s IDs.
+        """
+        for datas in self.read(cr, uid, ids):
+            if not (datas['auction_id'] and len(context['active_ids'])) :
+                return {}
+            refs = self.pool.get('auction.lots')
+            rec_ids = refs.browse(cr, uid, context['active_ids'])
+            line_ids = self.pool.get('auction.bid_line').search(cr, uid, [('lot_id', 'in', context['active_ids'])])
+        #   pooler.get_pool(cr.dbname).get('auction.bid_line').unlink(cr, uid, line_ids)
+            for rec in rec_ids:
+                new_id = self.pool.get('auction.lot.history').create(cr, uid, {
+                    'auction_id': rec.auction_id.id, 
+                    'lot_id': rec.id, 
+                    'price': rec.obj_ret
+                    })
+                up_auction = self.pool.get('auction.lots').write(cr, uid, [rec.id], {
+                    'auction_id':datas['auction_id'], 
+                    'obj_ret': None, 
+                    'obj_price': None, 
+                    'ach_login': None, 
+                    'ach_uid': None, 
+                    'ach_inv_id': None, 
+                    'sel_inv_id': None, 
+                    'obj_num': None, 
+                    'state': 'draft'})
+            return {}
+
+auction_lots_auction_move()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/auction_lots_auction_move_view.xml b/addons/auction/wizard/auction_lots_auction_move_view.xml
new file mode 100644
index 00000000000..394a916c96c
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_auction_move_view.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_lots_auction_move" model="ir.ui.view">
+            <field name="name">auction.lots.auction.move.form</field>
+            <field name="model">auction.lots.auction.move</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Change Auction Date">
+                	<group colspan="4" >
+                		 <label string="Warning, this will erase the object adjudication price and its buyer !" colspan="2"/>
+              			 <newline/>
+              			 <field name="auction_id"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon="gtk-redo" string="Move to Auction date" name="_auction_move_set" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_auction_lots_auction_move" model="ir.actions.act_window">
+            <field name="name">Change Auction Date</field>
+            <field name="res_model">auction.lots.auction.move</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_auction_lots_auction_move"/> 
+           <field name="target">new</field>
+           <field name="context">{'record_id' : active_id}</field>
+        </record>
+        
+        <record id="auction_lots_auction_move_values" model="ir.values">
+            <field name="model_id" ref="auction.model_auction_lots" />
+            <field name="object" eval="1" />
+            <field name="name">Change Auction Date</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_auction_lots_auction_move'))" />
+            <field name="key">action</field> 
+            <field name="model">auction.lots</field>
+        </record>
+        
+    </data>
+</openerp>
diff --git a/addons/auction/wizard/auction_lots_enable.py b/addons/auction/wizard/auction_lots_enable.py
new file mode 100644
index 00000000000..9d75ef1a589
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_enable.py
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+
+class auction_lots_enable(osv.osv_memory):
+   
+    _name = "auction.lots.enable"
+    _description = "Lots Enable"
+    _columns= {
+               'confirm_en':fields.integer('Catalog Number')
+               }
+    
+    def _confirm_enable(self, cr, uid, ids, context={}):
+        """
+        This function Update auction lots object and set taken away field False.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of auction lots enable’s IDs.
+        """
+        self.pool.get('auction.lots').write(cr, uid, context['active_id'], {'ach_emp':False})
+        return {}
+    
+auction_lots_enable()
diff --git a/addons/auction/wizard/auction_lots_enable_view.xml b/addons/auction/wizard/auction_lots_enable_view.xml
new file mode 100644
index 00000000000..e6a6936c5eb
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_enable_view.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_lots_enable" model="ir.ui.view">
+            <field name="name">auction.lots.enable.form</field>
+            <field name="model">auction.lots.enable</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Confirm">
+                	<group colspan="4" >
+                		 <separator string="Confirmation enable taken away" colspan="4"/>
+              			 <newline/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-goto-last"  string="Enable Taken away" name="_confirm_enable" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_auction_lots_enable" model="ir.actions.act_window">
+            <field name="name">Unmark as taken away</field>
+            <field name="res_model">auction.lots.enable</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_auction_lots_enable"/> 
+           <field name="target">new</field>
+           <field name="context">{'record_id' : active_id}</field>
+        </record>
+        
+        <record id="auction_lots_enable_values" model="ir.values">
+            <field name="model_id" ref="auction.model_auction_lots" />
+            <field name="object" eval="1" />
+            <field name="name">Unmark as taken away</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_auction_lots_enable'))" />
+            <field name="key">action</field> 
+            <field name="model">auction.lots</field>
+        </record>
+        
+        
+    </data>
+</openerp>
diff --git a/addons/auction/wizard/auction_lots_make_invoice.py b/addons/auction/wizard/auction_lots_make_invoice.py
new file mode 100644
index 00000000000..50177f54203
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_make_invoice.py
@@ -0,0 +1,93 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+
+class auction_lots_make_invoice(osv.osv_memory):
+    
+    def _value_amount(self, cr, uid, context={}):
+        """
+        For Amount default value
+        @return:default auction lots amount value in amount fields. 
+        """
+        lots= self.pool.get('auction.lots').browse(cr, uid, context['active_ids'])
+        amount_total=0.0
+        for lot in lots:
+            amount_total+=lot.seller_price
+        return amount_total
+        
+    def _value_object(self, cr, uid, context={}):
+        """
+        For object default value.
+        @return:length of id  in Object field.
+        """
+        object = len(context['active_ids'])
+        return object
+    
+    def _makeInvoices(self, cr, uid, ids, context):
+        """
+        seller invoice :Create an invoice.
+        @param cr: the current row, from the database cursor.
+        @param uid: the current user’s ID for security checks.
+        @param ids: List of Auction lots make invoice’s IDs
+        @return: dictionary of  account invoice form.
+        """    
+        for data in self.read(cr, uid, ids):
+            order_obj = self.pool.get('auction.lots')
+            mod_obj = self.pool.get('ir.model.data') 
+            result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
+            id = mod_obj.read(cr, uid, result, ['res_id'])
+            newinv = []
+            ids = order_obj.seller_trans_create(cr, uid, context['active_ids'], context)
+            cr.commit()
+            return {
+                'domain': "[('id','in', ["+','.join(map(str, ids))+"])]", 
+                'name': 'Seller invoices', 
+                'view_type': 'form', 
+                'view_mode': 'tree,form', 
+                'res_model': 'account.invoice', 
+                'view_id': False, 
+                'context': "{'type':'out_refund'}", 
+                'type': 'ir.actions.act_window', 
+                'search_view_id': id['res_id']        
+                }
+            
+    _name = "auction.lots.make.invoice"
+    _description = "Make invoice"
+    _columns= {
+               'amount': fields.float('Invoiced Amount', required =True, readonly=True), 
+               'objects':fields.integer('# of objects', required =True, readonly=True), 
+               'number':fields.char('Invoice Number', size=64), 
+              
+               }
+    _defaults={
+               'amount':_value_amount, 
+               'objects':_value_object, 
+               'number':lambda *a: False, 
+               
+               }
+
+auction_lots_make_invoice()
diff --git a/addons/auction/wizard/auction_lots_make_invoice_buyer.py b/addons/auction/wizard/auction_lots_make_invoice_buyer.py
new file mode 100644
index 00000000000..b35dc072776
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_make_invoice_buyer.py
@@ -0,0 +1,109 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+
+class auction_lots_make_invoice_buyer(osv.osv_memory):
+    
+    def _value_amount(self, cr, uid, context={}):
+        """
+        For Amount default value
+        @return:default auction lots amount value in amount fields. 
+        """
+        lots= self.pool.get('auction.lots').browse(cr, uid, context['active_ids'])
+        amount_total=0.0
+        for lot in lots:
+            amount_total+=lot.buyer_price
+        return amount_total
+        
+    def _value_object(self, cr, uid, context={}):
+        """
+        For object default value.
+        @return:length of id  in Object field.
+        """
+        object = len(context['active_ids'])
+        return object
+    
+    def _value_buyer_id(self, cr, uid, context={}):
+        """
+        For default buyer id value
+        @return:auction lots buyer id in buyer id field.
+        """
+        lots= self.pool.get('auction.lots').browse(cr, uid, context['active_ids'])
+        for lot in lots:
+            buyer=lot and lot.ach_uid.id or False
+        return buyer  
+
+    def _makeInvoices(self, cr, uid, ids, context):
+        """
+        Create an invoice for selected lots (IDS) to BUYER_ID .
+        @param cr: the current row, from the database cursor.
+        @param uid: the current user’s ID for security checks.
+        @param ids: List of Auction lots make invoice buyer’s IDs
+        @return: dictionary of  account invoice form.
+        """    
+        newinv = []
+        for data in self.read(cr, uid, ids):
+            
+            order_obj = self.pool.get('auction.lots')
+            mod_obj = self.pool.get('ir.model.data') 
+            result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
+            id = mod_obj.read(cr, uid, result, ['res_id'])
+            lots = order_obj.browse(cr, uid, context['active_ids'])
+            invoice_number = data['number']
+            for lot in lots:
+                up_auction = self.pool.get('auction.lots').write(cr, uid, [lot.id], {'ach_uid':data['buyer_id']})
+            ids = order_obj.lots_invoice(cr, uid, context['active_ids'], context, data['number'])
+            cr.commit()
+            return  {
+                'domain': "[('id','in', ["+','.join(map(str, ids))+"])]", 
+                'name': 'Buyer invoices', 
+                'view_type': 'form', 
+                'view_mode': 'tree,form', 
+                'res_model': 'account.invoice', 
+                'view_id': False, 
+                'context': "{'type':'in_refund'}", 
+                'type': 'ir.actions.act_window', 
+                'search_view_id': id['res_id']         
+            }
+            
+    _name = "auction.lots.make.invoice.buyer"
+    _description = "Make invoice buyer "
+    _columns= {
+               'amount': fields.float('Invoiced Amount', required =True, readonly=True), 
+               'objects':fields.integer('# of objects', required =True, readonly=True), 
+               'number':fields.char('Invoice Number', size=64), 
+               'buyer_id':fields.many2one('res.partner', 'Buyer', required=True), 
+               }
+    _defaults={
+               'amount':_value_amount,
+               'objects':_value_object,
+               'number':lambda *a: False,
+               'buyer_id':_value_buyer_id
+               
+               }
+
+auction_lots_make_invoice_buyer()
diff --git a/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml b/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
new file mode 100644
index 00000000000..b45d5bdbb1c
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_lots_make_invoice_buyer" model="ir.ui.view">
+            <field name="name">auction.lots.make.invoice.buyer.form</field>
+            <field name="model">auction.lots.make.invoice.buyer</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Paid">
+                	<group colspan="4" >
+                		 <field name="amount"/>
+                		 <field name="objects"/>
+                		 <field name="number"/>
+                		 <label string="(Keep empty for automatic number)" colspan="2"/>
+                		 <field name="buyer_id"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-ok" string="Create invoices" name="_makeInvoices" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_auction_lots_make_invoice_buyer" model="ir.actions.act_window">
+            <field name="name">Invoice Buyer objects</field>
+            <field name="res_model">auction.lots.make.invoice.buyer</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_auction_lots_make_invoice_buyer"/> 
+           <field name="target">new</field>
+           <field name="context">{'record_id' : active_id}</field>
+        </record>
+        
+        <record id="auction_lots_make_invoice_buyer_values" model="ir.values">
+            <field name="model_id" ref="auction.model_auction_lots" />
+            <field name="object" eval="1" />
+            <field name="name">Invoice Buyer objects</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_auction_lots_make_invoice_buyer'))" />
+            <field name="key">action</field> 
+            <field name="model">auction.lots</field>
+        </record>
+        
+        
+        
+    </data>
+</openerp>
diff --git a/addons/auction/wizard/auction_lots_make_invoice_view.xml b/addons/auction/wizard/auction_lots_make_invoice_view.xml
new file mode 100644
index 00000000000..e629942c5d5
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_make_invoice_view.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_lots_make_invoice" model="ir.ui.view">
+            <field name="name">auction.lots.make.invoice.form</field>
+            <field name="model">auction.lots.make.invoice</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Paid">
+                	<group colspan="4" >
+                		 <field name="amount"/>
+                		 <field name="objects"/>
+                		 <field name="number" colspan="3"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-ok" string="Create invoices" name="_makeInvoices" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_auction_lots_make_invoice" model="ir.actions.act_window">
+            <field name="name">Invoice Seller objects</field>
+            <field name="res_model">auction.lots.make.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_auction_lots_make_invoice"/> 
+           <field name="target">new</field>
+           <field name="context">{'record_id' : active_id}</field>
+        </record>
+        
+         <record id="auction_lots_make_invoice_values" model="ir.values">
+            <field name="model_id" ref="auction.model_auction_lots" />
+            <field name="object" eval="1" />
+            <field name="name">Invoice Seller objects</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_auction_lots_make_invoice'))" />
+            <field name="key">action</field> 
+            <field name="model">auction.lots</field>
+        </record>
+        
+    </data>
+</openerp>
diff --git a/addons/auction/wizard/auction_lots_sms_send.py b/addons/auction/wizard/auction_lots_sms_send.py
new file mode 100644
index 00000000000..95351c6965a
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_sms_send.py
@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+
+class auction_lots_sms_send(osv.osv_memory):
+
+    _name = "auction.lots.sms.send"
+    _description = "Sms send "
+    _columns= {
+               'app_id':fields.char('API ID', size=64, required=True), 
+               'user':fields.char('Login', size=64, required=True),
+               'password':fields.char('Password', size=64, required=True),
+               'text':fields.text('SMS Message', required=True)
+               }
+    
+    def _sms_send(self, cr, uid, ids, context):
+        
+        for datas in self.read(cr, uid, ids):
+            lots = self.pool.get('auction.lots').read(cr, uid, context['active_ids'], ['obj_num','obj_price','ach_uid'])
+            print "lots",lots, [l['ach_uid'][0] for l in lots if l['ach_uid']]
+            res = self.pool.get('res.partner').read(cr, uid, [l['ach_uid'][0] for l in lots if l['ach_uid']], ['gsm'], context)
+            
+            nbr = 0
+            for r in res:
+                add = self.pool.get('res.partner').address_get(cr, uid, [r['id']])['default']
+                addr = self.pool.get('res.partner.address').browse(cr, uid, add)
+                to = addr.mobile
+                if to:
+                    tools.smssend(data['user'], data['password'], data['app_id'], unicode(data['text'], 'utf-8').encode('latin1'), to)
+                    nbr += 1
+            return {'sms_sent': nbr}
+        
+            if to:
+                tools.smssend(data['user'], data['password'], data['app_id'], unicode(data['text'], 'utf-8').encode('latin1'), to)
+                nbr += 1
+            return {'sms_sent': nbr}
+#      
+auction_lots_sms_send()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/auction_lots_sms_send_view.xml b/addons/auction/wizard/auction_lots_sms_send_view.xml
new file mode 100644
index 00000000000..7e57833f72d
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_sms_send_view.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_lots_sms_send" model="ir.ui.view">
+            <field name="name">auction.lots.sms.send.form</field>
+            <field name="model">auction.lots.sms.send</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="SMS - Gateway: clickatell','Bulk SMS send">
+                	<group colspan="4" >
+                		 <separator string="SMS - Gateway: clickatell','Bulk SMS send" colspan="4"/>
+                		 <field name="app_id"/>
+                		 <newline/>
+                		 <field name="user"/>
+                		 <field name="password"/>
+                		 <newline/>
+                		 <field name="text" colspan="3"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-go-back" string="Send SMS" name="_sms_send" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_auction_lots_sms_send" model="ir.actions.act_window">
+            <field name="name">SMS Send</field>
+            <field name="res_model">auction.lots.sms.send</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_auction_lots_sms_send"/> 
+           <field name="target">new</field>
+           <field name="context">{'record_id' : active_id}</field>
+        </record>
+        
+       <record id="auction_lots_sms_send_values" model="ir.values">
+            <field name="model_id" ref="auction.model_auction_lots" />
+            <field name="object" eval="1" />
+            <field name="name">SMS Send</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_auction_lots_sms_send'))" />
+            <field name="key">action</field> 
+            <field name="model">auction.lots</field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/auction/wizard/auction_pay_buy.py b/addons/auction/wizard/auction_pay_buy.py
new file mode 100644
index 00000000000..8e7136b0064
--- /dev/null
+++ b/addons/auction/wizard/auction_pay_buy.py
@@ -0,0 +1,105 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+
+class auction_pay_buy(osv.osv_memory):
+    
+    def _start(self, cr, uid, context):
+        rec = self.pool.get('auction.lots').browse(cr, uid, context['active_ids'], context)
+        amount1 = 0.0
+        for r in rec:
+            amount1+= r.buyer_price
+            if r.is_ok:
+                raise osv.except_osv('Error !', 'Some lots of the selection are already paid.')
+        return amount1
+    
+    def _value_buyer_id(self, cr, uid, context={}):
+        """
+        For default buyer id value
+        @return:auction lots buyer id in buyer id field.
+        """
+        lots= self.pool.get('auction.lots').browse(cr, uid, context['active_ids'])
+        for lot in lots:
+            buyer=lot and lot.ach_uid.id or False
+        return buyer
+    
+    def _pay_and_reconcile(self, cr, uid, ids, context):
+        for datas in self.read(cr, uid, ids):
+            if not abs(datas['total'] - (datas['amount'] + datas['amount2'] + datas['amount3'])) <0.01:
+                rest = datas['total']-(datas['amount'] + datas['amount2'] + datas['amount3'])
+                raise osv.except_osv('Payment aborted !', 'You should pay all the total: "%.2f" are missing to accomplish the payment.' %(round(rest, 2)))
+    
+            lots = self.pool.get('auction.lots').browse(cr, uid, context['active_ids'], context)
+            ref_bk_s = self.pool.get('account.bank.statement.line')
+    
+            for lot in lots:
+                if datas['buyer_id']:
+                    self.pool.get('auction.lots').write(cr, uid, [lot.id], {'ach_uid':datas['buyer_id']})
+                if not lot.auction_id:
+                    raise osv.except_osv('Error !', 'No auction date for "%s": Please set one.'%(lot.name))
+                self.pool.get('auction.lots').write(cr, uid, [lot.id], {'is_ok':True})
+    
+            for st, stamount in [('statement_id1', 'amount'), ('statement_id2', 'amount2'), ('statement_id3', 'amount3')]:
+                if datas[st]:
+                    new_id = ref_bk_s.create(cr, uid, {
+                        'name':'Buyer:'+ str(lot.ach_login or '')+', auction:'+ lots[0].auction_id.name, 
+                        'date': time.strftime('%Y-%m-%d'), 
+                        'partner_id': datas['buyer_id'] or False, 
+                        'type':'customer', 
+                        'statement_id': datas[st], 
+                        'account_id': lot.auction_id.acc_income.id, 
+                        'amount': datas[stamount]
+                        })
+                    for lot in lots:
+                        self.pool.get('auction.lots').write(cr, uid, [lot.id], {'statement_id':[(4, new_id)]})
+            return {}
+   
+    _name = "auction.pay.buy"
+    _description = "Pay buy"
+    _columns= {
+               'amount': fields.float('Amount paid', digits= (16, int(tools.config['price_accuracy']))), 
+               'buyer_id':fields.many2one('res.partner', 'Buyer'), 
+               'statement_id1':fields.many2one('account.bank.statement', 'Statement', required=True), 
+               'amount2': fields.float('Amount paid', digits= (16, int(tools.config['price_accuracy']))), 
+               'statement_id2':fields.many2one('account.bank.statement', 'Statement'), 
+               'amount3': fields.float('Amount paid', digits = (16, int(tools.config['price_accuracy']))), 
+               'statement_id3':fields.many2one('account.bank.statement', 'Statement'), 
+               'total': fields.float('Amount paid', digits = (16, int(tools.config['price_accuracy'])), readonly =True), 
+               }
+    _defaults={
+               'amount' : _start,
+               'total' : _start,
+               'buyer_id' : _value_buyer_id
+               }
+    
+auction_pay_buy()
+
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/auction_pay_buy_view.xml b/addons/auction/wizard/auction_pay_buy_view.xml
new file mode 100644
index 00000000000..daa0ea2a195
--- /dev/null
+++ b/addons/auction/wizard/auction_pay_buy_view.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_pay_buy" model="ir.ui.view">
+            <field name="name">auction.pay.buy.form</field>
+            <field name="model">auction.pay.buy</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Pay objects">
+                	<group colspan="4" >
+                		 <field name="amount"/>
+                		 <field name="statement_id1" domain="[('state','=','draft')]"/>
+                		 <field name="amount2"/>
+                		 <field name="statement_id2"  domain="[('state','=','draft')]"/>
+                		 <field name="amount3"/>
+                		 <field name="statement_id3"  domain="[('state','=','draft')]"/>
+                		 <newline/>
+                		 <field name="buyer_id"/>
+                		 <field name="total"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-yes"  string="Pay" name="_pay_and_reconcile" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+  		<record id="action_auction_pay_buy" model="ir.actions.act_window">
+            <field name="name">Pay objects of the buyer</field>
+            <field name="res_model">auction.pay.buy</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_auction_pay_buy"/> 
+           <field name="target">new</field>
+           <field name="context">{'record_id' : active_id}</field>
+  		</record>
+  		
+  		 <record id="auction_pay_buy_values" model="ir.values">
+            <field name="model_id" ref="auction.model_auction_lots" />
+            <field name="object" eval="1" />
+            <field name="name">Pay objects of the buyer</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_auction_pay_buy'))" />
+            <field name="key">action</field> 
+            <field name="model">auction.lots</field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/auction/wizard/auction_pay_sel.py b/addons/auction/wizard/auction_pay_sel.py
new file mode 100644
index 00000000000..2643a565e3e
--- /dev/null
+++ b/addons/auction/wizard/auction_pay_sel.py
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+
+class auction_pay_sel(osv.osv_memory):
+   
+    _name = "auction.pay.sel"
+    _description = "Pay Invoice"
+    _columns= {
+               'amount': fields.float('Amount paid', digits= (16, int(tools.config['price_accuracy'])), required=True), 
+               'dest_account_id':fields.many2one('account.account', 'Payment to Account', required=True, domain= [('type', '=', 'cash')]), 
+               'journal_id':fields.many2one('account.journal', 'Journal', required=True), 
+               'period_id':fields.many2one('account.period', 'Period', required=True), 
+               }
+    
+    def _pay_and_reconcile(self, cr, uid, ids, context):
+        lot = self.pool.get('auction.lots').browse(cr, uid, context['active_id'], context)
+        for datas in self.read(cr, uid, ids):
+            account_id = datas.get('writeoff_acc_id', False)
+            period_id = datas.get('period_id', False)
+            journal_id = datas.get('journal_id', False)
+            if lot.sel_inv_id:
+                p = self.pool.get('account.invoice').pay_and_reconcile(['lot.sel_inv_id.id'], datas['amount'], datas['dest_account_id'], journal_id, account_id, period_id, journal_id, context)
+        #   lots.sel_inv_id.pay_and_reconcile(cr,uid,data[id], form['amount'], form['dest_account_id'], journal_id, account_id, period_id, journal_id, context)
+            return {}
+    
+auction_pay_sel()
diff --git a/addons/auction/wizard/auction_pay_sel_view.xml b/addons/auction/wizard/auction_pay_sel_view.xml
new file mode 100644
index 00000000000..b96f25032ac
--- /dev/null
+++ b/addons/auction/wizard/auction_pay_sel_view.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_pay_sel" model="ir.ui.view">
+            <field name="name">auction.pay.sel.form</field>
+            <field name="model">auction.pay.sel</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Pay invoice">
+                	<group colspan="4" >
+                		 <field name="amount"/>
+                		 <field name="dest_account_id"/>
+                		 <field name="journal_id"/>
+                		 <field name="period_id"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-yes" string="Pay" name="_pay_and_reconcile" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+  		<record id="action_auction_pay_sel" model="ir.actions.act_window">
+            <field name="name">Pay objects of the seller</field>
+            <field name="res_model">auction.pay.sel</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_auction_pay_sel"/> 
+           <field name="target">new</field>
+  		</record>
+
+    </data>
+</openerp>
diff --git a/addons/auction/wizard/auction_wizard_able_taken.py b/addons/auction/wizard/auction_payer_sel.py
similarity index 51%
rename from addons/auction/wizard/auction_wizard_able_taken.py
rename to addons/auction/wizard/auction_payer_sel.py
index 261cc47c48b..b59cbf591cc 100644
--- a/addons/auction/wizard/auction_wizard_able_taken.py
+++ b/addons/auction/wizard/auction_payer_sel.py
@@ -19,43 +19,42 @@
 #
 ##############################################################################
 
-import wizard
+from osv import fields, osv
+from tools.translate import _
 import netsvc
 import pooler
-take_form = """<?xml version="1.0"?>
-<form title="Confirm">
-    <separator string="Confirmation set taken away" colspan="4"/>
-    <newline/>
-</form>
-"""
+import time
+import tools
+import wizard
 
-take_fields = {
-#   'confirm_en': {'string':'Catalog Number', 'type':'integer'},
-}
-
-def _confirm_able(self,cr,uid,data,context={}):
-    res={}
-    pool = pooler.get_pool(cr.dbname)
-    pool.get('auction.lots').write(cr,uid,data['ids'],{'ach_emp':True})
-    return {}
-
-class able_take_away(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {
-                    'type' : 'form',
-                    'arch' : take_form,
-                    'fields' : take_fields,
-                    'state' : [('end', 'Cancel'),('go', 'Able Taken away')]}
-        },
-            'go' : {
-            'actions' : [_confirm_able],
-            'result' : {'type' : 'state', 'state' : 'end'}
-        },
-}
-able_take_away('auction.lots.able')
+class auction_payer(osv.osv_memory):
 
+    _name = "auction.payer"
+    _description = "Auction payer"
+    
+    def _payer(self, cr, uid, ids, context):
+        self.pool.get('auction.lots').write(cr, uid, context['active_ids'], {'is_ok':True, 'state':'paid'})
+        return {}
+    
+auction_payer()
 
+class auction_payer_sel(osv.osv_memory):
+    """
+    For Mark as payment for seller
+    """
+    _name = "auction.payer.sel"
+    _description = "Auction payment for seller"
+    
+    def _payer_sel(self, cr, uid, ids, context):
+        """
+        This function Update auction lots object and seller paid  true.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of auction payer sel’s IDs.
+        """
+        self.pool.get('auction.lots').write(cr, uid, context['active_ids'], {'paid_vnd':True})
+        return {}
+    
+auction_payer_sel()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/auction/wizard/auction_payer_sel_view.xml b/addons/auction/wizard/auction_payer_sel_view.xml
new file mode 100644
index 00000000000..93fe0ef38b1
--- /dev/null
+++ b/addons/auction/wizard/auction_payer_sel_view.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_payer" model="ir.ui.view">
+            <field name="name">auction.payer.form</field>
+            <field name="model">auction.payer</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Check payment for buyer">
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="2">
+                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon = "gtk-yes"  string="Pay"   name="_payer" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+  		<record id="view_auction_payer_sel" model="ir.ui.view">
+            <field name="name">auction.payer.sel.form</field>
+            <field name="model">auction.payer.sel</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Check payment for seller">
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon="gtk-yes" string="Pay" name="_payer_sel" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_auction_payer_sel" model="ir.actions.act_window">
+            <field name="name">Mark as paid for seller</field>
+            <field name="res_model">auction.payer.sel</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_auction_payer_sel"/> 
+           <field name="target">new</field>
+           <field name="context">{'record_id' : active_id}</field>
+        </record>
+        
+        <record id="auction_payer_sel_values" model="ir.values">
+            <field name="model_id" ref="auction.model_auction_lots" />
+            <field name="object" eval="1" />
+            <field name="name">Mark as paid for seller</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_auction_payer_sel'))" />
+            <field name="key">action</field> 
+            <field name="model">auction.lots</field>
+        </record>
+        
+    </data>
+</openerp>
diff --git a/addons/auction/wizard/auction_taken.py b/addons/auction/wizard/auction_taken.py
new file mode 100644
index 00000000000..48a5d8cf6af
--- /dev/null
+++ b/addons/auction/wizard/auction_taken.py
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+
+class auction_taken(osv.osv_memory):
+    """
+    Auction lots taken.
+    """
+    _name = "auction.taken"
+    _description = "Auction taken"
+    _columns = {
+              'lot_ids':fields.many2many('auction.lots', 'auction_taken_rel', 'taken_id', 'lot_id', 'Lots Emportes'), 
+              
+              }
+    
+    def _to_xml(s):
+        return s.replace('&','&amp;').replace('<','&lt;').replace('>','&gt;')
+
+    def _process(self, cr, uid, ids, context):
+          """
+          Update Auction lots state to taken_away.
+          @param cr: the current row, from the database cursor.
+          @param uid: the current user’s ID for security checks.
+          @param ids: List of Auction taken’s IDs
+          @return: dictionary of lot_ids fields with empty list 
+          """
+          for data in self.read(cr, uid, ids): 
+              lot_obj = self.pool.get('auction.lots')
+              if data['lot_ids']:
+                  lot_obj.write(cr, uid, data['lot_ids'], {'state':'taken_away'})
+              return {'lot_ids': []}
+
+auction_taken()
diff --git a/addons/auction/wizard/auction_taken_view.xml b/addons/auction/wizard/auction_taken_view.xml
new file mode 100644
index 00000000000..8ed7f730427
--- /dev/null
+++ b/addons/auction/wizard/auction_taken_view.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_taken" model="ir.ui.view">
+            <field name="name">auction.taken.form</field>
+            <field name="model">auction.taken</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Mark Lots"> 
+                	<group colspan="4" >
+                		 <label string="Select lots which are Sold" colspan="4"/>
+                		 <field name="lot_ids" nolabel="1" colspan="4" domain="[('state','=','sold')]"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-ok"  string="OK"  name="_process" type="object" />
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_auction_taken" model="ir.actions.act_window">
+            <field name="name">Gestion emporte</field>
+            <field name="res_model">auction.taken</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_auction_taken"/> 
+           <field name="target">new</field>
+        </record>
+        
+        <!-- <menuitem name="Tools Bar Codes"
+		id="auction_outils_menu"
+		parent="auction_menu_root" sequence="5"
+		/>
+        <menuitem name="Deliveries Management"
+		action="action_auction_taken"
+		id="menu_wizard_emporte"
+		parent="auction_outils_menu"
+		/> -->
+        
+    </data>
+</openerp>
diff --git a/addons/auction/wizard/auction_wizard_enable_taken.py b/addons/auction/wizard/auction_wizard_enable_taken.py
deleted file mode 100644
index 01f54ca28dc..00000000000
--- a/addons/auction/wizard/auction_wizard_enable_taken.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-#field name="confirm_en"/>
-
-take_form = """<?xml version="1.0"?>
-<form title="Confirm">
-    <separator string="Confirmation enable taken away" colspan="4"/>
-    <newline/>
-</form>
-"""
-
-take_fields = {
-    'confirm_en': {'string':'Catalog Number', 'type':'integer'},
-}
-
-def _confirm_enable(self,cr,uid,data,context={}):
-    pool = pooler.get_pool(cr.dbname)
-    pool.get('auction.lots').write(cr,uid,data['ids'],{'ach_emp':False})
-    return {}
-
-class enable_take_away(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {
-                    'type' : 'form',
-                    'arch' : take_form,
-                    'fields' : take_fields,
-                    'state' : [ ('end', 'Cancel'),('go', 'Enable Taken away')]}
-        },
-            'go' : {
-            'actions' : [_confirm_enable],
-            'result' : {'type' : 'state', 'state' : 'end'}
-        },
-}
-enable_take_away('auction.lots.enable')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/auction/wizard/wizard_auction_invoice_buyer.py b/addons/auction/wizard/wizard_auction_invoice_buyer.py
deleted file mode 100644
index 6cf12b5da22..00000000000
--- a/addons/auction/wizard/wizard_auction_invoice_buyer.py
+++ /dev/null
@@ -1,111 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-
-invoice_form = '''<?xml version="1.0"?>
-<form title="Paid ?">
-    <field name="amount"/>
-    <field name="objects"/>
-    <field name="number"/>
-    <label string="(Keep empty for automatic number)" colspan="2"/>
-    <field name="buyer_id"/>
-</form>'''
-
-invoice_fields = {
-    'amount': {'string':'Invoiced Amount', 'type':'float', 'required':True, 'readonly':True},
-    'objects': {'string':'# of objects', 'type':'integer', 'required':True, 'readonly':True},
-    'number': {'string':'Invoice Number', 'type':'char'},
-    'buyer_id':{'string': 'Buyer', 'type': 'many2one', 'relation':'res.partner'}
-
-}
-
-
-def _values(self,cr,uid, datas,context={}):
-    pool = pooler.get_pool(cr.dbname)
-    lots= pool.get('auction.lots').browse(cr,uid,datas['ids'])
-#   price = 0.0
-    amount_total=0.0
-#   pt_tax=pooler.get_pool(cr.dbname).get('account.tax')
-    for lot in lots:
-        buyer=lot and lot.ach_uid.id or False
-        amount_total+=lot.buyer_price
-#       taxes = lot.product_id.taxes_id
-#       if lot.author_right:
-#           taxes.append(lot.author_right)
-#       if lot.auction_id:
-#           taxes += lot.auction_id.buyer_costs
-#       tax=pt_tax.compute(cr,uid,taxes,lot.obj_price,1)
-#       for t in tax:
-#           amount_total+=t['amount']
-#       amount_total+=lot.obj_price
-    #   up_auction=pooler.get_pool(cr.dbname).get('auction.lots').write(cr,uid,[lot.id],{'ach_uid':datas['form']['buyer_id']})
-    invoice_number = False
-    return {'objects':len(datas['ids']), 'amount':amount_total, 'number':invoice_number,'buyer_id':buyer}
-
-
-def _makeInvoices(self, cr, uid, data, context):
-    newinv = []
-    pool = pooler.get_pool(cr.dbname)
-    order_obj = pool.get('auction.lots')
-    mod_obj = pool.get('ir.model.data') 
-    result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
-    id = mod_obj.read(cr, uid, result, ['res_id'])
-    lots= order_obj.browse(cr,uid,data['ids'])
-    invoice_number=data['form']['number']
-    for lot in lots:
-        up_auction=pooler.get_pool(cr.dbname).get('auction.lots').write(cr,uid,[lot.id],{'ach_uid':data['form']['buyer_id']})
-    ids = order_obj.lots_invoice(cr, uid, data['ids'],context,data['form']['number'])
-#   ids = order_obj.lots_invoice(cr, uid, data['ids'],context,invoice_number)
-    cr.commit()
-    return {
-        'domain': "[('id','in', ["+','.join(map(str, ids))+"])]",
-        'name': 'Buyer invoices',
-        'view_type': 'form',
-        'view_mode': 'tree,form',
-        'res_model': 'account.invoice',
-        'view_id': False,
-        'context': "{'type':'in_refund'}",
-        'type': 'ir.actions.act_window',
-        'search_view_id': id['res_id']         
-    }
-    return {}
-
-class make_invoice(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [_values],
-            'result' : {'type' : 'form',
-                    'arch' : invoice_form,
-                    'fields' : invoice_fields,
-                    'state' : [('end', 'Cancel'),('invoice', 'Create invoices')]}
-        },
-        'invoice' : {
-            'actions' : [],
-            'result' : {'type' : 'action',
-                    'action' : _makeInvoices}
-        },
-    }
-make_invoice("auction.lots.make_invoice_buyer")
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/auction/wizard/wizard_auction_journal.py b/addons/auction/wizard/wizard_auction_journal.py
deleted file mode 100644
index 79329592165..00000000000
--- a/addons/auction/wizard/wizard_auction_journal.py
+++ /dev/null
@@ -1,105 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-
-
-
-invoice_form = '''<?xml version="1.0"?>
-<form title="Paid ?">
-    <field name="amount"/>
-    <field name="objects"/>
-    <field name="number" colspan="3"/>
-</form>'''
-
-invoice_fields = {
-    'amount': {'string':'Invoiced Amount', 'type':'float', 'required':True, 'readonly':True},
-    'objects': {'string':'# of objects', 'type':'integer', 'required':True, 'readonly':True},
-    'number': {'string':'Invoice Number', 'type':'integer'},
-}
-
-def _values(self,cr,uid, datas,context={}):
-    lots= pooler.get_pool(cr.dbname).get('auction.lots').browse(cr,uid,datas['ids'])
-#   service = netsvc.LocalService("object_proxy")
-#   lots = service.execute(cr,uid, 'auction.lots', 'read', datas['ids'])
-#   auction = service.execute(cr,uid, 'auction.dates', 'read', [lots[0]['auction_id'][0]])[0]
-    price = 0.0
-    amount_total=0.0
-    pt_tax=pooler.get_pool(cr.dbname).get('account.tax')
-    for lot in lots:
-    #   taxes = lot.product_id.taxes_id
-    #   if lot.bord_vnd_id.tax_id:
-    #       taxes.append(lot.bord_vnd_id.tax_id)
-    #   if lot.auction_id:
-    #       taxes += lot.auction_id.seller_costs
-    #   tax=pt_tax.compute(cr,uid,taxes,lot.obj_price,1)
-    #   for t in tax:
-    #       amount_total+=t['amount']
-    #   amount_total+=lot.obj_price
-        amount_total+=lot.seller_price  
-#TODO: recuperer id next invoice (de la sequence)???
-    invoice_number = False
-    return {'objects':len(datas['ids']), 'amount':amount_total, 'number':invoice_number}
-
-def _makeInvoices(self, cr, uid, data, context):
-
-    pool = pooler.get_pool(cr.dbname)
-    order_obj = pool.get('auction.lots')
-    mod_obj = pool.get('ir.model.data') 
-    result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
-    id = mod_obj.read(cr, uid, result, ['res_id'])
-    newinv = []
-    ids = order_obj.seller_trans_create(cr, uid, data['ids'],context)
-    cr.commit()
-    return {
-        'domain': "[('id','in', ["+','.join(map(str, ids))+"])]",
-        'name': 'Seller invoices',
-        'view_type': 'form',
-        'view_mode': 'tree,form',
-        'res_model': 'account.invoice',
-        'view_id': False,
-        'context': "{'type':'out_refund'}",
-        'type': 'ir.actions.act_window',
-        'search_view_id': id['res_id']        
-    }
-    return {}
-
-class make_invoice(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [_values],
-            'result' : {'type' : 'form',
-                    'arch' : invoice_form,
-                    'fields' : invoice_fields,
-                    'state' : [('end', 'Cancel'),('invoice', 'Create invoices')]}
-        },
-        'invoice' : {
-            'actions' : [_makeInvoices],
-            'result' : {'type' : 'action',
-                    'action' : _makeInvoices,
-                    'state' : 'end'}
-        },
-    }
-make_invoice("auction.lots.make_invoice")
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/auction/wizard/wizard_emporte.py b/addons/auction/wizard/wizard_emporte.py
deleted file mode 100644
index 1172404e218..00000000000
--- a/addons/auction/wizard/wizard_emporte.py
+++ /dev/null
@@ -1,73 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-
-import pooler
-from tools.misc import UpdateableStr
-
-
-# Dossier
-
-_lot_arch = """<?xml version="1.0"?>
-<form string="Mark Lots" height="500" width="1000">
-    <label string="Select lots which are Sold" colspan="4"/>
-    <field name="lot_ids" nolabel="1" colspan="4" domain="[('state','=','sold')]"/>
-</form>
-"""
-_lot_fields = {
-    'lot_ids': {'string':'Lots Emportes','relation':'auction.lots','type':'many2many'}
-}
-
-def _to_xml(s):
-    return s.replace('&','&amp;').replace('<','&lt;').replace('>','&gt;')
-
-def _process(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    lot_obj = pool.get('auction.lots')
-    if data['form']['lot_ids']:
-        lot_obj.write(cr, uid, data['form']['lot_ids'][0][2], {'state':'taken_away'})
-    return {'lot_ids': []}
-
-class wizard_reprint(wizard.interface):
-    states = {
-        'valid': {
-            'actions': [_process],
-            'result': {'type':'state', 'state':'init'}
-        },
-        'init': {
-            'actions': [],
-            'result': {
-                'type':'form', 
-                'arch': _lot_arch,
-                'fields': _lot_fields,
-                'state': [
-                    ('valid','       OK       ')
-                ],
-            }
-        }
-    }
-wizard_reprint('auction.taken')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/auction/wizard/wizard_lot_date_move.py b/addons/auction/wizard/wizard_lot_date_move.py
deleted file mode 100644
index e6e13ea0ab2..00000000000
--- a/addons/auction/wizard/wizard_lot_date_move.py
+++ /dev/null
@@ -1,96 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-import sql_db
-
-auction_move = '''<?xml version="1.0"?>
-<form string="Change Auction Date">
-    <group col="1" colspan="2">
-    <label string="Warning, this will erase the object adjudication price and its buyer !" colspan="2"/>
-    </group>
-    <newline/>
-    <field name="auction_id"/>
-</form>'''
-
-auction_move_fields = {
-    'auction_id': {'string':'Auction Date', 'type':'many2one', 'required':True, 'relation':'auction.dates'},
-}
-
-#def _auction_move_set(self, uid, datas):
-#   if datas['form']['auction_id']:
-#       cr = sql_db.db.cursor()
-#       cr.execute('update auction_lots set auction_id=%s, obj_price=NULL, ach_login=NULL, ach_uid=NULL, ach_pay_id=NULL, ach_inv_id=NULL, state=%s where id in ('+','.join(map(str, datas['ids']))+')', (str(datas['form']['auction_id']), 'draft'))
-#       cr.execute('delete from auction_bid_line where lot_id in ('+','.join(map(str, datas['ids']))+')')
-#       cr.commit()
-#       cr.close()
-#   return {}
-def _top(self,cr,uid,datas,context={}):
-    refs = pooler.get_pool(cr.dbname).get('auction.lots')
-    rec_ids = refs.browse(cr,uid,datas['ids'])
-    for rec in rec_ids:
-        if not rec.auction_id:
-            raise wizard.except_wizard('Error !','You can not move a lot that has no auction date')
-    return {}
-def _auction_move_set(self,cr,uid,datas,context={}):
-    if not (datas['form']['auction_id'] and len(datas['ids'])) :
-        return {}
-    refs = pooler.get_pool(cr.dbname).get('auction.lots')
-    rec_ids = refs.browse(cr,uid,datas['ids'])
-    
-    line_ids= pooler.get_pool(cr.dbname).get('auction.bid_line').search(cr,uid,[('lot_id','in',datas['ids'])])
-#   pooler.get_pool(cr.dbname).get('auction.bid_line').unlink(cr, uid, line_ids)
-    for rec in rec_ids:
-        new_id=pooler.get_pool(cr.dbname).get('auction.lot.history').create(cr,uid,{
-            'auction_id':rec.auction_id.id,
-            'lot_id':rec.id,
-            'price': rec.obj_ret
-        })
-        up_auction=pooler.get_pool(cr.dbname).get('auction.lots').write(cr,uid,[rec.id],{
-            'auction_id':datas['form']['auction_id'],
-            'obj_ret':None,
-            'obj_price':None,
-            'ach_login':None,
-            'ach_uid':None,
-            'ach_inv_id':None,
-            'sel_inv_id':None,
-            'obj_num':None,
-            'state':'draft'})
-    return {}
-
-class wiz_auc_lots_auction_move(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_top],
-            'result': {'type': 'form', 'arch':auction_move, 'fields': auction_move_fields, 'state':[('set_date', 'Move to Auction date'),('end','Cancel')]}
-        },
-        'set_date': {
-            'actions': [_auction_move_set],
-            'result': {'type': 'state', 'state':'end'}
-        }
-    }
-
-wiz_auc_lots_auction_move('auction.lots.auction_move')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/auction/wizard/wizard_lots_pay.py b/addons/auction/wizard/wizard_lots_pay.py
deleted file mode 100644
index a6b8f635ba4..00000000000
--- a/addons/auction/wizard/wizard_lots_pay.py
+++ /dev/null
@@ -1,103 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import netsvc
-import osv
-import time
-import pooler
-
-invoice_form = '''<?xml version="1.0"?>
-<form string="Pay invoice">
-    <field name="amount"/>
-    <field name="dest_account_id"/>
-    <field name="journal_id"/>
-    <field name="period_id"/>
-</form>'''
-
-invoice_fields = {
-    'amount': {'string': 'Amount paid', 'type':'float', 'required':True},
-    'dest_account_id': {'string':'Payment to Account', 'type':'many2one', 'required':True, 'relation':'account.account', 'domain':[('type','=','cash')]},
-    'journal_id': {'string': 'Journal', 'type': 'many2one', 'relation':'account.journal', 'required':True},
-    'period_id': {'string': 'Period', 'type': 'many2one', 'relation':'account.period', 'required':True},
-}
-#def pay_n_check(self, cr, uid, data, context):
-#
-#   auction = pool.get('auction.lots').browse(cr,uid,data['id'],context)
-#   try:
-#       
-#       for lot in auction:
-#                            
-#           if not lot.auction_id :
-#               raise osv.except_osv("Error","No payment defined for this auction.")
-#           i=1
-#           tot= 0
-#           for payment in auction:
-#               if not payment.journal_id :
-#                   raise osv.except_osv("Error","No journal defined for the payment line %d" % (i,))
-#               if not payment.ach_inv_id.amount :
-#                   raise osv.except_osv("Error","No amount defined for the payment line %d." % (i,))
-#               i+=1
-#               tot+= payment.ach_inv_id.amount
-#           if abs(float(tot)) - abs(float(lot.obj_ret)) > 10**-6:
-#               raise osv.except_osv("Error","The amount paid does not match the total amount")
-#       else:
-#           for lot in auction:
-#              if not lot.journal_id :
-#               raise osv.except_osv("Error","Please choose a journal for the auction ("+lot.name+").")
-#           pool.get('auction.lots').create(cr,uid,{
-#               'auction_id': lot.auction.id,
-#               'journal_id': lot.journal_id,
-#
-#               })
-#   except osv.except_osv, e:
-#       raise wizard.except_wizard(e.name, e.name)
-#   return True
-def _pay_and_reconcile(self, cr, uid, data, context):
-
-    pool = pooler.get_pool(cr.dbname)
-    lot = pool.get('auction.lots').browse(cr,uid,data['id'],context)
-    form = data['form']
-    account_id = form.get('writeoff_acc_id', False)
-    period_id = form.get('period_id', False)
-    journal_id = form.get('journal_id', False)
-    if lot.sel_inv_id:
-        p=pool.get('account.invoice').pay_and_reconcile(['lot.sel_inv_id.id'], form['amount'], form['dest_account_id'], journal_id, account_id, period_id, journal_id, context)
-#   lots.sel_inv_id.pay_and_reconcile(cr,uid,data[id], form['amount'], form['dest_account_id'], journal_id, account_id, period_id, journal_id, context)
-    return {}
-
-
-class wiz_auc_lots_pay(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':invoice_form, 'fields': invoice_fields, 'state':[ ('pay','Pay'), ('end','Cancel')]}
-        },
-            'pay': {
-            'actions': [_pay_and_reconcile],
-            'result': {'type': 'state', 'state':'end'}
-        }}
-wiz_auc_lots_pay('auction.pay.sel');
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/auction/wizard/wizard_lots_sms.py b/addons/auction/wizard/wizard_lots_sms.py
deleted file mode 100644
index dc60a9bd24d..00000000000
--- a/addons/auction/wizard/wizard_lots_sms.py
+++ /dev/null
@@ -1,150 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-
-import urllib
-
-sms_send_form = '''<?xml version="1.0"?>
-<form title="%s">
-    <separator string="%s" colspan="4"/>
-    <field name="app_id"/>
-    <newline/>
-    <field name="user"/>
-    <field name="password"/>
-    <newline/>
-    <field name="text" colspan="3"/>
-</form>''' % ('SMS - Gateway: clickatell', 'Bulk SMS send')
-
-sms_send_fields = {
-    'app_id': {'string':'API ID', 'type':'char', 'required':True},
-    'user': {'string':'Login', 'type':'char', 'required':True},
-    'password': {'string':'Password', 'type':'char', 'required':True},
-    'text': {'string':'SMS Message', 'type':'text', 'required':True, 'value':'Les lots [lots] vous ont etes adjuges. -- Rops'}
-}
-##############################################################################
-#
-# Copyright (c) 2004-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
-#                    Fabien Pinckaers <fp@tiny.Be>
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# 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 2
-# 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-
-sms_send_form = '''<?xml version="1.0"?>
-<form string="%s">
-    <separator string="%s" colspan="4"/>
-    <field name="app_id"/>
-    <newline/>
-    <field name="user"/>
-    <field name="password"/>
-    <newline/>
-    <field name="text" colspan="3"/>
-</form>''' % ('SMS - Gateway: clickatell','Bulk SMS send')
-
-sms_send_fields = {
-    'app_id': {'string':'API ID', 'type':'char', 'required':True},
-    'user': {'string':'Login', 'type':'char', 'required':True},
-    'password': {'string':'Password', 'type':'char', 'required':True},
-    'text': {'string':'SMS Message', 'type':'text', 'required':True}
-}
-
-def _sms_send(self, cr, uid, data, context):
-    service = netsvc.LocalService("object_proxy")
-    lots = service.execute(cr.dbname,uid, 'auction.lots', 'read', data['ids'], ['obj_num','obj_price','ach_uid'])
-    res = service.execute(cr.dbname,uid, 'res.partner', 'read', [l['ach_uid'] for l in lots if l['ach_uid']], ['gsm'])
-    #res = service.execute(cr.dbname, uid, 'res.partner', 'read', data['ids'], ['gsm'])
-#   service = netsvc.LocalService("object_proxy")
-#   pool=pooler.get_pool(cr.dbname)
-#   lots=pool.get('auction.lots').browse(cr,uid,data['id'],context)
-#   r=lots.ach_uid.id
-    nbr = 0
-    for r in res:
-        to = r['mobile']
-        if to:
-            tools.smssend(data['form']['user'], data['form']['password'], data['form']['app_id'], unicode(data['form']['text'], 'utf-8').encode('latin1'), to)
-            nbr += 1
-    return {'sms_sent': nbr}
-
-    if to:
-        tools.smssend(data['form']['user'], data['form']['password'], data['form']['app_id'], unicode(data['form']['text'], 'utf-8').encode('latin1'), to)
-        nbr += 1
-    return {'sms_sent': nbr}
-#
-#def _sms_send(self, uid, datas):
-#   service = netsvc.LocalService("object_proxy")
-#   pool=pooler.ger_pool(cr.dbname)
-#   lots=pool.get('auction.lots').browse(cr,uid,datas['ids'],context)
-#   #lots = service.execute(uid, 'auction.lots', 'read', datas['ids'], ['obj_num','obj_price','ach_uid'])
-#   #part = service.execute(uid, 'res.partner', 'read', [l['ach_uid'] for l in lots if l['ach_uid']], ['gsm'])
-#   
-#   part =ach_uid.id
-#   part = map(lambda x: (x.id,x.mobile), part)
-#   for l in lots:
-#       part.append(str(l.obj_num)+'-%dEUR' % int(l.obj_price))
-#
-#   for p in part.values():
-#       to = p.mobile
-#       if to:
-#           params = urllib.urlencode({'user': datas['form']['user'], 'password': datas['form']['password'], 'api_id': datas['form']['app_id'], 'text':unicode(datas['form']['text'].replace('[lots]',', '.join(p['lots'])), 'utf-8').encode('latin1'), 'to':to})
-#           f = urllib.urlopen("http://196.7.150.220/http/sendmsg", params)
-#           nbr+=1
-#   return {'sms_sent':nbr}
-
-class lots_sms(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':sms_send_form, 'fields': sms_send_fields, 'state':[('send','Send SMS'), ('end','Cancel')]}
-        },
-        'send': {
-            'actions': [_sms_send],
-            'result': {'type': 'state', 'state':'end'}
-        }
-    }
-lots_sms('auction.lots.sms_send');
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/auction/wizard/wizard_pay.py b/addons/auction/wizard/wizard_pay.py
deleted file mode 100644
index ff68c2b5b8d..00000000000
--- a/addons/auction/wizard/wizard_pay.py
+++ /dev/null
@@ -1,109 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import netsvc
-import osv
-import time
-import pooler
-pay_form = '''<?xml version="1.0"?>
-<form string="Pay objects">
-    <field name="amount"/>
-    <field name="statement_id1" domain="[('state','=','draft')]"/>
-    <field name="amount2"/>
-    <field name="statement_id2"  domain="[('state','=','draft')]"/>
-    <field name="amount3"/>
-    <field name="statement_id3"  domain="[('state','=','draft')]"/>
-    <newline/>
-    <field name="buyer_id"/>
-    <field name="total"/>
-</form>'''
-
-def _start(self,cr,uid,data,context):
-    pool = pooler.get_pool(cr.dbname)
-    rec=pool.get('auction.lots').browse(cr,uid,data['ids'],context)
-    amount1=0.0
-    for r in rec:
-        amount1+=r.buyer_price
-        buyer= r and r.ach_uid.id or False
-        if r.is_ok:
-            raise wizard.except_wizard('Error !', 'Some lots of the selection are already paid.')
-    return {'amount':amount1, 'total':amount1,'buyer_id':buyer}
-
-pay_fields = {
-    'amount': {'string': 'Amount paid', 'type':'float'},
-    'buyer_id': {'string': 'Buyer', 'type': 'many2one', 'relation':'res.partner'},
-    'statement_id1': {'string':'Statement', 'type':'many2one', 'required':True, 'relation':'account.bank.statement'},
-    'amount2': {'string': 'Amount paid', 'type':'float'},
-    'statement_id2': {'string':'Statement', 'type':'many2one', 'relation':'account.bank.statement'},
-    'amount3': {'string': 'Amount paid', 'type':'float'},
-    'statement_id3': {'string':'Statement', 'type':'many2one', 'relation':'account.bank.statement'},
-    'total': {'string': 'Amount to paid', 'type':'float','readonly':True}
-}
-
-def _pay_and_reconcile(self, cr, uid, data, context):
-    if not abs(data['form']['total'] - (data['form']['amount']+data['form']['amount2']+data['form']['amount3']))<0.01:
-        rest=data['form']['total']-(data['form']['amount']+data['form']['amount2']+data['form']['amount3'])
-        raise wizard.except_wizard('Payment aborted !', 'You should pay all the total: "%.2f" are missing to accomplish the payment.' %(round(rest,2)))
-    
-    pool = pooler.get_pool(cr.dbname)
-    lots = pool.get('auction.lots').browse(cr,uid,data['ids'],context)
-    ref_bk_s=pooler.get_pool(cr.dbname).get('account.bank.statement.line')
-    
-    for lot in lots:
-        if data['form']['buyer_id']:
-            pool.get('auction.lots').write(cr,uid,[lot.id],{'ach_uid':data['form']['buyer_id']})
-        if not lot.auction_id:
-            raise wizard.except_wizard('Error !', 'No auction date for "%s": Please set one.'%(lot.name))
-        pool.get('auction.lots').write(cr,uid,[lot.id],{'is_ok':True})
-    
-    for st,stamount in [('statement_id1','amount'),('statement_id2','amount2'),('statement_id3','amount3')]:
-        if data['form'][st]:
-            new_id=ref_bk_s.create(cr,uid,{
-                'name':'Buyer:'+str(lot.ach_login or '')+', auction:'+ lots[0].auction_id.name,
-                'date': time.strftime('%Y-%m-%d'),
-                'partner_id':data['form']['buyer_id'] or False,
-                'type':'customer',
-                'statement_id':data['form'][st],
-                'account_id':lot.auction_id.acc_income.id,
-                'amount':data['form'][stamount]
-            })
-            for lot in lots:
-                pool.get('auction.lots').write(cr,uid,[lot.id],{'statement_id':[(4,new_id)]})
-    return {}
-
-
-class wiz_auc_lots_pay(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_start],
-            'result': {'type': 'form', 'arch':pay_form, 'fields': pay_fields, 'state':[('end','Cancel'),('pay','Pay')]}
-        },
-        'pay': {
-        'actions': [_pay_and_reconcile],
-        'result': {'type': 'state', 'state':'end'}
-        }}
-wiz_auc_lots_pay('auction.pay.buy')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/auction/wizard/wizard_payer.py b/addons/auction/wizard/wizard_payer.py
deleted file mode 100644
index 6e224fbadad..00000000000
--- a/addons/auction/wizard/wizard_payer.py
+++ /dev/null
@@ -1,79 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import netsvc
-import osv
-import time
-import pooler
-
-pay_form = '''<?xml version="1.0"?>
-<form string="Check payment for buyer">
-</form>'''
-pay_fields = {
-}
-
-
-pay_form1 = '''<?xml version="1.0"?>
-<form string="Check payment for seller">
-</form>'''
-pay_fields1 = {
-}
-def _payer(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    pool.get('auction.lots').write(cr,uid,data['ids'],{'is_ok':True, 'state':'paid'})
-    return {}
-
-
-def _payer_sel(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    pool.get('auction.lots').write(cr,uid,data['ids'],{'paid_vnd':True})
-    return {}
-
-
-class wiz_auc_pay(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':pay_form, 'fields': pay_fields, 'state':[('end','Cancel'),('pay','Pay')]}
-        },
-        'pay': {
-        'actions': [_payer],
-        'result': {'type': 'state', 'state':'end'}
-        }}
-wiz_auc_pay('auction.payer')
-
-
-class wiz_auc_pay_sel(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':pay_form1, 'fields': pay_fields1, 'state':[('end','Cancel'),('pay2','Pay')]}
-        },
-        'pay2': {
-        'actions': [_payer_sel],
-        'result': {'type': 'state', 'state':'end'}
-        }}
-wiz_auc_pay_sel('auction.payer.sel')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From d98d3acc469ea63e598b1b2ebb2fcac8418c8241 Mon Sep 17 00:00:00 2001
From: "ATP (Open ERP)" <>
Date: Wed, 10 Mar 2010 19:18:09 +0530
Subject: [PATCH 081/251] [IMP]: audittrail: Converted wizards to osv_memory
 wizards

bzr revid: rpa@tinyerp.com-20100310134809-80si1ahbkv8e0izb
---
 addons/audittrail/__terp__.py                 |  1 +
 addons/audittrail/audittrail_view.xml         |  4 +-
 addons/audittrail/wizard/__init__.py          |  2 +-
 .../audittrail/wizard/audittrail_view_log.py  | 72 +++++++++++++++++
 .../wizard/audittrail_view_log_view.xml       | 34 ++++++++
 addons/audittrail/wizard/wizard_view_log.py   | 81 -------------------
 6 files changed, 110 insertions(+), 84 deletions(-)
 create mode 100644 addons/audittrail/wizard/audittrail_view_log.py
 create mode 100644 addons/audittrail/wizard/audittrail_view_log_view.xml
 delete mode 100644 addons/audittrail/wizard/wizard_view_log.py

diff --git a/addons/audittrail/__terp__.py b/addons/audittrail/__terp__.py
index e7ecd839efb..8718523e7f1 100644
--- a/addons/audittrail/__terp__.py
+++ b/addons/audittrail/__terp__.py
@@ -31,6 +31,7 @@
     'depends': ['base'],
     'init_xml': [],
     'update_xml': [
+        'wizard/audittrail_view_log_view.xml',
         'audittrail_view.xml',
         'security/ir.model.access.csv',
         'security/audittrail_security.xml'
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index 98a4ecc00e9..536ca78741e 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -124,8 +124,8 @@
 		</record>
 		<menuitem name="Logs" id="menu_action_audittrail_log_tree" action="action_audittrail_log_tree" parent="menu_action_audittrail"/>
 
-		<wizard string="View log" menu="False" model="audittrail.log" name="audittrail.view.log" id="wizard_audittrail_log"/>
-		<menuitem name="View Logs" id="menu_action_log_tree2" action="wizard_audittrail_log" type="wizard" parent="menu_action_audittrail"/>
+		<!--  <wizard string="View log" menu="False" model="audittrail.log" name="audittrail.view.log" id="wizard_audittrail_log"/>-->
+		<menuitem name="View Logs" id="menu_action_log_tree2" action="action_audittrail_view_log"  parent="menu_action_audittrail"/>
 
 </data>
 </openerp>
diff --git a/addons/audittrail/wizard/__init__.py b/addons/audittrail/wizard/__init__.py
index c7b5a20d884..9b2af466a01 100644
--- a/addons/audittrail/wizard/__init__.py
+++ b/addons/audittrail/wizard/__init__.py
@@ -19,6 +19,6 @@
 #
 ##############################################################################
 
-import wizard_view_log
+import audittrail_view_log
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/audittrail/wizard/audittrail_view_log.py b/addons/audittrail/wizard/audittrail_view_log.py
new file mode 100644
index 00000000000..2e170f27200
--- /dev/null
+++ b/addons/audittrail/wizard/audittrail_view_log.py
@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+
+class audittrail_view_log(osv.osv_memory):
+    
+    _name = "audittrail.view.log"
+    _description = "View Log"
+    _columns ={
+               'from':fields.datetime('Log From'),
+               'to':fields.datetime('Log To', required = True)
+               }
+    _defaults = {
+                 'to': lambda *a: time.strftime("%Y-%m-%d %H:%M:%S"),
+             }
+    
+    def log_open_window(self, cr, uid, ids, context):
+        """
+        Open Log  form from given date range..
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of audittrail view log’s IDs.
+        @return: Dictionary of  audittrail log form on given date range.
+        """
+        mod_obj = self.pool.get('ir.model.data')
+        act_obj = self.pool.get('ir.actions.act_window')
+        result = mod_obj._get_id(cr, uid, 'audittrail', 'action_audittrail_log_tree')
+        id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
+        result = act_obj.read(cr, uid, [id])[0]
+        log_obj= self.pool.get(result['res_model'])
+        log_id = log_obj.search(cr, uid, [])
+        log_model=log_obj.read(cr, uid,log_id,['object_id'])  
+        for datas in self.read(cr, uid, ids):     
+            if not datas['from']:
+                if  datas['to'] <> time.strftime("%Y-%m-%d %H:%M:%S"):
+                    result['domain'] = str([('timestamp', '<',datas['to'])])                
+                else:
+                        pass
+            else:
+                result['domain'] = str([('timestamp', '>',datas['from']),('timestamp', '<',datas['to'])])
+        return result
+
+audittrail_view_log()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/audittrail/wizard/audittrail_view_log_view.xml b/addons/audittrail/wizard/audittrail_view_log_view.xml
new file mode 100644
index 00000000000..87648c7e136
--- /dev/null
+++ b/addons/audittrail/wizard/audittrail_view_log_view.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_audittrail_view_log" model="ir.ui.view">
+            <field name="name">audittrail.view.log.form</field>
+            <field name="model">audittrail.view.log</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Audit Logs">
+                	<group colspan="4" >
+                		 <field name="from" colspan="4"/>
+              			 <newline/>
+              			 <field name="to" colspan="4"/>   
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon="gtk-open" string="Open Logs" name="log_open_window" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_audittrail_view_log" model="ir.actions.act_window">
+            <field name="name">View log</field>
+            <field name="res_model">audittrail.view.log</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_audittrail_view_log"/> 
+           <field name="target">new</field>
+        </record>
+        
+    </data>
+</openerp>
diff --git a/addons/audittrail/wizard/wizard_view_log.py b/addons/audittrail/wizard/wizard_view_log.py
deleted file mode 100644
index 81936bcd54c..00000000000
--- a/addons/audittrail/wizard/wizard_view_log.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import pooler
-import time
-
-class wizard_view_log(wizard.interface):
-    
-    form1 = '''<?xml version="1.0"?>
-    <form string="Audit Logs">
-        <field name="from" colspan="4"/>
-        <newline/>
-        <field name="to" colspan="4"/>        
-    </form>'''
-    
-    form1_fields = {
-            'from': {
-                'string': 'Log From',
-                'type': 'datetime',
-        
-        },
-             'to': {
-                'string': 'Log To',
-                'type': 'datetime',
-                'default': lambda *a: time.strftime("%Y-%m-%d %H:%M:%S"),
-                'required':True
-        },
-    }
-    
-    
-    def _log_open_window(self, cr, uid, data, context):
-        mod_obj = pooler.get_pool(cr.dbname).get('ir.model.data')
-        act_obj = pooler.get_pool(cr.dbname).get('ir.actions.act_window')
-        result = mod_obj._get_id(cr, uid, 'audittrail', 'action_audittrail_log_tree')
-        id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
-        result = act_obj.read(cr, uid, [id])[0]
-        log_obj= pooler.get_pool(cr.dbname).get(result['res_model'])
-        log_id = log_obj.search(cr, uid, [])
-        log_model=log_obj.read(cr, uid,log_id,['object_id'])       
-        if not data['form']['from']:
-            if  data['form']['to'] <> time.strftime("%Y-%m-%d %H:%M:%S"):
-                result['domain'] = str([('timestamp', '<',data['form']['to'])])                
-            else:
-                pass
-        else:
-            result['domain'] = str([('timestamp', '>',data['form']['from']),('timestamp', '<',data['form']['to'])])
-            
-        return result
-
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':form1, 'fields':form1_fields, 'state': [('end', 'Cancel'), ('open', 'Open Logs')]}
-        },
-        'open': {
-            'actions': [],
-            'result': {'type': 'action', 'action':_log_open_window, 'state':'end'}
-        }
-    }
-wizard_view_log('audittrail.view.log')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From cefc85c5841ce79144fcc569db79972961be388f Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 10 Mar 2010 19:25:48 +0530
Subject: [PATCH 082/251] [IMP] point_of_sale: Converted Add Product wizard
 into osv_memory wizard

bzr revid: sbh@tinyerp.com-20100310135548-810h40effu2jtwft
---
 addons/point_of_sale/__terp__.py              |  1 +
 addons/point_of_sale/wizard/__init__.py       |  2 +-
 .../point_of_sale/wizard/pos_add_product.py   | 66 ++++++++++++++
 .../point_of_sale/wizard/pos_add_product.xml  | 35 ++++++++
 .../wizard/wizard_add_product.py              | 88 -------------------
 5 files changed, 103 insertions(+), 89 deletions(-)
 create mode 100644 addons/point_of_sale/wizard/pos_add_product.py
 create mode 100644 addons/point_of_sale/wizard/pos_add_product.xml
 delete mode 100644 addons/point_of_sale/wizard/wizard_add_product.py

diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__terp__.py
index 794793e3baa..464cb57ccf4 100644
--- a/addons/point_of_sale/__terp__.py
+++ b/addons/point_of_sale/__terp__.py
@@ -43,6 +43,7 @@ Main features :
         'security/ir.model.access.csv',
         'pos_report.xml',
         'pos_wizard.xml',
+        'wizard/pos_add_product.xml',
         'pos_view.xml',
         'pos_sequence.xml',
         'posrule_data.xml',
diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index 1ff9c124861..155c9b40c8c 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -23,7 +23,6 @@
 import wizard_pos_payment
 import wizard_default_journal
 import wizard_refund_order
-import wizard_add_product
 import wizard_confirm
 import wizard_discount
 import wizard_get_sale
@@ -39,5 +38,6 @@ import wizard_pos_sales_user_current_user
 import wizard_pos_details
 import wizard_open_statement
 import wizard_all_closed_cashbox_of_the_day
+import pos_add_product
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/wizard/pos_add_product.py b/addons/point_of_sale/wizard/pos_add_product.py
new file mode 100644
index 00000000000..e11dd89e3d9
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_add_product.py
@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import netsvc
+from osv import osv,fields
+from tools.translate import _
+
+class add_product(osv.osv_memory):
+    _name = 'pos.add.product'
+    _description = 'Add Product'
+
+    _columns = {
+                'product_id': fields.many2one('product.product', 'Product',required=True),
+                'quantity': fields.float('Quantity ', required=True),
+    }
+    _defaults = {
+                    'quantity': lambda *a: 1,
+                }
+    
+    def select_product(self, cr, uid, ids, context):
+        """ 
+             @summary: To get the product and quantity and add in order .            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary 
+             @return : Retrun the add product form again for addin more product
+        """        
+        this = self.browse(cr, uid, ids[0], context=context)
+        record_id = context and context.get('record_id',False)
+        if record_id:
+             order_obj = self.pool.get('pos.order')
+             order_obj.add_product(cr, uid, record_id, this.product_id.id,this.quantity,context=context)
+        
+        return {            
+                'name': _('Add Product'),
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'pos.add.product',
+                'view_id': False,
+                'target':'new',
+                'views': False,
+                'type': 'ir.actions.act_window',
+                }
+add_product()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/wizard/pos_add_product.xml b/addons/point_of_sale/wizard/pos_add_product.xml
new file mode 100644
index 00000000000..fe9d7ed7418
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_add_product.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        
+        <!--  Add  Product -->
+        
+		<record id="view_add_product" model="ir.ui.view">
+            <field name="name">Add  Product</field>
+            <field name="model">pos.add.product</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Add product :">
+				    <group col="2" colspan="4">
+				    	<field name="product_id"/>
+				    	<field name="quantity"/>
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Close" />
+                		<button name="select_product" string="Contiue"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_add_product" model="ir.actions.act_window">
+            <field name="name">Add  Product</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.add.product</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="context">{'record_id' : active_id}</field>
+        </record>
+        
+	</data>
+</openerp>	        
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/wizard_add_product.py b/addons/point_of_sale/wizard/wizard_add_product.py
deleted file mode 100644
index 0daa0bdf0db..00000000000
--- a/addons/point_of_sale/wizard/wizard_add_product.py
+++ /dev/null
@@ -1,88 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution	
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import pooler
-import wizard
-
-
-_form = """<?xml version="1.0"?>
-<form string="Add product :">
-<field name="product"/>
-<field name="quantity"/>
-</form>
-"""
-_fields = {
-    'product': {
-        'string': 'Product',
-        'type': 'many2one',
-        'relation': 'product.product',
-        'required': True,
-        'default': False
-    },
-
-    'quantity': {
-        'string': 'Quantity',
-        'type': 'integer',
-        'required': True,
-        'default': 1},
-    }
-
-
-def _add(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    order_obj = pool.get('pos.order')
-    order_obj.add_product(cr, uid, data['id'], data['form']['product'],
-                            data['form']['quantity'], context=context)
-
-    return {}
-
-
-def _pre_init(self, cr, uid, data, context):
-    return {'product': False, 'quantity': 1}
-
-
-class add_product(wizard.interface):
-
-    states = {
-        'init': {
-            'actions': [_pre_init],
-            'result': {
-                'type': 'form',
-                'arch': _form,
-                'fields': _fields,
-                'state': [('end', 'Cancel'), ('add', '_Add product', 'gtk-ok', True)
-                ]
-            }
-        },
-        'add': {
-            'actions': [_add],
-            'result': {
-                'type': 'state',
-                'state': 'init',
-            }
-        },
-    }
-
-add_product('pos.add_product')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From 52f667cbf8cce95e8c79632ed2f34311d02407bf Mon Sep 17 00:00:00 2001
From: "ATP (Open ERP)" <>
Date: Thu, 11 Mar 2010 10:53:02 +0530
Subject: [PATCH 083/251] [IMP]: base_calendar: Converted wizard into
 osv_memory wizard

bzr revid: rpa@tinyerp.com-20100311052302-0eqro8knu4mpjs12
---
 addons/base_calendar/__terp__.py              |  3 +-
 addons/base_calendar/wizard/__init__.py       |  3 +-
 .../wizard/calendar_event_edit_all.py         | 85 +++++++++++++++++++
 .../wizard/calendar_event_edit_all_view.xml   | 41 +++++++++
 .../wizard/wizard_cal_edit_event.py           | 78 -----------------
 5 files changed, 130 insertions(+), 80 deletions(-)
 create mode 100644 addons/base_calendar/wizard/calendar_event_edit_all.py
 create mode 100644 addons/base_calendar/wizard/calendar_event_edit_all_view.xml
 delete mode 100644 addons/base_calendar/wizard/wizard_cal_edit_event.py

diff --git a/addons/base_calendar/__terp__.py b/addons/base_calendar/__terp__.py
index e433fbb7668..ce65e1166c5 100644
--- a/addons/base_calendar/__terp__.py
+++ b/addons/base_calendar/__terp__.py
@@ -40,7 +40,8 @@
                    ], 
     "demo_xml" : [], 
     "update_xml" : [
-                    'security/ir.model.access.csv', 
+                    'security/ir.model.access.csv',
+                    'wizard/calendar_event_edit_all_view.xml',
                     'base_calendar_view.xml'
                     ], 
     "installable" : True, 
diff --git a/addons/base_calendar/wizard/__init__.py b/addons/base_calendar/wizard/__init__.py
index 60c61475131..38f790bcd42 100644
--- a/addons/base_calendar/wizard/__init__.py
+++ b/addons/base_calendar/wizard/__init__.py
@@ -18,7 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
-import wizard_cal_edit_event
+
+import calendar_event_edit_all
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/base_calendar/wizard/calendar_event_edit_all.py b/addons/base_calendar/wizard/calendar_event_edit_all.py
new file mode 100644
index 00000000000..0a7fddadb2a
--- /dev/null
+++ b/addons/base_calendar/wizard/calendar_event_edit_all.py
@@ -0,0 +1,85 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+
+class calendar_event_edit_all(osv.osv_memory):
+    
+    def _default_values(self, cr, uid, context={}):
+            """
+            @Return : Get Default value for Start Date
+            """
+            if context.get('date'):
+                 return context.get('date')
+            else:
+                model = context.get('model')
+                model_obj = self.pool.get(model)
+                event = model_obj.read(cr, uid, context['active_id'], ['name', 'location', 'alarm_id'])
+                return event['date']
+        
+    def _default_deadline(self, cr, uid, context={}):
+            """
+            @return : Get Default value for End Date
+            """
+            if context.get('date_deadline'):
+                 return context.get('date_deadline')
+            else:
+                model = context.get('model')
+                model_obj = self.pool.get(model)
+                event = model_obj.read(cr, uid, context['active_id'], ['name', 'location', 'alarm_id'])
+                return event['date_deadline']
+
+    def _modify_this(self, cr, uid, ids, context=None):
+        """
+        Modify All event for Crm Meeting.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of calendar event edit all’s IDs
+        """
+        for datas in self.read(cr, uid, ids):
+            model = context.get('model')
+            model_obj = self.pool.get(model)
+            model_obj.modify_all(cr, uid, [context['active_id']], datas, context)
+            return {}
+    
+    _name = "calendar.event.edit.all"
+    _description = "Calendar Edit all event"
+    _columns ={
+              'name':fields.char('Title', size=64, required=True),
+              'date':fields.datetime('Start Date', required=True),
+              'date_deadline':fields.datetime('End Date', required=True),
+              'location':fields.char('Location', size=124),
+              'alarm_id':fields.many2one('res.alarm', 'Reminder'),
+               }
+    _defaults = {
+                 'date':_default_values,
+                 'date_deadline':_default_deadline
+             }
+    
+calendar_event_edit_all()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_calendar/wizard/calendar_event_edit_all_view.xml b/addons/base_calendar/wizard/calendar_event_edit_all_view.xml
new file mode 100644
index 00000000000..15bd025441a
--- /dev/null
+++ b/addons/base_calendar/wizard/calendar_event_edit_all_view.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_calendar_event_edit_all" model="ir.ui.view">
+            <field name="name">calendar.event.edit.all.form</field>
+            <field name="model">calendar.event.edit.all</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Edit all Occurrences">
+                	<group colspan="4" >
+                		 <separator string="" colspan="4" />
+              			 <newline/>
+              			 <field name='name' colspan="4" />
+              			 <newline />
+              			 <field name='location' colspan="4" />
+              			 <newline />
+              			 <field name='date' />
+              			 <field name='date_deadline' />
+              			 <newline />
+              			 <field name='alarm_id'/>  
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon="gtk-save" string="_Save" name="_modify_this" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_calendar_event_edit_all" model="ir.actions.act_window">
+            <field name="name">Edit all events</field>
+            <field name="res_model">calendar.event.edit.all</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_calendar_event_edit_all"/> 
+           <field name="target">new</field>
+        </record>
+        
+    </data>
+</openerp>
diff --git a/addons/base_calendar/wizard/wizard_cal_edit_event.py b/addons/base_calendar/wizard/wizard_cal_edit_event.py
deleted file mode 100644
index 40a658eb431..00000000000
--- a/addons/base_calendar/wizard/wizard_cal_edit_event.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import pooler
-
-class event_edit_all(wizard.interface):
-    event_form = """<?xml version="1.0"?>
-                <form string="Edit all Occurrences">
-                    <separator string="" colspan="4" />
-                    <newline />
-                    <field name='name' colspan="4" />
-                    <newline />
-                    <field name='location' colspan="4" />
-                    <newline />
-                    <field name='date' />
-                    <field name='date_deadline' />
-                    <newline />
-                    <field name='alarm_id'/>
-                </form>"""
-
-    event_fields = {
-        'name': {'string': 'Title', 'type': 'char', 'size': 64, 'required': True}, 
-        'date': {'string': 'Start Date', 'type': 'datetime', 'required': True}, 
-        'date_deadline': {'string': 'End Date', 'type': 'datetime', 'required': True}, 
-        'location': {'string': 'Location', 'type': 'char', 'size': 124}, 
-        'alarm_id': {'string': 'Reminder', 'type': 'many2one', 'relation': 'res.alarm'}, 
-    }
-    
-    def _default_values(self, cr, uid, data, context=None):
-        model = data.get('model')
-        model_obj = pooler.get_pool(cr.dbname).get(model)
-        event = model_obj.read(cr, uid, data['id'], ['name', 'location', 'alarm_id'])
-        event.update({
-                      'date': context.get('date'), 
-                      'date_deadline': context.get('date_deadline')
-                      })
-        return event
-
-    def _modify_this(self, cr, uid, datas, context=None):
-        model = datas.get('model')
-        model_obj = pooler.get_pool(cr.dbname).get(model)
-        model_obj.modify_all(cr, uid, [datas['id']], datas['form'], context)
-        return {}
-
-    states = {
-        'init': {
-            'actions': [_default_values], 
-            'result': {'type': 'form', 'arch': event_form, 'fields': event_fields, 
-                'state': [('end', 'Cancel', 'gtk-cancel'), ('edit', '_Save', 'gtk-save')]}
-        }, 
-        'edit': {
-            'actions': [], 
-            'result': {'type': 'action', 'action': _modify_this, 'state': 'end'}
-        }
-    }
-
-event_edit_all('calendar.event.edit.all')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 799cc969db05c34cc3a2471718e99ecfee4e5880 Mon Sep 17 00:00:00 2001
From: "ATP (Open ERP)" <>
Date: Thu, 11 Mar 2010 10:58:58 +0530
Subject: [PATCH 084/251] [IMP]: crm: changes related to base_calendar wizard
 changes

bzr revid: rpa@tinyerp.com-20100311052858-zel2jtsyeh270cey
---
 addons/crm/__terp__.py                          |  1 -
 addons/crm/crm_meeting_view.xml                 |  2 +-
 addons/crm/crm_meeting_wizard.xml               |  8 --------
 addons/project_caldav/project_caldav_wizard.xml | 13 -------------
 4 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 addons/crm/crm_meeting_wizard.xml

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 994f11f3212..80f0eef8758 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -67,7 +67,6 @@ between mails and Open ERP.""",
         'crm_lead_wizard.xml', 
         'crm_lead_view.xml', 
         'crm_lead_menu.xml', 
-        'crm_meeting_wizard.xml', 
         'crm_meeting_view.xml', 
         'crm_meeting_menu.xml', 
         'crm_phonecall_wizard.xml', 
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index a1f1cef502e..59bedbb3b6a 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -38,7 +38,7 @@
                            <field name="rrule_type" string="Recurrency"
                                 colspan="1" attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
                             <button string="Edit All" help="Edit all Ourrences of recurrent Meeting" attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
-                            name="%(wizard_edit_all_events)d" icon="gtk-edit"
+                            name="%(base_calendar.action_calendar_event_edit_all)d" icon="gtk-edit"
                             type="action" context="{'model' : 'crm.meeting', 'date': date, 'date_deadline': date_deadline}" />
                     </group>
 
diff --git a/addons/crm/crm_meeting_wizard.xml b/addons/crm/crm_meeting_wizard.xml
deleted file mode 100644
index 8d6b66b3f2d..00000000000
--- a/addons/crm/crm_meeting_wizard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-	<data>
-		<wizard string="Edit all events" model="crm.meeting"
-			name="calendar.event.edit.all" id="wizard_edit_all_events"
-			menu="False" />
-	</data>
-</openerp>
diff --git a/addons/project_caldav/project_caldav_wizard.xml b/addons/project_caldav/project_caldav_wizard.xml
index 2bb677eea46..53c78a99bf2 100644
--- a/addons/project_caldav/project_caldav_wizard.xml
+++ b/addons/project_caldav/project_caldav_wizard.xml
@@ -1,18 +1,5 @@
 <openerp>
 	<data>
-		<wizard string="Import .ics File" model="project.task"
-			name="calendar.event.import" id="caldav.wizard_cal_event_import" />
-
-		<wizard string="Subscribe"
-			model="project.task" name="calendar.event.subscribe"
-			id="caldav.wizard_cal_event_subscribe" />
-
-		<wizard string="Export .ics File" model="project.task"
-			name="calendar.event.export" id="caldav.wizard_cal_event_export" />
-
-		<wizard string="Edit this event" model="project.task"
-			name="calendar.event.edit.this" id="caldav.wizard_edit_this_event"
-			menu="False" />
 
 	</data>
 </openerp>

From 223c30b38a4ff29114bd68e03a404bb88cc4a59e Mon Sep 17 00:00:00 2001
From: "ATP (Open ERP)" <>
Date: Thu, 11 Mar 2010 11:10:47 +0530
Subject: [PATCH 085/251] [IMP]: base_report_creator: Converted create menu
 wizard into osv_memory wizard

bzr revid: rpa@tinyerp.com-20100311054047-clk9fldz9ni87gl8
---
 addons/base_report_creator/__terp__.py        |   1 +
 .../base_report_creator_view.xml              |   2 +-
 .../base_report_creator_wizard.xml            |  15 +--
 addons/base_report_creator/wizard/__init__.py |   1 +
 .../wizard/report_menu_create.py              | 101 ++++++++----------
 .../wizard/report_menu_create_view.xml        |  34 ++++++
 6 files changed, 89 insertions(+), 65 deletions(-)
 create mode 100644 addons/base_report_creator/wizard/report_menu_create_view.xml

diff --git a/addons/base_report_creator/__terp__.py b/addons/base_report_creator/__terp__.py
index 5a78a903a5c..bee7ec57c91 100644
--- a/addons/base_report_creator/__terp__.py
+++ b/addons/base_report_creator/__terp__.py
@@ -37,6 +37,7 @@ the "Dashboard" menu.
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
+        'wizard/report_menu_create_view.xml',
         'base_report_creator_wizard.xml',
         'base_report_creator_view.xml'
     ],
diff --git a/addons/base_report_creator/base_report_creator_view.xml b/addons/base_report_creator/base_report_creator_view.xml
index 30c6b3735a9..1d606b93ec4 100644
--- a/addons/base_report_creator/base_report_creator_view.xml
+++ b/addons/base_report_creator/base_report_creator_view.xml
@@ -41,7 +41,7 @@
                     <field name="model_ids" colspan="4" context="{'model_ids':model_ids}"/>
                     <separator string="State"  colspan="4"/>
                     <field name="state"/>
-                    <button string="Create Menu" name="%(wizard_menu_create)d" type="action" colspan="2" icon="gtk-justify-fill"/>
+                    <button string="Create Menu" name="%(action_report_menu_create)d" type="action" colspan="2" icon="gtk-justify-fill"/>
                 </page><page string="View parameters">
                     <separator string="Used View" colspan="4"/>
                     <field name="view_type1"/>
diff --git a/addons/base_report_creator/base_report_creator_wizard.xml b/addons/base_report_creator/base_report_creator_wizard.xml
index eb956e89c6d..a8dad6f9b41 100644
--- a/addons/base_report_creator/base_report_creator_wizard.xml
+++ b/addons/base_report_creator/base_report_creator_wizard.xml
@@ -1,13 +1,8 @@
 <?xml version="1.0"?>
 <openerp>
-<data>
-	<wizard
-			id="wizard_set_filter_fields"
-			string="Set Filter Fields"
-			name="base_report_creator.report_filter.fields"/>
-	<wizard
-			id="wizard_menu_create"
-			string="Create Menu for Report"
-			name="base_report_creator.report.menu.create"/>
-</data>
+	<data>
+		<wizard id="wizard_set_filter_fields" string="Set Filter Fields"
+			name="base_report_creator.report_filter.fields" />
+
+	</data>
 </openerp>
diff --git a/addons/base_report_creator/wizard/__init__.py b/addons/base_report_creator/wizard/__init__.py
index 8fd4dff283a..945d42586d1 100644
--- a/addons/base_report_creator/wizard/__init__.py
+++ b/addons/base_report_creator/wizard/__init__.py
@@ -22,5 +22,6 @@
 import wiz_set_filter_fields
 import base_report_creator_open
 import report_menu_create
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/base_report_creator/wizard/report_menu_create.py b/addons/base_report_creator/wizard/report_menu_create.py
index 5d3cc322a7f..38821a81797 100644
--- a/addons/base_report_creator/wizard/report_menu_create.py
+++ b/addons/base_report_creator/wizard/report_menu_create.py
@@ -20,62 +20,55 @@
 ##############################################################################
 
 
-import time
-import wizard
-import osv
+from osv import fields, osv
+from tools.translate import _
+import netsvc
 import pooler
+import time
+import tools
+import wizard
 
-section_form = '''<?xml version="1.0"?>
-<form string="Create Menu For This Report">
-    <separator string="Menu Information" colspan="4"/>
-    <field name="menu_name"/>
-    <field name="menu_parent_id"/>
-</form>'''
-
-section_fields = {
-    'menu_name': {'string':'Menu Name', 'type':'char', 'required':True, 'size':64},
-    'menu_parent_id': {'string':'Parent Menu', 'type':'many2one', 'relation':'ir.ui.menu', 'required':True},
-}
-
-def report_menu_create(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    board = pool.get('base_report_creator.report').browse(cr, uid, data['id'])
-
-    view = board.view_type1
-    if board.view_type2:
-        view+=','+board.view_type2
-    if board.view_type3:
-        view+=','+board.view_type3
-    action_id = pool.get('ir.actions.act_window').create(cr, uid, {
-        'name': board.name,
-        'view_type':'form',
-        'view_mode':view,
-        'context': "{'report_id':%d}" % (board.id,),
-        'res_model': 'base_report_creator.report'
-    })
-    pool.get('ir.ui.menu').create(cr, uid, {
-        'name': data['form']['menu_name'],
-        'parent_id': data['form']['menu_parent_id'],
-        'icon': 'STOCK_SELECT_COLOR',
-        'action': 'ir.actions.act_window,'+str(action_id)
-    }, context)
-    return {}
-
-class wizard_section_menu_create(wizard.interface):
-    states = {
-        'init': {
-            'actions': [], 
-            'result': {'type':'form', 'arch':section_form, 'fields':section_fields, 'state':[('end','Cancel'),('create_menu','Create Menu')]}
-        },
-        'create_menu': {
-            'actions': [report_menu_create], 
-            'result': {
-                'type':'state', 
-                'state':'end'
-            }
-        }
-    }
-wizard_section_menu_create('base_report_creator.report.menu.create')
+class report_menu_create(osv.osv_memory):
+    """
+    Create Menu
+    """
+    _name = "report.menu.create"
+    _description = "Menu Create"
+    _columns ={
+              'menu_name':fields.char('Menu Name', size=64, required=True),
+              'menu_parent_id':fields.many2one('ir.ui.menu', 'Parent Menu', required=True),
+               }
+    
+    def report_menu_create(self, cr, uid, ids, context):
+        """
+        Create Menu.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Report Menu Create's IDs
+        """
+        board = self.pool.get('base_report_creator.report').browse(cr, uid, context['active_id'])
+        view = board.view_type1
+        if board.view_type2:
+            view+=','+board.view_type2
+        if board.view_type3:
+            view+=','+board.view_type3
+        action_id = self.pool.get('ir.actions.act_window').create(cr, uid, {
+            'name': board.name,
+            'view_type':'form',
+            'view_mode':view,
+            'context': "{'report_id':%d}" % (board.id,),
+            'res_model': 'base_report_creator.report'
+            })
+        for data in self.read(cr, uid, ids):
+            self.pool.get('ir.ui.menu').create(cr, uid, {
+                'name': data['menu_name'],
+                'parent_id': data['menu_parent_id'],
+                'icon': 'STOCK_SELECT_COLOR',
+                'action': 'ir.actions.act_window,'+str(action_id)
+                }, context)
+            return {}
+    
+report_menu_create()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/base_report_creator/wizard/report_menu_create_view.xml b/addons/base_report_creator/wizard/report_menu_create_view.xml
new file mode 100644
index 00000000000..dd8ecb441c4
--- /dev/null
+++ b/addons/base_report_creator/wizard/report_menu_create_view.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_report_menu_create" model="ir.ui.view">
+            <field name="name">report.menu.create.form</field>
+            <field name="model">report.menu.create</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Create Menu For This Report">
+                	<group colspan="4" >
+                		 <separator string="Menu Information" colspan="4"/>
+              			 <field name="menu_name"/>
+              			 <field name="menu_parent_id"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon="gtk-save" string="Create Menu" name="report_menu_create" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_report_menu_create" model="ir.actions.act_window">
+            <field name="name">Create Menu for Report</field>
+            <field name="res_model">report.menu.create</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_report_menu_create"/> 
+           <field name="target">new</field>
+        </record>
+        
+    </data>
+</openerp>
\ No newline at end of file

From b73b0eadb615ec9cc2c5f99448e5fba1f46c650b Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 11 Mar 2010 12:01:19 +0530
Subject: [PATCH 086/251] [IMP] point_of_sale: Convert the pos_confirm wizard
 into osv_memory

bzr revid: sbh@tinyerp.com-20100311063119-x9zo7cuj2jpv96gn
---
 addons/point_of_sale/__terp__.py              |  1 +
 addons/point_of_sale/pos_wizard.xml           |  8 --
 addons/point_of_sale/wizard/__init__.py       |  2 +-
 addons/point_of_sale/wizard/pos_confirm.py    | 59 ++++++++++++++
 addons/point_of_sale/wizard/wizard_confirm.py | 78 -------------------
 5 files changed, 61 insertions(+), 87 deletions(-)
 create mode 100644 addons/point_of_sale/wizard/pos_confirm.py
 delete mode 100644 addons/point_of_sale/wizard/wizard_confirm.py

diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__terp__.py
index 464cb57ccf4..a3c227b623d 100644
--- a/addons/point_of_sale/__terp__.py
+++ b/addons/point_of_sale/__terp__.py
@@ -44,6 +44,7 @@ Main features :
         'pos_report.xml',
         'pos_wizard.xml',
         'wizard/pos_add_product.xml',
+        'wizard/pos_confirm.xml',
         'pos_view.xml',
         'pos_sequence.xml',
         'posrule_data.xml',
diff --git a/addons/point_of_sale/pos_wizard.xml b/addons/point_of_sale/pos_wizard.xml
index 325350d031b..36613ddce36 100644
--- a/addons/point_of_sale/pos_wizard.xml
+++ b/addons/point_of_sale/pos_wizard.xml
@@ -30,14 +30,6 @@
 			<!--<wizard string="Cancel" model="pos.order"
 				name="pos.cancel" id="pos_cancel" multi="True"/>-->
 
-		<wizard
-        string="Confirm"
-        model="pos.order"
-				name="pos.confirm"
-        id="pos_confirm"
-			  multi="True"
-			  menu="True"
-        />
 
 		<wizard string="Discount" model="pos.order"
 				name="pos.discount" id="pos_discount" menu="False"/>
diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index 155c9b40c8c..b94ba0a0d0e 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -23,7 +23,6 @@
 import wizard_pos_payment
 import wizard_default_journal
 import wizard_refund_order
-import wizard_confirm
 import wizard_discount
 import wizard_get_sale
 import wizard_scan_product
@@ -39,5 +38,6 @@ import wizard_pos_details
 import wizard_open_statement
 import wizard_all_closed_cashbox_of_the_day
 import pos_add_product
+import pos_confirm
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/wizard/pos_confirm.py b/addons/point_of_sale/wizard/pos_confirm.py
new file mode 100644
index 00000000000..460e0e67a56
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_confirm.py
@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import netsvc
+from osv import osv,fields
+from tools.translate import _
+
+class pos_confirm(osv.osv_memory):
+    _name = 'pos.confirm'
+    _description = 'Point of Sale Confirm'
+    def action_confirm(self, cr, uid, ids, context):
+        """ 
+             @summary:   Confirm the order and close the sales  .            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary 
+             @return :Blank dictionary
+        """    
+       
+        this = self.browse(cr, uid, ids[0], context=context)
+        record_id = context and context.get('record_id',False)
+        if isinstance(record_id, (int, long)):
+            record_id=[record_id]
+        if record_id:
+            company_id=self.pool.get('res.users').browse(cr,uid,uid).company_id
+            order_obj = self.pool.get('pos.order')
+            
+            for order_id in order_obj.browse(cr, uid, record_id, context=context):
+                if  order_id.state =='paid':
+                    order_obj.write(cr,uid,[order_id.id],{'journal_entry':True})
+                    order_obj.create_account_move(cr, uid, [order_id.id], context=context)
+        
+            wf_service = netsvc.LocalService("workflow")
+            for i in record_id:
+                wf_service.trg_validate(uid, 'pos.order', i, 'done', cr)
+        return {}
+        
+pos_confirm()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/wizard/wizard_confirm.py b/addons/point_of_sale/wizard/wizard_confirm.py
deleted file mode 100644
index b819c840ae5..00000000000
--- a/addons/point_of_sale/wizard/wizard_confirm.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-
-import wizard
-import netsvc
-import pooler
-import time
-
-_form = """<?xml version="1.0"?>
-<form string="Open Statements">
-     <label string="Are you sure you want to close your sales ?" colspan="2"/>
-</form>
-"""
-_fields = {}
-
-def _confirm(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    company_id=pool.get('res.users').browse(cr,uid,uid).company_id
-    order_obj = pool.get('pos.order')
-    for order_id in order_obj.browse(cr, uid, data['ids'], context=context):
-        if  order_id.state =='paid':
-            order_obj.write(cr,uid,[order_id.id],{'journal_entry':True})
-            order_obj.create_account_move(cr, uid, [order_id.id], context=context)
-
-    wf_service = netsvc.LocalService("workflow")
-    for i in data['ids']:
-        wf_service.trg_validate(uid, 'pos.order', i, 'done', cr)
-    return {}
-
-def _get_state(self, cr, uid, data, context):
-    action = 'invoice'
-    return action
-class pos_confirm(wizard.interface):
-
- states = {
-        'init': {
-            'actions': [],
-            'result': {
-                'type': 'form',
-                'arch': _form,
-                'fields': _fields,
-                'state': (('end', 'No','gtk-cancel'),
-                          ('open', 'Yes', 'gtk-ok', True)
-                         )
-            }
-        },
-        'open': {
-            'actions': [_confirm],
-            'result': {
-                       'type': 'state',
-                       'state':'end'}
-        },
-    }
-
-pos_confirm('pos.confirm')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From 8cf8c156dee1a4a45ca222fbb7f8ea8f943e3e7c Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Thu, 11 Mar 2010 12:55:17 +0530
Subject: [PATCH 087/251] [IMP] stock: Renamed picking sequences IN/00001,
 OUT/00001, INT/00001.

bzr revid: uco@tinyerp.co.in-20100311072517-x9gny5kf7k4uin37
---
 addons/mrp/mrp.py               |  2 ++
 addons/mrp_repair/mrp_repair.py |  2 ++
 addons/purchase/purchase.py     |  2 ++
 addons/sale/sale.py             |  2 ++
 addons/stock/stock_sequence.xml | 45 +++++++++++++++++++++++++++------
 5 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index f1e42fad819..3e75f1363c7 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -721,7 +721,9 @@ class mrp_production(osv.osv):
                     pick_type = 'out'
                 address_id = routing_loc.address_id and routing_loc.address_id.id or False
                 routing_loc = routing_loc.id
+            pickname = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.'+pick_type)
             picking_id = self.pool.get('stock.picking').create(cr, uid, {
+                'name': pickname,
                 'origin': (production.origin or '').split(':')[0] +':'+production.name,
                 'type': pick_type,
                 'move_type': 'one',
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index fc91fe1f9e6..acd752863ad 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -398,7 +398,9 @@ class mrp_repair(osv.osv):
                 self.pool.get('mrp.repair.line').write(cr, uid, [move.id], {'move_id': move_id})
 
             if repair.deliver_bool:
+                pickname = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.out')
                 picking = self.pool.get('stock.picking').create(cr, uid, {
+                    'name': pickname,
                     'origin': repair.name,
                     'state': 'draft',
                     'move_type': 'one',
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index f512406738b..33bbf82694a 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -394,7 +394,9 @@ class purchase_order(osv.osv):
             istate = 'none'
             if order.invoice_method=='picking':
                 istate = '2binvoiced'
+            pickname = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.in')
             picking_id = self.pool.get('stock.picking').create(cr, uid, {
+                'name': pickname,
                 'origin': order.name+((order.origin and (':'+order.origin)) or ''),
                 'type': 'in',
                 'address_id': order.dest_address_id.id or order.partner_address_id.id,
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 501d9ac1ea7..3a79f937cd0 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -593,7 +593,9 @@ class sale_order(osv.osv):
                     location_id = order.shop_id.warehouse_id.lot_stock_id.id
                     if not picking_id:
                         loc_dest_id = order.partner_id.property_stock_customer.id
+                        pickname = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.out')
                         picking_id = self.pool.get('stock.picking').create(cr, uid, {
+                            'name': pickname,
                             'origin': order.name,
                             'type': 'out',
                             'state': 'auto',
diff --git a/addons/stock/stock_sequence.xml b/addons/stock/stock_sequence.xml
index d002b62ae83..d65c3df8fcb 100644
--- a/addons/stock/stock_sequence.xml
+++ b/addons/stock/stock_sequence.xml
@@ -2,18 +2,47 @@
 <openerp>
     <data noupdate="1">
         <!--
-    Sequences for pickings
+    Sequence types for pickings
     -->
 
-        <record id="seq_type_picking" model="ir.sequence.type">
-            <field name="name">Picking</field>
-            <field name="code">stock.picking</field>
+        <record id="seq_type_picking_in" model="ir.sequence.type">
+            <field name="name">Picking IN</field>
+            <field name="code">stock.picking.in</field>
+        </record>
+        
+        <record id="seq_type_picking_out" model="ir.sequence.type">
+            <field name="name">Picking OUT</field>
+            <field name="code">stock.picking.out</field>
+        </record>
+        
+        <record id="seq_type_picking_internal" model="ir.sequence.type">
+            <field name="name">Picking INT</field>
+            <field name="code">stock.picking.internal</field>
         </record>
 
-        <record id="seq_picking" model="ir.sequence">
-            <field name="name">Picking</field>
-            <field name="code">stock.picking</field>
-            <field name="prefix">PACK</field>
+		<!--
+    		Sequences for pickings
+    	-->
+
+        <record id="seq_picking_in" model="ir.sequence">
+            <field name="name">Picking IN</field>
+            <field name="code">stock.picking.in</field>
+            <field name="prefix">IN/</field>
+            <field name="padding">5</field>
+        </record>
+        
+        <record id="seq_picking_out" model="ir.sequence">
+            <field name="name">Picking OUT</field>
+            <field name="code">stock.picking.out</field>
+            <field name="prefix">OUT/</field>
+            <field name="padding">5</field>
+        </record>
+        
+        <record id="seq_picking_internal" model="ir.sequence">
+            <field name="name">Picking INT</field>
+            <field name="code">stock.picking.internal</field>
+            <field name="prefix">INT/</field>
+            <field name="padding">5</field>
         </record>
 
         <!--

From c4d99b22d223d2e221802a66056e6a7a525799c2 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 11 Mar 2010 13:07:58 +0530
Subject: [PATCH 088/251] [IMP] point_of_sale: convert wizard_discount into
 osv_memory

bzr revid: sbh@tinyerp.com-20100311073758-9tmnaetye01zfhfn
---
 addons/point_of_sale/__terp__.py              |   1 +
 addons/point_of_sale/pos_view.xml             |   2 +-
 addons/point_of_sale/pos_wizard.xml           |   4 +-
 addons/point_of_sale/wizard/__init__.py       |   2 +-
 addons/point_of_sale/wizard/pos_confirm.xml   |  42 +++++
 addons/point_of_sale/wizard/pos_discount.py   | 104 +++++++++++++
 addons/point_of_sale/wizard/pos_discount.xml  |  35 +++++
 .../point_of_sale/wizard/wizard_discount.py   | 145 ------------------
 8 files changed, 186 insertions(+), 149 deletions(-)
 create mode 100644 addons/point_of_sale/wizard/pos_confirm.xml
 create mode 100644 addons/point_of_sale/wizard/pos_discount.py
 create mode 100644 addons/point_of_sale/wizard/pos_discount.xml
 delete mode 100644 addons/point_of_sale/wizard/wizard_discount.py

diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__terp__.py
index a3c227b623d..e9e20d1c6d2 100644
--- a/addons/point_of_sale/__terp__.py
+++ b/addons/point_of_sale/__terp__.py
@@ -45,6 +45,7 @@ Main features :
         'pos_wizard.xml',
         'wizard/pos_add_product.xml',
         'wizard/pos_confirm.xml',
+        'wizard/pos_discount.xml',
         'pos_view.xml',
         'pos_sequence.xml',
         'posrule_data.xml',
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index baaac139ce4..99da6da80fc 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -43,7 +43,7 @@
                             <group colspan="4" col="7">
                                 <field name="amount_tax"/>
                                 <field name="amount_total"/>
-                                <button name="%(pos_discount)d" string="D_iscount" type="action" states="draft"/>
+                                <button name="%(action_pos_discount)d" string="D_iscount" type="action" states="draft"/>
                                 <button name="dummy_button" string="Compute" type="object" />
                             </group>
 
diff --git a/addons/point_of_sale/pos_wizard.xml b/addons/point_of_sale/pos_wizard.xml
index 36613ddce36..f9396499b0c 100644
--- a/addons/point_of_sale/pos_wizard.xml
+++ b/addons/point_of_sale/pos_wizard.xml
@@ -30,9 +30,9 @@
 			<!--<wizard string="Cancel" model="pos.order"
 				name="pos.cancel" id="pos_cancel" multi="True"/>-->
 
-
+<!--
 		<wizard string="Discount" model="pos.order"
-				name="pos.discount" id="pos_discount" menu="False"/>
+				name="pos.discount" id="pos_discount" menu="False"/>-->
 
 <!--		<wizard id="wizard_pos_payment_report" menu="False"
 				model="pos.order" name="pos.payment.report" string="All paid lines for the current User"/-->
diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index b94ba0a0d0e..c98cd507417 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -23,7 +23,6 @@
 import wizard_pos_payment
 import wizard_default_journal
 import wizard_refund_order
-import wizard_discount
 import wizard_get_sale
 import wizard_scan_product
 import wizard_receipt
@@ -39,5 +38,6 @@ import wizard_open_statement
 import wizard_all_closed_cashbox_of_the_day
 import pos_add_product
 import pos_confirm
+import pos_discount
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/wizard/pos_confirm.xml b/addons/point_of_sale/wizard/pos_confirm.xml
new file mode 100644
index 00000000000..2be29ee97c7
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_confirm.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        
+        <!--  Point of Sale Confirm -->
+        
+		<record id="view_pos_confirm" model="ir.ui.view">
+            <field name="name">Open Statements</field>
+            <field name="model">pos.confirm</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Open Statements">
+				     	<label string="Are you sure you want to close your sales ?" colspan="2"/>
+				     	<newline/>
+                		<button icon='gtk-cancel' special="cancel"
+                			string="No" />
+                		<button name="action_confirm" string="Yes"
+                			colspan="1" type="object" icon="gtk-ok"/>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_pos_confirm" model="ir.actions.act_window">
+            <field name="name">Open Statements</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.confirm</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="context">{'record_id' : active_id}</field>
+        </record>
+       <record model="ir.values" id="values_pos_confirm">
+            <field name="model_id" ref="point_of_sale.model_pos_order" />
+            <field name="object" eval="1" />
+            <field name="name">Open Statements</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_pos_confirm'))"/>
+            <field name="key">action</field>
+            <field name="model">pos.order</field>
+        </record>        
+        
+	</data>
+</openerp>	        
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/pos_discount.py b/addons/point_of_sale/wizard/pos_discount.py
new file mode 100644
index 00000000000..a6b537193d7
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_discount.py
@@ -0,0 +1,104 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import netsvc
+from osv import osv,fields
+from tools.translate import _
+
+class pos_discount(osv.osv_memory):
+    _name = 'pos.discount'
+    _description = 'Add Discount'
+
+    _columns = {
+                'discount': fields.float('Discount ', required=True),
+                'discount_notes': fields.char('Discount Notes',size= 128, required=True),
+    }
+    _defaults = {
+                    'discount': lambda *a: 5,
+                }
+    
+    def apply_discount(self, cr, uid, ids, context):
+        """ 
+             @summary: To give the discount of  product and check the  .            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary 
+             @return : nothing
+        """        
+        this = self.browse(cr, uid, ids[0], context=context)
+        record_id = context and context.get('record_id',False)
+        if isinstance(record_id, (int, long)):
+            record_id=[record_id]
+        
+        order_ref = self.pool.get('pos.order')
+        order_line_ref =self.pool.get('pos.order.line')
+        
+        for order in order_ref.browse(cr, uid, record_id, context=context):
+            for line in order.lines :
+                company_discount = order.company_id.company_discount
+                applied_discount =this.discount
+               
+                if applied_discount == 0.00:
+                    notice = 'No Discount'
+                elif company_discount >=  applied_discount:
+                    notice = 'Minimum Discount'
+                else:
+                    notice = this.discount_notes
+                    
+                if self.check_discount(cr, uid, record_id,this.discount,context) == 'apply_discount':
+                    order_line_ref.write(cr, uid, [line.id],
+                            {'discount': this.discount,
+                            'price_ded':line.price_unit*line.qty*(this.discount or 0)*0.01 or 0.0,
+                            'notice':notice
+                            },
+                            context=context,)
+                else :
+                    order_line_ref.write(cr, uid, [line.id],
+                            {'discount': this.discount,
+                            'notice': notice,
+                            'price_ded':line.price_unit*line.qty*(this.discount or 0)*0.01 or 0.0 
+                            },
+                            context=context,)
+        return {}
+    
+    def check_discount(self, cr, uid, record_id,discount, context):
+        """ 
+             @summary: Check the discount of define by company  .            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param record_id:Current Order id
+             @param discount:Select Discount
+             @param context: A standard dictionary 
+             @return : retrun  to apply and used the company discount base on condition
+        """                
+        order_ref = self.pool.get('pos.order')
+        for order in order_ref.browse(cr, uid, record_id, context=context):
+            company_disc = order.company_id.company_discount
+            for line in order.lines :
+                prod_disc = discount
+                if prod_disc <= company_disc :
+                   return 'apply_discount'
+                else :
+                    return 'disc_discount'    
+pos_discount()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/pos_discount.xml b/addons/point_of_sale/wizard/pos_discount.xml
new file mode 100644
index 00000000000..a0e658b8c9c
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_discount.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        
+        <!--  Add  Product -->
+        
+		<record id="view_pos_discount" model="ir.ui.view">
+            <field name="name">Apply Discount</field>
+            <field name="model">pos.discount</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Apply Discount">
+				    <group col="2" colspan="4">
+				    	<field name="discount"/>
+				    	<field name="discount_notes"/>
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Close" />
+                		<button name="apply_discount" string="Apply Discount"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_pos_discount" model="ir.actions.act_window">
+            <field name="name">Apply Discount</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.discount</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="context">{'record_id' : active_id}</field>
+        </record>
+        
+	</data>
+</openerp>	        
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/wizard_discount.py b/addons/point_of_sale/wizard/wizard_discount.py
deleted file mode 100644
index 035c387793c..00000000000
--- a/addons/point_of_sale/wizard/wizard_discount.py
+++ /dev/null
@@ -1,145 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import pooler
-import wizard
-
-_form = """<?xml version="1.0"?>
-<form string="Discount :">
-    <field name="discount"/>
-</form>
-"""
-disc_form = """<?xml version="1.0"?>
-
-<form string="Discount Notes :">
-    <label colspan="2" string="Reason For Giving Discount" align="0.0"/>
-    <newline/>
-    <field name="note" nolabel="1"/>
-</form>
-"""
-
-
-_fields = {
-    'discount': {
-        'string': 'Discount percentage',
-        'type': 'float',
-        'required': True,
-        'default': lambda *args: 5
-    },
-}
-
-disc_fields = {
-    'note': {
-        'string': 'Discount Notes',
-        'type': 'char',
-        'size': 128,
-        'required': True
-    },
-}
-
-class discount_wizard(wizard.interface):
-
-    def apply_discount(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        order_ref = pool.get('pos.order')
-        order_line_ref = pool.get('pos.order.line')
-        for order in order_ref.browse(cr, uid, data['ids'], context=context):
-            for line in order.lines :
-                company_discount = order.company_id.company_discount
-                applied_discount =data['form']['discount']
-                if applied_discount == 0.00:
-                    notice = 'No Discount'
-                elif company_discount >=  applied_discount:
-                    notice = 'Minimum Discount'
-                else:
-                    notice = data['form']['note']
-                if self.check_discount(cr, uid, data, context) == 'apply_discount':
-                    order_line_ref.write(cr, uid, [line.id],
-                            {'discount': data['form']['discount'],
-                            'price_ded':line.price_unit*line.qty*(data['form']['discount'] or 0)*0.01 or 0.0,
-                            'notice':notice
-                            },
-                            context=context,)
-                else :
-                    order_line_ref.write(cr, uid, [line.id],
-                            {'discount': data['form']['discount'],
-                            'notice': notice,
-                            'price_ded':line.price_unit*line.qty*(data['form']['discount'] or 0)*0.01 or 0.0 
-                            },
-                            context=context,)
-        return {}
-
-    def check_discount(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        order_ref = pool.get('pos.order')
-        for order in order_ref.browse(cr, uid, data['ids'], context=context):
-            company_disc = order.company_id.company_discount
-            for line in order.lines :
-                prod_disc = data['form']['discount']
-                if prod_disc <= company_disc :
-                   return 'apply_discount'
-                else :
-                    return 'disc_discount'
-
-    states = {
-        'init': {
-            'actions': [],
-            'result': {
-                'type': 'form',
-                'arch': _form,
-                'fields': _fields,
-                'state': (('end', 'Cancel'),
-                          ('check_disc', 'Apply Discount', 'gtk-ok', True)
-                         )
-            }
-        },
-
-        'check_disc': {
-            'actions': [],
-            'result': {'type':'choice','next_state':check_discount}
-        },
-
-        'disc_discount': {
-            'actions': [],
-            'result': {
-                'type': 'form',
-                'arch': disc_form,
-                'fields':disc_fields,
-                'state': (('end', 'Cancel'),
-                          ('apply_discount', 'Apply Discount', 'gtk-ok', True)
-                         )
-            }
-        },
-        'apply_discount': {
-            'actions': [],
-            'result': {
-                'type': 'action',
-                'action': apply_discount,
-                'state': "end",
-            }
-        },
-    }
-
-discount_wizard('pos.discount')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From d374d5376b0bcbcb95743b51c9d8e6e9bbca89b7 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Thu, 11 Mar 2010 13:17:54 +0530
Subject: [PATCH 089/251] [IMP] Stock, Sale:Code optimization in OSV_Memory
 wizard files

bzr revid: mso@mso-20100311074754-aswbr7n13dtmxll3
---
 addons/sale/wizard/sale_line_invoice.py          | 16 +++++++++-------
 addons/sale/wizard/sale_make_invoice_advance.py  | 10 ++++++----
 addons/stock/wizard/stock_fill_inventory.py      |  6 ++++--
 .../stock/wizard/stock_inventory_line_split.py   | 10 ++++++----
 addons/stock/wizard/stock_invoice_onshipping.py  |  8 ++++----
 5 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py
index 7dd7fef78cb..c9d18fd86ed 100644
--- a/addons/sale/wizard/sale_line_invoice.py
+++ b/addons/sale/wizard/sale_line_invoice.py
@@ -36,7 +36,7 @@ class sale_order_line_make_invoice(osv.osv_memory):
         'grouped' : lambda *a: False
                }
 
-    def makeInvoices(self, cr, uid, ids, context):
+    def make_invoices(self, cr, uid, ids, context):
         res = False
         invoices = {}
 
@@ -65,26 +65,28 @@ class sale_order_line_make_invoice(osv.osv_memory):
             inv_id = self.pool.get('account.invoice').create(cr, uid, inv)
             return inv_id
 
-        for line in self.pool.get('sale.order.line').browse(cr,uid,context['active_ids']):
+        sales_order_line_obj = self.pool.get('sale.order.line')
+        wf_service = netsvc.LocalService('workflow')
+        for line in sales_order_line_obj.browse(cr,uid,context['active_ids']):
             if (not line.invoiced) and (line.state not in ('draft','cancel')):
                 if not line.order_id.id in invoices:
                     invoices[line.order_id.id] = []
-                line_id = self.pool.get('sale.order.line').invoice_line_create(cr, uid,
+                line_id = sales_order_line_obj.invoice_line_create(cr, uid,
                         [line.id])
                 for lid in line_id:
                     invoices[line.order_id.id].append((line, lid))
-                self.pool.get('sale.order.line').write(cr, uid, [line.id],
+                sales_order_line_obj.write(cr, uid, [line.id],
                         {'invoiced': True})
             flag = True
-            data_sale = self.pool.get('sale.order').browse(cr,uid,line.order_id.id)
+            sales_order_obj = self.pool.get('sale.order') 
+            data_sale = sales_order_obj.browse(cr,uid,line.order_id.id)
             for line in data_sale.order_line:
                 if not line.invoiced:
                     flag = False
                     break
             if flag:
-                wf_service = netsvc.LocalService('workflow')
                 wf_service.trg_validate(uid, 'sale.order', line.order_id.id, 'all_lines', cr)
-                self.pool.get('sale.order').write(cr,uid,[line.order_id.id],{'state' : 'progress'})
+                sales_order_obj.write(cr,uid,[line.order_id.id],{'state' : 'progress'})
 
         for result in invoices.values():
             order = result[0][0].order_id
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 9a079c4f8ec..f441871946b 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -38,10 +38,12 @@ class sale_advance_payment_inv(osv.osv_memory):
     _default = {
         'qtty' : lambda *a: 1
                }
-    def createInvoices(self, cr, uid, ids, context={}):
+    def create_invoices(self, cr, uid, ids, context={}):
         list_inv = []
         obj_sale = self.pool.get('sale.order')
         obj_lines = self.pool.get('account.invoice.line')
+        inv_obj = self.pool.get('account.invoice')
+        
         for sale_adv_obj in self.browse(cr, uid, ids):
             for sale in obj_sale.browse(cr, uid, context['active_ids']):
                 address_contact = False
@@ -83,7 +85,7 @@ class sale_advance_payment_inv(osv.osv_memory):
                     'payment_term':sale.payment_term.id,
                     'fiscal_position': sale.partner_id.property_account_position.id
                     }
-                inv_obj = self.pool.get('account.invoice')
+                
                 inv_id = inv_obj.create(cr, uid, inv)
 
                 for inv in sale.invoice_ids:
@@ -134,9 +136,9 @@ class sale_open_invoice(osv.osv_memory):
         for advance_pay in self.browse(cr, uid, ids):
             result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
             id = mod_obj.read(cr, uid, result, ['res_id'])
-            model_data_ids = self.pool.get('ir.model.data').search(cr, uid,
+            model_data_ids = mod_obj.search(cr, uid,
                              [('model', '=', 'ir.ui.view'), ('name', '=', 'invoice_form')])
-            resource_id = self.pool.get('ir.model.data').read(cr, uid, model_data_ids,
+            resource_id = mod_obj.read(cr, uid, model_data_ids,
                                             fields=['res_id'])[0]['res_id']
         return {
 #            'domain': "[('id','in', ["+','.join(map(str, invoices))+"])]", # TODO
diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index 246aff9eabf..a7d68d4f0e3 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -40,6 +40,8 @@ class stock_fill_inventory(osv.osv_memory):
     def fill_inventory(self, cr, uid, ids, context):
         inventory_line_obj = self.pool.get('stock.inventory.line')
         location_obj = self.pool.get('stock.location')
+        product_obj = self.pool.get('product.product')
+        stock_location_obj = self.pool.get('stock.location')
         for fill_inventory in self.browse(cr, uid, ids):
             res = {}
             res_location = {}
@@ -59,10 +61,10 @@ class stock_fill_inventory(osv.osv_memory):
                 for location in res_location.keys():
                     res = res_location[location]
                     for product_id in res.keys():
-                        prod = self.pool.get('product.product').browse(cr, uid, [product_id])[0]
+                        prod = product_obj.browse(cr, uid, [product_id])[0]
                         uom = prod.uom_id.id
                         context.update({'uom': uom})
-                        amount = self.pool.get('stock.location')._product_get(cr, uid,
+                        amount = stock_location_obj._product_get(cr, uid,
                                  location, [product_id], context=context)[product_id]
 
                         if(amount):
diff --git a/addons/stock/wizard/stock_inventory_line_split.py b/addons/stock/wizard/stock_inventory_line_split.py
index 1723f7b3032..19a501478d3 100644
--- a/addons/stock/wizard/stock_inventory_line_split.py
+++ b/addons/stock/wizard/stock_inventory_line_split.py
@@ -37,7 +37,8 @@ class stock_inventory_line_split(osv.osv_memory):
             }
 
     def _check_production_lot(self, cr, uid, context):
-        for inv_obj in self.pool.get('stock.inventory.line').browse(cr, uid, \
+        stock_inventory_line_obj = self.pool.get('stock.inventory.line')
+        for inv_obj in stock_inventory_line_obj.browse(cr, uid, \
                             context['active_ids']):
             if not inv_obj.prod_lot_id:
                 raise osv.except_osv(_('Caution!'), _('Before splitting the \
@@ -53,10 +54,11 @@ inventory lines, make sure the production lot is assigned to this product.'))
         inv_id = context['active_id']
         inv_line_obj = self.pool.get('stock.inventory.line')
         prodlot_obj = self.pool.get('stock.production.lot')
-        for linesplit_obj in self.browse(cr, uid, ids):
-            ir_sequence_obj = self.pool.get('ir.sequence')
 
-            sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
+        ir_sequence_obj = self.pool.get('ir.sequence')
+        sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
+
+        for linesplit_obj in self.browse(cr, uid, ids):
             if not sequence:
                 raise wizard.except_wizard(_('Error!'), _('No production sequence defined'))
             if linesplit_obj.prefix:
diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py
index 82043fc0532..a4026e69827 100644
--- a/addons/stock/wizard/stock_invoice_onshipping.py
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@@ -70,15 +70,15 @@ class stock_invoice_onshipping(osv.osv_memory):
 
     def create_invoice(self, cr, uid, ids, context):
         result = []
+        picking_obj = self.pool.get('stock.picking')
+        mod_obj = self.pool.get('ir.model.data')
+        act_obj = self.pool.get('ir.actions.act_window')
+
         for onshipdata_obj in self.read(cr, uid, ids, ['journal_id', 'group', 'type', 'invoice_date']):
             if context.get('new_picking', False):
                 onshipdata_obj[id] = onshipdata_obj.new_picking
                 onshipdata_obj[ids] = onshipdata_obj.new_picking
 
-            picking_obj = self.pool.get('stock.picking')
-            mod_obj = self.pool.get('ir.model.data')
-            act_obj = self.pool.get('ir.actions.act_window')
-
             type = onshipdata_obj['type']
             context['date_inv'] = onshipdata_obj['invoice_date']
             res = picking_obj.action_invoice_create(cr, uid,context['active_ids'],

From e7fb07589f310a2e1b2d4d8ca8cdea3d7d2a3837 Mon Sep 17 00:00:00 2001
From: "ATP (Open ERP)" <>
Date: Thu, 11 Mar 2010 14:08:18 +0530
Subject: [PATCH 090/251] [IMP]: caldav: converted wizards into osv_memory
 wizards

bzr revid: rpa@tinyerp.com-20100311083818-fp3ve2g95mwa3wxu
---
 addons/caldav/__init__.py                     |  8 +-
 addons/caldav/__terp__.py                     |  4 +-
 addons/caldav/caldav_wizard.xml               | 19 ----
 addons/caldav/wizard/__init__.py              |  7 +-
 addons/caldav/wizard/calendar_event_export.py | 69 +++++++++++++
 .../wizard/calendar_event_export_view.xml     | 49 ++++++++++
 addons/caldav/wizard/calendar_event_import.py | 78 +++++++++++++++
 .../wizard/calendar_event_import_view.xml     | 61 ++++++++++++
 .../caldav/wizard/calendar_event_subscribe.py | 89 +++++++++++++++++
 .../wizard/calendar_event_subscribe_view.xml  | 61 ++++++++++++
 addons/caldav/wizard/wizard_cal_export.py     | 65 -------------
 addons/caldav/wizard/wizard_cal_import.py     | 88 -----------------
 addons/caldav/wizard/wizard_cal_subscribe.py  | 97 -------------------
 13 files changed, 417 insertions(+), 278 deletions(-)
 delete mode 100644 addons/caldav/caldav_wizard.xml
 create mode 100644 addons/caldav/wizard/calendar_event_export.py
 create mode 100644 addons/caldav/wizard/calendar_event_export_view.xml
 create mode 100644 addons/caldav/wizard/calendar_event_import.py
 create mode 100644 addons/caldav/wizard/calendar_event_import_view.xml
 create mode 100644 addons/caldav/wizard/calendar_event_subscribe.py
 create mode 100644 addons/caldav/wizard/calendar_event_subscribe_view.xml
 delete mode 100644 addons/caldav/wizard/wizard_cal_export.py
 delete mode 100644 addons/caldav/wizard/wizard_cal_import.py
 delete mode 100644 addons/caldav/wizard/wizard_cal_subscribe.py

diff --git a/addons/caldav/__init__.py b/addons/caldav/__init__.py
index 19f11301420..a7731ca526a 100644
--- a/addons/caldav/__init__.py
+++ b/addons/caldav/__init__.py
@@ -20,10 +20,10 @@
 ##############################################################################
 
 import caldav
-import caldav_cache
-import caldav_fs
-import caldav_node
-import webdav_server
+#import caldav_cache
+#import caldav_fs
+#import caldav_node
+#import webdav_server
 import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/__terp__.py b/addons/caldav/__terp__.py
index db6e46b1daa..1d25ad8cb77 100644
--- a/addons/caldav/__terp__.py
+++ b/addons/caldav/__terp__.py
@@ -49,7 +49,9 @@
     "demo_xml" : [], 
     "update_xml" : [
                     'security/ir.model.access.csv', 
-                    'caldav_wizard.xml', 
+                    'wizard/calendar_event_export_view.xml',
+                    'wizard/calendar_event_import_view.xml',
+                    'wizard/calendar_event_subscribe_view.xml',
                     'caldav_view.xml'
                     ], 
     "installable" : True, 
diff --git a/addons/caldav/caldav_wizard.xml b/addons/caldav/caldav_wizard.xml
deleted file mode 100644
index eaebba4234a..00000000000
--- a/addons/caldav/caldav_wizard.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-	<data>
-		<wizard string="Import .ics File" model="basic.calendar"
-			name="calendar.event.import" id="wizard_cal_event_import" />
-
-		<wizard string="Subscribe"
-			model="basic.calendar" name="calendar.event.subscribe"
-			id="wizard_cal_event_subscribe" multi="True" />
-
-		<wizard string="Export .ics File" model="basic.calendar"
-			name="calendar.event.export" id="wizard_cal_event_export" />
-
-		<wizard string="Edit this event" model="basic.calendar.event"
-			name="calendar.event.edit.this" id="wizard_edit_this_event"
-			menu="False" />
-
-	</data>
-</openerp>
\ No newline at end of file
diff --git a/addons/caldav/wizard/__init__.py b/addons/caldav/wizard/__init__.py
index 4ab34601a96..1c45cb2a191 100755
--- a/addons/caldav/wizard/__init__.py
+++ b/addons/caldav/wizard/__init__.py
@@ -19,9 +19,8 @@
 #
 ##############################################################################
 
-import wizard_cal_export
-import wizard_cal_import
-import wizard_cal_subscribe
+import calendar_event_export
+import calendar_event_import
+import calendar_event_subscribe
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/caldav/wizard/calendar_event_export.py b/addons/caldav/wizard/calendar_event_export.py
new file mode 100644
index 00000000000..3bee5a5089f
--- /dev/null
+++ b/addons/caldav/wizard/calendar_event_export.py
@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+import base64
+
+class calendar_event_export(osv.osv_memory):
+    """
+    Export Calendar Event.
+    """
+    def _process_export_ics(self, cr, uid, context):
+        """
+        Get Default value for file_path field.
+        """
+        model = context.get('model', 'basic.calendar')
+        model_obj = self.pool.get(model)
+        calendar = model_obj.export_cal(cr, uid, context['active_ids'], context)
+        #TODO: check why returns wrong value
+        return base64.encodestring(calendar)
+                            
+    def _process_export_ics_name(self, cr, uid, context):
+        """
+        Get Default value for Name field.
+        """
+        model = context.get('model', 'basic.calendar')
+        model_obj = self.pool.get(model)
+        calendar = model_obj.export_cal(cr, uid, context['active_ids'], context)
+        return  'OpenERP %s.ics' % (model_obj._description)
+    
+    _name = "calendar.event.export"
+    _description = "Event Export"
+    _columns = {
+              'file_path':fields.binary('Save ICS file', filters='*.ics', required=True),
+              'name':fields.char('File name', size=34, required=True, help='Save in .ics format')
+               }
+    
+    _defaults={
+               'name':_process_export_ics_name,
+               'file_path':_process_export_ics
+               }
+    
+calendar_event_export()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/wizard/calendar_event_export_view.xml b/addons/caldav/wizard/calendar_event_export_view.xml
new file mode 100644
index 00000000000..0a049e15083
--- /dev/null
+++ b/addons/caldav/wizard/calendar_event_export_view.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_calendar_event_export" model="ir.ui.view">
+            <field name="name">calendar.event.export.form</field>
+            <field name="model">calendar.event.export</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Export ICS">
+                	<group colspan="4" >
+                		 <field name="name"/>
+              			 <field name="file_path" colspan="4" width="300"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_calendar_event_export" model="ir.actions.act_window">
+            <field name="name">Export .ics File</field>
+            <field name="res_model">calendar.event.export</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_calendar_event_export"/> 
+           <field name="target">new</field>
+           <field name="context">{'record_id':active_id}</field>
+        </record>
+              
+<!--        <record id="action_calendar_event_export_values" model="ir.values">-->
+<!--            <field name="model_id" ref="caldav.model_basic_calendar" />-->
+<!--            <field name="object" eval="1" />-->
+<!--            <field name="name">Export .ics File</field>-->
+<!--            <field name="key2">client_action_multi</field>-->
+<!--            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_calendar_event_export'))"/>-->
+<!--            <field name="key">action</field> -->
+<!--            <field name="model">basic.calendar</field>-->
+<!--        </record>-->
+
+
+    	<act_window id="action_calendar_event_export_values"
+    		key2="client_action_multi" name="Export .ics File"
+    		res_model="calendar.event.export" src_model="basic.calendar"
+    		view_mode="form" target="new" view_type="form" />
+
+    </data>
+</openerp>
diff --git a/addons/caldav/wizard/calendar_event_import.py b/addons/caldav/wizard/calendar_event_import.py
new file mode 100644
index 00000000000..ba72e1c8c6d
--- /dev/null
+++ b/addons/caldav/wizard/calendar_event_import.py
@@ -0,0 +1,78 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+import base64
+
+class calendar_event_import(osv.osv_memory):
+    """
+    Import Calendar Event.
+    """
+    cnt = 0
+    def _process_imp_ics(self, cr, uid, ids, context=None):
+        """
+        Process Import ics File.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of calendar event import’s IDs
+        @return: dictionary of calendar evet import  window with Import successful msg.
+        """
+        for data in self.read(cr, uid, ids):
+            model = data.get('model', 'basic.calendar')
+            model_obj = self.pool.get(model)
+            context.update({'model': model})
+            data_obj = self.pool.get('ir.model.data')
+            id2 = data_obj._get_id(cr, uid, 'caldav', 'view_calendar_event_import_display')
+            if id2:
+                 id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+            vals = model_obj.import_cal(cr, uid, data['file_path'], context['active_id'], context)
+            global cnt
+            if vals:
+                cnt = len(vals)
+            value = {
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'calendar.event.import',
+                'views': [(id2,'form'),(False,'tree'),(False,'calendar'),(False,'graph')],
+                'type': 'ir.actions.act_window',
+                'target': 'new'
+            }
+            return value
+    
+    _name = "calendar.event.import"
+    _description = "Event Import"
+    _columns = {
+                  'file_path': fields.binary('Select ICS file', filters='*.ics', required=True),
+                  'msg': fields.text('', readonly=True),
+               }
+    _defaults={
+               'msg':lambda *a:'Import Sucessful'
+               }
+    
+calendar_event_import()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/wizard/calendar_event_import_view.xml b/addons/caldav/wizard/calendar_event_import_view.xml
new file mode 100644
index 00000000000..1fbd89b2499
--- /dev/null
+++ b/addons/caldav/wizard/calendar_event_import_view.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_calendar_event_import" model="ir.ui.view">
+            <field name="name">calendar.event.import.form</field>
+            <field name="model">calendar.event.import</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Import ICS">
+                	<group colspan="4" >
+                		 <separator string="Select ICS file"/>
+              			 <field name="file_path" colspan="4" width="300" nolabel="1"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                    	<button  icon="gtk-ok"  name="_process_imp_ics"  string="_Import" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+  		<record id="view_calendar_event_import_display" model="ir.ui.view">
+            <field name="name">calendar.event.import.form.display</field>
+            <field name="model">calendar.event.import</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Import Message">
+                	<group colspan="4" >
+                		  <field name="msg" colspan="4" width="300" nolabel="1"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4">
+                    	<button  icon="gtk-ok" special="cancel" string="Ok"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_calendar_event_import" model="ir.actions.act_window">
+            <field name="name">Import .ics File</field>
+            <field name="res_model">calendar.event.import</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_calendar_event_import"/> 
+           <field name="target">new</field>
+           <field name="context">{'record_id':active_id}</field>
+        </record>
+              
+        <record id="action_calendar_event_import_values" model="ir.values">
+            <field name="model_id" ref="caldav.model_basic_calendar" />
+            <field name="object" eval="1" />
+            <field name="name">Import .ics File</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_calendar_event_import'))"/>
+            <field name="key">action</field> 
+            <field name="model">basic.calendar</field>
+        </record>
+        
+    </data>
+</openerp>
diff --git a/addons/caldav/wizard/calendar_event_subscribe.py b/addons/caldav/wizard/calendar_event_subscribe.py
new file mode 100644
index 00000000000..aa539938877
--- /dev/null
+++ b/addons/caldav/wizard/calendar_event_subscribe.py
@@ -0,0 +1,89 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+import base64
+import urllib
+
+class calendar_event_subscribe(osv.osv_memory):
+    """
+    Subscribe  Calendar Event.
+    """
+    cnt = 0
+    def _process_imp_ics(self, cr, uid, ids, context=None):
+        """
+        process ics file.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of calendar event subscribe’s IDs
+        @return: dictionary of calendar evet subscribe  window with Import successful msg.
+        """
+        global cnt
+        for data in self.read(cr, uid, ids):
+            try:
+                f =  urllib.urlopen(data['url_path'])
+                caldata = f.fp.read()
+                f.close()
+            except Exception,e:
+                raise osv.except_osv(_('Error!'), _('Please provide Proper URL !'))
+            model = data.get('model', 'basic.calendar')
+            model_obj = self.pool.get(model)
+            context.update({'url': data['url_path'],
+                                    'model': data.get('model', 'basic.calendar')})
+            vals = model_obj.import_cal(cr, uid, base64.encodestring(caldata), \
+                                            context['active_id'],  context)
+            if vals:
+                cnt = vals['count']
+            data_obj = self.pool.get('ir.model.data')
+            id2 = data_obj._get_id(cr, uid, 'caldav', 'view_calendar_event_subscribe_display')
+            if id2:
+                 id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+          
+            value = {
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'calendar.event.subscribe',
+                'views': [(id2,'form'),(False,'tree'),(False,'calendar'),(False,'graph')],
+                'type': 'ir.actions.act_window',
+                'target': 'new'
+            }
+            return value
+    
+    _name = "calendar.event.subscribe"
+    _description = "Event subscribe"
+    _columns = {
+                'url_path': fields.char('Provide path for remote calendar', size=124, required=True),
+                'msg': fields.text('', readonly=True),
+               }
+    _defaults={
+               'msg':lambda *a:'Import Sucessful.'
+               }
+    
+calendar_event_subscribe()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/wizard/calendar_event_subscribe_view.xml b/addons/caldav/wizard/calendar_event_subscribe_view.xml
new file mode 100644
index 00000000000..95c06c20f6e
--- /dev/null
+++ b/addons/caldav/wizard/calendar_event_subscribe_view.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_calendar_event_subscribe" model="ir.ui.view">
+            <field name="name">calendar.event.subscribe.form</field>
+            <field name="model">calendar.event.subscribe</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Subscribe to Remote Calendar">
+                	<group colspan="4" >
+                		 <separator string="Provide path for Remote Calendar"/>
+              			  <field name="url_path" colspan="4" width="300" nolabel="1" widget="url"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                    	<button  icon="gtk-ok"  name="_process_imp_ics"  string="_Subscribe" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+  		<record id="view_calendar_event_subscribe_display" model="ir.ui.view">
+            <field name="name">calendar.event.subscribe.form.display</field>
+            <field name="model">calendar.event.subscribe</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Message...">
+                	<group colspan="4" >
+                		  <field name="msg" colspan="4" width="300" nolabel="1"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4">
+                    	<button  icon="gtk-ok" special="cancel" string="Ok"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_calendar_event_subscribe" model="ir.actions.act_window">
+            <field name="name">Subscribe</field>
+            <field name="res_model">calendar.event.subscribe</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_calendar_event_subscribe"/> 
+           <field name="target">new</field>
+           <field name="context">{'record_id':active_id}</field>
+        </record>
+              
+        <record id="action_calendar_event_subscribe_values" model="ir.values">
+            <field name="model_id" ref="caldav.model_basic_calendar" />
+            <field name="object" eval="1" />
+            <field name="name">Subscribe</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_calendar_event_subscribe'))"/>
+            <field name="key">action</field> 
+            <field name="model">basic.calendar</field>
+        </record>
+        
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/caldav/wizard/wizard_cal_export.py b/addons/caldav/wizard/wizard_cal_export.py
deleted file mode 100644
index f7896c738d7..00000000000
--- a/addons/caldav/wizard/wizard_cal_export.py
+++ /dev/null
@@ -1,65 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import base64
-import pooler
-
-
-class cal_event_export_wizard(wizard.interface):
-    form1 = '''<?xml version="1.0"?>
-    <form string="Export ICS">
-        <field name="name"/>
-        <field name="file_path" colspan="4" width="300"/>
-    </form>'''
-    
-    form1_fields = {
-            'file_path': {
-                'string': 'Save ICS file', 
-                'type': 'binary', 
-                'required': True, 
-                'filters': '*.ics'
-                },
-            'name': {
-                    'string': 'File name', 
-                    'type': 'char', 
-                    'size': 34, 
-                    'required': True, 
-                    'help': 'Save in .ics format'}, 
-            }
-    
-    def _process_export_ics(self, cr, uid, data, context):
-        model = data.get('model')
-        model_obj = pooler.get_pool(cr.dbname).get(model)
-        calendar = model_obj.export_cal(cr, uid, data['ids'], context)
-        return {'file_path': base64.encodestring(calendar), \
-                            'name': 'OpenERP %s.ics' % (model_obj._description)}
-
-    states = {
-        'init': {
-            'actions': [_process_export_ics], 
-            'result': {'type': 'form', 'arch':form1, 'fields':form1_fields, \
-                       'state': [('end', '_Cancel', 'gtk-cancel')]}}, 
-    }
-    
-cal_event_export_wizard('calendar.event.export')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/wizard/wizard_cal_import.py b/addons/caldav/wizard/wizard_cal_import.py
deleted file mode 100644
index a5670f545fa..00000000000
--- a/addons/caldav/wizard/wizard_cal_import.py
+++ /dev/null
@@ -1,88 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import pooler
-
-
-class cal_event_import_wizard(wizard.interface):
-    form1 = '''<?xml version="1.0"?>
-    <form string="Import ICS">
-        <separator string="Select ICS file"/>
-        <field name="file_path" colspan="4" width="300" nolabel="1"/>
-    </form>'''
-    
-    form1_fields = {
-            'file_path': {
-                'string': 'Select ICS file', 
-                'type': 'binary', 
-                'required': True, 
-                'filters': '*.ics'
-                }
-            }
-    display = '''<?xml version="1.0"?>
-    <form string="Import Message">
-        <field name="msg" colspan="4" width="300" nolabel="1"/>
-    </form>'''
-    
-    display_fields = {
-            'msg': {
-                'string': '', 
-                'type': 'text', 
-                'readonly': True, 
-                }
-            }
-
-    def _process_imp_ics(self, cr, uid, data, context=None):
-        model = data.get('model')
-        model_obj = pooler.get_pool(cr.dbname).get(model)
-        context.update({'model': model})
-        vals = model_obj.import_cal(cr, uid, data['form']['file_path'], data['id'], context)
-        global cnt
-        cnt = 0
-        if vals:
-            cnt = len(vals)
-        return {}
-    
-    def _result_set(self, cr, uid, data, context=None):
-        msg = (cnt and "Imported %s components" % cnt) or 'Import Sucessful' 
-        return {'msg': msg}
-    
-    states = {
-        'init': {
-            'actions': [], 
-            'result': {'type': 'form', 'arch': form1, 'fields': form1_fields, \
-                       'state': [('end', '_Cancel', 'gtk-cancel'), ('open', '_Import', 'gtk-ok')]}
-        }, 
-        'open': {
-            'actions': [], 
-            'result': {'type': 'action', 'action': _process_imp_ics, 'state': 'display'}
-        }, 
-       'display': {
-            'actions': [_result_set], 
-            'result': {'type': 'form', 'arch': display, 'fields': display_fields, \
-                       'state': [('end', 'Ok', 'gtk-ok')]}
-        }, 
-    }
-    
-cal_event_import_wizard('calendar.event.import')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/wizard/wizard_cal_subscribe.py b/addons/caldav/wizard/wizard_cal_subscribe.py
deleted file mode 100644
index 709c61d0b25..00000000000
--- a/addons/caldav/wizard/wizard_cal_subscribe.py
+++ /dev/null
@@ -1,97 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-from tools.translate import _
-import base64
-import pooler
-import urllib
-import wizard
-
-class cal_event_subscribe_wizard(wizard.interface):
-    form1 = '''<?xml version="1.0"?>
-    <form string="Subscribe to Remote Calendar">
-        <separator string="Provide path for Remote Calendar"/>
-        <field name="url_path" colspan="4" width="300" nolabel="1" widget="url"/>
-    </form>'''
-    
-    form1_fields = {
-            'url_path': {
-                'string': 'Provide path for remote calendar', 
-                'type': 'char', 
-                'required': True, 
-                'size': 124
-                }
-            }
-    display = '''<?xml version="1.0"?>
-    <form string="Message...">
-        <field name="msg" colspan="4" width="300" nolabel="1"/>
-    </form>'''
-    
-    display_fields = {
-            'msg': {
-                'string': '', 
-                'type': 'text', 
-                'readonly': True, 
-                }
-            }
-
-    def _process_imp_ics(self, cr, uid, data, context=None):
-        global cnt
-        cnt = 0
-        try:
-            f =  urllib.urlopen(data['form']['url_path'])
-            caldata = f.fp.read()
-            f.close()
-        except Exception,e:
-            raise wizard.except_wizard(_('Error!'), _('Please provide Proper URL !'))
-        model = data.get('model')
-        model_obj = pooler.get_pool(cr.dbname).get(model)
-        context.update({'url': data['form']['url_path'],
-                                    'model': data.get('model')})
-        vals = model_obj.import_cal(cr, uid, base64.encodestring(caldata), \
-                                            data['id'],  context)
-        if vals:
-            cnt = vals['count']
-        return {}
-    
-    def _result_set(self, cr, uid, data, context=None):
-        return {'msg': 'Import Sucessful.'}
-    
-    states = {
-        'init': {
-            'actions': [], 
-            'result': {'type': 'form', 'arch': form1, 'fields': form1_fields, \
-                       'state': [('end', '_Cancel', 'gtk-cancel'), ('open', '_Subscribe', 'gtk-ok')]}
-        }, 
-        'open': {
-            'actions': [], 
-            'result': {'type': 'action', 'action': _process_imp_ics, 'state': 'display'}
-        },
-       'display': {
-            'actions': [_result_set], 
-            'result': {'type': 'form', 'arch': display, 'fields': display_fields, \
-                       'state': [('end', 'Ok', 'gtk-ok')]}
-        }, 
-    }
-    
-cal_event_subscribe_wizard('calendar.event.subscribe')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From e2acebccc3eba3a62d468561865d8f313f3b868a Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 11 Mar 2010 14:21:30 +0530
Subject: [PATCH 091/251] [IMP] point_of_sale: Conver the get_sale wizard in
 osv_memory

bzr revid: sbh@tinyerp.com-20100311085130-ulfh1yp17xc42245
---
 addons/point_of_sale/__terp__.py              |  1 +
 addons/point_of_sale/wizard/__init__.py       |  2 +-
 addons/point_of_sale/wizard/pos_get_sale.py   | 78 +++++++++++++++
 addons/point_of_sale/wizard/pos_get_sale.xml  | 35 +++++++
 .../point_of_sale/wizard/wizard_get_sale.py   | 95 -------------------
 5 files changed, 115 insertions(+), 96 deletions(-)
 create mode 100644 addons/point_of_sale/wizard/pos_get_sale.py
 create mode 100644 addons/point_of_sale/wizard/pos_get_sale.xml
 delete mode 100644 addons/point_of_sale/wizard/wizard_get_sale.py

diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__terp__.py
index e9e20d1c6d2..415e394b24b 100644
--- a/addons/point_of_sale/__terp__.py
+++ b/addons/point_of_sale/__terp__.py
@@ -46,6 +46,7 @@ Main features :
         'wizard/pos_add_product.xml',
         'wizard/pos_confirm.xml',
         'wizard/pos_discount.xml',
+        'wizard/pos_get_sale.xml',
         'pos_view.xml',
         'pos_sequence.xml',
         'posrule_data.xml',
diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index c98cd507417..fe16ff175c8 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -23,7 +23,6 @@
 import wizard_pos_payment
 import wizard_default_journal
 import wizard_refund_order
-import wizard_get_sale
 import wizard_scan_product
 import wizard_receipt
 import wizard_return
@@ -39,5 +38,6 @@ import wizard_all_closed_cashbox_of_the_day
 import pos_add_product
 import pos_confirm
 import pos_discount
+import pos_get_sale
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/wizard/pos_get_sale.py b/addons/point_of_sale/wizard/pos_get_sale.py
new file mode 100644
index 00000000000..55da8e9d80c
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_get_sale.py
@@ -0,0 +1,78 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import netsvc
+from osv import osv,fields
+from tools.translate import _
+
+class pos_get_sale(osv.osv_memory):
+    _name = 'pos.get.sale'
+    _description = 'Get From Sale'
+
+    _columns = {
+                'picking_id': fields.many2one('stock.picking', 'Sale Order',   domain=[('state','in',('assigned','confirmed')), ('type', '=', 'out')],context="{'contact_display':'partner'}",required=True),                
+    }
+    
+    def sale_complete(self, cr, uid, ids, context):
+        """ 
+             @summary: Select the picking order and add the in Point of sale order          
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary 
+             @return : nothing
+        """        
+        this = self.browse(cr, uid, ids[0], context=context)
+        record_id = context and context.get('record_id',False)
+        
+        proxy_pos = self.pool.get('pos.order')
+        proxy_pick = self.pool.get('stock.picking')
+        
+        if record_id:
+            order=proxy_pos.browse(cr, uid, record_id, context)
+            
+            if order.state in ('paid', 'invoiced'):
+                 raise osv.except_osv(_('UserError '), _("You can't modify this order. It has already been paid"))
+            
+            for pick in proxy_pick.browse(cr, uid, [this.picking_id.id], context):
+                proxy_pos.write(cr, uid, record_id, {
+                    'last_out_picking':this.picking_id.id,
+                    'partner_id': pick.address_id and pick.address_id.partner_id.id
+                })
+            
+            order = proxy_pick.write(cr, uid, [this.picking_id.id], {
+                'invoice_state': 'none',
+                'pos_order': record_id
+            })
+        
+            for line in pick.move_lines:
+                self.pool.get('pos.order.line').create(cr, uid, {
+                    'name': line.sale_line_id.name,
+                    'order_id': record_id,
+                    'qty': line.product_qty,
+                    'product_id': line.product_id.id,
+                    'price_unit': line.sale_line_id.price_unit,
+                    'discount': line.sale_line_id.discount,
+                })
+    
+        return {}
+pos_get_sale()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/pos_get_sale.xml b/addons/point_of_sale/wizard/pos_get_sale.xml
new file mode 100644
index 00000000000..b44d2b9161e
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_get_sale.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Select an Open Sale Order -->
+        
+		<record id="view_pos_get_sale" model="ir.ui.view">
+            <field name="name">Open Sale Order</field>
+            <field name="model">pos.get.sale</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Select an Open Sale Order">
+				    <field name="picking_id"/>
+				    <newline/>
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="sale_complete" string="Confirm"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+        <record id="action_pos_get_sale" model="ir.actions.act_window">
+            <field name="name">Select an Open Sale Order</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.get.sale</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="context">{'record_id' : active_id}</field>
+        </record>
+	</data>
+</openerp>	
+        
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/wizard_get_sale.py b/addons/point_of_sale/wizard/wizard_get_sale.py
deleted file mode 100644
index de686c11d49..00000000000
--- a/addons/point_of_sale/wizard/wizard_get_sale.py
+++ /dev/null
@@ -1,95 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution	
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import pooler
-import wizard
-from tools.translate import _
-
-picking_form = """<?xml version="1.0"?>
-<form string="Select an Open Sale Order">
-    <field name="picking_id" domain="[('state','in',('assigned','confirmed')), ('type', '=', 'out')]" context="{'contact_display':'partner'}"/>
-</form>
-"""
-
-picking_fields = {
-    'picking_id': {'string': 'Sale Order', 'type': 'many2one', 'relation': 'stock.picking', 'required': True}
-}
-
-
-def _sale_complete(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    order = pool.get('pos.order').browse(cr, uid, data['id'], context)
-
-    if order.state in ('paid', 'invoiced'):
-        raise wizard.except_wizard(_('UserError'), _("You can't modify this order. It has already been paid"))
-
-    pick = pool.get('stock.picking').browse(cr, uid, data['form']['picking_id'], context)
-
-    pool.get('pos.order').write(cr, uid, data['id'], {
-        'last_out_picking': data['form']['picking_id'],
-        'partner_id': pick.address_id and pick.address_id.partner_id.id
-    })
-
-    order = pool.get('stock.picking').write(cr, uid, [data['form']['picking_id']], {
-        'invoice_state': 'none',
-        'pos_order': data['id']
-    })
-
-    for line in pick.move_lines:
-        pool.get('pos.order.line').create(cr, uid, {
-            'name': line.sale_line_id.name,
-            'order_id': data['id'],
-            'qty': line.product_qty,
-            'product_id': line.product_id.id,
-            'price_unit': line.sale_line_id.price_unit,
-            'discount': line.sale_line_id.discount,
-        })
-
-    return {}
-
-
-class pos_sale_get(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {
-                'type': 'form',
-                'arch': picking_form,
-                'fields': picking_fields,
-                'state': (('end', 'Cancel'),
-                          ('set', 'Confirm', 'gtk-ok', True)
-                         )
-            }
-        },
-        'set': {
-            'actions': [_sale_complete],
-            'result': {
-                'type': 'state',
-                'state': "end",
-            }
-        },
-    }
-
-pos_sale_get('pos.sale.get')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From d217272611da605662aa8df6a6e94271a7cfeba3 Mon Sep 17 00:00:00 2001
From: "Ysa (Open ERP)" <ysa@tinyerp.co.in>
Date: Thu, 11 Mar 2010 14:26:00 +0530
Subject: [PATCH 092/251] [IMP] document :- support indexation of .docx to text
 and PPTX to html

bzr revid: ysa@tinyerp.co.in-20100311085600-4t4gmuzywglpugh0
---
 addons/document/std_index.py | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/addons/document/std_index.py b/addons/document/std_index.py
index bd61c65e16b..b54ff396480 100644
--- a/addons/document/std_index.py
+++ b/addons/document/std_index.py
@@ -21,7 +21,7 @@
 
 import StringIO
 import odt2txt
-
+from subprocess import Popen, PIPE
 from content_index import indexer, cntIndex
 
 
@@ -50,15 +50,28 @@ class TxtIndex(indexer):
         
 cntIndex.register(TxtIndex())
 
+class PptIndex(indexer):
+    def _getMimeTypes(self):
+        return [ 'application/ms-word']
+    
+    def _getExtensions(self):
+        return ['.ppt','.pptx']
+
+    def _doIndexFile(self,fname):
+        fp = Popen(['ppthtml', fname], shell=False, stdout=PIPE).stdout
+        return _to_unicode( fp.read())
+
+cntIndex.register(PptIndex())
+
 class DocIndex(indexer):
     def _getMimeTypes(self):
         return [ 'application/ms-word']
     
     def _getExtensions(self):
-        return ['.doc']
+        return ['.doc','.docx']
 
     def _doIndexFile(self,fname):
-        fp = Popen(['antiword',fname], shell=False, stdout=PIPE).stdout
+        fp = Popen(['antiword', fname], shell=False, stdout=PIPE).stdout
         return _to_unicode( fp.read())
 
 cntIndex.register(DocIndex())

From f687c22859105bfe605732ad2735eb0f0f15606b Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 11 Mar 2010 14:50:06 +0530
Subject: [PATCH 093/251] [Fix] crm: Fix the probelm of section_id in
 crm_phonecall2phonecall

bzr revid: sbh@tinyerp.com-20100311092006-7h0ygtbm89zz056j
---
 addons/crm/wizard/crm_phonecall2phonecall.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/wizard/crm_phonecall2phonecall.py b/addons/crm/wizard/crm_phonecall2phonecall.py
index 5fcfc9ecb69..557b5da71f5 100644
--- a/addons/crm/wizard/crm_phonecall2phonecall.py
+++ b/addons/crm/wizard/crm_phonecall2phonecall.py
@@ -47,7 +47,7 @@ class crm_phonecall2phonecall(osv.osv_memory):
                 values['name']=this.name
                 values['user_id']=this.user_id and this.user_id.id
                 values['categ_id']=case.categ_id and case.categ_id.id or False
-                values['section_id']=case.section_id and case.section_id.id or False,
+                values['section_id']=case.section_id and case.section_id.id
                 values['description']=case.description or ''
                 values['partner_id']=case.partner_id.id
                 values['partner_address_id']=case.partner_address_id.id

From 0bba38da702229f6ef6267d66a40fddb29f8fcd3 Mon Sep 17 00:00:00 2001
From: "Ysa (Open ERP)" <ysa@tinyerp.co.in>
Date: Thu, 11 Mar 2010 17:15:01 +0530
Subject: [PATCH 094/251] [IMP] Thuderbird plugin :- removed section_id in
 plugin and create record with different object in crm

bzr revid: ysa@tinyerp.co.in-20100311114501-lhm4923ptbv39r3x
---
 addons/thunderbird/partner/partner.py         |   7 +++++--
 addons/thunderbird/plugin/tiny_plugin-2.0.xpi | Bin 65042 -> 65188 bytes
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py
index d3aa9020444..3a0fa73abc9 100644
--- a/addons/thunderbird/partner/partner.py
+++ b/addons/thunderbird/partner/partner.py
@@ -83,11 +83,14 @@ class tinythunderbird_partner(osv.osv):
 
     def thunderbird_mailcreate(self,cr,user,vals):
         dictcreate = dict(vals)
+        for val in vals:
+            if val[0] == 'object':
+                object = val[1]
         import email
         header_name = email.Header.decode_header(dictcreate['name'])
         dictcreate['name'] = header_name and header_name[0] and header_name[0][0] 
         add_obj=self.pool.get('res.partner.address')
-        case_pool=self.pool.get('crm.case')
+        case_pool=self.pool.get(object)
         partner_ids=add_obj.search(cr,user,[('email','=',dictcreate['email_from'])])
         partner=add_obj.read(cr,user,partner_ids,['partner_id'])
         if partner:
@@ -95,7 +98,7 @@ class tinythunderbird_partner(osv.osv):
         search_id = self.pool.get('res.request.link').search(cr,user,[('object','=',dictcreate['ref'].split(',')[0])])
         if not search_id:
             create_link_id = self.pool.get('res.request.link').create(cr,user,{'name':dictcreate['ref'].split(',')[0],'object':dictcreate['ref'].split(',')[0]})
-        create_id = self.pool.get('crm.case').create(cr, user, dictcreate)
+        create_id = self.pool.get(object).create(cr, user, dictcreate)
         cases=case_pool.browse(cr,user,[create_id])
         case_pool._history(cr, user, cases, _('Archive'), history=True, email=False)
         return create_id
diff --git a/addons/thunderbird/plugin/tiny_plugin-2.0.xpi b/addons/thunderbird/plugin/tiny_plugin-2.0.xpi
index 7fb57818c1539f3ba560ddd6abbcb8c409888ee0..d48a837cbbdf862348604b4be0901daf71a40cb0 100755
GIT binary patch
delta 53566
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

delta 53420
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


From d49417c9ed813d4f3e44b13e832327a8864405f5 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Thu, 11 Mar 2010 18:35:02 +0530
Subject: [PATCH 095/251] [ADD, IMP] stock_planning: Added a new module from
 trunk-extra-addons. Improved views. Improved security rules.

bzr revid: uco@tinyerp.co.in-20100311130502-xzg70ys4t2fs7gnl
---
 addons/stock_planning/__init__.py             |  24 ++
 addons/stock_planning/__terp__.py             |  41 +++
 addons/stock_planning/i18n/fr_BE.po           | 346 ++++++++++++++++++
 addons/stock_planning/i18n/stock_planning.pot | 346 ++++++++++++++++++
 .../security/ir.model.access.csv              |   5 +
 addons/stock_planning/stock_planning.py       | 338 +++++++++++++++++
 addons/stock_planning/stock_planning_view.xml | 235 ++++++++++++
 7 files changed, 1335 insertions(+)
 create mode 100644 addons/stock_planning/__init__.py
 create mode 100644 addons/stock_planning/__terp__.py
 create mode 100644 addons/stock_planning/i18n/fr_BE.po
 create mode 100644 addons/stock_planning/i18n/stock_planning.pot
 create mode 100644 addons/stock_planning/security/ir.model.access.csv
 create mode 100644 addons/stock_planning/stock_planning.py
 create mode 100644 addons/stock_planning/stock_planning_view.xml

diff --git a/addons/stock_planning/__init__.py b/addons/stock_planning/__init__.py
new file mode 100644
index 00000000000..f0fea471a21
--- /dev/null
+++ b/addons/stock_planning/__init__.py
@@ -0,0 +1,24 @@
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import stock_planning
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/stock_planning/__terp__.py b/addons/stock_planning/__terp__.py
new file mode 100644
index 00000000000..8deac6fe6ca
--- /dev/null
+++ b/addons/stock_planning/__terp__.py
@@ -0,0 +1,41 @@
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+{
+    "name":"Master Procurement Schedule",
+    "version":"1.0",
+    "author":"Tiny",
+    "category":"Custom",
+    "depends":["stock","sale"],
+    "description": """
+This module allows you to manage the planning of procurements based on sales
+forecasts, confirmed orders (customers and suppliers), stock movements, etc.
+You can planify expected outputs and inputs for each warehouses. It also works
+to manage all kind of procurements like purchase orders. That's why it is
+called Master Procurement Schedule instead of the classic Master Production
+Schedule therminology.
+""",
+    "demo_xml":[],
+    "update_xml":["security/ir.model.access.csv","stock_planning_view.xml"],
+    "active": False,
+    "installable": True,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/stock_planning/i18n/fr_BE.po b/addons/stock_planning/i18n/fr_BE.po
new file mode 100644
index 00000000000..26248a47bec
--- /dev/null
+++ b/addons/stock_planning/i18n/fr_BE.po
@@ -0,0 +1,346 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* stock_planning
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-26 06:00:58+0000\n"
+"PO-Revision-Date: 2009-11-26 06:00:58+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Procure Incoming Left"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_prevision_form
+#: view:stock.planning.sale.prevision:0
+msgid "Sales Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: field:stock.planning,planned_outgoing:0
+msgid "Planned Out"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,outgoing:0
+msgid "Confirmed Out"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
+#: model:ir.module.module,shortdesc:stock_planning.module_meta_information
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
+#: view:stock.planning:0
+msgid "Master Procurement Schedule"
+msgstr ""
+
+#. module: stock_planning
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,period_id:0
+#: field:stock.planning.sale.prevision,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period,state:0
+#: field:stock.planning,state:0
+#: field:stock.planning.sale.prevision,state:0
+msgid "State"
+msgstr ""
+
+#. module: stock_planning
+#: selection:stock.period,state:0
+#: selection:stock.planning,state:0
+#: selection:stock.planning.sale.prevision,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_period_form
+msgid "Stock Planning Periods"
+msgstr ""
+
+#. module: stock_planning
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: stock_planning
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: stock_planning
+#: selection:stock.planning.sale.prevision,state:0
+msgid "Validated"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_prevision_form_my
+#: model:ir.ui.menu,name:stock_planning.menu_stock_prevision_my
+msgid "My Sales Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,to_procure:0
+msgid "Planned In"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,outgoing_left:0
+msgid "Expected Out"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,product_id:0
+#: field:stock.planning.sale.prevision,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning.sale.prevision,amt_sold:0
+msgid "Real Amount Sold"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_prevision_current
+msgid "Sales Previsions of Current Period"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning.period:0
+msgid "Create Daily Periods"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_period
+msgid "stock.period"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period,name:0
+#: field:stock.planning.period,name:0
+msgid "Period Name"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+#: view:stock.planning.period:0
+msgid "Stock Periods"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_planning_sale_prevision
+msgid "stock.planning.sale.prevision"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning.sale.prevision:0
+msgid "Validate"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Stock"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: field:stock.planning,incoming:0
+msgid "Confirmed In"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,product_uom:0
+msgid "UoM"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,planned_sale:0
+msgid "Planned Sales"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period,date_stop:0
+#: field:stock.planning.period,date_stop:0
+msgid "End Date"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning.period:0
+msgid "Create Weekly Periods"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,name:0
+#: field:stock.planning.sale.prevision,name:0
+msgid "Name"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning.period:0
+msgid "Create Monthly Periods"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_manual_plannification
+msgid "Plannification"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,incoming_left:0
+msgid "Expected In"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,stock_start:0
+msgid "Stock Start"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_prevision
+msgid "Sales Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning.sale.prevision,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_prevision_all
+msgid "All Sales Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Stock Period"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_planning_period
+msgid "stock.planning.period"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.module.module,description:stock_planning.module_meta_information
+msgid "\n"
+"This module allows you to manage the planning of procurements based on sales\n"
+"forecasts, confirmed orders (customers and suppliers), stock movements, etc.\n"
+"You can planify expected outputs and inputs for each warehouses. It also works\n"
+"to manage all kind of procurements like purchase orders. That's why it is\n"
+"called Master Procurement Schedule instead of the classic Master Production\n"
+"Schedule therminology.\n"
+""
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning.sale.prevision,product_amt:0
+msgid "Product Amount"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning.sale.prevision,user_id:0
+msgid "Salesman"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_period
+msgid "Create Sales Periods"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,line_time:0
+msgid "Past/Future"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period
+msgid "Stock and Sales Periods"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning.sale.prevision,product_qty:0
+msgid "Product Quantity"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_planning
+msgid "stock.planning"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_prevision_my_current
+msgid "My Previsions of Current Period"
+msgstr ""
+
+#. module: stock_planning
+#: selection:stock.planning,state:0
+msgid "Done"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning.period,period_ids:0
+msgid "Periods"
+msgstr ""
+
+#. module: stock_planning
+#: selection:stock.period,state:0
+msgid "Close"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period,date_start:0
+#: field:stock.planning.period,date_start:0
+msgid "Start Date"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: view:stock.planning.sale.prevision:0
+msgid "Stock Planning"
+msgstr ""
+
+#. module: stock_planning
+#: selection:stock.period,state:0
+msgid "Open"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "Cannot delete Validated Sale Previsions !"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning.period:0
+msgid "Create periods for Sale Planning"
+msgstr ""
+
diff --git a/addons/stock_planning/i18n/stock_planning.pot b/addons/stock_planning/i18n/stock_planning.pot
new file mode 100644
index 00000000000..26248a47bec
--- /dev/null
+++ b/addons/stock_planning/i18n/stock_planning.pot
@@ -0,0 +1,346 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* stock_planning
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-26 06:00:58+0000\n"
+"PO-Revision-Date: 2009-11-26 06:00:58+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Procure Incoming Left"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_prevision_form
+#: view:stock.planning.sale.prevision:0
+msgid "Sales Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: field:stock.planning,planned_outgoing:0
+msgid "Planned Out"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,outgoing:0
+msgid "Confirmed Out"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
+#: model:ir.module.module,shortdesc:stock_planning.module_meta_information
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
+#: view:stock.planning:0
+msgid "Master Procurement Schedule"
+msgstr ""
+
+#. module: stock_planning
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,period_id:0
+#: field:stock.planning.sale.prevision,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period,state:0
+#: field:stock.planning,state:0
+#: field:stock.planning.sale.prevision,state:0
+msgid "State"
+msgstr ""
+
+#. module: stock_planning
+#: selection:stock.period,state:0
+#: selection:stock.planning,state:0
+#: selection:stock.planning.sale.prevision,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_period_form
+msgid "Stock Planning Periods"
+msgstr ""
+
+#. module: stock_planning
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: stock_planning
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: stock_planning
+#: selection:stock.planning.sale.prevision,state:0
+msgid "Validated"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_prevision_form_my
+#: model:ir.ui.menu,name:stock_planning.menu_stock_prevision_my
+msgid "My Sales Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,to_procure:0
+msgid "Planned In"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,outgoing_left:0
+msgid "Expected Out"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,product_id:0
+#: field:stock.planning.sale.prevision,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning.sale.prevision,amt_sold:0
+msgid "Real Amount Sold"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_prevision_current
+msgid "Sales Previsions of Current Period"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning.period:0
+msgid "Create Daily Periods"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_period
+msgid "stock.period"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period,name:0
+#: field:stock.planning.period,name:0
+msgid "Period Name"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+#: view:stock.planning.period:0
+msgid "Stock Periods"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_planning_sale_prevision
+msgid "stock.planning.sale.prevision"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning.sale.prevision:0
+msgid "Validate"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Stock"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: field:stock.planning,incoming:0
+msgid "Confirmed In"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,product_uom:0
+msgid "UoM"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,planned_sale:0
+msgid "Planned Sales"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period,date_stop:0
+#: field:stock.planning.period,date_stop:0
+msgid "End Date"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning.period:0
+msgid "Create Weekly Periods"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,name:0
+#: field:stock.planning.sale.prevision,name:0
+msgid "Name"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning.period:0
+msgid "Create Monthly Periods"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_manual_plannification
+msgid "Plannification"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,incoming_left:0
+msgid "Expected In"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,stock_start:0
+msgid "Stock Start"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_prevision
+msgid "Sales Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning.sale.prevision,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_prevision_all
+msgid "All Sales Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Stock Period"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_planning_period
+msgid "stock.planning.period"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.module.module,description:stock_planning.module_meta_information
+msgid "\n"
+"This module allows you to manage the planning of procurements based on sales\n"
+"forecasts, confirmed orders (customers and suppliers), stock movements, etc.\n"
+"You can planify expected outputs and inputs for each warehouses. It also works\n"
+"to manage all kind of procurements like purchase orders. That's why it is\n"
+"called Master Procurement Schedule instead of the classic Master Production\n"
+"Schedule therminology.\n"
+""
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning.sale.prevision,product_amt:0
+msgid "Product Amount"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning.sale.prevision,user_id:0
+msgid "Salesman"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_period
+msgid "Create Sales Periods"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,line_time:0
+msgid "Past/Future"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period
+msgid "Stock and Sales Periods"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning.sale.prevision,product_qty:0
+msgid "Product Quantity"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_planning
+msgid "stock.planning"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_prevision_my_current
+msgid "My Previsions of Current Period"
+msgstr ""
+
+#. module: stock_planning
+#: selection:stock.planning,state:0
+msgid "Done"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning.period,period_ids:0
+msgid "Periods"
+msgstr ""
+
+#. module: stock_planning
+#: selection:stock.period,state:0
+msgid "Close"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period,date_start:0
+#: field:stock.planning.period,date_start:0
+msgid "Start Date"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: view:stock.planning.sale.prevision:0
+msgid "Stock Planning"
+msgstr ""
+
+#. module: stock_planning
+#: selection:stock.period,state:0
+msgid "Open"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "Cannot delete Validated Sale Previsions !"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning.period:0
+msgid "Create periods for Sale Planning"
+msgstr ""
+
diff --git a/addons/stock_planning/security/ir.model.access.csv b/addons/stock_planning/security/ir.model.access.csv
new file mode 100644
index 00000000000..d08ea10a657
--- /dev/null
+++ b/addons/stock_planning/security/ir.model.access.csv
@@ -0,0 +1,5 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_stock_planning","stock.planning","model_stock_planning","stock.group_stock_user",1,1,1,1
+"access_stock_planning_period","stock.planning.period","model_stock_planning_period","stock.group_stock_user",1,0,0,0
+"access_stock_period","stock.period","model_stock_period","stock.group_stock_user",1,0,0,0
+"access_stock_planning_sale_prevision","stock.planning.sale.prevision","model_stock_planning_sale_prevision","stock.group_stock_user",1,0,0,0
diff --git a/addons/stock_planning/stock_planning.py b/addons/stock_planning/stock_planning.py
new file mode 100644
index 00000000000..421b18ee9e0
--- /dev/null
+++ b/addons/stock_planning/stock_planning.py
@@ -0,0 +1,338 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields,osv
+import pooler
+from tools import config
+import time
+import netsvc
+import math
+import mx.DateTime
+from mx.DateTime import RelativeDateTime, now, DateTime, localtime
+from tools.translate import _
+
+class stock_planning_period(osv.osv_memory):
+    _name = "stock.planning.period"
+    _description = "Create Planning Period"
+    
+    def _get_latest_period(self,cr,uid,context={}):
+        cr.execute("select max(date_stop) from stock_period")
+        result=cr.fetchone()        
+        return result and result[0] or False
+
+    _columns = {
+        'name': fields.char('Period Name', size=64),
+        'date_start': fields.date('Start Date', required=True),
+        'date_stop': fields.date('End Date', required=True),
+        'period_ids': fields.one2many('stock.period', 'planning_id', 'Periods'),
+    }
+    _defaults={
+        'date_start':_get_latest_period,
+    }
+    
+    def create_period_weekly(self,cr, uid, ids, context={}):
+        res=self.create_period(cr, uid, ids, context, 6, 'Weekly')
+        return {
+                'view_type': 'form',
+                "view_mode": 'tree',
+                'res_model': 'stock.period',
+                'type': 'ir.actions.act_window',                
+            }
+    
+    def create_period_monthly(self,cr, uid, ids, context={},interval=1):
+        for p in self.browse(cr, uid, ids, context):
+            dt = p.date_start
+            ds = mx.DateTime.strptime(p.date_start, '%Y-%m-%d')
+            while ds.strftime('%Y-%m-%d')<p.date_stop:
+                de = ds + RelativeDateTime(months=interval, days=-1)
+                self.pool.get('stock.period').create(cr, uid, {
+                    'name': ds.strftime('%Y/%m'),
+                    'date_start': ds.strftime('%Y-%m-%d'),
+                    'date_stop': de.strftime('%Y-%m-%d'),                    
+                })
+                ds = ds + RelativeDateTime(months=interval)
+        return {
+                'view_type': 'form',
+                "view_mode": 'tree',
+                'res_model': 'stock.period',
+                'type': 'ir.actions.act_window',                
+            }
+
+    def create_period(self,cr, uid, ids, context={}, interval=0, name='Daily'):
+        for p in self.browse(cr, uid, ids, context):
+            dt = p.date_start
+            ds = mx.DateTime.strptime(p.date_start, '%Y-%m-%d')            
+            while ds.strftime('%Y-%m-%d')<p.date_stop:
+                de = ds + RelativeDateTime(days=interval)
+                if name=='Daily':
+                    new_name=de.strftime('%Y-%m-%d')
+                if name=="Weekly":
+                    new_name=de.strftime('%Y, week %W')
+                self.pool.get('stock.period').create(cr, uid, {
+                    'name': new_name,
+                    'date_start': ds.strftime('%Y-%m-%d'),
+                    'date_stop': de.strftime('%Y-%m-%d'),
+                })
+                ds = ds + RelativeDateTime(days=interval) + 1
+        return {
+                'view_type': 'form',
+                "view_mode": 'tree',
+                'res_model': 'stock.period',
+                'type': 'ir.actions.act_window',                
+            }
+stock_planning_period()
+
+
+class stock_period(osv.osv):
+    _name = "stock.period"
+    _description = "Stock Period"
+    
+    _columns = {
+        'name': fields.char('Period Name', size=64),
+        'date_start': fields.datetime('Start Date', required=True),
+        'date_stop': fields.datetime('End Date', required=True),        
+        'state' : fields.selection([('draft','Draft'),('open','Open'),('close','Close')],'State')
+    }
+    _defaults = {
+        'state' : lambda * a : 'draft'
+    }
+stock_period()
+
+
+class stock_planning_sale_prevision(osv.osv):
+    _name = "stock.planning.sale.prevision"
+    _description = "Stock Planning Sale Prevision"
+    
+    def _get_real_amt_sold(self, cr, uid, ids, field, arg, context):
+        res = {}
+        for val in self.browse(cr, uid, ids):
+            cr.execute("select sum(l.product_uom_qty) from sale_order_line l left join sale_order s on (s.id=l.order_id) where l.product_id = %s and s.state not in ('draft','cancel')", (val.product_id.id,))
+            ret = cr.fetchall()
+            res[val.id] = ret[0][0]
+        return res
+    
+    _columns = {
+        'name' : fields.char('Name', size=64),
+        'user_id': fields.many2one('res.users' , 'Salesman',readonly=True, states={'draft':[('readonly',False)]}),
+        'period_id': fields.many2one('stock.period' , 'Period', required=True),
+        'product_id': fields.many2one('product.product' , 'Product', readonly=True, required=True,states={'draft':[('readonly',False)]}),
+        'product_qty' : fields.float('Product Quantity', required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'product_amt' : fields.float('Product Amount', readonly=True, states={'draft':[('readonly',False)]}),
+        'product_uom' : fields.many2one('product.uom', 'Product UoM', readonly=True, required=True, states={'draft':[('readonly',False)]}),
+        'amt_sold' : fields.function(_get_real_amt_sold, method=True, string='Real Amount Sold'),
+        'state' : fields.selection([('draft','Draft'),('validated','Validated')],'State',readonly=True),
+    }
+    _defaults = {
+        'state': lambda *args: 'draft'
+    }
+    def action_validate(self, cr, uid, ids, *args):
+        self.write(cr, uid, ids, {'state':'validated'})
+        return True
+    
+    def unlink(self, cr, uid, ids, context={}):
+        previsions = self.read(cr, uid, ids, ['state'])
+        unlink_ids = []
+        for t in previsions:
+            if t['state'] in ('draft'):
+                unlink_ids.append(t['id'])
+            else:
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Validated Sale Previsions !'))
+        osv.osv.unlink(self, cr, uid, unlink_ids,context=context)
+        return True
+    
+    def product_id_change(self, cr, uid, ids, product, uom=False, product_qty = 0, product_amt = 0.0):
+        if not product:
+            return {'value': {'product_qty' : 0.0, 'product_uom': False},'domain': {'product_uom': []}}
+
+        product_obj =  self.pool.get('product.product').browse(cr, uid, product)
+        result = {}
+        if not uom:
+            result['product_uom'] = product_obj.uom_id.id
+            domain = {'product_uom':
+                        [('category_id', '=', product_obj.uom_id.category_id.id)],}
+        if product_amt:
+            result['product_qty'] = math.floor(product_amt/(product_obj.product_tmpl_id.list_price))
+            
+        return {'value': result}
+    
+stock_planning_sale_prevision()
+
+class stock_planning(osv.osv):
+    _name = "stock.planning"
+    _description = "Stock Planning"
+    
+    def _get_product_qty(self, cr, uid, ids, field_names, arg, context):
+        res = {}
+        if not context:
+            context = {}
+        mapping = {
+            'incoming': {
+                'field': "incoming_qty",
+                'adapter': lambda x: x,
+            },
+            'outgoing': {
+                'field': "outgoing_qty",
+                'adapter': lambda x: -x,
+            },
+        }
+
+        for val in self.browse(cr, uid, ids):
+            res[val.id] = {}
+            context['from_date'] = val.period_id.date_start
+            context['to_date'] = val.period_id.date_stop
+            context['warehouse'] = val.warehouse_id.id or False
+            product_obj =  self.pool.get('product.product').read(cr, uid,val.product_id.id,[], context)
+            for fn in field_names:
+                product_qty = product_obj[mapping[fn]['field']]
+                res[val.id][fn] = mapping[fn]['adapter'](product_qty)
+        return res
+    
+    def _get_planned_sale(self, cr, uid, ids, field_name, arg, context):
+        res = {}
+        for val in self.browse(cr, uid, ids):
+            cr.execute('select sum(product_qty) from stock_planning_sale_prevision where product_id = %s and period_id = %s',(val.product_id.id,val.period_id.id))
+            product_qty = cr.fetchall()[0][0]
+            res[val.id] = product_qty
+        return res
+    
+    def _get_stock_start(self, cr, uid, ids, field_name, arg, context):
+        res = {}
+        for val in self.browse(cr, uid, ids):
+            res[val.id] = 0.0
+            context['from_date'] = val.period_id.date_start
+            context['to_date'] = val.period_id.date_stop
+            context['warehouse'] = val.warehouse_id.id or False
+            current_date =  time.strftime('%Y-%m-%d')
+            product_obj =  self.pool.get('product.product').browse(cr, uid,val.product_id.id,[], context)
+            if current_date > val.period_id.date_stop:
+                pass
+            elif current_date > val.period_id.date_start and current_date < val.period_id.date_stop:
+                res[val.id] = product_obj.qty_available
+            else:
+                res[val.id] = product_obj.qty_available + (val.to_procure - val.planned_outgoing)
+        return res
+    
+    def _get_value_left(self, cr, uid, ids, field_names, arg, context):
+        res = {}
+        for val in self.browse(cr, uid, ids):
+            res[val.id] = {}
+            if field_names[0] == 'incoming_left':
+                ret = val.to_procure-val.incoming
+            if  field_names[0] == 'outgoing_left':
+                ret = val.planned_outgoing-val.outgoing
+            res[val.id][field_names[0]] = ret
+        return res
+    
+    def _get_past_future(self, cr, uid, ids, field_names, arg, context):
+        res = {}
+        for val in self.browse(cr, uid, ids):
+            if val.period_id.date_stop < time.strftime('%Y-%m-%d'):
+                res[val.id] = 'Past'
+            else:
+                res[val.id] = 'Future'
+        return res
+    
+    def _get_period_id(self, cr, uid, context={}):
+#        cr.execute()
+        res = {}
+        return res   
+
+
+    _columns = {
+        'name' : fields.char('Name', size=64),
+        'state' : fields.selection([('draft','Draft'),('done','Done')],'State',readonly=True),
+        'period_id': fields.many2one('stock.period' , 'Period', required=True),
+        'product_id': fields.many2one('product.product' , 'Product', required=True),
+        'product_uom' : fields.many2one('product.uom', 'UoM', required=True),
+        'planned_outgoing' : fields.float('Forecast Out', required=True),
+        'planned_sale': fields.function(_get_planned_sale, method=True, string='Sales Forecast'),
+        'stock_start': fields.function(_get_stock_start, method=True, string='Stock Simulation'),
+        'incoming': fields.function(_get_product_qty, method=True, type='float', string='Confirmed In', multi='incoming'),
+        'outgoing': fields.function(_get_product_qty, method=True, type='float', string='Confirmed Out', multi='outgoing'),
+        'incoming_left': fields.function(_get_value_left, method=True, string='Delta In', multi="stock_incoming_left"),
+        'outgoing_left': fields.function(_get_value_left, method=True, string='Delta Out', multi="outgoing_left"),
+        'to_procure': fields.float(string='Forecast In', required=True),
+        'warehouse_id' : fields.many2one('stock.warehouse','Warehouse'),
+        'line_time' : fields.function(_get_past_future, method=True,type='char', string='Past/Future'),
+    }
+    _defaults = {
+        'state': lambda *args: 'draft' ,
+        'period_id': _get_period_id
+    }   
+    
+    _order = 'period_id'
+    
+    def procure_incomming_left(self, cr, uid, ids, context, *args):
+        result = {}
+        for obj in self.browse(cr, uid, ids):
+            # source location is virtual procurement location for the product (will be mapped to supplier or
+            # production location by mrp workflow)
+            src_id = obj.product_id.property_stock_procurement and obj.product_id.property_stock_procurement.id
+            # target location is input location of selected warehouse
+            location_id = obj.warehouse_id and obj.warehouse_id.lot_input_id.id or False
+            if location_id and src_id:
+                move_id = self.pool.get('stock.move').create(cr, uid, {
+                                'name': obj.product_id.name[:64],
+                                'product_id': obj.product_id.id,
+                                'date_planned': obj.period_id.date_start,
+                                'product_qty': obj.incoming_left,
+                                'product_uom': obj.product_uom.id,
+                                'product_uos_qty': obj.incoming_left,
+                                'product_uos': obj.product_uom.id,
+                                'location_id': src_id,
+                                'location_dest_id': location_id,
+                                'state': 'waiting',
+                            })
+                proc_id = self.pool.get('mrp.procurement').create(cr, uid, {
+                                'name': _('Procure Delta In From MPS'),
+                                'origin': 'Stock Planning',
+                                'date_planned': obj.period_id.date_start,
+                                'product_id': obj.product_id.id,
+                                'product_qty': obj.incoming_left,
+                                'product_uom': obj.product_uom.id,
+                                'product_uos_qty': obj.incoming_left,
+                                'product_uos': obj.product_uom.id,
+                                'location_id': location_id,
+                                'procure_method': obj.product_id.product_tmpl_id.procure_method,
+                                'move_id': move_id,
+                            })
+                wf_service = netsvc.LocalService("workflow")
+                wf_service.trg_validate(uid, 'mrp.procurement', proc_id, 'button_confirm', cr)
+                self.write(cr, uid, obj.id,{'state':'done'})
+            else:
+                raise osv.except_osv(_('Warning'), _('Please specify a warehouse to create the procurement'))
+        return True
+    
+    
+    def product_id_change(self, cr, uid, ids, product, uom=False):
+        if not product:
+            return {'value': { 'product_uom': False},'domain': {'product_uom': []}}
+        product_obj =  self.pool.get('product.product').browse(cr, uid, product)
+        result = {}
+        if not uom:
+            result['product_uom'] = product_obj.uom_id.id
+            domain = {'product_uom':
+                        [('category_id', '=', product_obj.uom_id.category_id.id)],}
+        return {'value': result}
+stock_planning()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
new file mode 100644
index 00000000000..509de0527b7
--- /dev/null
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+    <record id="view_stock_planning_period_form" model="ir.ui.view">
+            <field name="name">stock.planning.period.form</field>
+            <field name="model">stock.planning.period</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Stock Periods">
+                    <separator colspan="4" string="Create periods for Sale Planning"/>
+                    <field name="date_start"/>
+                    <field name="date_stop"/>                             
+                    <separator colspan="4" string=""/>        
+                    <group col="4" colspan="4">
+                    	<button special="cancel" string="Cancel" />
+                        <button name="create_period" string="Create Daily Periods" type="object"/>
+                        <button name="create_period_weekly" string="Create Weekly Periods" type="object"/>
+                        <button name="create_period_monthly" string="Create Monthly Periods" type="object"/>
+                    </group> 
+                </form>
+            </field>
+        </record>      
+        
+        
+        <record id="action_stock_planning_period_form" model="ir.actions.act_window">
+            <field name="name">Stock Planning Periods</field>
+            <field name="res_model">stock.planning.period</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_stock_planning_period_form"/>
+            <field name="target">new</field>
+        </record>
+        
+        <menuitem id="menu_stock_planning_main" name="Sales Planning Periods" parent="base.menu_base_config"/>
+        <menuitem id="menu_stock_planning_period_create" parent="menu_stock_planning_main" action="action_stock_planning_period_form"/>
+        
+        <record id="view_stock_period_form" model="ir.ui.view">
+            <field name="name">stock.period.form</field>
+            <field name="model">stock.period</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Stock Periods">
+                    <field name="name" select="1"/>
+                    <field name="date_start"/>
+                    <field name="date_stop"/>
+                    <field name="state"/>
+                </form>
+            </field>
+        </record>
+        
+        <record id="view_stock_period_tree" model="ir.ui.view">
+            <field name="name">stock.period.tree</field>
+            <field name="model">stock.period</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Stock Period" editable="bottom">
+                    <field name="name"/>
+                    <field name="date_start"/>
+                    <field name="date_stop"/>
+                    <field name="state" select="1"/>
+                </tree>
+            </field>
+        </record>
+        
+        <record id="action_stock_period_form" model="ir.actions.act_window">
+            <field name="name">Stock and Sales Periods</field>
+            <field name="res_model">stock.period</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem
+            id="menu_stock_period"
+            parent="menu_stock_planning_main"
+            action="action_stock_period_form"/>
+        
+        <record id="view_stock_planning_prevision_form" model="ir.ui.view">
+            <field name="name">stock.planning.sale.prevision.form</field>
+            <field name="model">stock.planning.sale.prevision</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Sales Forecast">
+                    <field name="user_id" select="1"/>
+                    <field name="period_id" select="1"/>
+                    <field name="product_id" on_change="product_id_change(product_id,product_uom,product_qty,product_amt)" />
+                    <field name="product_qty" on_change="product_id_change(product_id,product_uom,product_qty,product_amt)" />
+                    <field name="product_amt" on_change="product_id_change(product_id,product_uom,product_qty,product_amt)" />
+                    <field name="product_uom" on_change="product_id_change(product_id,product_uom,product_qty,product_amt)" />
+                    <field name="amt_sold"/>
+                    <field name="state" colspan="2"/>
+                    <button name="action_validate" string="Validate" states="draft" type="object" colspan="2"/>
+                </form>
+            </field>
+        </record>
+        
+        <record id="view_stock_planning_prevision_tree" model="ir.ui.view">
+             <field name="name">stock.planning.sale.prevision.tree</field>
+            <field name="model">stock.planning.sale.prevision</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Sales Forecast" editable="bottom">
+                    <field name="user_id" select="1"/>
+                    <field name="period_id" select="1"/>
+                    <field name="product_id" select="1" on_change="product_id_change(product_id,product_uom)" />
+                    <field name="product_qty"/>
+                    <field name="product_uom" on_change="product_id_change(product_id,product_uom)" />
+                </tree>
+            </field>
+        </record>
+        
+        <record id="view_stock_planning_prevision_filter" model="ir.ui.view">
+             <field name="name">stock.planning.sale.prevision.filter</field>
+            <field name="model">stock.planning.sale.prevision</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Sales Forecast">
+                	<filter string="Current" domain="[('user_id','=',uid)]" icon="gtk-execute" help="Current Sales Forecasts"/>
+                    <field name="period_id" select="1"/>
+                    <field name="product_id" select="1"/>
+                    <field name="user_id" widget="selection" select="1">
+                    	<filter domain="[('user_id','=',uid)]" icon="gtk-execute" help="My Forecasts" default="1"/>
+                    </field>
+                </search>
+            </field>
+        </record>
+        
+       <record id="view_stock_planning_prevision_graph" model="ir.ui.view">
+             <field name="name">stock.planning.sale.prevision.graph</field>
+            <field name="model">stock.planning.sale.prevision</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Stock Planning" type = "bar">
+                    <field name="product_id" select="1"/>
+                    <field name="product_qty"/>
+                </graph>
+            </field>
+        </record>
+        
+        
+        <record id="action_view_stock_planning_prevision_form" model="ir.actions.act_window">
+            <field name="name">Sales Forecast</field>
+            <field name="res_model">stock.planning.sale.prevision</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,graph</field>
+        </record>
+        
+        <record id="action_view_stock_planning_prevision_form_my" model="ir.actions.act_window">
+            <field name="name">My Sales Forecasts</field>
+            <field name="res_model">stock.planning.sale.prevision</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('user_id','=',uid)]</field>
+        </record>
+        
+        <menuitem id="menu_stock_manual_plannification" name="Procurement Forecast" parent="stock.menu_stock_root"/>
+        
+        <menuitem id="menu_stock_prevision" name="Sales Forecasts" parent="base.menu_sales"/>
+        
+        <menuitem id="menu_stock_prevision_all" name="Sales Forecasts" parent="menu_stock_prevision" action="action_view_stock_planning_prevision_form"/>
+        
+<!--        <menuitem id="menu_stock_prevision_current" name="Sales Forecast of Current Period" parent="menu_stock_prevision_all" action="action_view_stock_planning_prevision_form"/>-->
+
+<!--        <menuitem id="menu_stock_prevision_my" name="My Sales Forecasts" parent="menu_stock_prevision" action="action_view_stock_planning_prevision_form_my"/>-->
+
+<!--        <menuitem id="menu_stock_prevision_my_current" name="My Forecasts of Current Period" parent="menu_stock_prevision_my" action="action_view_stock_planning_prevision_form"/>-->
+        
+        <record id="view_stock_planning_form" model="ir.ui.view">
+            <field name="name">stock.planning.form</field>
+            <field name="model">stock.planning</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Stock Planning">
+                	<separator string="Product Information" colspan="4"/> 
+                	<group colspan="4">
+                    	<field name="period_id" select="1"/>
+                    	<field name="warehouse_id"/>
+                    	<field name="product_id" select="1" on_change="product_id_change(product_id,product_uom)" />
+                    	<field name="product_uom" on_change="product_id_change(product_id,product_uom)" />
+                    </group>
+                    <separator string="Forecast" colspan="4"/>
+                    <group colspan="4" col="6">
+	                    <field name="planned_sale"/>
+                    	<field name="stock_start"/>
+                    	<newline/>					
+	                    <field name="planned_outgoing"/>
+	                    <field name="outgoing"/>
+	                    <field name="outgoing_left"/>
+	                    <field name="to_procure"/>
+	                    <field name="incoming"/>
+	                    <field name="incoming_left"/>
+                    	<newline/>
+					</group>
+					<separator colspan="4"/>
+                    <field name="state"/>
+                    <button name="procure_incomming_left" states="draft" 
+                    	confirm="Are you sure you want to create a Procurement Order using 'Delta In' quantity, for the given Warehouse?" string="Procure Delta In" type="object"/>
+                </form>
+            </field>
+        </record>
+        <record id="view_stock_planning_tree" model="ir.ui.view">
+             <field name="name">stock.planning.tree</field>
+            <field name="model">stock.planning</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Master Procurement Schedule" editable="bottom" colors ="blue:line_time=='Past';black:line_time=='Future'">
+                    <field name="period_id" select="1"/>
+                    <field name="product_id" select="1" on_change="product_id_change(product_id,product_uom)" />
+                    <field name="product_uom" on_change="product_id_change(product_id,product_uom)" />
+                    <field name="stock_start" string="Stock Simulation"/>
+                    <field name="planned_sale"/>
+                    <field name="planned_outgoing"/>
+                    <field name="outgoing" />
+                    <field name="outgoing_left"/>
+                    <field name="to_procure"/>
+                    <field name="incoming" string="Confirmed In"/>
+                    <field name="incoming_left"/>
+                    <field name="line_time"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="action_view_stock_planning_form" model="ir.actions.act_window">
+            <field name="name">Master Procurement Schedule</field>
+            <field name="res_model">stock.planning</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem
+            id="menu_stock_planning" 
+            parent="menu_stock_manual_plannification"
+            action="action_view_stock_planning_form"/>
+        
+</data>
+</openerp>

From 3d052f10fdf1761942a795fbee934c0ca3878e82 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Thu, 11 Mar 2010 18:37:21 +0530
Subject: [PATCH 096/251] [IMP]: auction: removed _ from function called from
 button

bzr revid: atp@tinyerp.co.in-20100311130721-ytlq6asz1onr9ue5
---
 addons/auction/wizard/auction_lots_able.py                    | 2 +-
 addons/auction/wizard/auction_lots_able_view.xml              | 2 +-
 addons/auction/wizard/auction_lots_auction_move.py            | 2 +-
 addons/auction/wizard/auction_lots_auction_move_view.xml      | 2 +-
 addons/auction/wizard/auction_lots_enable.py                  | 2 +-
 addons/auction/wizard/auction_lots_enable_view.xml            | 2 +-
 addons/auction/wizard/auction_lots_make_invoice.py            | 2 +-
 addons/auction/wizard/auction_lots_make_invoice_buyer.py      | 2 +-
 .../auction/wizard/auction_lots_make_invoice_buyer_view.xml   | 2 +-
 addons/auction/wizard/auction_lots_make_invoice_view.xml      | 2 +-
 addons/auction/wizard/auction_lots_sms_send.py                | 2 +-
 addons/auction/wizard/auction_lots_sms_send_view.xml          | 2 +-
 addons/auction/wizard/auction_pay_buy.py                      | 2 +-
 addons/auction/wizard/auction_pay_buy_view.xml                | 2 +-
 addons/auction/wizard/auction_pay_sel.py                      | 2 +-
 addons/auction/wizard/auction_pay_sel_view.xml                | 2 +-
 addons/auction/wizard/auction_payer_sel.py                    | 4 ++--
 addons/auction/wizard/auction_payer_sel_view.xml              | 4 ++--
 addons/auction/wizard/auction_taken.py                        | 2 +-
 addons/auction/wizard/auction_taken_view.xml                  | 2 +-
 20 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/addons/auction/wizard/auction_lots_able.py b/addons/auction/wizard/auction_lots_able.py
index 686d26c0341..8ddeeca8055 100644
--- a/addons/auction/wizard/auction_lots_able.py
+++ b/addons/auction/wizard/auction_lots_able.py
@@ -31,7 +31,7 @@ class auction_lots_able(osv.osv_memory):
     _name = "auction.lots.able"
     _description = "Lots able"
     
-    def _confirm_able(self, cr, uid, ids, context={}):
+    def confirm_able(self, cr, uid, ids, context={}):
         """
             This function Update auction lots object and set taken away field true.
             @param cr: the current row, from the database cursor,
diff --git a/addons/auction/wizard/auction_lots_able_view.xml b/addons/auction/wizard/auction_lots_able_view.xml
index 374390a1404..c0ac577a8d7 100644
--- a/addons/auction/wizard/auction_lots_able_view.xml
+++ b/addons/auction/wizard/auction_lots_able_view.xml
@@ -14,7 +14,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                     	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button  icon="gtk-goto-last" string="Able Taken away" name="_confirm_able" type="object"/>
+                    	<button  icon="gtk-goto-last" string="Able Taken away" name="confirm_able" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/auction/wizard/auction_lots_auction_move.py b/addons/auction/wizard/auction_lots_auction_move.py
index 71e2b16e8e0..28146198b3f 100644
--- a/addons/auction/wizard/auction_lots_auction_move.py
+++ b/addons/auction/wizard/auction_lots_auction_move.py
@@ -43,7 +43,7 @@ class auction_lots_auction_move(osv.osv_memory):
                 raise osv.except_osv('Error !', 'You can not move a lot that has no auction date')
         return {}
     
-    def _auction_move_set(self, cr, uid, ids, context={}):
+    def auction_move_set(self, cr, uid, ids, context={}):
         """
         This Function update auction date on auction lots to given auction date.
         erase the auction lots's object adjudication price and its buyer and change state to draft.
diff --git a/addons/auction/wizard/auction_lots_auction_move_view.xml b/addons/auction/wizard/auction_lots_auction_move_view.xml
index 394a916c96c..0e81697c51b 100644
--- a/addons/auction/wizard/auction_lots_auction_move_view.xml
+++ b/addons/auction/wizard/auction_lots_auction_move_view.xml
@@ -15,7 +15,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                     	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button  icon="gtk-redo" string="Move to Auction date" name="_auction_move_set" type="object"/>
+                    	<button  icon="gtk-redo" string="Move to Auction date" name="auction_move_set" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/auction/wizard/auction_lots_enable.py b/addons/auction/wizard/auction_lots_enable.py
index 9d75ef1a589..e8aa5edadf5 100644
--- a/addons/auction/wizard/auction_lots_enable.py
+++ b/addons/auction/wizard/auction_lots_enable.py
@@ -34,7 +34,7 @@ class auction_lots_enable(osv.osv_memory):
                'confirm_en':fields.integer('Catalog Number')
                }
     
-    def _confirm_enable(self, cr, uid, ids, context={}):
+    def confirm_enable(self, cr, uid, ids, context={}):
         """
         This function Update auction lots object and set taken away field False.
         @param cr: the current row, from the database cursor,
diff --git a/addons/auction/wizard/auction_lots_enable_view.xml b/addons/auction/wizard/auction_lots_enable_view.xml
index e6a6936c5eb..ce99308798c 100644
--- a/addons/auction/wizard/auction_lots_enable_view.xml
+++ b/addons/auction/wizard/auction_lots_enable_view.xml
@@ -14,7 +14,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-goto-last"  string="Enable Taken away" name="_confirm_enable" type="object"/>
+                    	<button icon="gtk-goto-last"  string="Enable Taken away" name="confirm_enable" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/auction/wizard/auction_lots_make_invoice.py b/addons/auction/wizard/auction_lots_make_invoice.py
index 50177f54203..693826d71a0 100644
--- a/addons/auction/wizard/auction_lots_make_invoice.py
+++ b/addons/auction/wizard/auction_lots_make_invoice.py
@@ -47,7 +47,7 @@ class auction_lots_make_invoice(osv.osv_memory):
         object = len(context['active_ids'])
         return object
     
-    def _makeInvoices(self, cr, uid, ids, context):
+    def makeInvoices(self, cr, uid, ids, context):
         """
         seller invoice :Create an invoice.
         @param cr: the current row, from the database cursor.
diff --git a/addons/auction/wizard/auction_lots_make_invoice_buyer.py b/addons/auction/wizard/auction_lots_make_invoice_buyer.py
index b35dc072776..01eec83efe8 100644
--- a/addons/auction/wizard/auction_lots_make_invoice_buyer.py
+++ b/addons/auction/wizard/auction_lots_make_invoice_buyer.py
@@ -57,7 +57,7 @@ class auction_lots_make_invoice_buyer(osv.osv_memory):
             buyer=lot and lot.ach_uid.id or False
         return buyer  
 
-    def _makeInvoices(self, cr, uid, ids, context):
+    def makeInvoices(self, cr, uid, ids, context):
         """
         Create an invoice for selected lots (IDS) to BUYER_ID .
         @param cr: the current row, from the database cursor.
diff --git a/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml b/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
index b45d5bdbb1c..a813ca6c609 100644
--- a/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
+++ b/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
@@ -17,7 +17,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-ok" string="Create invoices" name="_makeInvoices" type="object"/>
+                    	<button icon="gtk-ok" string="Create invoices" name="makeInvoices" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/auction/wizard/auction_lots_make_invoice_view.xml b/addons/auction/wizard/auction_lots_make_invoice_view.xml
index e629942c5d5..4e06d8e15cc 100644
--- a/addons/auction/wizard/auction_lots_make_invoice_view.xml
+++ b/addons/auction/wizard/auction_lots_make_invoice_view.xml
@@ -15,7 +15,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-ok" string="Create invoices" name="_makeInvoices" type="object"/>
+                    	<button icon="gtk-ok" string="Create invoices" name="makeInvoices" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/auction/wizard/auction_lots_sms_send.py b/addons/auction/wizard/auction_lots_sms_send.py
index 95351c6965a..40322cb8b23 100644
--- a/addons/auction/wizard/auction_lots_sms_send.py
+++ b/addons/auction/wizard/auction_lots_sms_send.py
@@ -38,7 +38,7 @@ class auction_lots_sms_send(osv.osv_memory):
                'text':fields.text('SMS Message', required=True)
                }
     
-    def _sms_send(self, cr, uid, ids, context):
+    def sms_send(self, cr, uid, ids, context):
         
         for datas in self.read(cr, uid, ids):
             lots = self.pool.get('auction.lots').read(cr, uid, context['active_ids'], ['obj_num','obj_price','ach_uid'])
diff --git a/addons/auction/wizard/auction_lots_sms_send_view.xml b/addons/auction/wizard/auction_lots_sms_send_view.xml
index 7e57833f72d..b3c49077534 100644
--- a/addons/auction/wizard/auction_lots_sms_send_view.xml
+++ b/addons/auction/wizard/auction_lots_sms_send_view.xml
@@ -19,7 +19,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-go-back" string="Send SMS" name="_sms_send" type="object"/>
+                    	<button icon="gtk-go-back" string="Send SMS" name="sms_send" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/auction/wizard/auction_pay_buy.py b/addons/auction/wizard/auction_pay_buy.py
index 8e7136b0064..b1d31532939 100644
--- a/addons/auction/wizard/auction_pay_buy.py
+++ b/addons/auction/wizard/auction_pay_buy.py
@@ -48,7 +48,7 @@ class auction_pay_buy(osv.osv_memory):
             buyer=lot and lot.ach_uid.id or False
         return buyer
     
-    def _pay_and_reconcile(self, cr, uid, ids, context):
+    def pay_and_reconcile(self, cr, uid, ids, context):
         for datas in self.read(cr, uid, ids):
             if not abs(datas['total'] - (datas['amount'] + datas['amount2'] + datas['amount3'])) <0.01:
                 rest = datas['total']-(datas['amount'] + datas['amount2'] + datas['amount3'])
diff --git a/addons/auction/wizard/auction_pay_buy_view.xml b/addons/auction/wizard/auction_pay_buy_view.xml
index daa0ea2a195..dea8600b477 100644
--- a/addons/auction/wizard/auction_pay_buy_view.xml
+++ b/addons/auction/wizard/auction_pay_buy_view.xml
@@ -21,7 +21,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-yes"  string="Pay" name="_pay_and_reconcile" type="object"/>
+                    	<button icon="gtk-yes"  string="Pay" name="pay_and_reconcile" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/auction/wizard/auction_pay_sel.py b/addons/auction/wizard/auction_pay_sel.py
index 2643a565e3e..ff1e2e781e3 100644
--- a/addons/auction/wizard/auction_pay_sel.py
+++ b/addons/auction/wizard/auction_pay_sel.py
@@ -37,7 +37,7 @@ class auction_pay_sel(osv.osv_memory):
                'period_id':fields.many2one('account.period', 'Period', required=True), 
                }
     
-    def _pay_and_reconcile(self, cr, uid, ids, context):
+    def pay_and_reconcile(self, cr, uid, ids, context):
         lot = self.pool.get('auction.lots').browse(cr, uid, context['active_id'], context)
         for datas in self.read(cr, uid, ids):
             account_id = datas.get('writeoff_acc_id', False)
diff --git a/addons/auction/wizard/auction_pay_sel_view.xml b/addons/auction/wizard/auction_pay_sel_view.xml
index b96f25032ac..2570b7a7a0a 100644
--- a/addons/auction/wizard/auction_pay_sel_view.xml
+++ b/addons/auction/wizard/auction_pay_sel_view.xml
@@ -16,7 +16,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-yes" string="Pay" name="_pay_and_reconcile" type="object"/>
+                    	<button icon="gtk-yes" string="Pay" name="pay_and_reconcile" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/auction/wizard/auction_payer_sel.py b/addons/auction/wizard/auction_payer_sel.py
index b59cbf591cc..349f10d4dec 100644
--- a/addons/auction/wizard/auction_payer_sel.py
+++ b/addons/auction/wizard/auction_payer_sel.py
@@ -32,7 +32,7 @@ class auction_payer(osv.osv_memory):
     _name = "auction.payer"
     _description = "Auction payer"
     
-    def _payer(self, cr, uid, ids, context):
+    def payer(self, cr, uid, ids, context):
         self.pool.get('auction.lots').write(cr, uid, context['active_ids'], {'is_ok':True, 'state':'paid'})
         return {}
     
@@ -45,7 +45,7 @@ class auction_payer_sel(osv.osv_memory):
     _name = "auction.payer.sel"
     _description = "Auction payment for seller"
     
-    def _payer_sel(self, cr, uid, ids, context):
+    def payer_sel(self, cr, uid, ids, context):
         """
         This function Update auction lots object and seller paid  true.
         @param cr: the current row, from the database cursor,
diff --git a/addons/auction/wizard/auction_payer_sel_view.xml b/addons/auction/wizard/auction_payer_sel_view.xml
index 93fe0ef38b1..9e8ca5ec5d2 100644
--- a/addons/auction/wizard/auction_payer_sel_view.xml
+++ b/addons/auction/wizard/auction_payer_sel_view.xml
@@ -10,7 +10,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="2">
                     	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button  icon = "gtk-yes"  string="Pay"   name="_payer" type="object"/>
+                    	<button  icon = "gtk-yes"  string="Pay"   name="payer" type="object"/>
                    </group>
                </form>
             </field>
@@ -25,7 +25,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                     	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button  icon="gtk-yes" string="Pay" name="_payer_sel" type="object"/>
+                    	<button  icon="gtk-yes" string="Pay" name="payer_sel" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/auction/wizard/auction_taken.py b/addons/auction/wizard/auction_taken.py
index 48a5d8cf6af..20ac6482317 100644
--- a/addons/auction/wizard/auction_taken.py
+++ b/addons/auction/wizard/auction_taken.py
@@ -40,7 +40,7 @@ class auction_taken(osv.osv_memory):
     def _to_xml(s):
         return s.replace('&','&amp;').replace('<','&lt;').replace('>','&gt;')
 
-    def _process(self, cr, uid, ids, context):
+    def process(self, cr, uid, ids, context):
           """
           Update Auction lots state to taken_away.
           @param cr: the current row, from the database cursor.
diff --git a/addons/auction/wizard/auction_taken_view.xml b/addons/auction/wizard/auction_taken_view.xml
index 8ed7f730427..626caa473ad 100644
--- a/addons/auction/wizard/auction_taken_view.xml
+++ b/addons/auction/wizard/auction_taken_view.xml
@@ -13,7 +13,7 @@
                     </group>
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                    	<button icon="gtk-ok"  string="OK"  name="_process" type="object" />
+                    	<button icon="gtk-ok"  string="OK"  name="process" type="object" />
                    </group>
                </form>
             </field>

From b7e960c1ee5d2289d300f90a1ce97cfbdc3ca65b Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Thu, 11 Mar 2010 18:55:00 +0530
Subject: [PATCH 097/251] [IMP]: base_calendar: removed _ from function called
 from button

bzr revid: atp@tinyerp.co.in-20100311132500-u20yt7frb0in5bpw
---
 addons/base_calendar/wizard/calendar_event_edit_all.py       | 2 +-
 addons/base_calendar/wizard/calendar_event_edit_all_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base_calendar/wizard/calendar_event_edit_all.py b/addons/base_calendar/wizard/calendar_event_edit_all.py
index 0a7fddadb2a..d13b6ef8b38 100644
--- a/addons/base_calendar/wizard/calendar_event_edit_all.py
+++ b/addons/base_calendar/wizard/calendar_event_edit_all.py
@@ -53,7 +53,7 @@ class calendar_event_edit_all(osv.osv_memory):
                 event = model_obj.read(cr, uid, context['active_id'], ['name', 'location', 'alarm_id'])
                 return event['date_deadline']
 
-    def _modify_this(self, cr, uid, ids, context=None):
+    def modify_this(self, cr, uid, ids, context=None):
         """
         Modify All event for Crm Meeting.
         @param cr: the current row, from the database cursor,
diff --git a/addons/base_calendar/wizard/calendar_event_edit_all_view.xml b/addons/base_calendar/wizard/calendar_event_edit_all_view.xml
index 15bd025441a..8e406c4d8b0 100644
--- a/addons/base_calendar/wizard/calendar_event_edit_all_view.xml
+++ b/addons/base_calendar/wizard/calendar_event_edit_all_view.xml
@@ -22,7 +22,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                     	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button  icon="gtk-save" string="_Save" name="_modify_this" type="object"/>
+                    	<button  icon="gtk-save" string="_Save" name="modify_this" type="object"/>
                    </group>
                </form>
             </field>

From 149920642db79803774c102a176419e58655e842 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Fri, 12 Mar 2010 11:11:52 +0530
Subject: [PATCH 098/251] [IMP] product_margin,stock:Introduce act_window by
 replacing action in wizard & Code optimization in stock

bzr revid: mso@mso-20100312054152-ytyj9c8woj1kp2r9
---
 addons/mrp/wizard/change_production_qty.py          |  2 +-
 addons/product_margin/product_margin_view.xml       |  5 +++--
 addons/product_margin/wizard/product_margin.py      |  2 +-
 .../product_margin/wizard/product_margin_view.xml   | 13 ++++++++++++-
 addons/stock/wizard/stock_inventory_line_split.py   |  7 ++++---
 5 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/addons/mrp/wizard/change_production_qty.py b/addons/mrp/wizard/change_production_qty.py
index 292e8a323a6..0c385a76f00 100644
--- a/addons/mrp/wizard/change_production_qty.py
+++ b/addons/mrp/wizard/change_production_qty.py
@@ -78,7 +78,7 @@ class change_production_qty(osv.osv_memory):
         prod = prod_obj.browse(cr, uid,record_id)
         prod_obj.write(cr, uid,prod.id, {'product_qty': wiz_qty.product_qty})
         prod_obj.action_compute(cr, uid, [prod.id])
-    
+        
         move_lines_obj = self.pool.get('stock.move')
         for move in prod.move_lines:
             bom_point = prod.bom_id
diff --git a/addons/product_margin/product_margin_view.xml b/addons/product_margin/product_margin_view.xml
index 91ab522d62a..4433d30bae9 100644
--- a/addons/product_margin/product_margin_view.xml
+++ b/addons/product_margin/product_margin_view.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
-	
+	<!--   
 	<menuitem id="main" name="OSV Memory Wizard Test"/>
 	<menuitem
-            action="product_margin_action"
+            action="product_margin_act_window"
             id="menu_mrp_property_action"
             parent="main" />
+    -->
             
     <record model="ir.ui.view" id="view_product_margin_graph">
             <field name="name">product.margin.graph</field>
diff --git a/addons/product_margin/wizard/product_margin.py b/addons/product_margin/wizard/product_margin.py
index 4e499eba2a5..acf8a2c157e 100644
--- a/addons/product_margin/wizard/product_margin.py
+++ b/addons/product_margin/wizard/product_margin.py
@@ -32,7 +32,7 @@ class product_margin(osv.osv_memory):
     _name = 'product.margin'
     _description = 'Product Margin'
 
-    def _action_open_window(self, cr, uid, ids, context):
+    def action_open_window(self, cr, uid, ids, context):
         """
             @summary:
 
diff --git a/addons/product_margin/wizard/product_margin_view.xml b/addons/product_margin/wizard/product_margin_view.xml
index 1d2a4746896..4f4cc50e611 100644
--- a/addons/product_margin/wizard/product_margin_view.xml
+++ b/addons/product_margin/wizard/product_margin_view.xml
@@ -13,11 +13,20 @@
 						<field name="invoice_state" />
 						<group col="4" colspan="2">
 						    	<button special="cancel" string="Cancel" type="object"/>
-						    	<button name="_action_open_window" string="Open Margins" type="object"/>
+						    	<button name="action_open_window" string="Open Margins" type="object"/>
 						</group>
 	                </form>
 	            </field>
 	        </record>
+			<act_window name="Test Wizard"
+					res_model="product.margin"
+					src_model="product.product"
+					view_mode="form"
+					target="new"
+					key2="client_action_multi"    
+					id="product_margin_act_window"/>	       
+<!--  	       
+
 	        <record id="product_margin_action" model="ir.actions.act_window">
 	            <field name="name">Product Margine</field>
 	            <field name="type">ir.actions.act_window</field>
@@ -27,5 +36,7 @@
 	            <field name="view_mode">form</field>
 	            <field name="view_id" ref="product_margin_form_view"/>
 	        </record>
+	        
+	        -->
         </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/stock/wizard/stock_inventory_line_split.py b/addons/stock/wizard/stock_inventory_line_split.py
index 19a501478d3..dc2b02e113f 100644
--- a/addons/stock/wizard/stock_inventory_line_split.py
+++ b/addons/stock/wizard/stock_inventory_line_split.py
@@ -54,13 +54,14 @@ inventory lines, make sure the production lot is assigned to this product.'))
         inv_id = context['active_id']
         inv_line_obj = self.pool.get('stock.inventory.line')
         prodlot_obj = self.pool.get('stock.production.lot')
-
+        
         ir_sequence_obj = self.pool.get('ir.sequence')
         sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
+        if not sequence:
+            raise wizard.except_wizard(_('Error!'), _('No production sequence defined'))
 
         for linesplit_obj in self.browse(cr, uid, ids):
-            if not sequence:
-                raise wizard.except_wizard(_('Error!'), _('No production sequence defined'))
+
             if linesplit_obj.prefix:
                 sequence = linesplit_obj.prefix + '/' + (sequence or '')
 

From cf6bab1520755a6c0c0b1fce6b19dd5878e9a383 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 12 Mar 2010 12:09:09 +0530
Subject: [PATCH 099/251] [IMP] point_of_sale: convert the open_statement
 wizard into osv_memory and improve the view and doc string

bzr revid: sbh@tinyerp.com-20100312063909-9i5rucvfqe205s7s
---
 addons/point_of_sale/__terp__.py              |   1 +
 addons/point_of_sale/pos_wizard.xml           |   6 -
 addons/point_of_sale/statement_view.xml       |   3 +-
 addons/point_of_sale/statement_wizard.xml     |  14 +-
 addons/point_of_sale/wizard/__init__.py       |   1 +
 .../point_of_sale/wizard/pos_add_product.py   |   2 +-
 addons/point_of_sale/wizard/pos_confirm.xml   |   6 +-
 .../wizard/pos_open_statement.py              |  90 +++++++++++
 .../wizard/pos_open_statement.xml             |  53 +++++++
 .../wizard/wizard_open_statement.py           | 145 +++++++++---------
 10 files changed, 225 insertions(+), 96 deletions(-)
 create mode 100644 addons/point_of_sale/wizard/pos_open_statement.py
 create mode 100644 addons/point_of_sale/wizard/pos_open_statement.xml

diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__terp__.py
index 415e394b24b..640ed1d67c4 100644
--- a/addons/point_of_sale/__terp__.py
+++ b/addons/point_of_sale/__terp__.py
@@ -47,6 +47,7 @@ Main features :
         'wizard/pos_confirm.xml',
         'wizard/pos_discount.xml',
         'wizard/pos_get_sale.xml',
+        'wizard/pos_open_statement.xml', 
         'pos_view.xml',
         'pos_sequence.xml',
         'posrule_data.xml',
diff --git a/addons/point_of_sale/pos_wizard.xml b/addons/point_of_sale/pos_wizard.xml
index f9396499b0c..aaaeb8cd58a 100644
--- a/addons/point_of_sale/pos_wizard.xml
+++ b/addons/point_of_sale/pos_wizard.xml
@@ -66,12 +66,6 @@
         	menu="False"
         	name="statement.close"
         	string="Close Statements"/>
-  		<wizard
-        	id="open_statement"
-        	model="account.bank.statement"
-        	menu="False"
-        	name="statement.open"
-        	string="Open Statements"/>
 
 
        <wizard
diff --git a/addons/point_of_sale/statement_view.xml b/addons/point_of_sale/statement_view.xml
index e7e7119583d..188e1d72674 100644
--- a/addons/point_of_sale/statement_view.xml
+++ b/addons/point_of_sale/statement_view.xml
@@ -420,8 +420,7 @@
 		<menuitem
             name="Open Statements" parent="point_of_sale.menu_point_config"
             string="Open Statements"
-            action="open_statement"
-            type="wizard"
+            action="action_pos_open_statement"
             id="menu_open_statement" sequence="3" />
        <menuitem icon="STOCK_PRINT"
        			 action="wizard_all_closed_cashbox_of_the_day"
diff --git a/addons/point_of_sale/statement_wizard.xml b/addons/point_of_sale/statement_wizard.xml
index f3bffb15ce1..b6b06bb6765 100644
--- a/addons/point_of_sale/statement_wizard.xml
+++ b/addons/point_of_sale/statement_wizard.xml
@@ -12,19 +12,9 @@
             action="close_statement"
             type="wizard"
             id="menu_close_statement" sequence="4" />
-  		<wizard
-        	id="open_statement"
-        	model="account.bank.statement"
-        	menu="False"
-        	name="statement.open"
-        	string="Open Register"/>
 
-		<menuitem
-            name="Open Register" parent="point_of_sale.menu_point_config"
-            string="Open Register"
-            action="open_statement"
-            type="wizard"
-            id="menu_open_statement" sequence="1" />
+
+
 
        <wizard
         	id="wizard_all_closed_cashbox_of_the_day"
diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index fe16ff175c8..ea7539cba8f 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -39,5 +39,6 @@ import pos_add_product
 import pos_confirm
 import pos_discount
 import pos_get_sale
+import pos_open_statement
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/wizard/pos_add_product.py b/addons/point_of_sale/wizard/pos_add_product.py
index e11dd89e3d9..2f2ce958968 100644
--- a/addons/point_of_sale/wizard/pos_add_product.py
+++ b/addons/point_of_sale/wizard/pos_add_product.py
@@ -42,7 +42,7 @@ class add_product(osv.osv_memory):
              @param cr: A database cursor
              @param uid: ID of the user currently logged in
              @param context: A standard dictionary 
-             @return : Retrun the add product form again for addin more product
+             @return : Retrun the add product form again for adding more product
         """        
         this = self.browse(cr, uid, ids[0], context=context)
         record_id = context and context.get('record_id',False)
diff --git a/addons/point_of_sale/wizard/pos_confirm.xml b/addons/point_of_sale/wizard/pos_confirm.xml
index 2be29ee97c7..6c12afb6766 100644
--- a/addons/point_of_sale/wizard/pos_confirm.xml
+++ b/addons/point_of_sale/wizard/pos_confirm.xml
@@ -4,7 +4,7 @@
         <!--  Point of Sale Confirm -->
         
 		<record id="view_pos_confirm" model="ir.ui.view">
-            <field name="name">Open Statements</field>
+            <field name="name">Sale Confirm</field>
             <field name="model">pos.confirm</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
@@ -20,7 +20,7 @@
         </record>
 
         <record id="action_pos_confirm" model="ir.actions.act_window">
-            <field name="name">Open Statements</field>
+            <field name="name">Sale Confirm</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">pos.confirm</field>
             <field name="view_type">form</field>
@@ -31,7 +31,7 @@
        <record model="ir.values" id="values_pos_confirm">
             <field name="model_id" ref="point_of_sale.model_pos_order" />
             <field name="object" eval="1" />
-            <field name="name">Open Statements</field>
+            <field name="name">Sale Confirm</field>
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_pos_confirm'))"/>
             <field name="key">action</field>
diff --git a/addons/point_of_sale/wizard/pos_open_statement.py b/addons/point_of_sale/wizard/pos_open_statement.py
new file mode 100644
index 00000000000..a3ee7efa6ce
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_open_statement.py
@@ -0,0 +1,90 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import netsvc
+from osv import osv,fields
+from tools.translate import _
+import time
+class pos_open_statement(osv.osv_memory):
+    _name = 'pos.open.statement'
+    _description = 'Open Statements'
+
+    
+    def open_statement(self, cr, uid, ids, context):
+        """ 
+             @summary: open the statements          
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary 
+             @return : Blank Directory 
+        """        
+        company_id=self.pool.get('res.users').browse(cr,uid,uid).company_id.id
+        statement_obj =self.pool.get('account.bank.statement')
+        singer_obj = self.pool.get('singer.statement')
+        journal_obj=self.pool.get('account.journal')
+        journal_lst=journal_obj.search(cr,uid,[('company_id','=',company_id),('auto_cash','=',True)])
+        journal_ids=journal_obj.browse(cr,uid, journal_lst)
+        for journal in journal_ids:
+            ids = statement_obj.search(cr, uid, [('state','!=','confirm'),('user_id','=',uid),('journal_id','=',journal.id)])
+            if len(ids):
+               raise osv.except_osv(_('Message'),_('You can not open a Cashbox for "%s". \n Please close the cashbox related to. '%(journal.name) ))
+            sql = """ Select id from account_bank_statement
+                                    where journal_id=%d
+                                    and company_id =%d
+                                    order by id desc limit 1"""%(journal.id,company_id)
+            singer_ids=None
+            cr.execute(sql)
+            st_id = cr.fetchone()
+            number=''
+            sequence_obj=self.pool.get('ir.sequence')
+            if journal.statement_sequence_id:
+                number = sequence_obj.get_id(cr, uid, journal.id)
+            else:
+                number = sequence_obj.get(cr, uid,
+                                'account.bank.statement')
+    
+    #        statement_id=statement_obj.create(cr,uid,{'journal_id':journal.id,
+    #                                                  'company_id':company_id,
+    #                                                  'user_id':uid,
+    #                                                  'state':'open',
+    #                                                  'name':number
+    #                                                  })
+            period=statement_obj._get_period(cr,uid,context) or None
+            cr.execute("INSERT INTO account_bank_statement(journal_id,company_id,user_id,state,name, period_id,date) VALUES(%d,%d,%d,'open','%s',%d,'%s')"%(journal.id,company_id,uid,number, period, time.strftime('%Y-%m-%d %H:%M:%S')))
+            cr.commit()
+            cr.execute("select id from account_bank_statement where journal_id=%d and company_id=%d and user_id=%d and state='open' and name='%s'"%(journal.id,company_id,uid,number))
+            statement_id=cr.fetchone()[0]
+            if st_id:
+                statemt_id=statement_obj.browse(cr,uid,st_id[0])
+                if statemt_id and statemt_id.ending_details_ids:
+                    statement_obj.write(cr, uid,[statement_id], {'balance_start':statemt_id.balance_end,
+                                                                'state':'open'})
+                    if statemt_id.ending_details_ids:
+                        for i in statemt_id.ending_details_ids:
+                            c=singer_obj.create(cr,uid, { 'pieces':i.pieces,
+                                                        'number':i.number,
+                                                        'starting_id':statement_id,
+                                })
+            cr.commit()
+        return {}
+pos_open_statement()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/pos_open_statement.xml b/addons/point_of_sale/wizard/pos_open_statement.xml
new file mode 100644
index 00000000000..8b43a59836a
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_open_statement.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        
+        <!--  Point of Sale Confirm -->
+        
+		<record id="view_pos_open_statement" model="ir.ui.view">
+            <field name="name">Open Statements</field>
+            <field name="model">pos.open.statement</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Open Statements">
+				     	<label string="Are you sure you want to open the statements ?" colspan="2"/>
+				     	<newline/>
+                		<button icon='gtk-cancel' special="cancel"
+                			string="No" />
+                		<button name="open_statement" string="Yes"
+                			colspan="1" type="object" icon="gtk-ok"/>
+                </form>
+            </field>
+        </record>
+		<act_window name="Open Statements"
+				res_model="pos.open.statement"
+				src_model="account.bank.statement"
+				view_mode="form"
+				target="new"
+				key2="client_action_multi"    
+			id="act_pos_open_statement"/>
+
+        <record id="action_pos_open_statement" model="ir.actions.act_window">
+            <field name="name">Open Register</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.open.statement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="context">{'record_id' : active_id}</field>
+        </record>
+    
+   
+   <menuitem name="Point of Sale" id="menu_point_root" sequence="10"/>
+   <menuitem name="Reporting" parent="menu_point_root" id="menu_point_rep" sequence="5"/>
+       <menuitem name="Register Management" parent="menu_point_root"
+            id="menu_point_config" sequence="3"/>
+		<menuitem
+            name="Open Register" parent="menu_point_config"
+            string="Open Register"
+            action="action_pos_open_statement"
+            id="menu_open_statement" sequence="1" />
+
+
+        
+	</data>
+</openerp>	        
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/wizard_open_statement.py b/addons/point_of_sale/wizard/wizard_open_statement.py
index 09205a97b08..c976d9eb827 100644
--- a/addons/point_of_sale/wizard/wizard_open_statement.py
+++ b/addons/point_of_sale/wizard/wizard_open_statement.py
@@ -50,79 +50,80 @@ def _close_statement(self, cr, uid, data, context):
         ids = statement_obj.search(cr, uid, [('state','!=','confirm'),('user_id','=',uid),('journal_id','=',journal.id)])
         statement_obj.button_confirm(cr,uid,ids)
     return {}
-def _open_statement(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    company_id=pool.get('res.users').browse(cr,uid,uid).company_id.id
-    statement_obj = pool.get('account.bank.statement')
-    singer_obj = pool.get('singer.statement')
-    journal_obj=pool.get('account.journal')
-    journal_lst=journal_obj.search(cr,uid,[('company_id','=',company_id),('auto_cash','=',True)])
-    journal_ids=journal_obj.browse(cr,uid, journal_lst)
-    for journal in journal_ids:
-        ids = statement_obj.search(cr, uid, [('state','!=','confirm'),('user_id','=',uid),('journal_id','=',journal.id)])
-        if len(ids):
-            raise wizard.except_wizard(_('Message'),_('You can not open a Cashbox for "%s". \n Please close the cashbox related to. '%(journal.name) ))
-        sql = """ Select id from account_bank_statement
-                                where journal_id=%d
-                                and company_id =%d
-                                order by id desc limit 1"""%(journal.id,company_id)
-        singer_ids=None
-        cr.execute(sql)
-        st_id = cr.fetchone()
-        number=''
-        if journal.statement_sequence_id:
-            number = pool.get('ir.sequence').get_id(cr, uid, journal.id)
-        else:
-            number = pool.get('ir.sequence').get(cr, uid,
-                            'account.bank.statement')
+#def _open_statement(self, cr, uid, data, context):
+#    print ":::::::::::::::"
+#    pool = pooler.get_pool(cr.dbname)
+#    company_id=pool.get('res.users').browse(cr,uid,uid).company_id.id
+#    statement_obj = pool.get('account.bank.statement')
+#    singer_obj = pool.get('singer.statement')
+#    journal_obj=pool.get('account.journal')
+#    journal_lst=journal_obj.search(cr,uid,[('company_id','=',company_id),('auto_cash','=',True)])
+#    journal_ids=journal_obj.browse(cr,uid, journal_lst)
+#    for journal in journal_ids:
+#        ids = statement_obj.search(cr, uid, [('state','!=','confirm'),('user_id','=',uid),('journal_id','=',journal.id)])
+#        if len(ids):
+#            raise wizard.except_wizard(_('Message'),_('You can not open a Cashbox for "%s". \n Please close the cashbox related to. '%(journal.name) ))
+#        sql = """ Select id from account_bank_statement
+#                                where journal_id=%d
+#                                and company_id =%d
+#                                order by id desc limit 1"""%(journal.id,company_id)
+#        singer_ids=None
+#        cr.execute(sql)
+#        st_id = cr.fetchone()
+#        number=''
+#        if journal.statement_sequence_id:
+#            number = pool.get('ir.sequence').get_id(cr, uid, journal.id)
+#        else:
+#            number = pool.get('ir.sequence').get(cr, uid,
+#                            'account.bank.statement')
+#
+##        statement_id=statement_obj.create(cr,uid,{'journal_id':journal.id,
+##                                                  'company_id':company_id,
+##                                                  'user_id':uid,
+##                                                  'state':'open',
+##                                                  'name':number
+##                                                  })
+#        period=statement_obj._get_period(cr,uid,context) or None
+#        cr.execute("INSERT INTO account_bank_statement(journal_id,company_id,user_id,state,name, period_id,date) VALUES(%d,%d,%d,'open','%s',%d,'%s')"%(journal.id,company_id,uid,number, period, time.strftime('%Y-%m-%d %H:%M:%S')))
+#        cr.commit()
+#        cr.execute("select id from account_bank_statement where journal_id=%d and company_id=%d and user_id=%d and state='open' and name='%s'"%(journal.id,company_id,uid,number))
+#        statement_id=cr.fetchone()[0]
+#        if st_id:
+#            statemt_id=statement_obj.browse(cr,uid,st_id[0])
+#            if statemt_id and statemt_id.ending_details_ids:
+#                statement_obj.write(cr, uid,[statement_id], {'balance_start':statemt_id.balance_end,
+#                                                            'state':'open'})
+#                if statemt_id.ending_details_ids:
+#                    for i in statemt_id.ending_details_ids:
+#                        c=singer_obj.create(cr,uid, { 'pieces':i.pieces,
+#                                                    'number':i.number,
+#                                                    'starting_id':statement_id,
+#                            })
+#        cr.commit()
+#    return {}
 
-#        statement_id=statement_obj.create(cr,uid,{'journal_id':journal.id,
-#                                                  'company_id':company_id,
-#                                                  'user_id':uid,
-#                                                  'state':'open',
-#                                                  'name':number
-#                                                  })
-        period=statement_obj._get_period(cr,uid,context) or None
-        cr.execute("INSERT INTO account_bank_statement(journal_id,company_id,user_id,state,name, period_id,date) VALUES(%d,%d,%d,'open','%s',%d,'%s')"%(journal.id,company_id,uid,number, period, time.strftime('%Y-%m-%d %H:%M:%S')))
-        cr.commit()
-        cr.execute("select id from account_bank_statement where journal_id=%d and company_id=%d and user_id=%d and state='open' and name='%s'"%(journal.id,company_id,uid,number))
-        statement_id=cr.fetchone()[0]
-        if st_id:
-            statemt_id=statement_obj.browse(cr,uid,st_id[0])
-            if statemt_id and statemt_id.ending_details_ids:
-                statement_obj.write(cr, uid,[statement_id], {'balance_start':statemt_id.balance_end,
-                                                            'state':'open'})
-                if statemt_id.ending_details_ids:
-                    for i in statemt_id.ending_details_ids:
-                        c=singer_obj.create(cr,uid, { 'pieces':i.pieces,
-                                                    'number':i.number,
-                                                    'starting_id':statement_id,
-                            })
-        cr.commit()
-    return {}
-
-class statement_open(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {
-                'type': 'form',
-                'arch': statement_form,
-                'fields': statement_fields,
-                'state': (('end', 'No','gtk-cancel'),
-                          ('open', 'Yes', 'gtk-ok', True)
-                         )
-            }
-        },
-        'open': {
-            'actions': [_open_statement],
-            'result': {
-                       'type': 'state',
-#                       'action' :_open_statement,
-                       'state':'end'}
-        },
-    }
-statement_open('statement.open')
+#class statement_open(wizard.interface):
+#    states = {
+#        'init': {
+#            'actions': [],
+#            'result': {
+#                'type': 'form',
+#                'arch': statement_form,
+#                'fields': statement_fields,
+#                'state': (('end', 'No','gtk-cancel'),
+#                          ('open', 'Yes', 'gtk-ok', True)
+#                         )
+#            }
+#        },
+#        'open': {
+#            'actions': [_open_statement],
+#            'result': {
+#                       'type': 'state',
+##                       'action' :_open_statement,
+#                       'state':'end'}
+#        },
+#    }
+#statement_open('statement.open')
 class statement_close(wizard.interface):
     states = {
         'init': {

From c613516087fab2284048ac2e294a5a6a3b943da9 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Fri, 12 Mar 2010 12:21:44 +0530
Subject: [PATCH 100/251] [IMP] stock, product_margin:Code Improvements

bzr revid: mso@mso-20100312065144-npkjl2p4vsyg6qgm
---
 .../wizard/product_margin_view.xml             | 18 +++++-------------
 addons/stock/stock.py                          |  2 +-
 .../stock/wizard/stock_inventory_line_split.py |  2 +-
 .../wizard/stock_inventory_set_stock_zero.py   |  2 +-
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/addons/product_margin/wizard/product_margin_view.xml b/addons/product_margin/wizard/product_margin_view.xml
index 4f4cc50e611..1c09e409f0b 100644
--- a/addons/product_margin/wizard/product_margin_view.xml
+++ b/addons/product_margin/wizard/product_margin_view.xml
@@ -18,6 +18,7 @@
 	                </form>
 	            </field>
 	        </record>
+<!--  		        
 			<act_window name="Test Wizard"
 					res_model="product.margin"
 					src_model="product.product"
@@ -25,18 +26,9 @@
 					target="new"
 					key2="client_action_multi"    
 					id="product_margin_act_window"/>	       
-<!--  	       
-
-	        <record id="product_margin_action" model="ir.actions.act_window">
-	            <field name="name">Product Margine</field>
-	            <field name="type">ir.actions.act_window</field>
-	            <field name="target">new</field>
-	            <field name="res_model">product.margin</field>
-	            <field name="view_type">form</field>
-	            <field name="view_mode">form</field>
-	            <field name="view_id" ref="product_margin_form_view"/>
-	        </record>
-	        
-	        -->
+       
+    -->
+	      
+	    
         </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 31ffe5b6242..285d7c9424f 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1474,7 +1474,7 @@ class stock_move(osv.osv):
         ir_sequence_obj = self.pool.get('ir.sequence')
         sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
         if not sequence:
-            raise wizard.except_wizard(_('Error!'), _('No production sequence defined'))
+            raise osv.except_osv(_('Error!'), _('No production sequence defined'))
         prodlot_id = prodlot_obj.create(cr, uid, {'name': sequence, 'prefix': prefix}, {'product_id': product_id})
         prodlot = prodlot_obj.browse(cr, uid, prodlot_id) 
         ref = ','.join(map(lambda x:str(x),ids))
diff --git a/addons/stock/wizard/stock_inventory_line_split.py b/addons/stock/wizard/stock_inventory_line_split.py
index dc2b02e113f..3828538ba74 100644
--- a/addons/stock/wizard/stock_inventory_line_split.py
+++ b/addons/stock/wizard/stock_inventory_line_split.py
@@ -58,7 +58,7 @@ inventory lines, make sure the production lot is assigned to this product.'))
         ir_sequence_obj = self.pool.get('ir.sequence')
         sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
         if not sequence:
-            raise wizard.except_wizard(_('Error!'), _('No production sequence defined'))
+            raise osv.except_osv(_('Error!'), _('No production sequence defined'))
 
         for linesplit_obj in self.browse(cr, uid, ids):
 
diff --git a/addons/stock/wizard/stock_inventory_set_stock_zero.py b/addons/stock/wizard/stock_inventory_set_stock_zero.py
index cfb1d4a0ac9..e83c8e1e3d1 100644
--- a/addons/stock/wizard/stock_inventory_set_stock_zero.py
+++ b/addons/stock/wizard/stock_inventory_set_stock_zero.py
@@ -42,7 +42,7 @@ class inventory_merge_stock_zero(osv.osv_memory):
         prod_obj =  pooler.get_pool(cr.dbname).get('product.product')
     
         if len(context['active_ids']) <> 1:
-            raise wizard.except_wizard(_('Warning'), 
+            raise osv.except_osv(_('Warning'), 
                                        _('Please select one and only one inventory !'))
         for id in ids:
             datas = self.read(cr, uid, id)

From 8730f3c8325bb906edbe8e423541e31b80f0e6fd Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 12 Mar 2010 13:58:03 +0530
Subject: [PATCH 101/251] [IMP]:point_of_sale: convert the close statement in
 osv_memeroy and Fix the probelm of company_id

bzr revid: sbh@tinyerp.com-20100312082803-6m8cdlrg7t3yn6cu
---
 addons/point_of_sale/__terp__.py              |   3 +-
 .../point_of_sale/account_bank_statement.py   |  19 ++-
 addons/point_of_sale/pos_wizard.xml           |   6 +-
 addons/point_of_sale/statement_view.xml       |  17 +-
 addons/point_of_sale/statement_wizard.xml     |   6 +-
 addons/point_of_sale/wizard/__init__.py       |   3 +-
 .../wizard/pos_close_statement.py             |  52 ++++++
 .../wizard/pos_close_statement.xml            |  41 +++++
 .../wizard/pos_open_statement.xml             |  16 +-
 .../wizard/wizard_open_statement.py           | 148 ------------------
 10 files changed, 125 insertions(+), 186 deletions(-)
 create mode 100644 addons/point_of_sale/wizard/pos_close_statement.py
 create mode 100644 addons/point_of_sale/wizard/pos_close_statement.xml
 delete mode 100644 addons/point_of_sale/wizard/wizard_open_statement.py

diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__terp__.py
index 640ed1d67c4..6ee05318544 100644
--- a/addons/point_of_sale/__terp__.py
+++ b/addons/point_of_sale/__terp__.py
@@ -47,7 +47,8 @@ Main features :
         'wizard/pos_confirm.xml',
         'wizard/pos_discount.xml',
         'wizard/pos_get_sale.xml',
-        'wizard/pos_open_statement.xml', 
+        'wizard/pos_open_statement.xml',
+        'wizard/pos_close_statement.xml',  
         'pos_view.xml',
         'pos_sequence.xml',
         'posrule_data.xml',
diff --git a/addons/point_of_sale/account_bank_statement.py b/addons/point_of_sale/account_bank_statement.py
index b599f0531f9..b71e78afcfd 100644
--- a/addons/point_of_sale/account_bank_statement.py
+++ b/addons/point_of_sale/account_bank_statement.py
@@ -125,14 +125,17 @@ class account_bank_statement(osv.osv):
          }
 
     def create(self, cr, uid, vals, context=None):
-        open_jrnl = self.search(cr, uid, [('company_id', '=', vals['company_id']), ('journal_id', '=', vals['journal_id']), ('state', '=', 'open')])
-        if open_jrnl:
-            raise osv.except_osv('Error', u'Une caisse de type espèce est déjà ouverte')
-        if 'starting_details_ids' in vals:
-            vals['starting_details_ids'] = starting_details_ids = map(list, vals['starting_details_ids'])
-            for i in starting_details_ids:
-                if i and i[0] and i[1]:
-                    i[0], i[1] = 0, 0
+        
+        company_id = vals and vals.get('company_id',False)
+        if company_id:
+            open_jrnl = self.search(cr, uid, [('company_id', '=', vals['company_id']), ('journal_id', '=', vals['journal_id']), ('state', '=', 'open')])
+            if open_jrnl:
+                raise osv.except_osv('Error', u'Une caisse de type espèce est déjà ouverte')
+            if 'starting_details_ids' in vals:
+                vals['starting_details_ids'] = starting_details_ids = map(list, vals['starting_details_ids'])
+                for i in starting_details_ids:
+                    if i and i[0] and i[1]:
+                        i[0], i[1] = 0, 0
         res = super(account_bank_statement, self).create(cr, uid, vals, context=context)
         return res
 
diff --git a/addons/point_of_sale/pos_wizard.xml b/addons/point_of_sale/pos_wizard.xml
index aaaeb8cd58a..711d33784a2 100644
--- a/addons/point_of_sale/pos_wizard.xml
+++ b/addons/point_of_sale/pos_wizard.xml
@@ -60,12 +60,12 @@
 
 		<wizard string="Scan Product" model="pos.order"
 				name="pos.scan_product" id="pos_scan_product"/-->
-  		<wizard
+<!--  		<wizard
         	id="close_statement"
         	model="account.bank.statement"
-        	menu="False"
+        	menu="True"
         	name="statement.close"
-        	string="Close Statements"/>
+        	string="Close Statements"/>-->
 
 
        <wizard
diff --git a/addons/point_of_sale/statement_view.xml b/addons/point_of_sale/statement_view.xml
index 188e1d72674..9fd309170d8 100644
--- a/addons/point_of_sale/statement_view.xml
+++ b/addons/point_of_sale/statement_view.xml
@@ -417,11 +417,13 @@
 		<menuitem name="Cashboxes to Close" parent="menu_pos_bank_statment_tree"
 		 		action="action_cashboxes_to_close" id="menu_cashboxes_to_close_tree" groups="base.group_extended"/>
 
+	
 		<menuitem
-            name="Open Statements" parent="point_of_sale.menu_point_config"
-            string="Open Statements"
+            name="Open Registers" parent="point_of_sale.menu_point_config"
+            string="Open Register"
             action="action_pos_open_statement"
-            id="menu_open_statement" sequence="3" />
+            id="menu_open_statement" sequence="1111" />
+
        <menuitem icon="STOCK_PRINT"
        			 action="wizard_all_closed_cashbox_of_the_day"
 				 id="menu_all_closed_cashbox_of_the_day"
@@ -429,10 +431,9 @@
 				 type="wizard"/>
 
 		<menuitem
-            name="Close Statements" parent="point_of_sale.menu_point_config"
-            string="Close Statements"
-            action="close_statement"
-            type="wizard"
-            id="menu_close_statement" sequence="3" />
+            name="Close Register" parent="point_of_sale.menu_point_config"
+            string="Close Register"
+            action="action_pos_close_statement"
+            id="menu_close_statement" sequence="2" />
 	</data>
 </openerp>
diff --git a/addons/point_of_sale/statement_wizard.xml b/addons/point_of_sale/statement_wizard.xml
index b6b06bb6765..d00668a5657 100644
--- a/addons/point_of_sale/statement_wizard.xml
+++ b/addons/point_of_sale/statement_wizard.xml
@@ -1,9 +1,9 @@
 <openerp>
 	<data>
-  		<wizard
+<!--  		<wizard
         	id="close_statement"
         	model="account.bank.statement"
-        	menu="False"
+        	menu="True"
         	name="statement.close"
         	string="Close Statements"/>
 		<menuitem
@@ -13,7 +13,7 @@
             type="wizard"
             id="menu_close_statement" sequence="4" />
 
-
+-->
 
 
        <wizard
diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index ea7539cba8f..8025b412609 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -33,12 +33,13 @@ import wizard_pos_payment_report_date
 import wizard_pos_payment_report_user
 import wizard_pos_sales_user_current_user
 import wizard_pos_details
-import wizard_open_statement
+#import wizard_open_statement
 import wizard_all_closed_cashbox_of_the_day
 import pos_add_product
 import pos_confirm
 import pos_discount
 import pos_get_sale
 import pos_open_statement
+import pos_close_statement
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/wizard/pos_close_statement.py b/addons/point_of_sale/wizard/pos_close_statement.py
new file mode 100644
index 00000000000..8dd8c051fa9
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_close_statement.py
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import netsvc
+from osv import osv,fields
+from tools.translate import _
+import time
+
+class pos_close_statement(osv.osv_memory):
+    _name = 'pos.close.statement'
+    _description = 'Close Statements'
+
+    
+    def close_statement(self, cr, uid, ids, context):
+        """ 
+             @summary: Close the statements          
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary 
+             @return : Blank Dictionary 
+        """        
+        company_id=self.pool.get('res.users').browse(cr,uid,uid).company_id.id
+        statement_obj = self.pool.get('account.bank.statement')
+        singer_obj = self.pool.get('singer.statement')
+        journal_obj=self.pool.get('account.journal')
+        journal_lst=journal_obj.search(cr,uid,[('company_id','=',company_id),('auto_cash','=',True),('check_dtls','=',False)])
+        journal_ids=journal_obj.browse(cr,uid, journal_lst)
+        for journal in journal_ids:
+            ids = statement_obj.search(cr, uid, [('state','!=','confirm'),('user_id','=',uid),('journal_id','=',journal.id)])
+            statement_obj.button_confirm(cr,uid,ids)
+        return {}
+pos_close_statement()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/pos_close_statement.xml b/addons/point_of_sale/wizard/pos_close_statement.xml
new file mode 100644
index 00000000000..ff219b1c61f
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_close_statement.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        
+        <!--  Point of Sale Confirm -->
+        
+		<record id="view_pos_close_statement" model="ir.ui.view">
+            <field name="name">Close Statements</field>
+            <field name="model">pos.close.statement</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Close Statements">
+				     	<label string="Are you sure you want to close the statements ?" colspan="2"/>
+				     	<newline/>
+                		<button icon='gtk-cancel' special="cancel"
+                			string="No" />
+                		<button name="close_statement" string="Yes"
+                			colspan="1" type="object" icon="gtk-ok"/>
+                </form>
+            </field>
+        </record>
+
+		<act_window name="Close Statements"
+				res_model="pos.open.statement"
+				src_model="account.bank.statement"
+				view_mode="form"
+				target="new"
+				key2="client_action_multi"    
+			id="action_pos_open_statement"/>
+   	
+   	
+        <record id="action_pos_close_statement" model="ir.actions.act_window">
+            <field name="name">Close Register</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.close.statement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="context">{'record_id' : active_id}</field>
+        </record>        
+	</data>
+</openerp>	        
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/pos_open_statement.xml b/addons/point_of_sale/wizard/pos_open_statement.xml
index 8b43a59836a..0e22e03e4cf 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.xml
+++ b/addons/point_of_sale/wizard/pos_open_statement.xml
@@ -4,7 +4,7 @@
         <!--  Point of Sale Confirm -->
         
 		<record id="view_pos_open_statement" model="ir.ui.view">
-            <field name="name">Open Statements</field>
+            <field name="name">Open Statementsffffffff</field>
             <field name="model">pos.open.statement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
@@ -33,21 +33,9 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
+            <field name="view_id" ref="view_pos_open_statement"/>
             <field name="context">{'record_id' : active_id}</field>
         </record>
-    
-   
-   <menuitem name="Point of Sale" id="menu_point_root" sequence="10"/>
-   <menuitem name="Reporting" parent="menu_point_root" id="menu_point_rep" sequence="5"/>
-       <menuitem name="Register Management" parent="menu_point_root"
-            id="menu_point_config" sequence="3"/>
-		<menuitem
-            name="Open Register" parent="menu_point_config"
-            string="Open Register"
-            action="action_pos_open_statement"
-            id="menu_open_statement" sequence="1" />
-
-
         
 	</data>
 </openerp>	        
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/wizard_open_statement.py b/addons/point_of_sale/wizard/wizard_open_statement.py
deleted file mode 100644
index c976d9eb827..00000000000
--- a/addons/point_of_sale/wizard/wizard_open_statement.py
+++ /dev/null
@@ -1,148 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import pooler
-import wizard
-from tools.translate import _
-import time
-
-statement_form = """<?xml version="1.0"?>
-<form string="Open Statements">
-     <label string="Are you sure you want to open the statements ?" colspan="2"/>
-</form>
-"""
-statement_form_close = """<?xml version="1.0"?>
-<form string="Close Statements">
-     <label string="Are you sure you want to close the statements ?" colspan="2"/>
-</form>
-"""
-
-statement_fields = {}
-
-def _close_statement(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    company_id=pool.get('res.users').browse(cr,uid,uid).company_id.id
-    statement_obj = pool.get('account.bank.statement')
-    singer_obj = pool.get('singer.statement')
-    journal_obj=pool.get('account.journal')
-    journal_lst=journal_obj.search(cr,uid,[('company_id','=',company_id),('auto_cash','=',True),('check_dtls','=',False)])
-    journal_ids=journal_obj.browse(cr,uid, journal_lst)
-    for journal in journal_ids:
-        ids = statement_obj.search(cr, uid, [('state','!=','confirm'),('user_id','=',uid),('journal_id','=',journal.id)])
-        statement_obj.button_confirm(cr,uid,ids)
-    return {}
-#def _open_statement(self, cr, uid, data, context):
-#    print ":::::::::::::::"
-#    pool = pooler.get_pool(cr.dbname)
-#    company_id=pool.get('res.users').browse(cr,uid,uid).company_id.id
-#    statement_obj = pool.get('account.bank.statement')
-#    singer_obj = pool.get('singer.statement')
-#    journal_obj=pool.get('account.journal')
-#    journal_lst=journal_obj.search(cr,uid,[('company_id','=',company_id),('auto_cash','=',True)])
-#    journal_ids=journal_obj.browse(cr,uid, journal_lst)
-#    for journal in journal_ids:
-#        ids = statement_obj.search(cr, uid, [('state','!=','confirm'),('user_id','=',uid),('journal_id','=',journal.id)])
-#        if len(ids):
-#            raise wizard.except_wizard(_('Message'),_('You can not open a Cashbox for "%s". \n Please close the cashbox related to. '%(journal.name) ))
-#        sql = """ Select id from account_bank_statement
-#                                where journal_id=%d
-#                                and company_id =%d
-#                                order by id desc limit 1"""%(journal.id,company_id)
-#        singer_ids=None
-#        cr.execute(sql)
-#        st_id = cr.fetchone()
-#        number=''
-#        if journal.statement_sequence_id:
-#            number = pool.get('ir.sequence').get_id(cr, uid, journal.id)
-#        else:
-#            number = pool.get('ir.sequence').get(cr, uid,
-#                            'account.bank.statement')
-#
-##        statement_id=statement_obj.create(cr,uid,{'journal_id':journal.id,
-##                                                  'company_id':company_id,
-##                                                  'user_id':uid,
-##                                                  'state':'open',
-##                                                  'name':number
-##                                                  })
-#        period=statement_obj._get_period(cr,uid,context) or None
-#        cr.execute("INSERT INTO account_bank_statement(journal_id,company_id,user_id,state,name, period_id,date) VALUES(%d,%d,%d,'open','%s',%d,'%s')"%(journal.id,company_id,uid,number, period, time.strftime('%Y-%m-%d %H:%M:%S')))
-#        cr.commit()
-#        cr.execute("select id from account_bank_statement where journal_id=%d and company_id=%d and user_id=%d and state='open' and name='%s'"%(journal.id,company_id,uid,number))
-#        statement_id=cr.fetchone()[0]
-#        if st_id:
-#            statemt_id=statement_obj.browse(cr,uid,st_id[0])
-#            if statemt_id and statemt_id.ending_details_ids:
-#                statement_obj.write(cr, uid,[statement_id], {'balance_start':statemt_id.balance_end,
-#                                                            'state':'open'})
-#                if statemt_id.ending_details_ids:
-#                    for i in statemt_id.ending_details_ids:
-#                        c=singer_obj.create(cr,uid, { 'pieces':i.pieces,
-#                                                    'number':i.number,
-#                                                    'starting_id':statement_id,
-#                            })
-#        cr.commit()
-#    return {}
-
-#class statement_open(wizard.interface):
-#    states = {
-#        'init': {
-#            'actions': [],
-#            'result': {
-#                'type': 'form',
-#                'arch': statement_form,
-#                'fields': statement_fields,
-#                'state': (('end', 'No','gtk-cancel'),
-#                          ('open', 'Yes', 'gtk-ok', True)
-#                         )
-#            }
-#        },
-#        'open': {
-#            'actions': [_open_statement],
-#            'result': {
-#                       'type': 'state',
-##                       'action' :_open_statement,
-#                       'state':'end'}
-#        },
-#    }
-#statement_open('statement.open')
-class statement_close(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {
-                'type': 'form',
-                'arch': statement_form_close,
-                'fields': statement_fields,
-                'state': (('end', 'No','gtk-cancel'),
-                          ('open', 'Yes', 'gtk-ok', True)
-                         )
-            }
-        },
-        'open': {
-            'actions': [_close_statement],
-            'result': {
-                       'type': 'state',
-                       'state':'end'}
-        },
-    }
-statement_close('statement.close')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 712b574c8adf320081d297496e2c1294006c7ffd Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 12 Mar 2010 14:11:37 +0530
Subject: [PATCH 102/251] [IMP]: Remove the context of record_id and improve
 the code

bzr revid: sbh@tinyerp.com-20100312084137-uus1pg8pv7vs5imf
---
 .../wizard/pos_close_statement.xml            |  1 -
 addons/point_of_sale/wizard/pos_confirm.py    | 27 ++++++++++---------
 addons/point_of_sale/wizard/pos_confirm.xml   |  1 -
 addons/point_of_sale/wizard/pos_get_sale.py   |  5 ++--
 addons/point_of_sale/wizard/pos_get_sale.xml  |  1 -
 .../wizard/pos_open_statement.xml             |  1 -
 6 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/addons/point_of_sale/wizard/pos_close_statement.xml b/addons/point_of_sale/wizard/pos_close_statement.xml
index ff219b1c61f..122ec30ea14 100644
--- a/addons/point_of_sale/wizard/pos_close_statement.xml
+++ b/addons/point_of_sale/wizard/pos_close_statement.xml
@@ -35,7 +35,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-            <field name="context">{'record_id' : active_id}</field>
         </record>        
 	</data>
 </openerp>	        
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/pos_confirm.py b/addons/point_of_sale/wizard/pos_confirm.py
index 460e0e67a56..f73d7e60828 100644
--- a/addons/point_of_sale/wizard/pos_confirm.py
+++ b/addons/point_of_sale/wizard/pos_confirm.py
@@ -37,21 +37,22 @@ class pos_confirm(osv.osv_memory):
         """    
        
         this = self.browse(cr, uid, ids[0], context=context)
-        record_id = context and context.get('record_id',False)
-        if isinstance(record_id, (int, long)):
-            record_id=[record_id]
+        record_id = context and context.get('active_id',False)
         if record_id:
-            company_id=self.pool.get('res.users').browse(cr,uid,uid).company_id
-            order_obj = self.pool.get('pos.order')
+            if isinstance(record_id, (int, long)):
+                record_id=[record_id]
+            if record_id:
+                company_id=self.pool.get('res.users').browse(cr,uid,uid).company_id
+                order_obj = self.pool.get('pos.order')
+                
+                for order_id in order_obj.browse(cr, uid, record_id, context=context):
+                    if  order_id.state =='paid':
+                        order_obj.write(cr,uid,[order_id.id],{'journal_entry':True})
+                        order_obj.create_account_move(cr, uid, [order_id.id], context=context)
             
-            for order_id in order_obj.browse(cr, uid, record_id, context=context):
-                if  order_id.state =='paid':
-                    order_obj.write(cr,uid,[order_id.id],{'journal_entry':True})
-                    order_obj.create_account_move(cr, uid, [order_id.id], context=context)
-        
-            wf_service = netsvc.LocalService("workflow")
-            for i in record_id:
-                wf_service.trg_validate(uid, 'pos.order', i, 'done', cr)
+                wf_service = netsvc.LocalService("workflow")
+                for i in record_id:
+                    wf_service.trg_validate(uid, 'pos.order', i, 'done', cr)
         return {}
         
 pos_confirm()
diff --git a/addons/point_of_sale/wizard/pos_confirm.xml b/addons/point_of_sale/wizard/pos_confirm.xml
index 6c12afb6766..384d75f768f 100644
--- a/addons/point_of_sale/wizard/pos_confirm.xml
+++ b/addons/point_of_sale/wizard/pos_confirm.xml
@@ -26,7 +26,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-            <field name="context">{'record_id' : active_id}</field>
         </record>
        <record model="ir.values" id="values_pos_confirm">
             <field name="model_id" ref="point_of_sale.model_pos_order" />
diff --git a/addons/point_of_sale/wizard/pos_get_sale.py b/addons/point_of_sale/wizard/pos_get_sale.py
index 55da8e9d80c..fae826f70b9 100644
--- a/addons/point_of_sale/wizard/pos_get_sale.py
+++ b/addons/point_of_sale/wizard/pos_get_sale.py
@@ -41,10 +41,11 @@ class pos_get_sale(osv.osv_memory):
              @return : nothing
         """        
         this = self.browse(cr, uid, ids[0], context=context)
-        record_id = context and context.get('record_id',False)
+        record_id = context and context.get('active_id',False)
         
         proxy_pos = self.pool.get('pos.order')
         proxy_pick = self.pool.get('stock.picking')
+        proxy_order_line=self.pool.get('pos.order.line')
         
         if record_id:
             order=proxy_pos.browse(cr, uid, record_id, context)
@@ -64,7 +65,7 @@ class pos_get_sale(osv.osv_memory):
             })
         
             for line in pick.move_lines:
-                self.pool.get('pos.order.line').create(cr, uid, {
+                proxy_order_line.create(cr, uid, {
                     'name': line.sale_line_id.name,
                     'order_id': record_id,
                     'qty': line.product_qty,
diff --git a/addons/point_of_sale/wizard/pos_get_sale.xml b/addons/point_of_sale/wizard/pos_get_sale.xml
index b44d2b9161e..9a28da548d2 100644
--- a/addons/point_of_sale/wizard/pos_get_sale.xml
+++ b/addons/point_of_sale/wizard/pos_get_sale.xml
@@ -28,7 +28,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-            <field name="context">{'record_id' : active_id}</field>
         </record>
 	</data>
 </openerp>	
diff --git a/addons/point_of_sale/wizard/pos_open_statement.xml b/addons/point_of_sale/wizard/pos_open_statement.xml
index 0e22e03e4cf..8fb8bf93696 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.xml
+++ b/addons/point_of_sale/wizard/pos_open_statement.xml
@@ -34,7 +34,6 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
             <field name="view_id" ref="view_pos_open_statement"/>
-            <field name="context">{'record_id' : active_id}</field>
         </record>
         
 	</data>

From 5e07688ffcdabf3962759ea0254a5634d2a316c6 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 12 Mar 2010 14:36:41 +0530
Subject: [PATCH 103/251] [IMP] point_of_sale :correct the name res_model

bzr revid: sbh@tinyerp.com-20100312090641-sk63i86uj8xqwfzn
---
 addons/point_of_sale/wizard/pos_close_statement.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/wizard/pos_close_statement.xml b/addons/point_of_sale/wizard/pos_close_statement.xml
index 122ec30ea14..0292241f8de 100644
--- a/addons/point_of_sale/wizard/pos_close_statement.xml
+++ b/addons/point_of_sale/wizard/pos_close_statement.xml
@@ -20,7 +20,7 @@
         </record>
 
 		<act_window name="Close Statements"
-				res_model="pos.open.statement"
+				res_model="pos.close.statement"
 				src_model="account.bank.statement"
 				view_mode="form"
 				target="new"

From 7c5001a4aa2fcef11658d4e12f33e79d9afa3e3f Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 12 Mar 2010 15:18:58 +0530
Subject: [PATCH 104/251] [IMP] point_of_sale: set the sequence and improve the
 view

bzr revid: sbh@tinyerp.com-20100312094858-pctod6auq3eymhq5
---
 addons/point_of_sale/pos_view.xml                   | 2 +-
 addons/point_of_sale/statement_view.xml             | 2 +-
 addons/point_of_sale/wizard/pos_close_statement.xml | 2 +-
 addons/point_of_sale/wizard/pos_open_statement.xml  | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 99da6da80fc..21f213d2804 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -843,7 +843,7 @@ invoiced
             string="Refloat"
             action="pos_entries"
             type="wizard"
-            id="menu_wizard_enter_jrnl" sequence="2" />
+            id="menu_wizard_enter_jrnl" sequence="3" />
         <wizard
             string="Enter negative operations"
             model="account.bank.statement"
diff --git a/addons/point_of_sale/statement_view.xml b/addons/point_of_sale/statement_view.xml
index 9fd309170d8..b76f17cf8d2 100644
--- a/addons/point_of_sale/statement_view.xml
+++ b/addons/point_of_sale/statement_view.xml
@@ -422,7 +422,7 @@
             name="Open Registers" parent="point_of_sale.menu_point_config"
             string="Open Register"
             action="action_pos_open_statement"
-            id="menu_open_statement" sequence="1111" />
+            id="menu_open_statement" sequence="1" />
 
        <menuitem icon="STOCK_PRINT"
        			 action="wizard_all_closed_cashbox_of_the_day"
diff --git a/addons/point_of_sale/wizard/pos_close_statement.xml b/addons/point_of_sale/wizard/pos_close_statement.xml
index 0292241f8de..fed3518b706 100644
--- a/addons/point_of_sale/wizard/pos_close_statement.xml
+++ b/addons/point_of_sale/wizard/pos_close_statement.xml
@@ -25,7 +25,7 @@
 				view_mode="form"
 				target="new"
 				key2="client_action_multi"    
-			id="action_pos_open_statement"/>
+			id="act_pos_open_statement"/>
    	
    	
         <record id="action_pos_close_statement" model="ir.actions.act_window">
diff --git a/addons/point_of_sale/wizard/pos_open_statement.xml b/addons/point_of_sale/wizard/pos_open_statement.xml
index 8fb8bf93696..9b80a7ec60d 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.xml
+++ b/addons/point_of_sale/wizard/pos_open_statement.xml
@@ -4,7 +4,7 @@
         <!--  Point of Sale Confirm -->
         
 		<record id="view_pos_open_statement" model="ir.ui.view">
-            <field name="name">Open Statementsffffffff</field>
+            <field name="name">Open Statements</field>
             <field name="model">pos.open.statement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
@@ -33,7 +33,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-            <field name="view_id" ref="view_pos_open_statement"/>
         </record>
         
 	</data>

From 760fb76524eaa1952bdcae0a8a0df9cf15a6e8ac Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Fri, 12 Mar 2010 17:18:16 +0530
Subject: [PATCH 105/251] [FIX, ADD] mrp_repair: Fixed report bug. Added
 security rules for newly added objects.

bzr revid: uco@tinyerp.co.in-20100312114816-91bk0bye8eq2e0hx
---
 addons/mrp_repair/report/order.rml             | 2 +-
 addons/mrp_repair/security/ir.model.access.csv | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml
index 6c56c80978b..bb3e61ab4e7 100644
--- a/addons/mrp_repair/report/order.rml
+++ b/addons/mrp_repair/report/order.rml
@@ -397,7 +397,7 @@
     <blockTable colWidths="534.0" style="Table8">
       <tr>
         <td>
-          <para style="P3">[[ format(o.quotation_notes) or '' ]]</para>
+          <para style="P3">[[ format(o.quotation_notes) or removeParentNode('blockTable') ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/mrp_repair/security/ir.model.access.csv b/addons/mrp_repair/security/ir.model.access.csv
index 0f12f66a815..c524afce69b 100644
--- a/addons/mrp_repair/security/ir.model.access.csv
+++ b/addons/mrp_repair/security/ir.model.access.csv
@@ -5,3 +5,7 @@
 "access_mrp_repair_line_manager","MRP Repair Line manager","model_mrp_repair_line","stock.group_stock_manager",1,1,1,1
 "access_mrp_repair_fee_user","MRP Repair Fee user","model_mrp_repair_fee","stock.group_stock_user",1,0,0,0
 "access_mrp_repair_fee_manager","MRP Repair Fee manager","model_mrp_repair_fee","stock.group_stock_manager",1,1,1,1
+"access_mrp_repair_cancel_user","mrp.repair.cancel user","model_mrp_repair_cancel","stock.group_stock_user",1,0,0,0
+"access_mrp_repair_cancel_manager","mrp.repair.cancel manager","model_mrp_repair_cancel","stock.group_stock_manager",1,1,1,1
+"access_mrp_repair_make_invoice_user","mrp.repair.make_invoice user","model_mrp_repair_make_invoice","stock.group_stock_user",1,0,0,0
+"access_mrp_repair_make_invoice_manager","mrp.repair.make_invoice manager","model_mrp_repair_make_invoice","stock.group_stock_manager",1,1,1,1

From c95150b75a73bbc82a570f76b02bffb3ce8ec186 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Fri, 12 Mar 2010 17:20:12 +0530
Subject: [PATCH 106/251] [FIX] mrp, mrp_repair, purchase, sale: Changed name
 of variable for maintaining naming convention.

bzr revid: uco@tinyerp.co.in-20100312115012-vrf4lut48ptyxk92
---
 addons/mrp/mrp.py               | 4 ++--
 addons/mrp_repair/mrp_repair.py | 4 ++--
 addons/purchase/purchase.py     | 4 ++--
 addons/sale/sale.py             | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index de0140e84d5..f7c5226feb7 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -700,9 +700,9 @@ class mrp_production(osv.osv):
                     pick_type = 'out'
                 address_id = routing_loc.address_id and routing_loc.address_id.id or False
                 routing_loc = routing_loc.id
-            pickname = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.'+pick_type)
+            pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.'+pick_type)
             picking_id = self.pool.get('stock.picking').create(cr, uid, {
-                'name': pickname,
+                'name': pick_name,
                 'origin': (production.origin or '').split(':')[0] +':'+production.name,
                 'type': pick_type,
                 'move_type': 'one',
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 71312af18ed..e456c3770d2 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -398,9 +398,9 @@ class mrp_repair(osv.osv):
                 self.pool.get('mrp.repair.line').write(cr, uid, [move.id], {'move_id': move_id})
 
             if repair.deliver_bool:
-                pickname = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.out')
+                pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.out')
                 picking = self.pool.get('stock.picking').create(cr, uid, {
-                    'name': pickname,
+                    'name': pick_name,
                     'origin': repair.name,
                     'state': 'draft',
                     'move_type': 'one',
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 33bbf82694a..319fca8589f 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -394,9 +394,9 @@ class purchase_order(osv.osv):
             istate = 'none'
             if order.invoice_method=='picking':
                 istate = '2binvoiced'
-            pickname = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.in')
+            pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.in')
             picking_id = self.pool.get('stock.picking').create(cr, uid, {
-                'name': pickname,
+                'name': pick_name,
                 'origin': order.name+((order.origin and (':'+order.origin)) or ''),
                 'type': 'in',
                 'address_id': order.dest_address_id.id or order.partner_address_id.id,
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 3a79f937cd0..8b77719171a 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -593,9 +593,9 @@ class sale_order(osv.osv):
                     location_id = order.shop_id.warehouse_id.lot_stock_id.id
                     if not picking_id:
                         loc_dest_id = order.partner_id.property_stock_customer.id
-                        pickname = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.out')
+                        pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.out')
                         picking_id = self.pool.get('stock.picking').create(cr, uid, {
-                            'name': pickname,
+                            'name': pick_name,
                             'origin': order.name,
                             'type': 'out',
                             'state': 'auto',

From de5642cd5685d5a968a5cd6315c07b03d03e5503 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 12 Mar 2010 18:33:52 +0530
Subject: [PATCH 107/251] [IMP]: caldav: Improvement in export data for
 multiple vtimezone exported for one timezone

bzr revid: rpa@tinyerp.com-20100312130352-k2hlxmrsivxaa3u8
---
 addons/caldav/caldav.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/caldav/caldav.py b/addons/caldav/caldav.py
index ce7bbe62e24..91491dd1688 100644
--- a/addons/caldav/caldav.py
+++ b/addons/caldav/caldav.py
@@ -207,6 +207,7 @@ class CalDAV(object):
     def create_ics(self, cr, uid, datas, name, ical, context=None):
         if not datas:
             return
+        timezones = []
         for data in datas:
             tzval = None
             vevent = ical.add(name)
@@ -246,11 +247,12 @@ class CalDAV(object):
                         alarm_obj = self.pool.get('basic.calendar.alarm')
                         vevent = alarm_obj.export_cal(cr, uid, model, \
                                     data[map_field][0], vevent, context=ctx)
-                    elif field == 'vtimezone' and data[map_field]:
+                    elif field == 'vtimezone' and data[map_field] and data[map_field] not in timezones:
                         tzval = data[map_field]
                         tz_obj = self.pool.get('basic.calendar.timezone')
                         ical = tz_obj.export_cal(cr, uid, None, \
                                      data[map_field], ical, context=context)
+                        timezones.append(data[map_field])
                     elif data[map_field]:
                         if map_type in ("char", "text"):
                             if field in ('exdate'):

From c6be2d42a300da90e76b5930af04ceca4aa247f3 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Fri, 12 Mar 2010 19:12:55 +0530
Subject: [PATCH 108/251] [IMP]: stock,sale:docstrings added in the osv_memory
 files

bzr revid: mso@mso-20100312134255-b8h0bg1gjah1s2e1
---
 .../product_margin/wizard/product_margin.py   |   4 +-
 addons/sale/wizard/sale_line_invoice.py       |  22 ++++
 .../sale/wizard/sale_make_invoice_advance.py  |  24 ++++
 addons/stock/stock.py                         |   6 +-
 addons/stock/stock_view.xml                   |   7 ++
 addons/stock/wizard/stock_fill_inventory.py   |  12 ++
 .../wizard/stock_inventory_line_split.py      |  23 ++++
 .../wizard/stock_inventory_set_stock_zero.py  |  18 ++-
 .../stock_inventory_set_stock_zero_view.xml   |   8 +-
 .../stock/wizard/stock_invoice_onshipping.py  |  24 ++++
 addons/stock/wizard/stock_location_product.py |  12 ++
 addons/stock/wizard/stock_move.py             | 106 ++++++++++++++++++
 12 files changed, 256 insertions(+), 10 deletions(-)

diff --git a/addons/product_margin/wizard/product_margin.py b/addons/product_margin/wizard/product_margin.py
index e3f03b625d4..effa42dc77c 100644
--- a/addons/product_margin/wizard/product_margin.py
+++ b/addons/product_margin/wizard/product_margin.py
@@ -38,7 +38,7 @@ class product_margin(osv.osv_memory):
 
             @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param ids: the account  ID or list of IDs if we want more than one
+            @param ids: the ID or list of IDs if we want more than one
 
             @return:
         """
@@ -73,7 +73,7 @@ class product_margin(osv.osv_memory):
 
             @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param ids: the account  ID or list of IDs if we want more than one
+            @param ids: the ID or list of IDs if we want more than one
 
             @return:
         """
diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py
index c270ecc3b75..a9a2e77050d 100644
--- a/addons/sale/wizard/sale_line_invoice.py
+++ b/addons/sale/wizard/sale_line_invoice.py
@@ -37,11 +37,33 @@ class sale_order_line_make_invoice(osv.osv_memory):
     }
 
     def make_invoices(self, cr, uid, ids, context):
+        """ 
+             @summary: To make invoices.
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID or list of IDs if we want more than one 
+             @param context: A standard dictionary 
+             
+             @return: A dictionary which of fields with values. 
+        
+        """        
+
         res = False
         invoices = {}
 
     #TODO: merge with sale.py/make_invoice
         def make_invoice(order, lines):
+            """ 
+                 @summary: To make invoices.
+                
+                 @param order: 
+                 @param lines: 
+                
+                 @return:  
+            
+            """            
             a = order.partner_id.property_account_receivable.id
             if order.partner_id and order.partner_id.property_payment_term.id:
                 pay_term = order.partner_id.property_payment_term.id
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index f441871946b..112aac7895c 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -39,6 +39,18 @@ class sale_advance_payment_inv(osv.osv_memory):
         'qtty' : lambda *a: 1
                }
     def create_invoices(self, cr, uid, ids, context={}):
+        """ 
+             @summary: To create invoices.
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID or list of IDs if we want more than one 
+             @param context: A standard dictionary 
+             
+             @return:  
+        
+        """        
         list_inv = []
         obj_sale = self.pool.get('sale.order')
         obj_lines = self.pool.get('account.invoice.line')
@@ -130,6 +142,18 @@ class sale_open_invoice(osv.osv_memory):
     }
 
     def open_invoice(self, cr, uid, ids, context):
+        """ 
+             @summary: To open invoice.
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID or list of IDs if we want more than one 
+             @param context: A standard dictionary 
+             
+             @return:  
+        
+        """        
         mod_obj = self.pool.get('ir.model.data')
         invoices = []
         #TODO: Can not get invoice ids here
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 285d7c9424f..344eca867a6 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1713,8 +1713,12 @@ class stock_inventory_line(osv.osv):
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
         'product_qty': fields.float('Quantity'),
         'company_id': fields.related('inventory_id','company_id',type='many2one',relation='res.company',string='Company',store=True),
-        'prod_lot_id': fields.many2one('stock.production.lot', 'Production Lot', domain="[('product_id','=',product_id)]")
+        'prod_lot_id': fields.many2one('stock.production.lot', 'Production Lot', domain="[('product_id','=',product_id)]"),
+#        'state': fields.selection( (('draft', 'Draft'), ('done', 'Done'), ('cancel','Cancelled')), 'State', readonly=True),
     }
+#    _defaults = {
+#        'state': lambda *a: 'draft',
+#    }
     def on_change_product_id(self, cr, uid, ids, location_id, product, uom=False):
         if not product:
             return {}
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index f6ffdb9cbde..0cc33d229d7 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -18,7 +18,11 @@
                     <field name="product_qty"/>
                     <field name="product_uom"/>
                     <field name="prod_lot_id"/>
+					<button name="%(stock.action_view_stock_inventory_line_split)d"
+                    		 		string="Split inventory lines"
+                      		 		type="action" icon="gtk-justify-fill"/>                    
                     <field name="location_id"/>
+                    
                 </tree>
             </field>
         </record>
@@ -87,6 +91,9 @@
                                 <field name="product_uom"/>
                                 <field name="prod_lot_id"/>
                                 <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>
+									<button name="%(stock.action_view_stock_inventory_line_split)d"
+                    		 		string="Split inventory lines"
+                      		 		type="action" icon="gtk-justify-fill" states="draft"/>
                             </tree>
                             <form string="Inventory Lines">
                                 <field colspan="4" context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" select="1" domain="[('type','&lt;&gt;','service')]"/>
diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index 33e9a3cc44c..0c5ff199244 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -38,6 +38,18 @@ class stock_fill_inventory(osv.osv_memory):
             }
 
     def fill_inventory(self, cr, uid, ids, context):
+        """ 
+             @summary: To fill stock inventory according to products available in the selected locations..
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID or list of IDs if we want more than one 
+             @param context: A standard dictionary 
+             
+             @return:  
+        
+        """        
         inventory_line_obj = self.pool.get('stock.inventory.line')
         location_obj = self.pool.get('stock.location')
         product_obj = self.pool.get('product.product')
diff --git a/addons/stock/wizard/stock_inventory_line_split.py b/addons/stock/wizard/stock_inventory_line_split.py
index 3828538ba74..4a77660ed8a 100644
--- a/addons/stock/wizard/stock_inventory_line_split.py
+++ b/addons/stock/wizard/stock_inventory_line_split.py
@@ -37,6 +37,17 @@ class stock_inventory_line_split(osv.osv_memory):
             }
 
     def _check_production_lot(self, cr, uid, context):
+        """ 
+             @summary: to check the availability of production lot. 
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary 
+             
+             @return:  
+        
+        """             
         stock_inventory_line_obj = self.pool.get('stock.inventory.line')
         for inv_obj in stock_inventory_line_obj.browse(cr, uid, \
                             context['active_ids']):
@@ -51,6 +62,18 @@ inventory lines, make sure the production lot is assigned to this product.'))
             }
 
     def split_lines(self, cr, uid, ids, context):
+        """ 
+             @summary: to split stock inventory lines according to production lot
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID or list of IDs if we want more than one 
+             @param context: A standard dictionary 
+             
+             @return:  
+        
+        """             
         inv_id = context['active_id']
         inv_line_obj = self.pool.get('stock.inventory.line')
         prodlot_obj = self.pool.get('stock.production.lot')
diff --git a/addons/stock/wizard/stock_inventory_set_stock_zero.py b/addons/stock/wizard/stock_inventory_set_stock_zero.py
index 3074c1a0dfa..8e10ab42bb5 100644
--- a/addons/stock/wizard/stock_inventory_set_stock_zero.py
+++ b/addons/stock/wizard/stock_inventory_set_stock_zero.py
@@ -29,14 +29,26 @@ import time
 import wizard
 
 
-class inventory_merge_stock_zero(osv.osv_memory):
-    _name = "stock.inventory.merge.stock.zero"
+class inventory_set_stock_zero(osv.osv_memory):
+    _name = "stock.inventory.set.stock.zero"
     _description = "Set Stock to 0"
     _columns = {
             'location_id': fields.many2one('stock.location', 'Location', required=True), 
             }
     
     def do_merge(self, cr, uid, ids, context):
+        """ 
+             @summary:To set stock to Zero 
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID or list of IDs if we want more than one 
+             @param context: A standard dictionary 
+             
+             @return:  
+        
+        """            
         invent_obj = pooler.get_pool(cr.dbname).get('stock.inventory')
         invent_line_obj = pooler.get_pool(cr.dbname).get('stock.inventory.line')
         prod_obj =  pooler.get_pool(cr.dbname).get('product.product')
@@ -67,6 +79,6 @@ class inventory_merge_stock_zero(osv.osv_memory):
                         })
         return {}
 
-inventory_merge_stock_zero()
+inventory_set_stock_zero()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/stock_inventory_set_stock_zero_view.xml b/addons/stock/wizard/stock_inventory_set_stock_zero_view.xml
index a6456917023..0ee84d2045d 100644
--- a/addons/stock/wizard/stock_inventory_set_stock_zero_view.xml
+++ b/addons/stock/wizard/stock_inventory_set_stock_zero_view.xml
@@ -2,9 +2,9 @@
 <openerp>
     <data>
 
-    	<record id="view_inventory_merge_stock_zero" model="ir.ui.view">
+    	<record id="view_inventory_set_stock_zero" model="ir.ui.view">
             <field name="name">Set Stock to Zero</field>
-            <field name="model">stock.inventory.merge.stock.zero</field>
+            <field name="model">stock.inventory.set.stock.zero</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Set Stock to Zero">
@@ -20,12 +20,12 @@
 		</record>
 
         <act_window name="Set Stock to Zero"		    
-		    res_model="stock.inventory.merge.stock.zero"
+		    res_model="stock.inventory.set.stock.zero"
 		    src_model="stock.inventory"
 		    view_mode="form"
 		    target="new"        
             key2="client_action_multi"    
-		    id="action_view_inventory_merge_stock_zero"/>			
+		    id="action_view_inventory_set_stock_zero"/>			
         
     </data>
 </openerp>
diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py
index a4026e69827..26788d8ad76 100644
--- a/addons/stock/wizard/stock_invoice_onshipping.py
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@@ -42,6 +42,18 @@ class stock_invoice_onshipping(osv.osv_memory):
             }
 
     def _get_type(self, cr, uid, context):
+        """ 
+             @summary:To get invoice type
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID or list of IDs if we want more than one 
+             @param context: A standard dictionary 
+             
+             @return: invoice type
+        
+        """                
         picking_obj = self.pool.get('stock.picking')
         usage = 'customer'
         pick = picking_obj.browse(cr, uid, context['active_id'])
@@ -69,6 +81,18 @@ class stock_invoice_onshipping(osv.osv_memory):
         }
 
     def create_invoice(self, cr, uid, ids, context):
+        """ 
+             @summary:To create invoice
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID or list of IDs if we want more than one 
+             @param context: A standard dictionary 
+             
+             @return: invoice ids 
+        
+        """        
         result = []
         picking_obj = self.pool.get('stock.picking')
         mod_obj = self.pool.get('ir.model.data')
diff --git a/addons/stock/wizard/stock_location_product.py b/addons/stock/wizard/stock_location_product.py
index 0c307492bf3..4f9e45196ac 100755
--- a/addons/stock/wizard/stock_location_product.py
+++ b/addons/stock/wizard/stock_location_product.py
@@ -37,6 +37,18 @@ class stock_location_product(osv.osv_memory):
                 }
 
     def action_open_window(self, cr, uid, ids, context):
+        """ 
+             @summary:To open location wise product information specific to given duration
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID or list of IDs if we want more than one 
+             @param context: A standard dictionary 
+             
+             @return: invoice type
+        
+        """                
         mod_obj = self.pool.get('ir.model.data')
         for location_obj in self.read(cr, uid, ids, ['from_date', 'to_date']):
             result = mod_obj._get_id(cr, uid, 'product', 'product_search_form_view')
diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index 548375db199..6d438f9a661 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -36,6 +36,18 @@ class stock_move_track(osv.osv_memory):
                  }
     
     def track_lines(self, cr, uid, ids, context={}):
+        """ 
+             @summary:To track stock moves lines
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID or list of IDs if we want more than one 
+             @param context: A standard dictionary 
+             
+             @return: 
+        
+        """                
         datas = self.read(cr, uid, ids)[0]
         move_obj = self.pool.get('stock.move')
         move_obj._track_lines(cr, uid, context['active_id'], datas, context=context)
@@ -55,18 +67,63 @@ class stock_move_consume(osv.osv_memory):
               }
 
     def _get_product_id(self, cr, uid, context):
+        """ 
+             @summary:To get product id
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary 
+             
+             @return: product id
+        
+        """                        
         move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
         return move.product_id.id
     
     def _get_product_qty(self, cr, uid, context):
+        """ 
+             @summary:To get product quantity
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary 
+             
+             @return: quantity
+        
+        """                
         move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
         return move.product_qty
     
     def _get_product_uom(self, cr, uid, context):
+        """ 
+             @summary:To get Unit of measure
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary 
+             
+             @return: uom
+        
+        """                
         move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
         return move.product_uom.id
     
     def _get_location_id(self, cr, uid, context):
+        """ 
+             @summary:To get location id
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary 
+             
+             @return: location id
+        
+        """                
+        
         move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
         return move.location_id.id
     
@@ -78,6 +135,18 @@ class stock_move_consume(osv.osv_memory):
                  }
 
     def do_move_consume(self, cr, uid, ids, context={}):
+        """ 
+             @summary:To move consumed products
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID or list of IDs if we want more than one 
+             @param context: A standard dictionary 
+             
+             @return: 
+        
+        """              
         move_obj = self.pool.get('stock.move')
         move_ids = context['active_ids']
         for data in self.read(cr, uid, ids):            
@@ -99,6 +168,18 @@ class stock_move_scrap(osv.osv_memory):
     }
 
     def move_scrap(self, cr, uid, ids, context={}):
+        """ 
+             @summary:To move scraped products
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID or list of IDs if we want more than one 
+             @param context: A standard dictionary 
+             
+             @return: 
+        
+        """              
         move_obj = self.pool.get('stock.move')        
         move_ids = context['active_ids']
         for data in self.read(cr, uid, ids):
@@ -128,10 +209,35 @@ class split_in_production_lot(osv.osv_memory):
                  }
 
     def split_lot(self, cr, uid, ids, context=None):
+        """ 
+             @summary:To split a lot
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID or list of IDs if we want more than one 
+             @param context: A standard dictionary 
+             
+             @return: 
+        
+        """                    
         self.split(cr, uid, ids, context.get('active_ids'), context=context)
         return {}
 
     def split(self, cr, uid, ids, move_ids, context=None):
+        """ 
+             @summary:To split stock moves into production lot
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID or list of IDs if we want more than one 
+             @param move_ids: the ID or list of IDs of stock move we want to split
+             @param context: A standard dictionary 
+             
+             @return: 
+        
+        """                    
         prodlot_obj = self.pool.get('stock.production.lot')
         ir_sequence_obj = self.pool.get('ir.sequence')
         move_obj = self.pool.get('stock.move')

From 080297c2dc1c07e5d72c787251bd78bb9dd19827 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 15 Mar 2010 11:02:03 +0530
Subject: [PATCH 109/251] [IMP]: base_calendar: Put store=True for vtimezone
 field on event

bzr revid: rpa@tinyerp.com-20100315053203-nqi7vv152rkr6fe5
---
 addons/base_calendar/base_calendar.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 4d0f85376f3..9835217c0e3 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -775,7 +775,7 @@ rule or repeating pattern for anexception to a recurrence set"),
         'base_calendar_alarm_id': fields.many2one('calendar.alarm', 'Alarm'), 
         'recurrent_uid': fields.integer('Recurrent ID'), 
         'recurrent_id': fields.datetime('Recurrent ID date'), 
-        'vtimezone': fields.related('user_id', 'context_tz', type='char', size=24, string='Timezone'), 
+        'vtimezone': fields.related('user_id', 'context_tz', type='char', size=24, string='Timezone', store=True), 
         'user_id': fields.many2one('res.users', 'Responsible'), 
         'freq': fields.selection([('None', 'No Repeat'), \
                             ('secondly', 'Secondly'), \

From 363090e95990811084363b7c58090bb0be7d6598 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 15 Mar 2010 11:22:08 +0530
Subject: [PATCH 110/251] [Add] point_of_sale: add the osv_memory wizard of
 _box_entries and comment the old wizard

bzr revid: sbh@tinyerp.com-20100315055208-hq5k5gn53edzpzra
---
 addons/point_of_sale/__terp__.py              |   1 +
 addons/point_of_sale/pos_view.xml             |   8 +-
 addons/point_of_sale/wizard/__init__.py       |   1 +
 .../point_of_sale/wizard/pos_box_entries.py   | 132 +++++++++++++++++
 .../point_of_sale/wizard/pos_box_entries.xml  |  38 +++++
 .../wizard/wizard_refund_order.py             | 138 +++++++++---------
 6 files changed, 245 insertions(+), 73 deletions(-)
 create mode 100644 addons/point_of_sale/wizard/pos_box_entries.py
 create mode 100644 addons/point_of_sale/wizard/pos_box_entries.xml

diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__terp__.py
index 6ee05318544..82c1e5a31da 100644
--- a/addons/point_of_sale/__terp__.py
+++ b/addons/point_of_sale/__terp__.py
@@ -49,6 +49,7 @@ Main features :
         'wizard/pos_get_sale.xml',
         'wizard/pos_open_statement.xml',
         'wizard/pos_close_statement.xml',  
+        'wizard/pos_box_entries.xml',  
         'pos_view.xml',
         'pos_sequence.xml',
         'posrule_data.xml',
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 21f213d2804..265bdb6d836 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -830,19 +830,19 @@ invoiced
 					action="action_product_output"
 					id="products_for_output_operations"/>
 
-        <wizard
+<!--        <wizard
             string="Refloat Box entries"
             model="account.bank.statement"
             name="pos.entry"
             menu="False"
-            id="pos_entries"/>
+            id="pos_entries"/>-->
+            
         <menuitem name="Register Management" parent="menu_point_root"
             id="menu_point_config" sequence="3"/>
         <menuitem
             name="Input Operations" parent="menu_point_config"
             string="Refloat"
-            action="pos_entries"
-            type="wizard"
+            action="action_box_entries"
             id="menu_wizard_enter_jrnl" sequence="3" />
         <wizard
             string="Enter negative operations"
diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index 8025b412609..17ddf3c5c61 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -41,5 +41,6 @@ import pos_discount
 import pos_get_sale
 import pos_open_statement
 import pos_close_statement
+import pos_box_entries
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/wizard/pos_box_entries.py b/addons/point_of_sale/wizard/pos_box_entries.py
new file mode 100644
index 00000000000..c33bc13a285
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_box_entries.py
@@ -0,0 +1,132 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import netsvc
+from osv import osv,fields
+from tools.translate import _
+from tools.misc import UpdateableStr
+from mx import DateTime
+from tools.translate import _
+
+
+class pos_box_entries(osv.osv_memory):
+    _name = 'pos.box.entries'
+    _description = 'Pos Box Entries'
+
+    def _get_journal(self,cr,uid,context):
+        """ 
+             @summary:   Make the selection list of Cash Journal  .       
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary 
+             @return :Return the list of journal 
+        """            
+        
+        obj = self.pool.get('account.journal')
+        user = self.pool.get('res.users').browse(cr, uid, uid)
+        ids = obj.search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', user.company_id.id)])
+        res = obj.read(cr, uid, ids, ['id', 'name'], context)
+        res = [(r['id'], r['name']) for r in res]
+        res.insert(0, ('', ''))
+        return res
+    
+    def _get_income_product(self,cr,uid,context):
+        
+        """ 
+             @summary:   Make the selection list of purchasing  products.            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary 
+             @return :Return of operation of product 
+        """                  
+        obj = self.pool.get('product.product')
+        ids = obj.search(cr, uid, [('income_pdt', '=', True)])
+        res = obj.read(cr, uid, ids, ['id', 'name'], context)
+        res = [(r['id'], r['name']) for r in res]
+        res.insert(0, ('', ''))
+        
+        return res
+    
+    
+    _columns = {
+                'name': fields.char('Name', size=32,required=True),
+                'journal_id': fields.selection(_get_journal, "Journal",required=True),
+                'product_id': fields.selection(_get_income_product, "Operation",required=True),
+                'amount' :fields.float('Amount', digits=(16,2)),
+                'ref':fields.char('Ref', size=32),
+    }
+    _defaults = {
+                 'journal_id': lambda *a: 1,
+                 'product_id': lambda *a: 1,
+                }
+    def get_in(self, cr, uid, ids, context):
+
+        
+        """ 
+             @summary:  Create the entry of statement in journal   .            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary 
+             @return :Return of operation of product 
+        """         
+        statement_obj = self.pool.get('account.bank.statement')
+        product_obj = self.pool.get('product.template')
+        res_obj = self.pool.get('res.users')
+        product_obj=self.pool.get('product.product')
+        bank_statement=self.pool.get('account.bank.statement.line')
+        for data in  self.read(cr, uid, ids):
+            args = {}
+            curr_company = res_obj.browse(cr,uid,uid).company_id.id
+            statement_id = statement_obj.search(cr,uid, [('journal_id','=',data['journal_id']),('company_id','=',curr_company),('user_id','=',uid),('state','=','open')])
+            if not statement_id:
+                raise osv.except_osv(_('Error !'), _('You have to open at least one cashbox'))
+        
+            product = product_obj.browse(cr, uid, data['product_id'])
+            acc_id = product_obj.browse(cr,uid,data['product_id']).property_account_income
+            if not acc_id:
+                 raise osv.except_osv(_('Error !'), _('please check that account is set to %s')%(product_obj.browse(cr,uid,data['product_id']).name))
+            if statement_id:
+                statement_id = statement_id[0]
+            if not statement_id:
+                statement_id = statement_obj.create(cr,uid,{'date':time.strftime('%Y-%m-%d 00:00:00'),
+                                                            'journal_id':data['journal_id'],
+                                                            'company_id':curr_company,
+                                                            'user_id':uid,
+                                                           })
+        
+            args['statement_id'] = statement_id
+            args['journal_id'] =  data['journal_id']
+            if acc_id:
+                args['account_id'] =  acc_id.id
+            args['amount'] = data['amount'] or 0.0
+            args['ref'] = "%s" %(data['ref'] or '')
+            args['name'] = "%s: %s "% (product_obj.browse(cr,uid,data['product_id']).name, data['name'].decode('utf8'))
+            address_u = res_obj.browse(cr,uid,uid).address_id
+            if address_u:
+                partner_id = address_u.partner_id and address_u.partner_id.id or None
+                args['partner_id'] = partner_id
+            statement_line_id =bank_statement.create(cr, uid, args)
+        
+            return {}
+pos_box_entries()    
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/pos_box_entries.xml b/addons/point_of_sale/wizard/pos_box_entries.xml
new file mode 100644
index 00000000000..e0f0a21402f
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_box_entries.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        
+        <!--  Box Entries -->
+        
+		<record id="view_box_entries" model="ir.ui.view">
+            <field name="name">Box Entries</field>
+            <field name="model">pos.box.entries</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Entrée de caisse">
+				    	<separator string="Please fill these fields for entries to the box:" colspan="4"/>
+				    	<field name="name"/>
+				    	<field name="journal_id"/>
+				    	<field name="product_id"/>
+				    	<field name="amount"/>
+				    	<field name="ref"/>
+				    	<group colspan="4" col="2">
+				 		<button icon='gtk-cancel' special="cancel"
+                			string="Close" />
+                		<button name="get_in" string="Make Entries in the CashBox"
+                			colspan="1" type="object" icon="gtk-ok" />
+                			</group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_box_entries" model="ir.actions.act_window">
+         	<field name="name">Box Entries</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.box.entries</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>            
+        </record>
+        
+	</data>
+</openerp>	        
diff --git a/addons/point_of_sale/wizard/wizard_refund_order.py b/addons/point_of_sale/wizard/wizard_refund_order.py
index 188e7b47690..9ecfff0c19b 100644
--- a/addons/point_of_sale/wizard/wizard_refund_order.py
+++ b/addons/point_of_sale/wizard/wizard_refund_order.py
@@ -71,14 +71,14 @@ def _get_pdt_exp(self,cr,uid,context):
     res.insert(0, ('', ''))
     return res
 
-entry_fields = {
-    'journal_id': {'string': 'Journal', 'type': 'selection', 'selection': _get_journal, 'required':True},
-    'product_id': {'string': 'Operation', 'type': 'selection', 'selection':_get_pdt , 'required':True},
-    'amount': {'string': 'Amount', 'type': 'float'},
-    'name': {'string': 'Name', 'type': 'char', 'size': '32', 'required':True},
-    'ref': {'string': 'Ref.', 'type': 'char', 'size': '32'},
-
-}
+#entry_fields = {
+#    'journal_id': {'string': 'Journal', 'type': 'selection', 'selection': _get_journal, 'required':True},
+#    'product_id': {'string': 'Operation', 'type': 'selection', 'selection':_get_pdt , 'required':True},
+#    'amount': {'string': 'Amount', 'type': 'float'},
+#    'name': {'string': 'Name', 'type': 'char', 'size': '32', 'required':True},
+#    'ref': {'string': 'Ref.', 'type': 'char', 'size': '32'},
+#
+#}
 
 out_fields = {
     'journal_id': {'string': 'Journal', 'type': 'selection', 'selection': _get_journal, 'required':True},
@@ -144,67 +144,67 @@ def _get_out(self, cr, uid, data, context):
     statement_line_id = pool.get('account.bank.statement.line').create(cr, uid, args)
     return {}
 
-def _get_in(self, cr, uid, data, context):
-    args = {}
-    pool = pooler.get_pool(cr.dbname)
-    statement_obj = pool.get('account.bank.statement')
-    product_obj = pool.get('product.template')
-    res_obj = pool.get('res.users')
-    curr_company = res_obj.browse(cr,uid,uid).company_id.id
-    statement_id = statement_obj.search(cr,uid, [('journal_id','=',data['form']['journal_id']),('company_id','=',curr_company),('user_id','=',uid),('state','=','open')])
-    if not statement_id:
-        raise wizard.except_wizard(_('Error !'), _('You have to open at least one cashbox'))
-
-    product = pool.get('product.product').browse(cr, uid, data['form']['product_id'])
-    acc_id = product_obj.browse(cr,uid,data['form']['product_id']).property_account_income
-    if not acc_id:
-        raise wizard.except_wizard(_('Error !'), _('please check that account is set to %s')%(product_obj.browse(cr,uid,data['form']['product_id']).name))
-    if statement_id:
-        statement_id = statement_id[0]
-    if not statement_id:
-        statement_id = statement_obj.create(cr,uid,{'date':time.strftime('%Y-%m-%d 00:00:00'),
-                                                    'journal_id':data['form']['journal_id'],
-                                                    'company_id':curr_company,
-                                                    'user_id':uid,
-                                                   })
-
-    args['statement_id'] = statement_id
-    args['journal_id'] =  data['form']['journal_id']
-    if acc_id:
-        args['account_id'] =  acc_id.id
-    args['amount'] = data['form']['amount'] or 0.0
-    args['ref'] = "%s" %(data['form']['ref'] or '')
-    args['name'] = "%s: %s "% (product_obj.browse(cr,uid,data['form']['product_id']).name, data['form']['name'].decode('utf8'))
-    address_u = pool.get('res.users').browse(cr,uid,uid).address_id
-    if address_u:
-        partner_id = address_u.partner_id and address_u.partner_id.id or None
-        args['partner_id'] = partner_id
-    statement_line_id = pool.get('account.bank.statement.line').create(cr, uid, args)
-
-    return {}
-
-class box_entries(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {
-                'type': 'form',
-                'arch': entry_form % u'Entrée de caisse',
-                'fields': entry_fields,
-                'state': [('end', 'Cancel', 'gtk-cancel'), ('next', 'Make entries in the Cashbox', 'gtk-ok')]
-            }
-        },
-        'next': {
-            'actions': [],
-            'result': {
-                'type': 'action',
-                'action': _get_in,
-                'state': 'end'
-            }
-        },
-    }
-
-box_entries('pos.entry')
+#def _get_in(self, cr, uid, data, context):
+#    args = {}
+#    pool = pooler.get_pool(cr.dbname)
+#    statement_obj = pool.get('account.bank.statement')
+#    product_obj = pool.get('product.template')
+#    res_obj = pool.get('res.users')
+#    curr_company = res_obj.browse(cr,uid,uid).company_id.id
+#    statement_id = statement_obj.search(cr,uid, [('journal_id','=',data['form']['journal_id']),('company_id','=',curr_company),('user_id','=',uid),('state','=','open')])
+#    if not statement_id:
+#        raise wizard.except_wizard(_('Error !'), _('You have to open at least one cashbox'))
+#
+#    product = pool.get('product.product').browse(cr, uid, data['form']['product_id'])
+#    acc_id = product_obj.browse(cr,uid,data['form']['product_id']).property_account_income
+#    if not acc_id:
+#        raise wizard.except_wizard(_('Error !'), _('please check that account is set to %s')%(product_obj.browse(cr,uid,data['form']['product_id']).name))
+#    if statement_id:
+#        statement_id = statement_id[0]
+#    if not statement_id:
+#        statement_id = statement_obj.create(cr,uid,{'date':time.strftime('%Y-%m-%d 00:00:00'),
+#                                                    'journal_id':data['form']['journal_id'],
+#                                                    'company_id':curr_company,
+#                                                    'user_id':uid,
+#                                                   })
+#
+#    args['statement_id'] = statement_id
+#    args['journal_id'] =  data['form']['journal_id']
+#    if acc_id:
+#        args['account_id'] =  acc_id.id
+#    args['amount'] = data['form']['amount'] or 0.0
+#    args['ref'] = "%s" %(data['form']['ref'] or '')
+#    args['name'] = "%s: %s "% (product_obj.browse(cr,uid,data['form']['product_id']).name, data['form']['name'].decode('utf8'))
+#    address_u = pool.get('res.users').browse(cr,uid,uid).address_id
+#    if address_u:
+#        partner_id = address_u.partner_id and address_u.partner_id.id or None
+#        args['partner_id'] = partner_id
+#    statement_line_id = pool.get('account.bank.statement.line').create(cr, uid, args)
+#
+#    return {}
+#
+#class box_entries(wizard.interface):
+#    states = {
+#        'init': {
+#            'actions': [],
+#            'result': {
+#                'type': 'form',
+#                'arch': entry_form % u'Entrée de caisse',
+#                'fields': entry_fields,
+#                'state': [('end', 'Cancel', 'gtk-cancel'), ('next', 'Make entries in the Cashbox', 'gtk-ok')]
+#            }
+#        },
+#        'next': {
+#            'actions': [],
+#            'result': {
+#                'type': 'action',
+#                'action': _get_in,
+#                'state': 'end'
+#            }
+#        },
+#    }
+#
+#box_entries('pos.entry')
 
 class box_out(wizard.interface):
     states = {

From 5479a4e88e7cf53ff82cbb6e9dbad0199432d23e Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Mon, 15 Mar 2010 11:31:38 +0530
Subject: [PATCH 111/251] [IMP]: olap: Converted Load column and Query Logs
 wizrd  into osv memory wizard

bzr revid: ksa@tinyerp.co.in-20100315060138-l0cygthavv1ht1vs
---
 addons/olap/__terp__.py                       |   4 +-
 addons/olap/data/olap_fact_view.xml           |  10 +-
 addons/olap/data/olap_wizard.xml              |  29 +--
 addons/olap/wizard/__init__.py                |   6 +-
 ...rd_load_columns.py => olap_load_column.py} |  40 ++--
 addons/olap/wizard/olap_load_column_view.xml  |  37 ++++
 addons/olap/wizard/olap_query_logs_clear.py   |  75 +++++++
 .../wizard/olap_query_logs_clear_view.xml     |  45 ++++
 .../wizard/wizard_application_configure.py    | 194 ------------------
 addons/olap/wizard/wizard_clear_logs.py       |  83 --------
 10 files changed, 197 insertions(+), 326 deletions(-)
 rename addons/olap/wizard/{wizard_load_columns.py => olap_load_column.py} (67%)
 create mode 100644 addons/olap/wizard/olap_load_column_view.xml
 create mode 100755 addons/olap/wizard/olap_query_logs_clear.py
 create mode 100644 addons/olap/wizard/olap_query_logs_clear_view.xml
 delete mode 100755 addons/olap/wizard/wizard_application_configure.py
 delete mode 100755 addons/olap/wizard/wizard_clear_logs.py

diff --git a/addons/olap/__terp__.py b/addons/olap/__terp__.py
index 7583de75182..d716fb83ddf 100644
--- a/addons/olap/__terp__.py
+++ b/addons/olap/__terp__.py
@@ -10,8 +10,10 @@
     """,
     "init_xml" :  ["data/olap_data.xml"],
     "update_xml" : [
-        "data/olap_view.xml",
+        "wizard/olap_query_logs_clear_view.xml",
+        "wizard/olap_load_column_view.xml",
         "data/olap_wizard.xml",
+        "data/olap_view.xml",
         "data/olap_cube_view.xml",
         "data/olap_fact_view.xml",
         "data/olap_cube_workflow.xml",
diff --git a/addons/olap/data/olap_fact_view.xml b/addons/olap/data/olap_fact_view.xml
index d46669e2725..74a794d9eee 100755
--- a/addons/olap/data/olap_fact_view.xml
+++ b/addons/olap/data/olap_fact_view.xml
@@ -81,7 +81,7 @@
                 <field name="active"/>
                 <field name="hide"/>
 <!--                <button name="show_col_view" string="Columns" type="object"/>-->
-                <!--<button string="Columns_wiz" name="%(bi_load_column)d" type="action"/>-->
+
                 <button name="hide_col" string="Hide" type="object"/>
                 <button name="show_col" string="Show" type="object"/>
             </tree>
@@ -108,7 +108,7 @@
                         <button name="hide_col" string="Hide" type="object"/>
                         <button name="show_col" string="Show" type="object"/>
                     </tree>
-                </field>            
+                </field>
                 <field name="fact_database_id" select="1" colspan="2"/>
                 <field name="active"/>
                 <field name="hide"/>
@@ -150,7 +150,7 @@
             </tree>
         </field>
     </record>
-    
+
     <record model="ir.ui.view" id="view_olap_database_columns_tree_m20">
         <field name="name">olap.database.columns.tree.m20</field>
         <field name="model">olap.database.columns</field>
@@ -165,7 +165,7 @@
             </tree>
         </field>
     </record>
-    
+
     <record model="ir.ui.view" id="view_olap_database_columns_form">
         <field name="name">olap.database.columns.form</field>
         <field name="model">olap.database.columns</field>
@@ -318,7 +318,7 @@
             <form string="Olap Application Field">
                 <newline/>
                 <field name="name" select="1" colspan="2"/>
-                <field name="field_name" select="1" />              
+                <field name="field_name" select="1" />
                 <field name="table_name" select="1" />
                 <newline/>
                 <field name="is_hidden" select="1" colspan="2"/>
diff --git a/addons/olap/data/olap_wizard.xml b/addons/olap/data/olap_wizard.xml
index c2cda9ef29a..794b7c3681c 100755
--- a/addons/olap/data/olap_wizard.xml
+++ b/addons/olap/data/olap_wizard.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    
+
     <wizard
             string="Query Builder"
             model="olap.schema"
@@ -9,8 +9,6 @@
             menu= "False"
             multi="True"
             id="bi_conf_cube_query_builder"/>
-        <!--        <menuitem name="Query Builder" action="bi_conf_cube_query_builder" type="wizard"  id="menu_bi_conf_cube_query_builder" sequence="40" parent="menu_bi_conf_tools"/>
-        -->
 
     <wizard
             string="Load Tables"
@@ -28,20 +26,19 @@
             menu= "False"
             multi="True"
             id="bi_menu_olap_load_table"/>
-            
+
         <wizard
             string="Open Configuration"
             model="olap.schema"
             name="olap.load.configuration.table"
             menu= "False"
             multi="True"
-            id="bi_load_configuration_table"/>          
+            id="bi_load_configuration_table"/>
 
         <wizard
             string="Configure from Application"
             model="olap.schema"
             name="olap.application.configuration"
-            menu="False"
             multi="True"
             id="bi_application_configuration"/>
 
@@ -50,24 +47,10 @@
             model="olap.fact.database"
             name="olap.fact.database.test_connection"
             menu="False"
-            id="bi_test_connection"/> 
-
-        <wizard
-            string="Open Columns"
-            model="olap.database.columns"
-            name="olap.load.column"
-            menu= "False"
-            multi="True"
-            id="bi_load_column"/> 
-            
-        <wizard
-            string="Clear Logs"
-            model="olap.query.logs"
-            name="olap.query.logs.clear"
-            menu="True"
-            id="bi_clear_logs"/>    
-        <menuitem name="Clear Logs" action="bi_clear_logs" type="wizard"  id="menu_bi_clear_logs" sequence="30" parent="menu_bi_conf_tools"/>
+            id="bi_test_connection"/>
 
+   <menuitem name="Clear Logs" action="action_view_olap_query_logs_clear" icon="STOCK_EXECUTE"
+         id="menu_bi_clear_logs" sequence="30" parent="menu_bi_conf_tools"/>
 
     </data>
 </openerp>
diff --git a/addons/olap/wizard/__init__.py b/addons/olap/wizard/__init__.py
index a7b3a6af17f..94763698ad2 100755
--- a/addons/olap/wizard/__init__.py
+++ b/addons/olap/wizard/__init__.py
@@ -28,7 +28,7 @@
 import wizard_query_builder
 import wizard_load_data
 import wizard_load_configured_table
-import wizard_clear_logs
-import wizard_application_configure
-import wizard_load_columns
 import wizard_test_connection
+#import wizard_application_configure
+import olap_query_logs_clear
+import olap_load_column
\ No newline at end of file
diff --git a/addons/olap/wizard/wizard_load_columns.py b/addons/olap/wizard/olap_load_column.py
similarity index 67%
rename from addons/olap/wizard/wizard_load_columns.py
rename to addons/olap/wizard/olap_load_column.py
index f64a94399b4..e60f0f2bfa6 100755
--- a/addons/olap/wizard/wizard_load_columns.py
+++ b/addons/olap/wizard/olap_load_column.py
@@ -24,17 +24,25 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-import time
-
-import wizard
+from osv import fields, osv
+from service import web_services
 import pooler
+import time
+import wizard
 
-class wizard_load_columns(wizard.interface):
-    def _get_table_data(self, cr, uid, data, context={}):
-        pool_obj = pooler.get_pool(cr.dbname)
-        ids_cols=pool_obj.get('olap.database.columns').search(cr, uid, ([('table_id','=',data['id'])]),context={})
-        model_data_ids = pool_obj.get('ir.model.data').search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_olap_database_columns_form')],context={})
-        resource_id = pool_obj.get('ir.model.data').read(cr,uid,model_data_ids,fields=['res_id'])[0]['res_id']
+class olap_load_column(osv.osv_memory):
+    """ Load Database Column """
+    _name = "olap.load.column"
+    _description = "Olap Load Column"
+
+    def get_table_data(self, cr, uid, ids, context={}):
+        ids_cols=self.pool.get('olap.database.columns').search(cr, uid,\
+                             ([('table_id','=',context['active_id'])]),context={})
+        model_data_ids = self.pool.get('ir.model.data').search(cr,uid,\
+                        [('model','=','ir.ui.view'),\
+                    ('name','=','view_olap_database_columns_form')],context={})
+        resource_id = self.pool.get('ir.model.data').read(cr,uid,\
+                                model_data_ids,fields=['res_id'])[0]['res_id']
         return {
             'domain': "[('id','in', ["+','.join(map(str,ids_cols))+"])]",
             'name': 'Database Columns',
@@ -44,12 +52,10 @@ class wizard_load_columns(wizard.interface):
             'views': [(False,'tree'),(resource_id,'form')],
             'type': 'ir.actions.act_window',
         }
-        
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'action' ,'action':_get_table_data,'state':'end'}
-        }
-      }
+    _columns = {
 
-wizard_load_columns('olap.load.column')
+            }
+
+olap_load_column()
+
+# vim: ts=4 sts=4 sw=4 si et
\ No newline at end of file
diff --git a/addons/olap/wizard/olap_load_column_view.xml b/addons/olap/wizard/olap_load_column_view.xml
new file mode 100644
index 00000000000..48fd23362de
--- /dev/null
+++ b/addons/olap/wizard/olap_load_column_view.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_olap_load_column" model="ir.ui.view">
+            <field name="name">Create Logs</field>
+            <field name="model">olap.load.column</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="">
+              	<separator string="                    " colspan="4"/> 
+            	<button name="get_table_data" string="Open" type="object"/>
+			</form>
+            </field>
+		</record>
+
+		<record id="action_olap_load_column" model="ir.actions.act_window">
+            <field name="name">Open Columns</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">olap.load.column</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="context">{'record_id' : active_id}</field>
+            <field name="target">new</field>
+    	</record>
+
+		<record model="ir.values" id="lap_load_column">
+            <field name="model_id" ref="olap.model_olap_database_columns" />
+            <field name="object" eval="1" />
+            <field name="name">Open Columns</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_olap_load_column'))" />
+            <field name="key">action</field>
+            <field name="model">olap.database.columns</field>
+        </record>
+        
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/olap/wizard/olap_query_logs_clear.py b/addons/olap/wizard/olap_query_logs_clear.py
new file mode 100755
index 00000000000..63f35a382ea
--- /dev/null
+++ b/addons/olap/wizard/olap_query_logs_clear.py
@@ -0,0 +1,75 @@
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# 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 2
+# 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, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from osv import fields, osv
+from service import web_services
+import pooler
+import time
+import wizard
+
+class olap_query_logs_clear(osv.osv_memory):
+    """ Clear the Logs for Given User  """
+    _name = "olap.query.logs.clear"
+    _description = "Olap Query Logs Clear"
+    _columns = {
+        'user_name':fields.char('User',size=64,required=True,readonly=True),
+    }
+
+    def _getdata(self,cr,uid,context={}):
+        user = self.pool.get('res.users').browse(cr,uid,uid)
+        return user.name
+
+    _defaults = {
+        'user_name': _getdata
+            }
+
+    def clear_logs(self,cr,uid,part,context={}):
+        ids = self.pool.get('olap.query.logs').search(cr,uid,[('user_id','=',uid)])
+        self.pool.get('olap.query.logs').unlink(cr, uid,ids,context)
+        data_obj = self.pool.get('ir.model.data')
+        id2 = data_obj._get_id(cr, uid, 'olap', 'view_olap_query_logs_clear_msg')
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        value = {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'olap.query.logs.clear.msg',
+            'views': [(id2,'form'),(False,'tree'),(False,'calendar'),(False,'graph')],
+            'type': 'ir.actions.act_window',
+            'target': 'new'
+        }
+        return value
+
+olap_query_logs_clear()
+
+class olap_query_logs_clear_msg(osv.osv_memory):
+    _name = "olap.query.logs.clear.msg"
+    _description = "Olap Query Logs Clear Message"
+    _columns = {
+
+            }
+olap_query_logs_clear_msg()
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/wizard/olap_query_logs_clear_view.xml b/addons/olap/wizard/olap_query_logs_clear_view.xml
new file mode 100644
index 00000000000..08d93c9410b
--- /dev/null
+++ b/addons/olap/wizard/olap_query_logs_clear_view.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_olap_query_logs_clear" model="ir.ui.view">
+            <field name="name">Create Logs</field>
+            <field name="model">olap.query.logs.clear</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string=" To Load Data">
+    			<field name='user_name'/>
+    			<separator string="" colspan="4" />
+    	        <label string="" colspan="2" />
+    	        <group colspan="4">
+        	    <button special="cancel" string="Cancel" />
+            	<button name="clear_logs" string="Clear Logs" type="object"/>
+            	</group>
+			</form>
+            </field>
+		</record>
+
+		<record id="action_view_olap_query_logs_clear" model="ir.actions.act_window">
+            <field name="name">Create Logs </field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">olap.query.logs.clear</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+    	</record>
+
+		<record id="view_olap_query_logs_clear_msg" model="ir.ui.view">
+            <field name="name">Create Logs Message</field>
+            <field name="model">olap.query.logs.clear.msg</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Load Data">
+    			<label string="Logs Cleared successfully"/>
+    	        <group colspan="4">
+            	 <button special="cancel" string="Ok" />
+            	</group>
+			</form>
+            </field>
+		</record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/olap/wizard/wizard_application_configure.py b/addons/olap/wizard/wizard_application_configure.py
deleted file mode 100755
index 3dfac9e2974..00000000000
--- a/addons/olap/wizard/wizard_application_configure.py
+++ /dev/null
@@ -1,194 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# 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 2
-# 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-import time
-
-import wizard
-import pooler
-from osv import osv
-import netsvc
-
-info = '''<?xml version="1.0"?>
-<form string="Auto Configure">
-    <label string="Your database structure (Open ERP) has been sucessfully configured."/>
-</form>'''
-
-form1 = '''<?xml version="1.0"?>
-<form string=" Auto Configure ">
-    <label string="This will Auto Configure Application"/>
-</form>'''
-
-class wizard_application_configure(wizard.interface):
-    
-    def configure_application(self,cr,uid,data,context):
-        
-        vals={}
-        apptabnew_vals={}
-        appfieldnew_vals={}
-        
-        ids=pooler.get_pool(cr.dbname).get('olap.schema').browse(cr,uid,data['id'])
-        
-        if ids.app_detect == "Unknown Application":
-            raise wizard.except_wizard('Warning', 'The Application is Unknown, we can not configure it automatically.')
-
-        else:
-            app_objs = pooler.get_pool(cr.dbname).get('olap.application')
-            app_ids = app_objs.search(cr, uid, [])
-            app_res = app_objs.browse(cr,uid, app_ids)
-            app_id=''
-            for x_app in app_res:
-                  app_id = x_app['id']
-                  
-            apptab_objs = pooler.get_pool(cr.dbname).get('olap.application.table')
-            apptab_ids = apptab_objs.search(cr, uid, [])
-            apptab_res = apptab_objs.browse(cr,uid, apptab_ids)
-            apptab_name=[]
-            for aptab in apptab_res:
-                apptab_name.append(aptab.name)
-
-            appfield_objs = pooler.get_pool(cr.dbname).get('olap.application.field')
-            appfield_ids = appfield_objs.search(cr, uid, [])
-            appfield_res = appfield_objs.browse(cr,uid, appfield_ids)
-            appcol_name=[]
-            for apcol in appfield_res:
-                appcol_name.append(apcol.name)
-            
-
-            apptab_objs = pooler.get_pool(cr.dbname).get('olap.application.table')
-            apptab_ids = apptab_objs.search(cr, uid, [])
-            apptab_res = apptab_objs.browse(cr,uid, apptab_ids)
-#            apptab_data_res = apptab_objs.read(cr,uid, apptab_ids,[])[0]
-            
-            apptab_name=[]
-            map_apptab_name_id={}
-            for aptab in apptab_res:
-                apptab_name.append(aptab.name)
-                map_apptab_name_id[aptab.table_name]=aptab
-            
-            appfield_objs = pooler.get_pool(cr.dbname).get('olap.application.field')
-            appfield_ids = appfield_objs.search(cr, uid, [])
-            appfield_res = appfield_objs.browse(cr,uid, appfield_ids)
-            appfield_data_res = appfield_objs.read(cr,uid, appfield_ids,[])
-            
-            appcol_name=[]
-            for apcol in appfield_res:
-                appcol_name.append(apcol.name)
-                
-            id_tables=pooler.get_pool(cr.dbname).get('olap.database.tables').search(cr,uid,[('fact_database_id','=',ids.database_id.id),('table_db_name','not in',['inherit','res_roles','user_rule_group_rel','res_roles_users_rel','group_rule_group_rel'])])
-            tables=pooler.get_pool(cr.dbname).get('olap.database.tables').read(cr,uid,id_tables,[])
-            
-            for tables in tables:
-                if not(tables['table_db_name'].startswith('ir') or tables['table_db_name'].startswith('wkf') or tables['table_db_name'].startswith('res_groups')):
-                    vals={}
-                    if len(apptab_ids)==0 and (tables['table_db_name'] not in apptab_name):
-                        vals['table_name']=tables['table_db_name']
-                        vals['name']=(" ").join(map(lambda x:x.capitalize(),tables['name'].split("_")))
-                        vals['is_hidden']=tables['hide']
-                        vals['application_id']=app_id
-                        apptab_new_obj=apptab_objs.create(cr,uid,vals)
-                    else:
-                        if map_apptab_name_id.has_key(tables['table_db_name']):
-                            app_table = map_apptab_name_id[tables['table_db_name']]
-                            if ((app_table['table_name']==tables['table_db_name']) and not (app_table['table_name']==tables['name'])):
-                                vals['name']=aptable_obj.table_name
-                                vals['hide']=aptable_obj.is_hidden
-                                tables_obj_new=apptab_objs.write(cr,uid,tables['id'],vals)
-                        else:
-                            vals['table_name']=tables['table_db_name']
-                            vals['name']=(" ").join(map(lambda x:x.capitalize(),tables['name'].split("_")))
-                            vals['is_hidden']=tables['hide']
-                            vals['application_id']=app_id
-                            apptab_new_obj=apptab_objs.create(cr,uid,vals)
-                    
-            id_columns=pooler.get_pool(cr.dbname).get('olap.database.columns').search(cr,uid,[('table_id','in',id_tables)])
-            columns=pooler.get_pool(cr.dbname).get('olap.database.columns').read(cr,uid,id_columns,[])
-            for columns in columns:
-                vals={}
-                if len(appfield_ids) == 0 and (columns['column_db_name'] not in appcol_name):
-                    vals['field_name']=columns['column_db_name']
-                    vals['table_name']=columns['table_id'][1]
-                    vals['name']=(" ").join(map(lambda x:x.capitalize(),columns['name'].split("_")))
-                    vals['is_hidden']=columns['hide']
-                    vals['application_id']=x_app['id']                      
-                    appfield_new_obj=appfield_objs.create(cr,uid,vals)
-                else:
-                    if map_apptab_name_id.has_key(columns['table_id'][1]):
-                        table_id_write = map_apptab_name_id[columns['table_id'][1]]
-                        filter_column=filter(lambda x: columns['column_db_name']==x['field_name'] and columns['table_id'][1]==x['table_name'],appfield_data_res)
-                        vals['name']=(" ").join(map(lambda x:x.capitalize(),columns['name'].split("_")))
-                        vals['is_hidden']=columns['hide']
-                        appfield_new_obj=appfield_objs.write(cr,uid,filter_column[0]['id'],vals)
-                    else:
-                        vals['field_name']=columns['column_db_name']
-                        vals['table_name']=columns['table_id'][1]
-                        vals['name']=(" ").join(map(lambda x:x.capitalize(),columns['name'].split("_")))
-                        vals['is_hidden']=columns['hide']
-                        vals['application_id']=x_app['id']                      
-                        appfield_new_obj=appfield_objs.create(cr,uid,vals)
-        
-        
-            database_tables = pooler.get_pool(cr.dbname).get('olap.database.tables')
-            id_tables=database_tables.search(cr,uid,[('fact_database_id','=',ids.database_id.id)])
-            tables=database_tables.read(cr,uid,id_tables,[])
-            make_id=[]
-            for table in tables:
-                vals={}
-                if (table['table_db_name'].startswith('ir') or table['table_db_name'].startswith('wkf')) or (table['table_db_name'].startswith('res_groups')) or (table['table_db_name'] in ['inherit','res_roles','user_rule_group_rel','res_roles_users_rel','group_rule_group_rel']):            
-                    vals['hide']=True
-                    vals['active']=False
-                    make_id.append(table['id'])
-                    database_tables.write(cr,uid,table['id'],vals)
-                    
-            database_columns=pooler.get_pool(cr.dbname).get('olap.database.columns')
-            id_columns=database_columns.search(cr,uid,[('table_id','in',make_id)])
-            columns=database_columns.read(cr,uid,id_columns,[])
-            for col in columns:
-                val={}
-                vals['hide']=True
-                vals['active']=False
-                database_columns.write(cr,uid,col['id'],vals)
-                
-            
-        wf_service = netsvc.LocalService('workflow')
-        wf_service.trg_validate(uid, 'olap.schema', data['id'], 'dbconfigure', cr)
-        return {}
-      
-    
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':form1, 'fields':{}, 'state':[('configure','Configure'),('end','Cancel')]}
-        },
-        'configure': {
-            'actions': [configure_application],
-            'result': {'type':'form', 'arch':info, 'fields':{}, 'state':[('end','Ok')]}   
-        },
-
-      }
-
-
-wizard_application_configure('olap.application.configuration')
-# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/wizard/wizard_clear_logs.py b/addons/olap/wizard/wizard_clear_logs.py
deleted file mode 100755
index 38b6531485a..00000000000
--- a/addons/olap/wizard/wizard_clear_logs.py
+++ /dev/null
@@ -1,83 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# 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 2
-# 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-import time
-
-import wizard
-import pooler
-from osv import osv
-
-
-info = '''<?xml version="1.0"?>
-<form string="Load Data">
-    <label string="Logs Cleared successfully"/>
-</form>'''
-
-form1 = '''<?xml version="1.0"?>
-<form string=" To Load Data">
-    <field name='user_name'/>
-</form>'''
-
-field1 = {
- #   'account_id': {'string':"Analytic Account", 'type':'many2one', 'relation':'account.analytic.account', 'required':True, 'domain':"[('type','=','normal')]"},
-    'user_name': {'string':'User', 'type':'char','size':'64', 'required':True, 'readonly':True},
-#    'db_name': {'string':'Database Name', 'type':'char','size':'64', 'required':True, 'readonly':True},
-
-}
-
-def clear_logs(self,cr,uid,part,context={}):
-    ids=pooler.get_pool(cr.dbname).get('olap.query.logs').search(cr,uid,[('user_id','=',uid)])
-    pooler.get_pool(cr.dbname).get('olap.query.logs').unlink(cr, uid,ids,context)
-    return {}
-
-def _getdata(self,cr,uid,part,context={}):
-    ids=pooler.get_pool(cr.dbname).get('res.users').browse(cr,uid,uid)
-    part['form']['user_name']=ids['name']
-#    part['form']['db_name']=lines.database_id.db_name
-    return part['form']
-
-class wizard_clear_logs(wizard.interface):
-
-    states = {
-
-       'init': {
-            'actions': [_getdata],
-            'result': {'type':'form','arch':form1, 'fields':field1, 'state':[('end','Cancel'),('ok','Clear Logs')]}
-        },
-
-        'ok': {
-            'actions': [clear_logs],
-            'result': {'type':'form','arch':info,'fields':{}, 'state':[('end','Ok')]}
-                },
-
-         'info': {
-            'actions': [],
-            'result': {'type':'form', 'arch':info, 'fields':{}, 'state':[('end','Ok')]}
-                },
-
-      }
-
-wizard_clear_logs('olap.query.logs.clear')

From 2de6177884ff2873ece4276a1417e4ff9e9df462 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 15 Mar 2010 11:59:59 +0530
Subject: [PATCH 112/251] [IMP]: olap: Improvement for menu of query logs
 wizard

bzr revid: rpa@tinyerp.com-20100315062959-5sn2aat89g8xp3i7
---
 addons/olap/data/olap_view.xml   | 4 +++-
 addons/olap/data/olap_wizard.xml | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/olap/data/olap_view.xml b/addons/olap/data/olap_view.xml
index ac6b50711e6..35aac4a20c0 100755
--- a/addons/olap/data/olap_view.xml
+++ b/addons/olap/data/olap_view.xml
@@ -47,7 +47,9 @@
         id="menu_bi_conf_tools"
         parent="menu_bi_configuration"/>
 
-
+	<menuitem name="Clear Logs" action="action_view_olap_query_logs_clear" icon="STOCK_EXECUTE"
+         id="menu_bi_clear_logs" sequence="30" parent="menu_bi_conf_tools"/>
+         
     <record model="ir.actions.url" id="menu_url_cube_browser">
             <field name="name">name_menu_url_cube_browser</field>
             <field name="url">http://localhost:8080/browser</field>
diff --git a/addons/olap/data/olap_wizard.xml b/addons/olap/data/olap_wizard.xml
index 794b7c3681c..beb3453d224 100755
--- a/addons/olap/data/olap_wizard.xml
+++ b/addons/olap/data/olap_wizard.xml
@@ -49,8 +49,6 @@
             menu="False"
             id="bi_test_connection"/>
 
-   <menuitem name="Clear Logs" action="action_view_olap_query_logs_clear" icon="STOCK_EXECUTE"
-         id="menu_bi_clear_logs" sequence="30" parent="menu_bi_conf_tools"/>
 
     </data>
 </openerp>

From bd000f7a18c00f798cfffd8a6622d3e826b630ad Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 15 Mar 2010 12:00:32 +0530
Subject: [PATCH 113/251] [IMP] point_of_sale: Convert the box_out wizard into
 osv_memory wizard

bzr revid: sbh@tinyerp.com-20100315063032-82jq0fglyloak8ml
---
 addons/point_of_sale/__terp__.py              |   1 +
 addons/point_of_sale/pos_view.xml             |   8 +-
 addons/point_of_sale/wizard/__init__.py       |   2 +-
 .../point_of_sale/wizard/pos_box_entries.py   |  33 +--
 addons/point_of_sale/wizard/pos_box_out.py    | 132 ++++++++++
 addons/point_of_sale/wizard/pos_box_out.xml   |  38 +++
 .../wizard/wizard_refund_order.py             | 232 ------------------
 7 files changed, 193 insertions(+), 253 deletions(-)
 create mode 100644 addons/point_of_sale/wizard/pos_box_out.py
 create mode 100644 addons/point_of_sale/wizard/pos_box_out.xml
 delete mode 100644 addons/point_of_sale/wizard/wizard_refund_order.py

diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__terp__.py
index 82c1e5a31da..3127af647df 100644
--- a/addons/point_of_sale/__terp__.py
+++ b/addons/point_of_sale/__terp__.py
@@ -50,6 +50,7 @@ Main features :
         'wizard/pos_open_statement.xml',
         'wizard/pos_close_statement.xml',  
         'wizard/pos_box_entries.xml',  
+        'wizard/pos_box_out.xml',  
         'pos_view.xml',
         'pos_sequence.xml',
         'posrule_data.xml',
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 265bdb6d836..0a72e5f1a50 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -844,17 +844,17 @@ invoiced
             string="Refloat"
             action="action_box_entries"
             id="menu_wizard_enter_jrnl" sequence="3" />
-        <wizard
+            
+    <!--    <wizard
             string="Enter negative operations"
             model="account.bank.statement"
             name="pos.out"
             menu="False"
-            id="pos_entries2"/>
+            id="pos_entries2"/>-->
         <menuitem
             name="Output Operations" parent="menu_point_config"
             string="Refloat"
-            action="pos_entries2"
-            type="wizard"
+            action="action_box_out"
             id="menu_wizard_enter_jrnl2" sequence="3" />
 
 <!--        <menuitem name="Sales Waiting Validation" parent="menu_point_config" id="menu_point_ofsale_date_payment"-->
diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index 17ddf3c5c61..641736a3460 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -22,7 +22,6 @@
 
 import wizard_pos_payment
 import wizard_default_journal
-import wizard_refund_order
 import wizard_scan_product
 import wizard_receipt
 import wizard_return
@@ -42,5 +41,6 @@ import pos_get_sale
 import pos_open_statement
 import pos_close_statement
 import pos_box_entries
+import pos_box_out
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/wizard/pos_box_entries.py b/addons/point_of_sale/wizard/pos_box_entries.py
index c33bc13a285..7ef9eed6634 100644
--- a/addons/point_of_sale/wizard/pos_box_entries.py
+++ b/addons/point_of_sale/wizard/pos_box_entries.py
@@ -26,28 +26,29 @@ from tools.misc import UpdateableStr
 from mx import DateTime
 from tools.translate import _
 
-
-class pos_box_entries(osv.osv_memory):
-    _name = 'pos.box.entries'
-    _description = 'Pos Box Entries'
-
-    def _get_journal(self,cr,uid,context):
-        """ 
+def get_journal(self,cr,uid,context):
+    """ 
              @summary:   Make the selection list of Cash Journal  .       
              @param self: The object pointer.
              @param cr: A database cursor
              @param uid: ID of the user currently logged in
              @param context: A standard dictionary 
              @return :Return the list of journal 
-        """            
+    """            
         
-        obj = self.pool.get('account.journal')
-        user = self.pool.get('res.users').browse(cr, uid, uid)
-        ids = obj.search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', user.company_id.id)])
-        res = obj.read(cr, uid, ids, ['id', 'name'], context)
-        res = [(r['id'], r['name']) for r in res]
-        res.insert(0, ('', ''))
-        return res
+    obj = self.pool.get('account.journal')
+    user = self.pool.get('res.users').browse(cr, uid, uid)
+    ids = obj.search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', user.company_id.id)])
+    res = obj.read(cr, uid, ids, ['id', 'name'], context)
+    res = [(r['id'], r['name']) for r in res]
+    res.insert(0, ('', ''))
+    return res
+
+class pos_box_entries(osv.osv_memory):
+    _name = 'pos.box.entries'
+    _description = 'Pos Box Entries'
+
+
     
     def _get_income_product(self,cr,uid,context):
         
@@ -70,7 +71,7 @@ class pos_box_entries(osv.osv_memory):
     
     _columns = {
                 'name': fields.char('Name', size=32,required=True),
-                'journal_id': fields.selection(_get_journal, "Journal",required=True),
+                'journal_id': fields.selection(get_journal, "Journal",required=True),
                 'product_id': fields.selection(_get_income_product, "Operation",required=True),
                 'amount' :fields.float('Amount', digits=(16,2)),
                 'ref':fields.char('Ref', size=32),
diff --git a/addons/point_of_sale/wizard/pos_box_out.py b/addons/point_of_sale/wizard/pos_box_out.py
new file mode 100644
index 00000000000..c2dcec98a49
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_box_out.py
@@ -0,0 +1,132 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import netsvc
+from osv import osv,fields
+from tools.translate import _
+from tools.misc import UpdateableStr
+from mx import DateTime
+from tools.translate import _
+import pos_box_entries
+print  dir(pos_box_entries)
+
+class pos_box_out(osv.osv_memory):
+    _name = 'pos.box.out'
+    _description = 'Pos Box Out'
+    
+    def _get_expense_product(self,cr,uid,context):
+        
+        """ 
+             @summary:   Make the selection list of expense product.            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary 
+             @return :Return of operation of product 
+        """            
+        obj = self.pool.get('product.product')
+        company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
+        ids = obj.search(cr, uid, ['&', ('expense_pdt', '=', True), '|', ('company_id', '=', company_id), ('company_id', '=', None)])
+        res = obj.read(cr, uid, ids, ['id', 'name'], context)
+        res = [(r['id'], r['name']) for r in res]
+        res.insert(0, ('', ''))
+        return res    
+    
+    _columns = {
+                'name': fields.char('Name', size=32,required=True),
+                'journal_id': fields.selection(pos_box_entries.get_journal, "Journal",required=True),
+                'product_id': fields.selection(_get_expense_product, "Operation",required=True),
+                'amount' :fields.float('Amount', digits=(16,2)),
+                'ref':fields.char('Ref', size=32),
+    }
+    _defaults = {
+                 'journal_id': lambda *a: 1,
+                 'product_id': lambda *a: 1,
+                }
+    def get_out(self, cr, uid, ids, context):
+        
+        """ 
+             @summary:  Create the entries in the CashBox   .            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary 
+             @return :Return of operation of product 
+        """         
+        args = {}
+        statement_obj= self.pool.get('account.bank.statement')
+        statement_line_obj=self.pool.get('account.bank.statement.line')
+        product_obj= self.pool.get('product.template')
+        productp_obj= self.pool.get('product.product')
+        res_obj = self.pool.get('res.users')
+        for data in  self.read(cr, uid, ids):
+                        
+            curr_company = res_obj.browse(cr,uid,uid).company_id.id
+            statement_id = statement_obj.search(cr,uid, [('journal_id','=',data['journal_id']),('company_id','=',curr_company),('user_id','=',uid),('state','=','open')])
+            monday = (DateTime.now() + DateTime.RelativeDateTime(weekday=(DateTime.Monday,0))).strftime('%Y-%m-%d')
+            sunday = (DateTime.now() + DateTime.RelativeDateTime(weekday=(DateTime.Sunday,0))).strftime('%Y-%m-%d')
+            done_statmt = statement_obj.search(cr,uid, [('date','>=',monday+' 00:00:00'),('date','<=',sunday+' 23:59:59'),('journal_id','=',data['journal_id']),('company_id','=',curr_company),('user_id','=',uid)])
+            stat_done = statement_obj.browse(cr,uid, done_statmt)
+            address_u = res_obj.browse(cr,uid,uid).address_id
+            am = 0.0
+            
+            amount_check = productp_obj.browse(cr,uid,data['product_id']).am_out or False
+            for st in stat_done:
+                for s in st.line_ids:
+                    if address_u and s.partner_id==address_u.partner_id and s.am_out:
+                        am+=s.amount
+            if (-data['amount'] or 0.0)+ am <-(res_obj.browse(cr,uid,uid).company_id.max_diff or 0.0) and amount_check:
+                val = (res_obj.browse(cr,uid,uid).company_id.max_diff or 0.0)+ am
+                raise osv.except_osv(_('Error !'), _('The maximum value you can still withdraw is exceeded. \n Remaining value is equal to %d ')%(val))
+        
+            acc_id = product_obj.browse(cr,uid,data['product_id']).property_account_income
+            if not acc_id:
+                 raise osv.except_osv(_('Error !'), _('please check that account is set to %s')%(product_obj.browse(cr,uid,data['product_id']).name))
+            if not statement_id:
+                 raise osv.except_osv(_('Error !'), _('You have to open at least one cashbox'))
+            if statement_id:
+                statement_id = statement_id[0]
+            if not statement_id:
+                statement_id = statement_obj.create(cr,uid,{'date':time.strftime('%Y-%m-%d 00:00:00'),
+                                                'journal_id':data['journal_id'],
+                                                'company_id':curr_company,
+                                                'user_id':uid,
+                                                })
+            args['statement_id']= statement_id
+            args['journal_id']= data['journal_id']
+            if acc_id:
+                args['account_id']= acc_id.id
+            amount= data['amount'] or 0.0
+            if data['amount'] > 0:
+                amount= -data['amount']
+            args['amount'] = amount
+            if productp_obj.browse(cr,uid,data['product_id']).am_out:
+                args['am_out'] = True
+            args['ref'] = data['ref'] or ''
+            args['name'] = "%s: %s "%(product_obj.browse(cr,uid,data['product_id']).name, data['name'].decode('utf8'))
+            address_u = res_obj.browse(cr,uid,uid).address_id
+            if address_u:
+                partner_id = address_u.partner_id and address_u.partner_id.id or None
+                args['partner_id'] = partner_id
+            statement_line_id = statement_line_obj.create(cr, uid, args)
+        return {}
+
+pos_box_out()    
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/pos_box_out.xml b/addons/point_of_sale/wizard/pos_box_out.xml
new file mode 100644
index 00000000000..c634b4cf997
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_box_out.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        
+        <!--  Box Entries -->
+        
+		<record id="view_pos_box_out" model="ir.ui.view">
+            <field name="name">Box Out</field>
+            <field name="model">pos.box.out</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Sortie de caisse">
+				    	<separator string="Please fill these fields for entries to the box:" colspan="4"/>
+				    	<field name="name"/>
+				    	<field name="journal_id"/>
+				    	<field name="product_id"/>
+				    	<field name="amount"/>
+				    	<field name="ref"/>
+				    	<group colspan="4" col="2">
+				 		<button icon='gtk-cancel' special="cancel"
+                			string="Close" />
+                		<button name="get_out" string="Make Entries in the CashBox"
+                			colspan="1" type="object" icon="gtk-ok" />
+                			</group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_box_out" model="ir.actions.act_window">
+         	<field name="name">Box Out</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.box.out</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>            
+        </record>
+        
+	</data>
+</openerp>	        
diff --git a/addons/point_of_sale/wizard/wizard_refund_order.py b/addons/point_of_sale/wizard/wizard_refund_order.py
deleted file mode 100644
index 9ecfff0c19b..00000000000
--- a/addons/point_of_sale/wizard/wizard_refund_order.py
+++ /dev/null
@@ -1,232 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-
-import time
-import netsvc
-from tools.misc import UpdateableStr
-import wizard
-import pooler
-from mx import DateTime
-from tools.translate import _
-
-
-entry_form = '''<?xml version="1.0"?>
-<form string="%s">
-<separator string="Please fill these fields for entries to the box:" colspan="4"/>
-<newline/>
-<field name="name"/>
-<field name="ref"/>
-<field name="journal_id"/>
-<field name="amount"/>
-<field name="product_id"/>
-</form>
-'''
-
-def _get_journal(self,cr,uid,context):
-    pool = pooler.get_pool(cr.dbname)
-    obj = pool.get('account.journal')
-    user = pool.get('res.users').browse(cr, uid, uid)
-    ids = obj.search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', user.company_id.id)])
-    res = obj.read(cr, uid, ids, ['id', 'name'], context)
-    res = [(r['id'], r['name']) for r in res]
-    res.insert(0, ('', ''))
-    return res
-
-def _get_pdt(self,cr,uid,context):
-    pool = pooler.get_pool(cr.dbname)
-    obj = pool.get('product.product')
-    ids = obj.search(cr, uid, [('income_pdt', '=', True)])
-    res = obj.read(cr, uid, ids, ['id', 'name'], context)
-    res = [(r['id'], r['name']) for r in res]
-    res.insert(0, ('', ''))
-    return res
-
-def _get_pdt_exp(self,cr,uid,context):
-    pool = pooler.get_pool(cr.dbname)
-    obj = pool.get('product.product')
-    company_id = pool.get('res.users').browse(cr, uid, uid).company_id.id
-    ids = obj.search(cr, uid, ['&', ('expense_pdt', '=', True), '|', ('company_id', '=', company_id), ('company_id', '=', None)])
-    res = obj.read(cr, uid, ids, ['id', 'name'], context)
-    res = [(r['id'], r['name']) for r in res]
-    res.insert(0, ('', ''))
-    return res
-
-#entry_fields = {
-#    'journal_id': {'string': 'Journal', 'type': 'selection', 'selection': _get_journal, 'required':True},
-#    'product_id': {'string': 'Operation', 'type': 'selection', 'selection':_get_pdt , 'required':True},
-#    'amount': {'string': 'Amount', 'type': 'float'},
-#    'name': {'string': 'Name', 'type': 'char', 'size': '32', 'required':True},
-#    'ref': {'string': 'Ref.', 'type': 'char', 'size': '32'},
-#
-#}
-
-out_fields = {
-    'journal_id': {'string': 'Journal', 'type': 'selection', 'selection': _get_journal, 'required':True},
-    'product_id': {'string': 'Operation', 'type': 'selection', 'selection':_get_pdt_exp , 'required':True},
-    'amount': {'string': 'Amount', 'type': 'float'},
-    'name': {'string': 'Name', 'type': 'char', 'size': '32', 'required':True},
-    'ref': {'string': 'Ref.', 'type': 'char', 'size': '32'},
-}
-
-def _get_out(self, cr, uid, data, context):
-    args = {}
-    pool = pooler.get_pool(cr.dbname)
-    statement_obj= pool.get('account.bank.statement')
-    product_obj= pool.get('product.template')
-    productp_obj= pool.get('product.product')
-    res_obj = pool.get('res.users')
-    curr_company = res_obj.browse(cr,uid,uid).company_id.id
-    statement_id = statement_obj.search(cr,uid, [('journal_id','=',data['form']['journal_id']),('company_id','=',curr_company),('user_id','=',uid),('state','=','open')])
-    monday = (DateTime.now() + DateTime.RelativeDateTime(weekday=(DateTime.Monday,0))).strftime('%Y-%m-%d')
-    sunday = (DateTime.now() + DateTime.RelativeDateTime(weekday=(DateTime.Sunday,0))).strftime('%Y-%m-%d')
-    done_statmt = statement_obj.search(cr,uid, [('date','>=',monday+' 00:00:00'),('date','<=',sunday+' 23:59:59'),('journal_id','=',data['form']['journal_id']),('company_id','=',curr_company),('user_id','=',uid)])
-    stat_done = statement_obj.browse(cr,uid, done_statmt)
-    address_u = pool.get('res.users').browse(cr,uid,uid).address_id
-    am = 0.0
-    amount_check = productp_obj.browse(cr,uid,data['form']['product_id']).am_out or False
-    for st in stat_done:
-        for s in st.line_ids:
-            if address_u and s.partner_id==address_u.partner_id and s.am_out:
-                am+=s.amount
-    if (-data['form']['amount'] or 0.0)+ am <-(res_obj.browse(cr,uid,uid).company_id.max_diff or 0.0) and amount_check:
-        val = (res_obj.browse(cr,uid,uid).company_id.max_diff or 0.0)+ am
-        raise wizard.except_wizard(_('Error !'), _('The maximum value you can still withdraw is exceeded. \n Remaining value is equal to %d ')%(val))
-
-    acc_id = product_obj.browse(cr,uid,data['form']['product_id']).property_account_income
-    if not acc_id:
-        raise wizard.except_wizard(_('Error !'), _('please check that account is set to %s')%(product_obj.browse(cr,uid,data['form']['product_id']).name))
-    if not statement_id:
-        raise wizard.except_wizard(_('Error !'), _('You have to open at least one cashbox'))
-    if statement_id:
-        statement_id = statement_id[0]
-    if not statement_id:
-        statement_id = statement_obj.create(cr,uid,{'date':time.strftime('%Y-%m-%d 00:00:00'),
-                                        'journal_id':data['form']['journal_id'],
-                                        'company_id':curr_company,
-                                        'user_id':uid,
-                                        })
-    args['statement_id']= statement_id
-    args['journal_id']= data['form']['journal_id']
-    if acc_id:
-        args['account_id']= acc_id.id
-    amount= data['form']['amount'] or 0.0
-    if data['form']['amount'] > 0:
-        amount= -data['form']['amount']
-    args['amount'] = amount
-    if productp_obj.browse(cr,uid,data['form']['product_id']).am_out:
-        args['am_out'] = True
-    args['ref'] = data['form']['ref'] or ''
-    args['name'] = "%s: %s "%(product_obj.browse(cr,uid,data['form']['product_id']).name, data['form']['name'].decode('utf8'))
-    address_u = pool.get('res.users').browse(cr,uid,uid).address_id
-    if address_u:
-        partner_id = address_u.partner_id and address_u.partner_id.id or None
-        args['partner_id'] = partner_id
-    statement_line_id = pool.get('account.bank.statement.line').create(cr, uid, args)
-    return {}
-
-#def _get_in(self, cr, uid, data, context):
-#    args = {}
-#    pool = pooler.get_pool(cr.dbname)
-#    statement_obj = pool.get('account.bank.statement')
-#    product_obj = pool.get('product.template')
-#    res_obj = pool.get('res.users')
-#    curr_company = res_obj.browse(cr,uid,uid).company_id.id
-#    statement_id = statement_obj.search(cr,uid, [('journal_id','=',data['form']['journal_id']),('company_id','=',curr_company),('user_id','=',uid),('state','=','open')])
-#    if not statement_id:
-#        raise wizard.except_wizard(_('Error !'), _('You have to open at least one cashbox'))
-#
-#    product = pool.get('product.product').browse(cr, uid, data['form']['product_id'])
-#    acc_id = product_obj.browse(cr,uid,data['form']['product_id']).property_account_income
-#    if not acc_id:
-#        raise wizard.except_wizard(_('Error !'), _('please check that account is set to %s')%(product_obj.browse(cr,uid,data['form']['product_id']).name))
-#    if statement_id:
-#        statement_id = statement_id[0]
-#    if not statement_id:
-#        statement_id = statement_obj.create(cr,uid,{'date':time.strftime('%Y-%m-%d 00:00:00'),
-#                                                    'journal_id':data['form']['journal_id'],
-#                                                    'company_id':curr_company,
-#                                                    'user_id':uid,
-#                                                   })
-#
-#    args['statement_id'] = statement_id
-#    args['journal_id'] =  data['form']['journal_id']
-#    if acc_id:
-#        args['account_id'] =  acc_id.id
-#    args['amount'] = data['form']['amount'] or 0.0
-#    args['ref'] = "%s" %(data['form']['ref'] or '')
-#    args['name'] = "%s: %s "% (product_obj.browse(cr,uid,data['form']['product_id']).name, data['form']['name'].decode('utf8'))
-#    address_u = pool.get('res.users').browse(cr,uid,uid).address_id
-#    if address_u:
-#        partner_id = address_u.partner_id and address_u.partner_id.id or None
-#        args['partner_id'] = partner_id
-#    statement_line_id = pool.get('account.bank.statement.line').create(cr, uid, args)
-#
-#    return {}
-#
-#class box_entries(wizard.interface):
-#    states = {
-#        'init': {
-#            'actions': [],
-#            'result': {
-#                'type': 'form',
-#                'arch': entry_form % u'Entrée de caisse',
-#                'fields': entry_fields,
-#                'state': [('end', 'Cancel', 'gtk-cancel'), ('next', 'Make entries in the Cashbox', 'gtk-ok')]
-#            }
-#        },
-#        'next': {
-#            'actions': [],
-#            'result': {
-#                'type': 'action',
-#                'action': _get_in,
-#                'state': 'end'
-#            }
-#        },
-#    }
-#
-#box_entries('pos.entry')
-
-class box_out(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {
-                'type': 'form',
-                'arch': entry_form % u'Sortie de caisse',
-                'fields': out_fields,
-                'state': [('end', 'Cancel', 'gtk-cancel'), ('next', 'Make Entries in the CashBox', 'gtk-ok')]
-            }
-        },
-        'next': {
-            'actions': [],
-            'result': {
-                'type': 'action',
-                'action': _get_out,
-                'state': 'end'
-            }
-        },
-    }
-
-box_out('pos.out')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From d32a42c9f25411506a2c765c928d1611f12a46c7 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Mon, 15 Mar 2010 13:02:07 +0530
Subject: [PATCH 114/251] [REF] mrp: Write back reverted changes.

bzr revid: uco@tinyerp.co.in-20100315073207-lg9dcgku27pflymb
---
 addons/mrp/mrp_view.xml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 260deed7839..ee7417e1d0b 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -242,19 +242,21 @@
             <field name="arch" type="xml">
                 <form string="Bill of Material">
                     <group colspan="4" col="6">
-                      <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
-                      <field name="name" select="1"/>
-                      <field name="code" select="1"/>
-                      <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+	                    <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
+	                    <field name="name" select="1"/>
+	                    <field name="code" select="1"/>
+	                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <newline/>
-                    <field name="product_uom"/>
-                    <field name="product_qty"/>
-                    <newline/>
                     <field name="product_uos" groups="product.group_uos"/>
                     <field name="product_uos_qty" groups="product.group_uos"/>
                     <field name="routing_id" select="2" groups="base.group_extended"/>
                     <field name="type" groups="base.group_extended"/>
+                    <group colspan="4" col="6">
+	                    <field name="product_uom"/>
+	                   	<field name="product_qty"/>
+	                    <field name="multi_level_bom"/>
+	                </group>
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="bom_lines" nolabel="1" widget="one2many_list"/>
@@ -274,6 +276,9 @@
                             <field name="product_efficiency"/>
                             <field colspan="4" name="property_ids" nolabel="2" groups="base.group_extended"/>
                         </page>
+                        <page string="Multi-Level BoM" attrs="{'invisible':[('multi_level_bom','=',False)]}">
+                        	<field colspan="4" name="child_ids" nolabel="1" string="BoM Hierarchy"/>
+                        </page>
                     </notebook>
                 </form>
             </field>

From 061a9d20274498ce5d2ca6071ef3464b878e4808 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Mon, 15 Mar 2010 13:03:35 +0530
Subject: [PATCH 115/251] [IMP] product: Revamp the UoM definition to allow
 using the intuitive conversion factor + specifying if the UoM is
 larger/smaller than the reference one. Added a selection field.

bzr revid: uco@tinyerp.co.in-20100315073335-t5888y0tje5jcp7d
---
 addons/product/product.py       | 6 +++++-
 addons/product/product_view.xml | 6 ++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index 87b0622ae9e..77980c89041 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -84,7 +84,7 @@ class product_uom(osv.osv):
             help="Unit of Measure of a category can be converted between each others in the same category."),
         'factor': fields.float('Rate', digits=(12, 6), required=True,
             help='The coefficient for the formula:\n' \
-                    '1 (base unit) = coeff (this unit). Rate = 1 / Factor.'),
+                    '1 (base unit) = coeff (this unit). Ratio = 1 / Factor.'),
         'factor_inv': fields.function(_factor, digits=(12, 6),
             method=True, string='Factor',
             help='The coefficient for the formula:\n' \
@@ -93,6 +93,9 @@ class product_uom(osv.osv):
         'rounding': fields.float('Rounding Precision', digits=(16, 3), required=True,
             help="The computed quantity will be a multiple of this value. Use 1.0 for products that can not be split."),
         'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the unit of measure without removing it."),
+        'uom_factor': fields.selection([('bigger','Bigger than the Default'),
+                                        ('smaller','Smaller than the Default'),
+                                        ('','')],'UoM Factor'),
     }
 
     _defaults = {
@@ -100,6 +103,7 @@ class product_uom(osv.osv):
         'factor_inv': lambda *a: 1.0,
         'active': lambda *a: 1,
         'rounding': lambda *a: 0.01,
+        'uom_factor': lambda *a: 'smaller',
     }
 
     _sql_constraints = [
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index e6c5588f4f7..5c947be57ff 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -302,9 +302,11 @@
                 <form string="Units of Measure">
                     <field name="name" select="1"/>
                     <field name="category_id" select="1"/>
-                    <field name="factor" select="1"/>
-                    <field name="factor_inv" select="1"/>
+                    <field name="factor" select="1" attrs="{'readonly':[('uom_factor','=','bigger')]}"/>
+					<field name="factor_inv_data" select="1" string="Factor Data" attrs="{'readonly':[('uom_factor','=','smaller')]}"/>
+                    <field name="factor_inv" invisible="1"/>
                     <field name="rounding"/>
+                    <field name="uom_factor"/>
                     <field name="active"/>
                 </form>
             </field>

From 92a50fe4f12a5dd3a1e8f2017e63146af038d077 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Mon, 15 Mar 2010 13:08:58 +0530
Subject: [PATCH 116/251] [REF] mrp: Renamed Purchase Order field to Latest
 Requistion on Minimum Stock Rules.

bzr revid: uco@tinyerp.co.in-20100315073858-nqjcmk6g6wzhgtn0
---
 addons/mrp/mrp.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index f7c5226feb7..96e2c0a91b1 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -1261,7 +1261,7 @@ class stock_warehouse_orderpoint(osv.osv):
             "a requisition to bring the virtual stock to the Max Quantity."),
         'qty_multiple': fields.integer('Qty Multiple', required=True,
             help="The requisition quantity will by rounded up to this multiple."),
-        'procurement_id': fields.many2one('mrp.procurement', 'Purchase Order'),
+        'procurement_id': fields.many2one('mrp.procurement', 'Latest Requisition'),
         'company_id': fields.many2one('res.company','Company',required=True),
     }
     _defaults = {

From b50ef32811961be48d12ca666097b516a35fd4a0 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Mon, 15 Mar 2010 14:24:51 +0530
Subject: [PATCH 117/251] [REF,ADD]: Added demo data for unit of measures.
 (product.uom: Rename Rate by Ratio)

bzr revid: uco@tinyerp.co.in-20100315085451-cmwtwenyyw81ziwj
---
 addons/product/product.py       |  2 +-
 addons/product/product_data.xml | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index 77980c89041..e77f71950f8 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -82,7 +82,7 @@ class product_uom(osv.osv):
         'name': fields.char('Name', size=64, required=True, translate=True),
         'category_id': fields.many2one('product.uom.categ', 'UoM Category', required=True, ondelete='cascade',
             help="Unit of Measure of a category can be converted between each others in the same category."),
-        'factor': fields.float('Rate', digits=(12, 6), required=True,
+        'factor': fields.float('Ratio', digits=(12, 6), required=True,
             help='The coefficient for the formula:\n' \
                     '1 (base unit) = coeff (this unit). Ratio = 1 / Factor.'),
         'factor_inv': fields.function(_factor, digits=(12, 6),
diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 4ed27c81d1d..300a2b0f546 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -21,25 +21,31 @@
             <field name="category_id" ref="product_uom_categ_unit"/>
             <field name="name">PCE</field>
             <field name="factor">1.0</field>
-            <field name="factor_inv">1.0</field>
+            <field name="factor_inv_data">1.0</field>
         </record>
         <record id="product_uom_kgm" model="product.uom">
             <field name="category_id" ref="product_uom_categ_kgm"/>
             <field name="name">KGM</field>
             <field name="factor">1.0</field>
-            <field name="factor_inv">1.0</field>
+            <field name="factor_inv_data">1.0</field>
         </record>
         <record id="uom_hour" model="product.uom">
             <field name="name">Hour</field>
             <field eval="uom_categ_wtime" name="category_id"/>
             <field name="factor">8.0</field>
-            <field name="factor_inv">1.0</field>
+            <field name="factor_inv_data">1.0</field>
         </record>
         <record id="uom_day" model="product.uom">
             <field name="name">Day</field>
             <field eval="uom_categ_wtime" name="category_id"/>
             <field name="factor">1.0</field>
-            <field name="factor_inv">1.0</field>
+            <field name="factor_inv_data">1.0</field>
+        </record>
+        <record id="product_uom_ton" model="product.uom">
+            <field name="category_id" ref="product_uom_categ_kgm"/>
+            <field name="name">TON</field>
+            <field name="factor">1.0</field>
+            <field name="factor_inv_data">1.0</field>
         </record>
 
         <!--

From 8cd69ba5a97593811f7eefa37dce0dcf8230632d Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 15 Mar 2010 14:28:28 +0530
Subject: [PATCH 118/251] [Merge] stock_planing : Merge with  
 https://code.launchpad.net/~grzechu.g/openobject-addons/x_trunk_stock_planning_new

bzr revid: sbh@tinyerp.com-20100315085828-gmlgntpnl03wnpy3
---
 addons/stock_planning/__terp__.py             |  123 +-
 .../security/ir.model.access.csv              |    5 +-
 addons/stock_planning/stock_planning.py       | 1027 ++++++++++++++---
 addons/stock_planning/stock_planning_view.xml |  441 +++++--
 4 files changed, 1283 insertions(+), 313 deletions(-)

diff --git a/addons/stock_planning/__terp__.py b/addons/stock_planning/__terp__.py
index 8deac6fe6ca..1ff4e8d0b10 100644
--- a/addons/stock_planning/__terp__.py
+++ b/addons/stock_planning/__terp__.py
@@ -20,17 +20,122 @@
 
 {
     "name":"Master Procurement Schedule",
-    "version":"1.0",
-    "author":"Tiny",
+    "version":"1.1",
+    "author":"Tiny and Grzegorz Grzelak (Cirrus)",
     "category":"Custom",
-    "depends":["stock","sale"],
+    "depends":["hr","stock","sale"],
     "description": """
-This module allows you to manage the planning of procurements based on sales
-forecasts, confirmed orders (customers and suppliers), stock movements, etc.
-You can planify expected outputs and inputs for each warehouses. It also works
-to manage all kind of procurements like purchase orders. That's why it is
-called Master Procurement Schedule instead of the classic Master Production
-Schedule therminology.
+This module is based on original Tiny module stock_planning version 1.0 of the same name Master Procurement Schedule.
+
+Purpose of MPS is to allow create a manual procurement (requisition) apart of MRP scheduler (which works automatically on minimum stock rules).
+
+Terms used in the module:
+- Stock and Sales Period - is the time (between Start Date and End Date) for which you plan Stock and Sales Forecast and make Procurement Planning. 
+- Stock and Sales Forecast - is the quantity of products you plan to sell in the Period.
+- Stock Planning - is the quantity of products you plan to purchase or produce for the Period.
+
+Because we have another module sale_forecast which uses terms "Sales Forecast" and "Planning" as amount values we will use terms "Stock and Sales Forecast" and "Stock Planning" to emphasize that we use quantity values. 
+
+Activity with this module is divided to three steps:
+- Creating Periods. Mandatory step.
+- Creating Sale Forecasts and entering quantities to them. Optional step but useful for farther planning.
+- Creating Planning lines, entering quantities to them and making Procurement. Making procurement is the final step for the Period.
+
+Periods
+=======
+You have two menu items for Periods in "Sales Management - Configuration". There are:
+- "Create Sales Periods" - Which automates creating daily, weekly or monthly periods.
+- "Stock and sales Periods" - Which allows to create any type of periods, change the dates and change the State of period.
+
+Creating periods is the first step you have to do to use modules features. You can create custom periods using "New" button in "Stock and Sales Periods" form or view but it is recommended to use automating tool.
+
+Remarks:
+- These periods (officially Stock and Sales Periods) are separated of Financial or other periods in the system.
+- Periods are not assigned to companies (when you use multicompany feature at all). Module suppose that you use the same periods across companies. If you wish to use different periods for different companies define them as you wish (they can overlap). Later on in this text will be indications how to use such periods.
+- When periods are created automatically their start and finish dates are with with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily periods they will have start date 31.01.2010 00:00:00 and end date 31.01.2010 23:59:00. It works only in automatic creation of periods. When you create periods manually you have to take care about hours because you can have incorrect values form sales or stock. 
+- If you use overlapping periods for the same product, warehouse and company results can be unpredictable.
+- If current date doesn't belong to any period or you have holes between periods results can be unpredictable.
+
+Sales Forecasts
+===============
+You have few menus for Sales forecast in "Sales Management - Sales Forecasts".
+- "Create Sales Forecasts for Sales Periods" - which automates creating forecasts lines according to some parameters.
+- "Sales Forecasts" - few menus for working with forecasts lists and forms.
+
+Menu "Create Sales Forecasts for Sales Periods" creates Forecasts for products from selected Category, for selected Period and for selected Warehouse. It is an option "Copy Last Forecast" to copy forecast and other settings of period before this one to created one.
+
+Remarks:
+- This tool doesn't create lines if relevant lines (for the same Product, Period, Warehouse and validated or created by you) already exists. If you wish to create another forecast if relevant lines exists you have to do it manually using menus described bellow.
+- When created lines are validated by someone else you can use this tool to create another lines for the same Period, Product and Warehouse. 
+- When you choose "Copy Last Forecast" created line takes quantity and some settings from your (validated by you or created by you if not validated yet) forecast which is for last period before period of created forecast. If there are few your forecasts for period before this one (it is possible) system takes one of them (no rule which of them).
+
+
+Menus "Sales Forecasts"
+On "Sales Forecast" form mainly you have to enter a forecast quantity in "Product Quantity". Farther calculation can work for draft forecasts. But validation can save your data against any accidental changes. You can click "Validate" button but it is not mandatory.
+
+Instead of forecast quantity you can enter amount of forecast sales in field "Product Amount". System will count quantity from amount according to Sale price of the Product.
+
+All values on the form are expressed in unit of measure selected on form. You can select one of unit of measure from default category or from second category. When you change unit of measure the quanities will be recalculated according to new UoM: editable values (blue fields) immediately, non edited fields after clicking of "Calculate Planning" button.
+
+To find proper value for Sale Forecast you can use "Sales History" table for this product. You have to enter parameters to the top and left of this table and system will count sale quantities according to these parameters. So you can select fe. your department (at the top) then (to the left): last period, period before last and period year ago.
+
+Remarks:
+
+
+Procurement Planning
+====================
+Menu for Planning you can find in "Warehouse - Stock Planning".
+- "Create Stock Planning Lines" - allows you to automate creating planning lines according to some parameters.
+- "Master Procurement Scheduler" - is the most important menu of the module which allows to create procurement.
+
+As Sales forecast is phase of planning sales. The Procurement Planning (Planning) is the phase of scheduling Purchasing or Producing. You can create Procurement Planning quickly using tool from menu "Create Stock Planning Lines", then you can review created planning and make procurement using menu "Master Procurement Schedule".
+
+Menu "Create Stock Planning Lines" allows you to create quickly Planning lines for products from selected Category, for selected Period, and for selected Warehouse. When you check option "All Products with Forecast" system creates lines for all products having forecast for selected Period and Warehouse. Selected Category will be ignored in this case.
+
+Under menu "Master Procurement Scheduler" you can generally change the values "Planned Out" and "Planned In" to observe the field "Stock Simulation" and decide if this value would be accurate for end of the Period. 
+"Planned Out" can be based on "Warehouse Forecast" which is the sum of all forecasts for Period and Warehouse. But your planning can be based on any other information you have. It is not necessary to have any forecast. 
+"Planned In" quantity is used to calculate field "Incoming Left" which is the quantity to be procured to make stock as indicated in "Stock Simulation" at the and of Period. You can compare "Stock Simulation" quantity to minimum stock rules visible on the form. But you can plan different quantity than in Minimum Stock Rules. Calculation is made for whole Warehouse by default. But if you want to see values for Stock location of calculated warehouse you can use check box "Stock Location Only".
+
+If after few tries you decide that you found correct quantities for "Planned Out" and "Planned In" and you are satisfied with end of period stock calculated in "Stock Simulation" you can click "Procure Incoming Left" button to procure quantity of field "Incoming Left" into the Warehouse. System creates appropriate Procurement Order. You can decide if procurement will be made to Stock or Input location of calculated Warehouse. 
+
+If you don't want to Produce or Buy the product but just pick calculated quantity from another warehouse you can click "Supply from Another Warehouse" (instead of "Procure Incoming Left"). System creates pick list with move from selected source Warehouse to calculated Warehouse (as destination). You can also decide if this pick should be done from Stock or Output location of source warehouse. Destination location (Stock or Input) of destination warehouse will be used as set for "Procure Incoming Left". 
+
+To see proper quantities in fields "Confirmed In", "Confirmed Out", "Confirmed In Before", "Planned Out Before" and "Stock Simulation" you have to click button "Calculate Planning".
+
+All values on the form are expressed in unit of measure selected on form. You can select one of unit of measure from default category or from second category. When you change unit of measure the quanities will be recalculated according to new UoM: editable values (blue fields) immediately, non edited fields after clicking of "Calculate Planning" button.
+
+How Stock Simulation field is calculated:
+Generally Stock Simulation shows the stock for end of the calculated period according to some planned or confirmed stock moves. Calculation always starts with quantity of real stock of beginning of current period. Then calculation adds or subtracts quantities of calculated period or periods before calculated.
+When you are in the same period (current period is the same as calculated) Stock Simulation is calculated as follows:
+Stock Simulation = 
+	Stock of beginning of current Period
+	- Planned Out 
+	+ Planned In
+
+When you calculate period next to current:
+Stock Simulation = 
+	Stock of beginning of current Period
+	- Planned Out of current Period 
+	+ Confirmed In of current Period  (incl. Already In)
+	- Planned Out of calculated Period 
+	+ Planned In of calculated Period .
+
+As you see calculated Period is taken the same way like in case above. But calculation of current Period are made a little bit different. First you should note that system takes for current Period only Confirmed In moves. It means that you have to make planning and procurement for current Period before this calculation (for Period next to current). 
+
+When you calculate Period ahead:
+Stock Simulation = 
+	Stock of beginning of current Period 
+	- Sum of Planned Out of Periods before calculated 
+	+ Sum of Confirmed In of Periods before calculated (incl. Already In) 
+	- Planned Out of calculated Period 
+	+ Planned In of calculated Period.
+
+Periods before calculated means periods starting from current till period before calculated.
+
+Remarks:
+- Remember to make planning for all periods before calculated because omitting these quantities and procurements can cause wrong suggestions for procurements few periods ahead.
+- If you made planning few periods ahead and you find that real Confirmed Out is bigger than Planned Out in some periods before you can repeat Planning and make another procurement. You should do it in the same planning line. If you create another planning line the suggestions can be wrong.
+- When you wish to work with different periods for some part of products define two kinds of periods (fe. Weekly and Monthly) and use them for different products. Example: If you use always Weekly periods for Products A, and Monthly periods for Products B your all calculations will work correctly. You can also use different kind of periods for the same products from different warehouse or companies. But you cannot use overlapping periods for the same product, warehouse and company because results can be unpredictable. The same apply to Forecasts lines.
 """,
     "demo_xml":[],
     "update_xml":["security/ir.model.access.csv","stock_planning_view.xml"],
diff --git a/addons/stock_planning/security/ir.model.access.csv b/addons/stock_planning/security/ir.model.access.csv
index d08ea10a657..cfd8cc17c4c 100644
--- a/addons/stock_planning/security/ir.model.access.csv
+++ b/addons/stock_planning/security/ir.model.access.csv
@@ -1,5 +1,2 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_stock_planning","stock.planning","model_stock_planning","stock.group_stock_user",1,1,1,1
-"access_stock_planning_period","stock.planning.period","model_stock_planning_period","stock.group_stock_user",1,0,0,0
-"access_stock_period","stock.period","model_stock_period","stock.group_stock_user",1,0,0,0
-"access_stock_planning_sale_prevision","stock.planning.sale.prevision","model_stock_planning_sale_prevision","stock.group_stock_user",1,0,0,0
+"access_stock_planning","stock.planning","model_stock_planning","stock.group_stock_user",1,1,1,1
\ No newline at end of file
diff --git a/addons/stock_planning/stock_planning.py b/addons/stock_planning/stock_planning.py
index 421b18ee9e0..fa0bec2f5b1 100644
--- a/addons/stock_planning/stock_planning.py
+++ b/addons/stock_planning/stock_planning.py
@@ -30,14 +30,28 @@ import mx.DateTime
 from mx.DateTime import RelativeDateTime, now, DateTime, localtime
 from tools.translate import _
 
-class stock_planning_period(osv.osv_memory):
-    _name = "stock.planning.period"
-    _description = "Create Planning Period"
-    
-    def _get_latest_period(self,cr,uid,context={}):
+def rounding(fl, round_value):
+    if not round_value:
+        return fl
+    return round(fl / round_value) * round_value
+
+
+# Object creating periods quickly
+# changed that stop_date is created with hour 23:59:00 when it was 00:00:00 stop date was excluded from period
+class stock_period_createlines(osv.osv_memory):
+    _name = "stock.period.createlines"
+
+    def _get_new_period_start(self,cr,uid,context={}):
         cr.execute("select max(date_stop) from stock_period")
-        result=cr.fetchone()        
-        return result and result[0] or False
+        result=cr.fetchone()
+        last_date = result and result[0] or False
+        if last_date:
+            period_start = mx.DateTime.strptime(last_date,"%Y-%m-%d %H:%M:%S")+ RelativeDateTime(days=1)
+            period_start = period_start - RelativeDateTime(hours=period_start.hour, minutes=period_start.minute, seconds=period_start.second)
+        else:
+            period_start = mx.DateTime.today()
+        return period_start.strftime('%Y-%m-%d')
+   
 
     _columns = {
         'name': fields.char('Period Name', size=64),
@@ -46,7 +60,7 @@ class stock_planning_period(osv.osv_memory):
         'period_ids': fields.one2many('stock.period', 'planning_id', 'Periods'),
     }
     _defaults={
-        'date_start':_get_latest_period,
+        'date_start':_get_new_period_start,
     }
     
     def create_period_weekly(self,cr, uid, ids, context={}):
@@ -63,11 +77,11 @@ class stock_planning_period(osv.osv_memory):
             dt = p.date_start
             ds = mx.DateTime.strptime(p.date_start, '%Y-%m-%d')
             while ds.strftime('%Y-%m-%d')<p.date_stop:
-                de = ds + RelativeDateTime(months=interval, days=-1)
+                de = ds + RelativeDateTime(months=interval, minutes=-1)
                 self.pool.get('stock.period').create(cr, uid, {
                     'name': ds.strftime('%Y/%m'),
                     'date_start': ds.strftime('%Y-%m-%d'),
-                    'date_stop': de.strftime('%Y-%m-%d'),                    
+                    'date_stop': de.strftime('%Y-%m-%d %H:%M:%S'),                    
                 })
                 ds = ds + RelativeDateTime(months=interval)
         return {
@@ -82,7 +96,7 @@ class stock_planning_period(osv.osv_memory):
             dt = p.date_start
             ds = mx.DateTime.strptime(p.date_start, '%Y-%m-%d')            
             while ds.strftime('%Y-%m-%d')<p.date_stop:
-                de = ds + RelativeDateTime(days=interval)
+                de = ds + RelativeDateTime(days=interval, minutes =-1)
                 if name=='Daily':
                     new_name=de.strftime('%Y-%m-%d')
                 if name=="Weekly":
@@ -90,7 +104,7 @@ class stock_planning_period(osv.osv_memory):
                 self.pool.get('stock.period').create(cr, uid, {
                     'name': new_name,
                     'date_start': ds.strftime('%Y-%m-%d'),
-                    'date_stop': de.strftime('%Y-%m-%d'),
+                    'date_stop': de.strftime('%Y-%m-%d %H:%M:%S'),
                 })
                 ds = ds + RelativeDateTime(days=interval) + 1
         return {
@@ -99,13 +113,12 @@ class stock_planning_period(osv.osv_memory):
                 'res_model': 'stock.period',
                 'type': 'ir.actions.act_window',                
             }
-stock_planning_period()
-
+stock_period_createlines()
 
+# Periods have no company_id field as they can be shared across similar companies.
+# If somone thinks different it can be improved.
 class stock_period(osv.osv):
     _name = "stock.period"
-    _description = "Stock Period"
-    
     _columns = {
         'name': fields.char('Period Name', size=64),
         'date_start': fields.datetime('Start Date', required=True),
@@ -117,222 +130,880 @@ class stock_period(osv.osv):
     }
 stock_period()
 
+# Creates forecasts records for products from selected Product Category for selected 'Warehouse - Period'
+# Object added by contributor in ver 1.1
+class stock_sale_forecast_createlines(osv.osv_memory):
+    _name = "stock.sale.forecast.createlines"
 
-class stock_planning_sale_prevision(osv.osv):
-    _name = "stock.planning.sale.prevision"
-    _description = "Stock Planning Sale Prevision"
-    
-    def _get_real_amt_sold(self, cr, uid, ids, field, arg, context):
-        res = {}
-        for val in self.browse(cr, uid, ids):
-            cr.execute("select sum(l.product_uom_qty) from sale_order_line l left join sale_order s on (s.id=l.order_id) where l.product_id = %s and s.state not in ('draft','cancel')", (val.product_id.id,))
-            ret = cr.fetchall()
-            res[val.id] = ret[0][0]
-        return res
+# FIXME Add some period sugestion like below
+
+#    def _get_latest_period(self,cr,uid,context={}):
+#        cr.execute("select max(date_stop) from stock_period")
+#        result=cr.fetchone()        
+#        return result and result[0] or False
+   
+
+    _columns = {
+        'company_id': fields.many2one('res.company', 'Company', required=True, select=1),
+        'warehouse_id1': fields.many2one('stock.warehouse' , 'Warehouse', required=True, \
+                                help='Warehouse which forecasts will concern. '\
+                                   'If during stock planning you will need sales forecast for all warehouses choose any warehouse now.'),
+        'period_id1': fields.many2one('stock.period' , 'Period', required=True, help = 'Period which forecasts will concern.' ),
+        'product_categ_id1': fields.many2one('product.category' , 'Product Category', required=True, \
+                                help ='Product Category of products which created forecasts will concern.'),
+        'copy_forecast' : fields.boolean('Copy Last Forecast', help="Copy quantities from last Stock and Sale Forecast."),
+    }
+
+    _defaults = { 
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.sale.forecast.createlines', context=c),
+    }
+
+    def create_forecast(self,cr, uid, ids, context={}):
+        product_obj = self.pool.get('product.product')
+        forecast_obj=self.pool.get('stock.sale.forecast')
+        for f in self.browse(cr, uid, ids, context):
+            prod_categ_obj=self.pool.get('product.category')
+            template_obj=self.pool.get('product.template')
+            categ_ids =  f.product_categ_id1.id and [f.product_categ_id1.id] or []
+            prod_categ_ids=prod_categ_obj.search(cr,uid,[('parent_id','child_of',categ_ids)]) 
+            templates_ids = template_obj.search(cr,uid,[('categ_id','in',prod_categ_ids)]) 
+            products_ids = product_obj.search(cr,uid,[('product_tmpl_id','in',templates_ids)])
+            if len(products_ids)==0:
+                raise osv.except_osv(_('Error !'), _('No products in selected category !'))
+            copy = f.copy_forecast
+            for p in product_obj.browse(cr, uid, products_ids,{}):
+                if len(forecast_obj.search(cr, uid, [('product_id','=',p.id) , \
+                                                       ('period_id','=',f.period_id1.id), \
+                                                       ('user_id','=',uid), \
+                                                       ('warehouse_id','=',f.warehouse_id1.id)]))== 0:
+                    forecast_qty = 0.0
+# Not sure if it is expected quantity for this feature (copying forecast from previous period)
+# because it can take incidental forecast of this warehouse, this product and this user (creating, writing or validating forecast).
+# It takes only one forecast line (no sum). If user creates only one forecast per period it will be OK. If not I have no idea how to count it.
+                    
+                    prod_uom = False
+                    if copy:
+                        cr.execute("SELECT period.date_stop, forecast.product_qty, forecast.product_uom \
+                                    FROM stock_sale_forecast AS forecast \
+                                    LEFT JOIN stock_period AS period \
+                                    ON forecast.period_id = period.id \
+                                    WHERE (forecast.user_id = %s OR forecast.create_uid = %s OR forecast.write_uid = %s) \
+                                        AND forecast.warehouse_id = %s AND forecast.product_id = %s \
+                                        AND period.date_stop < %s \
+                                    ORDER BY period.date_stop DESC",
+                                    (uid, uid, uid, f.warehouse_id1.id, p.id, f.period_id1.date_stop) )
+                        ret=cr.fetchone()
+                        if ret:
+                            forecast_qty = ret[1]        
+                            prod_uom = ret[2]
+                    prod_uom = prod_uom or p.uom_id.id
+                    prod_uos_categ = False
+                    if p.uos_id:
+                        prod_uos_categ = p.uos_id.category_id.id
+                    forecast_obj.create(cr, uid, {
+                        'company_id'  : f.warehouse_id1.company_id.id,
+                        'period_id': f.period_id1.id,
+                        'warehouse_id': f.warehouse_id1.id,
+                        'product_id': p.id,
+                        'product_qty' : forecast_qty,
+                        'product_amt' : 0.0,
+                        'product_uom' : prod_uom,
+                        'active_uom' : prod_uom,
+                        'product_uom_categ' : p.uom_id.category_id.id,
+                        'product_uos_categ' : prod_uos_categ,
+                     })
+        return {
+                'view_type': 'form',
+                "view_mode": 'tree',
+                'res_model': 'stock.sale.forecast',
+                'type': 'ir.actions.act_window',                
+            }
+stock_sale_forecast_createlines()
+
+
+# Stock and Sales Forecast object. Previously stock_planning_sale_prevision.
+# A lot of changes in 1.1
+class stock_sale_forecast(osv.osv):
+    _name = "stock.sale.forecast"
     
     _columns = {
-        'name' : fields.char('Name', size=64),
-        'user_id': fields.many2one('res.users' , 'Salesman',readonly=True, states={'draft':[('readonly',False)]}),
-        'period_id': fields.many2one('stock.period' , 'Period', required=True),
-        'product_id': fields.many2one('product.product' , 'Product', readonly=True, required=True,states={'draft':[('readonly',False)]}),
-        'product_qty' : fields.float('Product Quantity', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'product_amt' : fields.float('Product Amount', readonly=True, states={'draft':[('readonly',False)]}),
-        'product_uom' : fields.many2one('product.uom', 'Product UoM', readonly=True, required=True, states={'draft':[('readonly',False)]}),
-        'amt_sold' : fields.function(_get_real_amt_sold, method=True, string='Real Amount Sold'),
+        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'create_uid':  fields.many2one('res.users', 'Responsible'),
+        'name' : fields.char('Name', size=64, readonly=True, states={'draft':[('readonly',False)]}),
+        'user_id': fields.many2one('res.users' , 'Created/Validated by',readonly=True, \
+                                        help='Shows who created this forecast, or who validated.'),
+        'warehouse_id': fields.many2one('stock.warehouse' , 'Warehouse', required=True, readonly=True, states={'draft':[('readonly',False)]}, \
+                                        help='Shows which warehouse this forecast concerns. '\
+                                         'If during stock planning you will need sales forecast for all warehouses choose any warehouse now.'),
+        'period_id': fields.many2one('stock.period' , 'Period', required=True, readonly=True, states={'draft':[('readonly',False)]}, \
+                                        help = 'Shows which period this forecast concerns.'),
+        'product_id': fields.many2one('product.product' , 'Product', readonly=True, required=True, states={'draft':[('readonly',False)]}, \
+                                        help = 'Shows which product this forecast concerns.'),
+        'product_qty' : fields.float('Product Quantity', required=True, readonly=True, states={'draft':[('readonly',False)]}, \
+                                        help= 'Forecasted quantity.'),
+        'product_amt' : fields.float('Product Amount', readonly=True, states={'draft':[('readonly',False)]}, \
+                                        help='Forecast value which will be converted to Product Quantity according to prices.'),
+        'product_uom_categ' : fields.many2one('product.uom.categ', 'Product UoM Category'),  # Invisible field for product_uom domain
+        'product_uom' : fields.many2one('product.uom', 'Product UoM', required=True, readonly=True, states={'draft':[('readonly',False)]}, \
+                        help = "Unit of Measure used to show the quanities of stock calculation." \
+                        "You can use units form default category or from second category (UoS category)."),
+        'product_uos_categ' : fields.many2one('product.uom.categ', 'Product UoS Category'), # Invisible field for product_uos domain
+# Field used in onchange_uom to check what uom was before change and recalculate quantities acording to old uom (active_uom) and new uom.
+        'active_uom' :fields.many2one('product.uom',  string = "Active UoM"),  
         'state' : fields.selection([('draft','Draft'),('validated','Validated')],'State',readonly=True),
+        'analyzed_period1_id' : fields.many2one('stock.period' , 'Period1', readonly=True, states={'draft':[('readonly',False)]},),
+        'analyzed_period2_id' : fields.many2one('stock.period' , 'Period2', readonly=True, states={'draft':[('readonly',False)]},),
+        'analyzed_period3_id' : fields.many2one('stock.period' , 'Period3', readonly=True, states={'draft':[('readonly',False)]},),
+        'analyzed_period4_id' : fields.many2one('stock.period' , 'Period4', readonly=True, states={'draft':[('readonly',False)]},),
+        'analyzed_period5_id' : fields.many2one('stock.period' , 'Period5', readonly=True, states={'draft':[('readonly',False)]},),
+        'analyzed_user_id' : fields.many2one('res.users' , 'This User', required=False, readonly=True, states={'draft':[('readonly',False)]},),
+        'analyzed_dept_id' : fields.many2one('hr.department' , 'This Department', required=False, \
+                                    readonly=True, states={'draft':[('readonly',False)]},),
+        'analyzed_warehouse_id' : fields.many2one('stock.warehouse' , 'This Warehouse', required=False, \
+                                    readonly=True, states={'draft':[('readonly',False)]}),
+        'analyze_company' : fields.boolean('Per Company', readonly=True, states={'draft':[('readonly',False)]}, \
+                                    help = "Check this box to see the sales for whole company."),
+        'analyzed_period1_per_user' : fields.float('This User Period1', readonly=True),
+        'analyzed_period2_per_user' : fields.float('This User Period2', readonly=True),
+        'analyzed_period3_per_user' : fields.float('This User Period3', readonly=True),
+        'analyzed_period4_per_user' : fields.float('This User Period4', readonly=True),
+        'analyzed_period5_per_user' : fields.float('This User Period5', readonly=True),
+        'analyzed_period1_per_dept' : fields.float('This Dept Period1', readonly=True),
+        'analyzed_period2_per_dept' : fields.float('This Dept Period2', readonly=True),
+        'analyzed_period3_per_dept' : fields.float('This Dept Period3', readonly=True),
+        'analyzed_period4_per_dept' : fields.float('This Dept Period4', readonly=True),
+        'analyzed_period5_per_dept' : fields.float('This Dept Period5', readonly=True),
+        'analyzed_period1_per_warehouse' : fields.float('This Warehouse Period1', readonly=True),
+        'analyzed_period2_per_warehouse' : fields.float('This Warehouse Period2', readonly=True),
+        'analyzed_period3_per_warehouse' : fields.float('This Warehouse Period3', readonly=True),
+        'analyzed_period4_per_warehouse' : fields.float('This Warehouse Period4', readonly=True),
+        'analyzed_period5_per_warehouse' : fields.float('This Warehouse Period5', readonly=True),
+        'analyzed_period1_per_company' : fields.float('This Copmany Period1', readonly=True),
+        'analyzed_period2_per_company' : fields.float('This Company Period2', readonly=True),
+        'analyzed_period3_per_company' : fields.float('This Company Period3', readonly=True),
+        'analyzed_period4_per_company' : fields.float('This Company Period4', readonly=True),
+        'analyzed_period5_per_company' : fields.float('This Company Period5', readonly=True),
     }
     _defaults = {
-        'state': lambda *args: 'draft'
+        'user_id': lambda obj, cr, uid, context: uid,
+        'state': lambda *args: 'draft',
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.sale.forecast', context=c),
     }
+
     def action_validate(self, cr, uid, ids, *args):
-        self.write(cr, uid, ids, {'state':'validated'})
+        self.write(cr, uid, ids, {'state':'validated','user_id':uid})
         return True
     
     def unlink(self, cr, uid, ids, context={}):
-        previsions = self.read(cr, uid, ids, ['state'])
+        forecasts = self.read(cr, uid, ids, ['state'])
         unlink_ids = []
-        for t in previsions:
+        for t in forecasts:
             if t['state'] in ('draft'):
                 unlink_ids.append(t['id'])
             else:
-                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Validated Sale Previsions !'))
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Validated Sale Forecasts !'))
         osv.osv.unlink(self, cr, uid, unlink_ids,context=context)
         return True
-    
-    def product_id_change(self, cr, uid, ids, product, uom=False, product_qty = 0, product_amt = 0.0):
-        if not product:
-            return {'value': {'product_qty' : 0.0, 'product_uom': False},'domain': {'product_uom': []}}
 
-        product_obj =  self.pool.get('product.product').browse(cr, uid, product)
+    def onchange_company(self, cr, uid, ids, company_id):
         result = {}
-        if not uom:
-            result['product_uom'] = product_obj.uom_id.id
-            domain = {'product_uom':
-                        [('category_id', '=', product_obj.uom_id.category_id.id)],}
-        if product_amt:
-            result['product_qty'] = math.floor(product_amt/(product_obj.product_tmpl_id.list_price))
-            
+        if company_id:
+            result['warehouse_id'] = False
+            result['analyzed_user_id'] = False
+            result['analyzed_dept_id'] = False
+            result['analyzed_warehouse_id'] = False
         return {'value': result}
-    
-stock_planning_sale_prevision()
 
+    def product_id_change(self, cr, uid, ids, product_id):
+        ret={}
+        if product_id:
+            product_rec =  self.pool.get('product.product').browse(cr, uid, product_id)
+            ret['product_uom'] = product_rec.uom_id.id
+            ret['product_uom_categ'] = product_rec.uom_id.category_id.id
+            ret['product_uos_categ'] = product_rec.uos_id and product_rec.uos_id.category_id.id or False
+            ret['active_uom'] = product_rec.uom_id.id
+        else:
+            ret['product_uom'] = False
+            ret['product_uom_categ'] = False
+            ret['product_uos_categ'] = False
+        res = {'value': ret}
+        return res
+
+    def onchange_uom(self, cr, uid, ids, product_uom=False, product_qty=0.0, active_uom=False ):
+        ret={}
+        val1 = self.browse(cr, uid, ids)
+        val = val1[0]
+        coeff_uom2def = self._to_default_uom_factor(cr, uid, val, active_uom, {})
+        coeff_def2uom, round_value = self._from_default_uom_factor( cr, uid, val, product_uom, {})
+        coeff = coeff_uom2def * coeff_def2uom
+        ret['product_qty'] = rounding(coeff * product_qty, round_value)
+        ret['active_uom'] = product_uom
+        return {'value': ret}
+
+    def product_amt_change(self, cr, uid, ids, product_amt = 0.0, product_uom=False):
+        ret={}
+        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, {})
+            ret['product_qty'] = rounding(coeff_def2uom * product_amt/(val.product_id.product_tmpl_id.list_price), round_value)
+        res = {'value': ret}
+        return res
+
+    def _to_default_uom_factor(self, cr, uid, val, uom_id, context):
+        uom_obj = self.pool.get('product.uom')
+        uom = uom_obj.browse(cr, uid, uom_id, context=context)
+        coef =  uom.factor
+        if uom.category_id.id <> val.product_id.uom_id.category_id.id:
+            coef = coef / val.product_id.uos_coeff
+        return val.product_id.uom_id.factor / coef
+
+    def _from_default_uom_factor(self, cr, uid, val, uom_id, context):
+        uom_obj = self.pool.get('product.uom')
+        uom = uom_obj.browse(cr, uid, uom_id, context=context)
+        res = uom.factor
+        if uom.category_id.id <> val.product_id.uom_id.category_id.id:
+            res = res / val.product_id.uos_coeff
+        return res / val.product_id.uom_id.factor, uom.rounding
+
+    def _sales_per_users(self, cr, uid, so, so_line, company, users):
+        cr.execute("SELECT sum(sol.product_uom_qty) FROM sale_order_line AS sol LEFT JOIN sale_order AS s ON (s.id = sol.order_id) " \
+                   "WHERE (sol.id IN (%s)) AND (s.state NOT IN (\'draft\',\'cancel\')) AND (s.id IN (%s)) AND (s.company_id=%s) " \
+                    "AND (s.user_id IN (%s)) " %(so_line, so, company, users))
+        ret = cr.fetchone()[0] or 0.0
+        return ret
+
+    def _sales_per_warehouse(self, cr, uid, so, so_line, company, shops):        
+        cr.execute("SELECT sum(sol.product_uom_qty) FROM sale_order_line AS sol LEFT JOIN sale_order AS s ON (s.id = sol.order_id) " \
+                   "WHERE (sol.id IN (%s)) AND (s.state NOT IN (\'draft\',\'cancel\')) AND (s.id IN (%s))AND (s.company_id=%s) " \
+                    "AND (s.shop_id IN (%s))" %(so_line, so, company, shops))
+        ret = cr.fetchone()[0] or 0.0
+        return ret
+
+    def _sales_per_company(self, cr, uid, so, so_line, company, ):
+        cr.execute("SELECT sum(sol.product_uom_qty) FROM sale_order_line AS sol LEFT JOIN sale_order AS s ON (s.id = sol.order_id) " \
+                   "WHERE (sol.id IN (%s)) AND (s.state NOT IN (\'draft\',\'cancel\')) AND (s.id IN (%s)) AND (s.company_id=%s)"%(so_line, so, company))
+        ret = cr.fetchone()[0] or 0.0
+        return ret
+    
+    def calculate_sales_history(self, cr, uid, ids, context, *args):
+        sales=[[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],]
+        for obj in  self.browse(cr, uid, ids):
+            periods =obj.analyzed_period1_id, obj.analyzed_period2_id, obj.analyzed_period3_id, obj.analyzed_period4_id, obj.analyzed_period5_id
+            so_obj = self.pool.get('sale.order')
+            so_line_obj= self.pool.get('sale.order.line')
+            so_line_product_ids = so_line_obj.search(cr, uid, [('product_id','=', obj.product_id.id)], context = context)
+            if so_line_product_ids:
+                so_line_product_set = ','.join(map(str,so_line_product_ids))
+                if obj.analyzed_warehouse_id:
+                    shops = self.pool.get('sale.shop').search(cr, uid,[('warehouse_id','=', obj.analyzed_warehouse_id.id)], context = context)
+                    shops_set = ','.join(map(str,shops))
+                else:
+                    shops = False
+                if obj.analyzed_dept_id:
+                    dept_obj = self.pool.get('hr.department')
+                    dept_id =  obj.analyzed_dept_id.id and [obj.analyzed_dept_id.id] or []
+                    dept_ids = dept_obj.search(cr,uid,[('parent_id','child_of',dept_id)])
+                    dept_ids_set = ','.join(map(str,dept_ids))
+                    cr.execute("SELECT user_id FROM hr_department_user_rel WHERE (department_id IN (%s))" %(dept_ids_set))
+                    dept_users = [x for x, in cr.fetchall()]
+                    dept_users_set =  ','.join(map(str,dept_users))
+                else:
+                    dept_users = False
+                factor, round_value = self._from_default_uom_factor(cr, uid, obj, obj.product_uom.id, context=context)
+                for i, period in enumerate(periods):
+                    if period:
+                        so_period_ids = so_obj.search(cr, uid, [('date_order','>=',period.date_start), ('date_order','<=',period.date_stop)], context = context)
+                        if so_period_ids:
+                            so_period_set = ','.join(map(str,so_period_ids))
+                            if obj.analyzed_user_id:
+                                user_set = str(obj.analyzed_user_id.id)
+                                sales[i][0] =self._sales_per_users(cr, uid, so_period_set, so_line_product_set, obj.company_id.id, user_set)
+                                sales[i][0] *=factor
+                            if dept_users:
+                                sales[i][1]=  self._sales_per_users(cr, uid, so_period_set,  so_line_product_set, obj.company_id.id, dept_users_set)
+                                sales[i][1]*=factor
+                            if shops:
+                                sales[i][2]= self._sales_per_warehouse(cr, uid, so_period_set,  so_line_product_set, obj.company_id.id, shops_set)
+                                sales[i][2]*=factor
+                            if obj.analyze_company:
+                                sales[i][3]= self._sales_per_company(cr, uid, so_period_set, so_line_product_set, obj.company_id.id, )
+                                sales[i][3]*=factor
+        self.write(cr, uid, ids, {
+            'analyzed_period1_per_user':sales[0][0],
+            'analyzed_period2_per_user':sales[1][0],
+            'analyzed_period3_per_user':sales[2][0],
+            'analyzed_period4_per_user':sales[3][0],
+            'analyzed_period5_per_user':sales[4][0],
+            'analyzed_period1_per_dept':sales[0][1],
+            'analyzed_period2_per_dept':sales[1][1],
+            'analyzed_period3_per_dept':sales[2][1],
+            'analyzed_period4_per_dept':sales[3][1],
+            'analyzed_period5_per_dept':sales[4][1],
+            'analyzed_period1_per_warehouse':sales[0][2],
+            'analyzed_period2_per_warehouse':sales[1][2],
+            'analyzed_period3_per_warehouse':sales[2][2],
+            'analyzed_period4_per_warehouse':sales[3][2],
+            'analyzed_period5_per_warehouse':sales[4][2],
+            'analyzed_period1_per_company':sales[0][3],
+            'analyzed_period2_per_company':sales[1][3],
+            'analyzed_period3_per_company':sales[2][3],
+            'analyzed_period4_per_company':sales[3][3],
+            'analyzed_period5_per_company':sales[4][3],
+        })
+        return True
+
+
+stock_sale_forecast()
+
+# Creates stock planning records for products from selected Product Category for selected 'Warehouse - Period' 
+# Object added by contributor in ver 1.1 
+class stock_planning_createlines(osv.osv_memory):
+    _name = "stock.planning.createlines"
+
+    def onchange_company(self, cr, uid, ids, company_id):
+        result = {}
+        if company_id:
+            result['warehouse_id2'] = False
+        return {'value': result}
+
+    _columns = {
+        'company_id': fields.many2one('res.company', 'Company', required = True),
+        'period_id2': fields.many2one('stock.period' , 'Period', required=True, help = 'Period which planning will concern.'),
+        'warehouse_id2': fields.many2one('stock.warehouse' , 'Warehouse', required=True, help = 'Warehouse which planning will concern.'),
+        'product_categ_id2': fields.many2one('product.category' , 'Product Category', \
+                        help = 'Planning will be created for products from Product Category selected by this field. '\
+                               'This field is ignored when you check \"All Forecasted Product\" box.' ),
+        'forecasted_products': fields.boolean('All Products with Forecast', \
+                     help = "Check this box to create planning for all products having any forecast for selected Warehouse and Period. "\
+                            "Product Category field will be ignored."),
+    }
+
+    _defaults = {
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.planning', context=c),
+    }
+
+    def create_planning(self,cr, uid, ids, context={}):
+        product_obj = self.pool.get('product.product')
+        planning_obj=self.pool.get('stock.planning')
+
+        for f in self.browse(cr, uid, ids, context=context):
+            if f.forecasted_products:
+                cr.execute("SELECT product_id \
+                                FROM stock_sale_forecast \
+                                WHERE (period_id = %s) AND (warehouse_id = %s)", (f.period_id2.id, f.warehouse_id2.id))
+                products_id1 = [x for x, in cr.fetchall()]
+            else:
+                prod_categ_obj=self.pool.get('product.category')
+                template_obj=self.pool.get('product.template')
+                categ_ids =  f.product_categ_id2.id and [f.product_categ_id2.id] or []
+                prod_categ_ids=prod_categ_obj.search(cr,uid,[('parent_id','child_of',categ_ids)]) 
+                templates_ids = template_obj.search(cr,uid,[('categ_id','in',prod_categ_ids)]) 
+                products_id1 = product_obj.search(cr,uid,[('product_tmpl_id','in',templates_ids)])
+            if len(products_id1)==0:
+                raise osv.except_osv(_('Error !'), _('No forecasts for selected period or no products in selected category !'))
+
+            for p in product_obj.browse(cr, uid, products_id1,context=context):
+                if len(planning_obj.search(cr, uid, [('product_id','=',p.id),
+                                                      ('period_id','=',f.period_id2.id),
+                                                      ('warehouse_id','=',f.warehouse_id2.id)]))== 0:
+                    cr.execute("SELECT period.date_stop, planning.product_uom, planning.planned_outgoing, planning.to_procure, \
+                                    planning.stock_only, planning.procure_to_stock, planning.confirmed_forecasts_only, \
+                                    planning.supply_warehouse_id, planning.stock_supply_location \
+                                FROM stock_planning AS planning \
+                                LEFT JOIN stock_period AS period \
+                                ON planning.period_id = period.id \
+                                WHERE (planning.create_uid = %s OR planning.write_uid = %s) \
+                                     AND planning.warehouse_id = %s AND planning.product_id = %s \
+                                     AND period.date_stop < %s \
+                                ORDER BY period.date_stop DESC",
+                                    (uid, uid, f.warehouse_id2.id, p.id, f.period_id2.date_stop) )
+                    ret=cr.fetchone()
+#                        forecast_qty = ret and ret[0] or 0.0
+                    if ret:
+#                            raise osv.except_osv(_('Error !'), _('ret is %s %s %s %s %s %s')%(ret[0],ret[2],ret[3],ret[4],ret[5],ret[6],))
+                        prod_uom = ret[1]
+                        planned_out = ret[2]        
+                        to_procure = ret[3]
+                        stock_only = ret[4]
+                        procure_to_stock = ret[5]
+                        confirmed_forecasts_only = ret[6]
+                        supply_warehouse_id = ret[7]
+                        stock_supply_location = ret[8]
+                    else:
+                        prod_uom = p.uom_id.id
+                        planned_out = False        
+                        to_procure = False
+                        stock_only = False
+                        procure_to_stock = False
+                        confirmed_forecasts_only = False
+                        supply_warehouse_id = False
+                        stock_supply_location = False
+                    prod_uos_categ = False
+                    if p.uos_id:
+                        prod_uos_categ = p.uos_id.category_id.id
+                    planning_obj.create(cr, uid, {
+                        'company_id' : f.warehouse_id2.company_id.id,
+                        'period_id': f.period_id2.id,
+                        'warehouse_id' : f.warehouse_id2.id,
+                        'product_id': p.id,
+                        'product_uom' : prod_uom,
+                        'product_uom_categ' : p.uom_id.category_id.id,
+                        'product_uos_categ' : prod_uos_categ,
+                        'active_uom' : prod_uom,
+                        'planned_outgoing': planned_out,       
+                        'to_procure': to_procure,
+                        'stock_only': stock_only,
+                        'procure_to_stock': procure_to_stock,
+                        'confirmed_forecasts_only': confirmed_forecasts_only,
+                        'supply_warehouse_id': supply_warehouse_id,
+                        'stock_supply_location': stock_supply_location,
+
+                    })
+        return {
+                'view_type': 'form',
+                "view_mode": 'tree',
+                'res_model': 'stock.planning',
+                'type': 'ir.actions.act_window',                
+            }
+stock_planning_createlines()
+
+
+# The main Stock Planning object
+# A lot of changes by contributor in ver 1.1
 class stock_planning(osv.osv):
     _name = "stock.planning"
-    _description = "Stock Planning"
     
-    def _get_product_qty(self, cr, uid, ids, field_names, arg, context):
-        res = {}
-        if not context:
-            context = {}
-        mapping = {
-            'incoming': {
-                'field': "incoming_qty",
-                'adapter': lambda x: x,
-            },
-            'outgoing': {
-                'field': "outgoing_qty",
-                'adapter': lambda x: -x,
-            },
+    def _get_in_out(self, cr, uid, val, date_start, date_stop, direction, done, context):
+#        res = {}
+#        if not context:
+#            context = {}
+        mapping = {'in': {
+                        'field': "incoming_qty",
+                        'adapter': lambda x: x,
+                  },
+                  'out': {
+                        'field': "outgoing_qty",
+                        'adapter': lambda x: -x,
+                  },
         }
+        context['from_date'] = date_start
+        context['to_date'] = date_stop
+        locations = [val.warehouse_id.lot_stock_id.id,]
+        if not val.stock_only:
+            locations.extend([val.warehouse_id.lot_input_id.id, val.warehouse_id.lot_output_id.id])
+        context['location'] = locations
+        context['compute_child'] = True
+        product_obj =  self.pool.get('product.product')
+        prod_id = val.product_id.id
+        if done:
+            c1=context.copy()
+            c1.update({ 'states':('done',), 'what':(direction,) })
+            prod_ids = [prod_id]
+            st = product_obj.get_product_available(cr,uid, prod_ids, context=c1)
+            res = mapping[direction]['adapter'](st.get(prod_id,0.0))
+        else:
+            product=product_obj.read(cr, uid, prod_id,[], context)
+            product_qty = product[mapping[direction]['field']]
+            res = mapping[direction]['adapter'](product_qty)
+#            res[val.id] = product_obj['incoming_qty']
+        return res
 
-        for val in self.browse(cr, uid, ids):
-            res[val.id] = {}
-            context['from_date'] = val.period_id.date_start
-            context['to_date'] = val.period_id.date_stop
-            context['warehouse'] = val.warehouse_id.id or False
-            product_obj =  self.pool.get('product.product').read(cr, uid,val.product_id.id,[], context)
-            for fn in field_names:
-                product_qty = product_obj[mapping[fn]['field']]
-                res[val.id][fn] = mapping[fn]['adapter'](product_qty)
+    def _get_outgoing_before(self, cr, uid, val, date_start, date_stop, context):
+        cr.execute("SELECT sum(planning.planned_outgoing), planning.product_uom \
+                    FROM stock_planning AS planning \
+                    LEFT JOIN stock_period AS period \
+                    ON (planning.period_id = period.id) \
+                    WHERE (period.date_stop >= %s) AND (period.date_stop <= %s) \
+                        AND (planning.product_id = %s) AND (planning.company_id = %s) \
+                    GROUP BY planning.product_uom", \
+                        (date_start, date_stop, val.product_id.id, val.company_id.id,))
+        planning_qtys = cr.fetchall()
+        res = self._to_planning_uom(cr, uid, val, planning_qtys, context)
         return res
-    
-    def _get_planned_sale(self, cr, uid, ids, field_name, arg, context):
+
+    def _to_planning_uom(self, cr, uid, val, qtys, context):
+        res_qty = 0
+        if qtys:
+            uom_obj = self.pool.get('product.uom')
+            for qty, prod_uom in qtys:
+                coef = self._to_default_uom_factor(cr, uid, val, prod_uom, context=context)
+                res_coef, round_value = self._from_default_uom_factor(cr, uid, val, val.product_uom.id, context=context)
+                coef = coef * res_coef
+                res_qty += rounding(qty * coef, round_value)
+        return res_qty
+        
+
+    def _get_forecast(self, cr, uid, ids, field_names, arg, context):
         res = {}
         for val in self.browse(cr, uid, ids):
-            cr.execute('select sum(product_qty) from stock_planning_sale_prevision where product_id = %s and period_id = %s',(val.product_id.id,val.period_id.id))
-            product_qty = cr.fetchall()[0][0]
-            res[val.id] = product_qty
+            res[val.id]={}
+            valid_part = val.confirmed_forecasts_only and " AND state = 'validated'" or ""
+            cr.execute('SELECT sum(product_qty), product_uom  \
+                        FROM stock_sale_forecast \
+                        WHERE product_id = %s AND period_id = %s AND company_id = %s '+valid_part+ \
+                       'GROUP BY product_uom', \
+                            (val.product_id.id,val.period_id.id, val.company_id.id))
+            company_qtys = cr.fetchall()
+            res[val.id]['company_forecast'] = self._to_planning_uom(cr, uid, val, company_qtys, context)
+
+            cr.execute('SELECT sum(product_qty), product_uom \
+                        FROM stock_sale_forecast \
+                        WHERE product_id = %s and period_id = %s AND warehouse_id = %s ' + valid_part + \
+                       'GROUP BY product_uom', \
+                        (val.product_id.id,val.period_id.id, val.warehouse_id.id))
+            warehouse_qtys = cr.fetchall()
+            res[val.id]['warehouse_forecast'] = self._to_planning_uom(cr, uid, val, warehouse_qtys, context)
+            res[val.id]['warehouse_forecast'] = rounding(res[val.id]['warehouse_forecast'],  val.product_id.uom_id.rounding)
         return res
-    
-    def _get_stock_start(self, cr, uid, ids, field_name, arg, context):
-        res = {}
-        for val in self.browse(cr, uid, ids):
-            res[val.id] = 0.0
-            context['from_date'] = val.period_id.date_start
-            context['to_date'] = val.period_id.date_stop
-            context['warehouse'] = val.warehouse_id.id or False
-            current_date =  time.strftime('%Y-%m-%d')
-            product_obj =  self.pool.get('product.product').browse(cr, uid,val.product_id.id,[], context)
-            if current_date > val.period_id.date_stop:
-                pass
-            elif current_date > val.period_id.date_start and current_date < val.period_id.date_stop:
-                res[val.id] = product_obj.qty_available
-            else:
-                res[val.id] = product_obj.qty_available + (val.to_procure - val.planned_outgoing)
-        return res
-    
-    def _get_value_left(self, cr, uid, ids, field_names, arg, context):
-        res = {}
-        for val in self.browse(cr, uid, ids):
-            res[val.id] = {}
-            if field_names[0] == 'incoming_left':
-                ret = val.to_procure-val.incoming
-            if  field_names[0] == 'outgoing_left':
-                ret = val.planned_outgoing-val.outgoing
-            res[val.id][field_names[0]] = ret
+
+    def _get_stock_start(self, cr, uid, val, date, context):
+        context['from_date'] = None
+        context['to_date'] = date
+        locations = [val.warehouse_id.lot_stock_id.id,]
+        if not val.stock_only:
+            locations.extend([val.warehouse_id.lot_input_id.id, val.warehouse_id.lot_output_id.id])
+        context['location'] = locations
+        context['compute_child'] = True
+        product_obj =  self.pool.get('product.product').read(cr, uid,val.product_id.id,[], context)
+        res = product_obj['qty_available']     # value for stock_start
         return res
     
     def _get_past_future(self, cr, uid, ids, field_names, arg, context):
         res = {}
-        for val in self.browse(cr, uid, ids):
+        for val in self.browse(cr, uid, ids, context=context):
             if val.period_id.date_stop < time.strftime('%Y-%m-%d'):
                 res[val.id] = 'Past'
             else:
                 res[val.id] = 'Future'
         return res
-    
-    def _get_period_id(self, cr, uid, context={}):
-#        cr.execute()
-        res = {}
-        return res   
 
+    def _get_op(self, cr, uid, ids, field_names, arg, context):  # op = OrderPoint
+        res = {}
+        for val in self.browse(cr, uid, ids, context=context):
+            res[val.id]={}
+            cr.execute("SELECT product_min_qty, product_max_qty, product_uom  \
+                        FROM stock_warehouse_orderpoint \
+                        WHERE warehouse_id = %s AND product_id = %s AND active = 'TRUE'", (val.warehouse_id.id, val.product_id.id))
+            ret =  cr.fetchone() or [0.0,0.0,False]
+            coef = 1
+            round_value = 1
+            if ret[2]:
+                coef = self._to_default_uom_factor(cr, uid, val, ret[2], context)
+                res_coef, round_value = self._from_default_uom_factor(cr, uid, val, val.product_uom.id, context=context)
+                coef = coef * res_coef
+            res[val.id]['minimum_op'] = rounding(ret[0]*coef, round_value)
+            res[val.id]['maximum_op'] = ret[1]*coef
+        return res
+    
+    def onchange_company(self, cr, uid, ids, company_id):
+        result = {}
+        if company_id:
+            result['warehouse_id'] = False
+        return {'value': result}
+
+    def onchange_uom(self, cr, uid, ids, product_uom, ):
+        if not product_uom:
+            return {}
+        ret={}
+        val1 = self.browse(cr, uid, ids)
+        val = val1[0]
+        coeff_uom2def = self._to_default_uom_factor(cr, uid, val, val.active_uom.id, {})
+        coeff_def2uom, round_value = self._from_default_uom_factor( cr, uid, val, product_uom, {})
+        coeff = coeff_uom2def * coeff_def2uom
+        ret['planned_outgoing'] = rounding(coeff * val.planned_outgoing, round_value)
+        ret['to_procure'] = rounding(coeff * val.to_procure, round_value)
+        ret['active_uom'] = product_uom
+        return {'value': ret}
 
     _columns = {
-        'name' : fields.char('Name', size=64),
+        'company_id': fields.many2one('res.company', 'Company', required = True),
+        'history' : fields.text('Procurement History', readonly=True, help = "History of procurement or internal supply of this planning line."),
         'state' : fields.selection([('draft','Draft'),('done','Done')],'State',readonly=True),
-        'period_id': fields.many2one('stock.period' , 'Period', required=True),
-        'product_id': fields.many2one('product.product' , 'Product', required=True),
-        'product_uom' : fields.many2one('product.uom', 'UoM', required=True),
-        'planned_outgoing' : fields.float('Forecast Out', required=True),
-        'planned_sale': fields.function(_get_planned_sale, method=True, string='Sales Forecast'),
-        'stock_start': fields.function(_get_stock_start, method=True, string='Stock Simulation'),
-        'incoming': fields.function(_get_product_qty, method=True, type='float', string='Confirmed In', multi='incoming'),
-        'outgoing': fields.function(_get_product_qty, method=True, type='float', string='Confirmed Out', multi='outgoing'),
-        'incoming_left': fields.function(_get_value_left, method=True, string='Delta In', multi="stock_incoming_left"),
-        'outgoing_left': fields.function(_get_value_left, method=True, string='Delta Out', multi="outgoing_left"),
-        'to_procure': fields.float(string='Forecast In', required=True),
-        'warehouse_id' : fields.many2one('stock.warehouse','Warehouse'),
+        'period_id': fields.many2one('stock.period' , 'Period', required=True, \
+                help = 'Period for this planning. Requisition will be created for beginning of the period.'),
+        'warehouse_id' : fields.many2one('stock.warehouse','Warehouse', required=True), 
+        'product_id': fields.many2one('product.product' , 'Product', required=True, help = 'Product which this planning is created for.'),
+        'product_uom_categ' : fields.many2one('product.uom.categ', 'Product UoM Category'), # Invisible field for product_uom domain
+        'product_uom' : fields.many2one('product.uom', 'UoM', required=True, help = "Unit of Measure used to show the quanities of stock calculation." \
+                        "You can use units form default category or from second category (UoS category)."),
+        'product_uos_categ' : fields.many2one('product.uom.categ', 'Product UoM Category'), # Invisible field for product_uos domain
+# Field used in onchange_uom to check what uom was before change to recalculate quantities acording to old uom (active_uom) and new uom.
+        'active_uom' :fields.many2one('product.uom',  string = "Active UoM"), 
+        'planned_outgoing' : fields.float('Planned Out', required=True,  \
+                help = 'Enter planned outgoing quantity from selected Warehouse during the selected Period of selected Product. '\
+                        'To plan this value look at Confirmed Out or Sales Forecasts. This value should be equal or greater than Confirmed Out.'),
+        'company_forecast': fields.function(_get_forecast, method=True, string ='Company Forecast', multi = 'company', \
+                help = 'All sales forecasts for whole company (for all Warehouses) of selected Product during selected Period.'),
+        'warehouse_forecast': fields.function(_get_forecast, method=True, string ='Warehouse Forecast',  multi = 'warehouse',\
+                help = 'All sales forecasts for selected Warehouse of selected Product during selected Period.'),
+        'stock_simulation': fields.float('Stock Simulation', readonly =True, \
+                help = 'Stock simulation at the end of selected Period.\n For current period it is: \n' \
+                       'Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n' \
+                        'For periods ahead it is: \nInitial Stock - Planned Out Before + Incoming Before - Planned Out + Planned In.'),
+        'incoming': fields.float('Confirmed In', readonly=True, \
+                help = 'Quantity of all confirmed incoming moves in calculated Period.'),
+        'outgoing': fields.float('Confirmed Out', readonly=True, \
+                help = 'Quantity of all confirmed outgoing moves in calculated Period.'),
+        'incoming_left': fields.float('Incoming Left', readonly=True,  \
+                help = 'Quantity left to Planned incoming quantity. This is calculated difference between Planned In and Confirmed In. ' \
+                        'For current period Already In is also calculated. This value is used to create procurement for lacking quantity.'),
+        'outgoing_left': fields.float('Expected Out', readonly=True, \
+                help = 'Quantity expected to go out in selected period. As a difference between Planned Out and Confirmed Out. ' \
+                        'For current period Already Out is also calculated'),
+        'to_procure': fields.float(string='Planned In', required=True, \
+                help = 'Enter quantity which (by your plan) should come in. Change this value and observe Stock simulation. ' \
+                        'This value should be equal or greater than Confirmed In.'),
         'line_time' : fields.function(_get_past_future, method=True,type='char', string='Past/Future'),
+        'minimum_op' : fields.function(_get_op, method=True, type='float', string = 'Minimum Rule', multi= 'minimum', \
+                            help = 'Minimum quantity set in Minimum Stock Rules for this Warhouse'),
+        'maximum_op' : fields.function(_get_op, method=True, type='float', string = 'Maximum Rule', multi= 'maximum', \
+                            help = 'Maximum quantity set in Minimum Stock Rules for this Warhouse'),
+        'outgoing_before' : fields.float('Planned Out Before', readonly=True, \
+                            help= 'Planned Out in periods before calculated. '\
+                                    'Between start date of current period and one day before start of calculated period.'),
+        'incoming_before': fields.float('Incoming Before', readonly = True, \
+                            help= 'Confirmed incoming in periods before calculated (Including Already In). '\
+                                    'Between start date of current period and one day before start of calculated period.'),
+        'stock_start' : fields.float('Initial Stock', readonly=True, \
+                            help= 'Stock quantity one day before current period.'),
+        'already_out' : fields.float('Already Out', readonly=True, \
+                            help= 'Quantity which is already dispatched out of this warehouse in current period.'),
+        'already_in' : fields.float('Already In', readonly=True, \
+                            help= 'Quantity which is already picked up to this warehouse in current period.'),
+        'stock_only' : fields.boolean("Stock Location Only", help = "Check to calculate stock location of selected warehouse only. " \
+                                        "If not selected calculation is made for input, stock and output location of warehouse."),
+        "procure_to_stock" : fields.boolean("Procure To Stock Location", help = "Chect to make procurement to stock location of selected warehouse. " \
+                                        "If not selected procurement will be made into input location of warehouse."),
+        "confirmed_forecasts_only" : fields.boolean("Validated Forecasts", help = "Check to take validated forecasts only. " \
+                    "If not checked system takes validated and draft forecasts."),
+        'supply_warehouse_id' : fields.many2one('stock.warehouse','Source Warehouse', help = "Warehouse used as source in supply pick move created by 'Supply from Another Warhouse'."), 
+        "stock_supply_location" : fields.boolean("Stock Supply Location", help = "Check to supply from Stock location of Supply Warehouse. " \
+                "If not checked supply will be made from Output location of Supply Warehouse. Used in 'Supply from Another Warhouse' with Supply Warehouse."),
+
     }
+
     _defaults = {
         'state': lambda *args: 'draft' ,
-        'period_id': _get_period_id
+        'to_procure' : 0.0,
+        'planned_outgoing' : 0.0,
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.planning', context=c),
     }   
     
     _order = 'period_id'
+
+    def _to_default_uom_factor(self, cr, uid, val, uom_id, context):
+        uom_obj = self.pool.get('product.uom')
+        uom = uom_obj.browse(cr, uid, uom_id, context=context)
+        coef =  uom.factor
+        if uom.category_id.id != val.product_id.uom_id.category_id.id:
+            coef = coef / val.product_id.uos_coeff
+        return val.product_id.uom_id.factor / coef
+
+
+    def _from_default_uom_factor(self, cr, uid, val, uom_id, context):
+        uom_obj = self.pool.get('product.uom')
+        uom = uom_obj.browse(cr, uid, uom_id, context=context)
+        res = uom.factor
+        if uom.category_id.id != val.product_id.uom_id.category_id.id:
+            res = res / val.product_id.uos_coeff
+        return res / val.product_id.uom_id.factor, uom.rounding
+
+    def calculate_planning(self, cr, uid, ids, context, *args):
+        one_minute = RelativeDateTime(minutes=1)
+        current_date_beginning_c = mx.DateTime.today()
+        current_date_end_c = current_date_beginning_c  + RelativeDateTime(days=1, minutes=-1)  # to get hour 23:59:00 
+        current_date_beginning = current_date_beginning_c.strftime('%Y-%m-%d %H:%M:%S')
+        current_date_end = current_date_end_c.strftime('%Y-%m-%d %H:%M:%S')
+        for val in self.browse(cr, uid, ids, context=context):
+            day = mx.DateTime.strptime(val.period_id.date_start, '%Y-%m-%d %H:%M:%S')
+            dbefore = mx.DateTime.DateTime(day.year, day.month, day.day) - one_minute
+            day_before_calculated_period = dbefore.strftime('%Y-%m-%d %H:%M:%S')   # one day before start of calculated period
+            cr.execute("SELECT date_start \
+                    FROM stock_period AS period \
+                    LEFT JOIN stock_planning AS planning \
+                    ON (planning.period_id = period.id) \
+                    WHERE (period.date_stop >= %s) AND (period.date_start <= %s) AND \
+                        planning.product_id = %s", (current_date_end, current_date_end, val.product_id.id,)) #
+            date = cr.fetchone()
+            start_date_current_period = date and date[0] or False
+            start_date_current_period = start_date_current_period or current_date_beginning
+            day = mx.DateTime.strptime(start_date_current_period, '%Y-%m-%d %H:%M:%S')
+            dbefore = mx.DateTime.DateTime(day.year, day.month, day.day) - one_minute
+            date_for_start = dbefore.strftime('%Y-%m-%d %H:%M:%S')   # one day before current period
+            already_out = self._get_in_out(cr, uid, val, start_date_current_period, current_date_end, direction='out', done = True, context=context),
+            already_in = self._get_in_out(cr, uid, val, start_date_current_period, current_date_end, direction='in', done = True, context=context),
+            outgoing = self._get_in_out(cr, uid, val, val.period_id.date_start, val.period_id.date_stop, direction='out', done = False, context=context),
+            incoming = self._get_in_out(cr, uid, val, val.period_id.date_start, val.period_id.date_stop, direction='in', done = False, context=context),
+            outgoing_before = self._get_outgoing_before(cr, uid, val, start_date_current_period, day_before_calculated_period, context=context),
+            incoming_before = self._get_in_out(cr, uid, val, start_date_current_period, day_before_calculated_period, direction='in', done = False, context=context),
+            stock_start = self._get_stock_start(cr, uid, val, date_for_start, context=context),
+            if start_date_current_period == val.period_id.date_start:   # current period is calculated
+                current=True
+            else:
+                current=False
+            factor, round_value = self._from_default_uom_factor(cr, uid, val, val.product_uom.id, context=context)
+            self.write(cr, uid, ids, {
+                'already_out': rounding(already_out[0]*factor,round_value),
+                'already_in': rounding(already_in[0]*factor,round_value),
+                'outgoing': rounding(outgoing[0]*factor,round_value),
+                'incoming': rounding(incoming[0]*factor,round_value),
+                'outgoing_before' : rounding(outgoing_before[0]*factor,round_value),
+                'incoming_before': rounding((incoming_before[0]+ (not current and already_in[0]))*factor,round_value),
+                'outgoing_left': rounding(val.planned_outgoing - (outgoing[0] + (current and already_out[0]))*factor,round_value),
+                'incoming_left': rounding(val.to_procure - (incoming[0] + (current and already_in[0]))*factor,round_value),
+                'stock_start' : rounding(stock_start[0]*factor,round_value),
+                'stock_simulation': rounding(val.to_procure - val.planned_outgoing + (stock_start[0]+ incoming_before[0] - outgoing_before[0] \
+                                     + (not current and already_in[0]))*factor,round_value),
+            })
+        return True
+
+# method below converts quantities and uoms to general OpenERP standard with UoM Qty, UoM, UoS Qty, UoS.
+# from stock_planning standard where you have one Qty and one UoM (any from UoM or UoS category) 
+# so if UoM is from UoM category it is used as UoM in standard and if product has UoS the UoS will be calcualated.
+# If UoM is from UoS category it is recalculated to basic UoS from product (in planning you can use any UoS from UoS category) 
+# and basic UoM is calculated.
+    def _qty_to_standard(self, cr, uid, val, context):
+        uos = False
+        uos_qty = 0.0
+        if val.product_uom.category_id.id == val.product_id.uom_id.category_id.id:
+            uom_qty = val.incoming_left
+            uom = val.product_uom.id
+            if val.product_id.uos_id:
+                uos = val.product_id.uos_id.id
+                coeff_uom2def = self._to_default_uom_factor(cr, uid, val, val.product_uom.id, {})
+                coeff_def2uom, round_value = self._from_default_uom_factor(cr, uid, val, uos, {})
+                uos_qty = rounding(val.incoming_left * coeff_uom2def * coeff_def2uom, round_value)
+        elif val.product_uom.category_id.id == val.product_id.uos_id.category_id.id:
+            coeff_uom2def = self._to_default_uom_factor(cr, uid, val, val.product_uom.id, {})
+            uos = val.product_id.uos_id.id
+            coeff_def2uom, round_value = self._from_default_uom_factor(cr, uid, val, uos, {})
+            uos_qty = rounding(val.incoming_left * coeff_uom2def * coeff_def2uom, round_value)
+            uom = val.product_id.uom_id.id
+            coeff_def2uom, round_value = self._from_default_uom_factor(cr, uid, val, uom, {})
+            uom_qty = rounding(val.incoming_left * coeff_uom2def * coeff_def2uom, round_value)
+        return uom_qty, uom, uos_qty, uos
     
     def procure_incomming_left(self, cr, uid, ids, context, *args):
-        result = {}
         for obj in self.browse(cr, uid, ids):
-            # source location is virtual procurement location for the product (will be mapped to supplier or
-            # production location by mrp workflow)
-            src_id = obj.product_id.property_stock_procurement and obj.product_id.property_stock_procurement.id
-            # target location is input location of selected warehouse
-            location_id = obj.warehouse_id and obj.warehouse_id.lot_input_id.id or False
-            if location_id and src_id:
-                move_id = self.pool.get('stock.move').create(cr, uid, {
-                                'name': obj.product_id.name[:64],
-                                'product_id': obj.product_id.id,
-                                'date_planned': obj.period_id.date_start,
-                                'product_qty': obj.incoming_left,
-                                'product_uom': obj.product_uom.id,
-                                'product_uos_qty': obj.incoming_left,
-                                'product_uos': obj.product_uom.id,
-                                'location_id': src_id,
-                                'location_dest_id': location_id,
-                                'state': 'waiting',
-                            })
-                proc_id = self.pool.get('mrp.procurement').create(cr, uid, {
-                                'name': _('Procure Delta In From MPS'),
-                                'origin': 'Stock Planning',
-                                'date_planned': obj.period_id.date_start,
-                                'product_id': obj.product_id.id,
-                                'product_qty': obj.incoming_left,
-                                'product_uom': obj.product_uom.id,
-                                'product_uos_qty': obj.incoming_left,
-                                'product_uos': obj.product_uom.id,
-                                'location_id': location_id,
-                                'procure_method': obj.product_id.product_tmpl_id.procure_method,
-                                'move_id': move_id,
-                            })
-                wf_service = netsvc.LocalService("workflow")
-                wf_service.trg_validate(uid, 'mrp.procurement', proc_id, 'button_confirm', cr)
-                self.write(cr, uid, obj.id,{'state':'done'})
-            else:
-                raise osv.except_osv(_('Warning'), _('Please specify a warehouse to create the procurement'))
+            if obj.incoming_left <= 0:
+                raise osv.except_osv(_('Error !'), _('Incoming Left must be greater than 0 !'))
+            uom_qty, uom, uos_qty, uos = self._qty_to_standard(cr, uid, obj, context)
+            user = self.pool.get('res.users').browse(cr, uid, uid, context)
+            proc_id = self.pool.get('mrp.procurement').create(cr, uid, {
+                        'company_id' : obj.company_id.id,
+                        'name': _('Manual planning for ') + obj.period_id.name,
+                        'origin': _('MPS(') + str(user.login) +') '+ obj.period_id.name,
+                        'date_planned': obj.period_id.date_start,
+                        'product_id': obj.product_id.id,
+                        'product_qty': uom_qty,
+                        'product_uom': uom,
+                        'product_uos_qty': uos_qty,
+                        'product_uos': uos,
+                        'location_id': obj.procure_to_stock and obj.warehouse_id.lot_stock_id.id or obj.warehouse_id.lot_input_id.id, 
+                        'procure_method': 'make_to_order',
+                        'note' : _("Procurement created in MPS by user: ") + str(user.login) + _("  Creation Date: ") + \
+                                            time.strftime('%Y-%m-%d %H:%M:%S') + \
+                                        _("\nFor period: ") + obj.period_id.name + _(" according to state:") + \
+                                        _("\n Warehouse Forecast: ") + str(obj.warehouse_forecast) + \
+                                        _("\n Initial Stock: ") + str(obj.stock_start) + \
+                                        _("\n Planned Out: ") + str(obj.planned_outgoing) + _("    Planned In: ") + str(obj.to_procure) + \
+                                        _("\n Already Out: ") + str(obj.already_out) + _("    Already In: ") +  str(obj.already_in) + \
+                                        _("\n Confirmed Out: ") + str(obj.outgoing) + _("    Confirmed In: ") + str(obj.incoming) + \
+                                        _("\n Planned Out Before: ") + str(obj.outgoing_before) + _("    Confirmed In Before: ") + \
+                                                                                            str(obj.incoming_before) + \
+                                        _("\n Expected Out: ") + str(obj.outgoing_left) + _("    Incoming Left: ") + str(obj.incoming_left) + \
+                                        _("\n Stock Simulation: ") +  str(obj.stock_simulation) + _("    Minimum stock: ") + str(obj.minimum_op),
+
+                            }, context=context)
+            wf_service = netsvc.LocalService("workflow")
+            wf_service.trg_validate(uid, 'mrp.procurement', proc_id, 'button_confirm', cr)
+            self.calculate_planning(cr, uid, ids, context)
+            prev_text = obj.history or ""
+            self.write(cr, uid, ids, {
+                    'history' : prev_text + _('Requisition (') + str(user.login) + ", " + time.strftime('%Y.%m.%d %H:%M) ') + str(obj.incoming_left) + \
+                    " " + obj.product_uom.name + "\n",
+                })
         return True
-    
-    
-    def product_id_change(self, cr, uid, ids, product, uom=False):
-        if not product:
-            return {'value': { 'product_uom': False},'domain': {'product_uom': []}}
-        product_obj =  self.pool.get('product.product').browse(cr, uid, product)
-        result = {}
-        if not uom:
-            result['product_uom'] = product_obj.uom_id.id
-            domain = {'product_uom':
-                        [('category_id', '=', product_obj.uom_id.category_id.id)],}
-        return {'value': result}
+
+    def internal_supply(self, cr, uid, ids, context, *args):
+        for obj in self.browse(cr, uid, ids):
+            if obj.incoming_left <= 0:
+                raise osv.except_osv(_('Error !'), _('Incoming Left must be greater than 0 !'))
+            if not obj.supply_warehouse_id:
+                raise osv.except_osv(_('Error !'), _('You must specify a Source Warehouse !'))
+            if obj.supply_warehouse_id.id == obj.warehouse_id.id:
+                raise osv.except_osv(_('Error !'), _('You must specify a Source Warehouse different than calculated (destination) Warehouse !'))
+            uom_qty, uom, uos_qty, uos = self._qty_to_standard(cr, uid, obj, context)
+            user = self.pool.get('res.users').browse(cr, uid, uid, context)
+            picking_id = self.pool.get('stock.picking').create(cr, uid, {
+                            'origin': _('MPS(') + str(user.login) +') '+ obj.period_id.name,
+                            'type': 'internal',
+                            'state': 'auto',
+                            'date' :  obj.period_id.date_start,
+                            'move_type': 'direct',
+                            'invoice_state':  'none',
+                            'company_id': obj.company_id.id,
+                            'note': _("Pick created from MPS by user: ") + str(user.login) + _("  Creation Date: ") + \
+                                            time.strftime('%Y-%m-%d %H:%M:%S') + \
+                                        _("\nFor period: ") + obj.period_id.name + _(" according to state:") + \
+                                        _("\n Warehouse Forecast: ") + str(obj.warehouse_forecast) + \
+                                        _("\n Initial Stock: ") + str(obj.stock_start) + \
+                                        _("\n Planned Out: ") + str(obj.planned_outgoing) + _("    Planned In: ") + str(obj.to_procure) + \
+                                        _("\n Already Out: ") + str(obj.already_out) + _("    Already In: ") +  str(obj.already_in) + \
+                                        _("\n Confirmed Out: ") + str(obj.outgoing) + _("    Confirmed In: ") + str(obj.incoming) + \
+                                        _("\n Planned Out Before: ") + str(obj.outgoing_before) + _("    Confirmed In Before: ") + \
+                                                                                            str(obj.incoming_before) + \
+                                        _("\n Expected Out: ") + str(obj.outgoing_left) + _("    Incoming Left: ") + str(obj.incoming_left) + \
+                                        _("\n Stock Simulation: ") +  str(obj.stock_simulation) + _("    Minimum stock: ") + str(obj.minimum_op),
+                        })
+
+            move_id = self.pool.get('stock.move').create(cr, uid, {
+                        'name': _('MPS(') + str(user.login) +') '+ obj.period_id.name,
+                        'picking_id': picking_id,
+                        'product_id': obj.product_id.id,
+                        'date_planned': obj.period_id.date_start,
+                        'product_qty': uom_qty,
+                        'product_uom': uom,
+                        'product_uos_qty': uos_qty,
+                        'product_uos': uos,
+                        'location_id': obj.stock_supply_location and obj.supply_warehouse_id.lot_stock_id.id or \
+                                                                obj.supply_warehouse_id.lot_output_id.id,
+                        'location_dest_id': obj.procure_to_stock and obj.warehouse_id.lot_stock_id.id or \
+                                                                obj.warehouse_id.lot_input_id.id,
+                        'tracking_id': False,
+                        'company_id': obj.company_id.id,
+                    })
+            wf_service = netsvc.LocalService("workflow")
+            wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
+
+        self.calculate_planning(cr, uid, ids, context)
+        prev_text = obj.history or ""
+        pick_name = self.pool.get('stock.picking').browse(cr, uid, picking_id).name
+        self.write(cr, uid, ids, {
+              'history' : prev_text + _('Pick List ')+ pick_name + " (" + str(user.login) + ", " + time.strftime('%Y.%m.%d %H:%M) ') \
+                + str(obj.incoming_left) +" " + obj.product_uom.name + "\n",
+                })
+
+        return True
+   
+    def product_id_change(self, cr, uid, ids, product_id):
+        ret={}
+        if product_id:
+            product_rec =  self.pool.get('product.product').browse(cr, uid, product_id)
+            ret['product_uom'] = product_rec.uom_id.id
+            ret['active_uom'] = product_rec.uom_id.id
+            ret['product_uom_categ'] = product_rec.uom_id.category_id.id
+            ret['product_uos_categ'] = product_rec.uos_id and product_rec.uos_id.category_id.id or False
+        else:
+            ret['product_uom'] = False
+            ret['product_uom_categ'] = False
+            ret['product_uos_categ'] = False
+        res = {'value': ret}
+        return res
+
 stock_planning()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 509de0527b7..e90d68cf855 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -1,18 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
-    <record id="view_stock_planning_period_form" model="ir.ui.view">
-            <field name="name">stock.planning.period.form</field>
-            <field name="model">stock.planning.period</field>
+        <menuitem id="menu_stock_period_main" 
+                  name="Stock and Sales Periods" 
+                  parent="base.menu_base_config"/>
+
+<!-- Creating periods section -->
+
+    <record id="view_stock_period_createlines_form" model="ir.ui.view">
+            <field name="name">stock.period.createlines.form</field>
+            <field name="model">stock.period.createlines</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Stock Periods">
-                    <separator colspan="4" string="Create periods for Sale Planning"/>
+                <form string="Stock and Sales Periods">
+                    <separator colspan="4" string="Create periods for Stock and Sales Planning"/>
                     <field name="date_start"/>
                     <field name="date_stop"/>                             
                     <separator colspan="4" string=""/>        
-                    <group col="4" colspan="4">
-                    	<button special="cancel" string="Cancel" />
+                    <group col="3" colspan="4">
                         <button name="create_period" string="Create Daily Periods" type="object"/>
                         <button name="create_period_weekly" string="Create Weekly Periods" type="object"/>
                         <button name="create_period_monthly" string="Create Monthly Periods" type="object"/>
@@ -20,30 +25,34 @@
                 </form>
             </field>
         </record>      
-        
-        
-        <record id="action_stock_planning_period_form" model="ir.actions.act_window">
-            <field name="name">Stock Planning Periods</field>
-            <field name="res_model">stock.planning.period</field>
+
+        <record id="action_stock_period_createlines_form" model="ir.actions.act_window">
+            <field name="name">Stock and Sales Planning Periods</field>
+            <field name="res_model">stock.period.createlines</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
-            <field name="view_id" ref="view_stock_planning_period_form"/>
+            <field name="view_id" ref="view_stock_period_createlines_form"/>
             <field name="target">new</field>
         </record>
-        
-        <menuitem id="menu_stock_planning_main" name="Sales Planning Periods" parent="base.menu_base_config"/>
-        <menuitem id="menu_stock_planning_period_create" parent="menu_stock_planning_main" action="action_stock_planning_period_form"/>
-        
+
+        <menuitem id="menu_stock_period_creatlines" 
+                  name="Create Stock and Sales Periods" 
+                  parent="menu_stock_period_main" 
+                  action="action_stock_period_createlines_form"
+                  sequence = "5"/>
+
+<!-- Periods tree and form section -->
+
         <record id="view_stock_period_form" model="ir.ui.view">
             <field name="name">stock.period.form</field>
             <field name="model">stock.period</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Stock Periods">
-                    <field name="name" select="1"/>
+                <form string="Stock and Sales Periods">
+                    <field name="name"/>
                     <field name="date_start"/>
+                    <field name="state" select="1"/>
                     <field name="date_stop"/>
-                    <field name="state"/>
                 </form>
             </field>
         </record>
@@ -53,7 +62,7 @@
             <field name="model">stock.period</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Stock Period" editable="bottom">
+                <tree string="Stock and Sales Period" editable="bottom">
                     <field name="name"/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
@@ -61,160 +70,346 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="action_stock_period_form" model="ir.actions.act_window">
             <field name="name">Stock and Sales Periods</field>
             <field name="res_model">stock.period</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
+
+        
         <menuitem
             id="menu_stock_period"
-            parent="menu_stock_planning_main"
-            action="action_stock_period_form"/>
-        
-        <record id="view_stock_planning_prevision_form" model="ir.ui.view">
-            <field name="name">stock.planning.sale.prevision.form</field>
-            <field name="model">stock.planning.sale.prevision</field>
+            parent="menu_stock_period_main"
+            action="action_stock_period_form"
+            sequence = "10"/>
+
+<!--   Create Forecast section   -->
+
+        <record id="view_stock_sale_forecast_createlines_form" model="ir.ui.view">
+            <field name="name">stock.sale.forecast.createlines</field>
+            <field name="model">stock.sale.forecast.createlines</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sales Forecast">
-                    <field name="user_id" select="1"/>
-                    <field name="period_id" select="1"/>
-                    <field name="product_id" on_change="product_id_change(product_id,product_uom,product_qty,product_amt)" />
-                    <field name="product_qty" on_change="product_id_change(product_id,product_uom,product_qty,product_amt)" />
-                    <field name="product_amt" on_change="product_id_change(product_id,product_uom,product_qty,product_amt)" />
-                    <field name="product_uom" on_change="product_id_change(product_id,product_uom,product_qty,product_amt)" />
-                    <field name="amt_sold"/>
-                    <field name="state" colspan="2"/>
-                    <button name="action_validate" string="Validate" states="draft" type="object" colspan="2"/>
+                <form string="Stock and Sales Forecasts">
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <newline/>
+                    <field name="period_id1" widget="selection"/>
+                    <newline/>
+                    <field name="warehouse_id1" domain = "[('company_id','=',company_id)] "/>
+                    <newline/>
+                    <field name="product_categ_id1" widget="selection"/>
+                    <newline/>
+                    <field name="copy_forecast"/>
+                    <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-execute" name="create_forecast" string="Create Forecasts" type="object" />
+                    </group>         
+                </form>
+            </field>
+        </record>      
+
+        <record id="action_stock_sale_forecast_createlines_form" model="ir.actions.act_window">
+            <field name="name">Create Stock and Sales Forecasts</field>
+            <field name="res_model">stock.sale.forecast.createlines</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_stock_sale_forecast_createlines_form"/>
+            <field name="target">new</field>
+        </record>
+        
+        <menuitem id="menu_stock_sale_forecast" name="Stock and Sales Forecasts" parent="base.menu_base_partner"/>
+        
+        <menuitem id="menu_stock_sale_forecast_createlines" name="Create Stock and Sales Forecasts" parent="menu_stock_sale_forecast" action="action_stock_sale_forecast_createlines_form" sequence = "5"/>
+
+        <record id="view_stock_sale_forecast_form" model="ir.ui.view">
+            <field name="name">stock.sale.forecast.form</field>
+            <field name="model">stock.sale.forecast</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Stock and Sales Forecast">
+                    <group colspan = "4" col = "4">
+		        <group colspan = "2" col="2" >
+                            <field name="company_id" select="1" 
+                                        groups="base.group_multi_company" 
+                                        widget="selection" 
+                                        on_change="onchange_company(company_id)"/>
+                            <field name="warehouse_id" select="1" domain = "[('company_id','=',company_id)] "/>
+                            <field name="period_id" select="1" />
+                            <field name="product_id" select="1" on_change="product_id_change(product_id)" />
+			    <field name="product_uom_categ"  invisible = "True"/>
+			    <field name="product_uos_categ"  invisible = "True"/>
+                            <field name="product_uom"  
+                                         domain = "[('category_id','in',[product_uom_categ,product_uos_categ])]"
+                                         on_change = "onchange_uom(product_uom, product_qty, active_uom)"/>
+                            <field name="active_uom" invisible = "True" />  
+		         </group>
+		         <group colspan = "2" col="2" >
+                            <field name="user_id"/>
+                            <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"/>
+		        </group>
+                    </group>
+                    <separator colspan ="4" string="Sales history"/>
+                    <group colspan = "4" col = "5"> 
+                        <label string = " "/>
+                        <label string = "Per User :"/>
+                        <label string = "Per Department :"/>
+                        <label string = "Per Warehouse :"/>
+                        <label string = "Per Company :"/>
+                        <label string = "Periods :"/>
+                        <field name="analyzed_user_id" nolabel = "1" domain = "[('company_id','=',company_id)] "/>
+                        <field name="analyzed_dept_id" nolabel = "1" domain = "[('company_id','=',company_id)] " />
+                        <field name="analyzed_warehouse_id" nolabel = "1" domain = "[('company_id','=',company_id)] " />
+                        <group colspan = "1" col = "2"> 
+                            <field name = "analyze_company"/>
+                        </group>
+                        <field name = "analyzed_period1_id" nolabel = "1"  />
+                        <field name = "analyzed_period1_per_user" nolabel = "1" />
+                        <field name = "analyzed_period1_per_dept" nolabel = "1" />
+                        <field name = "analyzed_period1_per_warehouse" nolabel = "1" />
+                        <field name = "analyzed_period1_per_company" nolabel = "1"/>
+                        <field name = "analyzed_period2_id" nolabel = "1" />
+                        <field name = "analyzed_period2_per_user" nolabel = "1" />
+                        <field name = "analyzed_period2_per_dept" nolabel = "1" />
+                        <field name = "analyzed_period2_per_warehouse" nolabel = "1" />
+                        <field name = "analyzed_period2_per_company" nolabel = "1" />
+                        <field name = "analyzed_period3_id" nolabel = "1"/>
+                        <field name = "analyzed_period3_per_user" nolabel = "1" />
+                        <field name = "analyzed_period3_per_dept" nolabel = "1" />
+                        <field name = "analyzed_period3_per_warehouse" nolabel = "1" />
+                        <field name = "analyzed_period3_per_company" nolabel = "1" />
+                        <field name = "analyzed_period4_id" nolabel = "1" />
+                        <field name = "analyzed_period4_per_user" nolabel = "1" />
+                        <field name = "analyzed_period4_per_dept" nolabel = "1" />
+                        <field name = "analyzed_period4_per_warehouse" nolabel = "1" />
+                        <field name = "analyzed_period4_per_company" nolabel = "1" />
+                        <field name = "analyzed_period5_id" nolabel = "1" />
+                        <field name = "analyzed_period5_per_user" nolabel = "1" />
+                        <field name = "analyzed_period5_per_dept" nolabel = "1" />
+                        <field name = "analyzed_period5_per_warehouse" nolabel = "1" />
+                        <field name = "analyzed_period5_per_company" nolabel = "1" />
+                        <button name="calculate_sales_history" icon="gtk-execute" 
+                                string="Calculate Sales History" type="object" colspan = "1" states="draft" />
+                    </group>
+
                 </form>
             </field>
         </record>
         
-        <record id="view_stock_planning_prevision_tree" model="ir.ui.view">
-             <field name="name">stock.planning.sale.prevision.tree</field>
-            <field name="model">stock.planning.sale.prevision</field>
+        <record id="view_stock_sale_forecast_tree" model="ir.ui.view">
+             <field name="name">stock.sale.forecast.tree</field>
+            <field name="model">stock.sale.forecast</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Sales Forecast" editable="bottom">
-                    <field name="user_id" select="1"/>
+                <tree string="Stock and Sales Forecasts" editable="bottom">
+                    <field name="warehouse_id" select="1"/>
+                    <field name="user_id"/>
                     <field name="period_id" select="1"/>
-                    <field name="product_id" select="1" on_change="product_id_change(product_id,product_uom)" />
+                    <field name="product_id" on_change="product_id_change(product_id)" />
                     <field name="product_qty"/>
-                    <field name="product_uom" on_change="product_id_change(product_id,product_uom)" />
+                    <field name="product_uom" />
                 </tree>
             </field>
         </record>
         
-        <record id="view_stock_planning_prevision_filter" model="ir.ui.view">
-             <field name="name">stock.planning.sale.prevision.filter</field>
-            <field name="model">stock.planning.sale.prevision</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Sales Forecast">
-                	<filter string="Current" domain="[('user_id','=',uid)]" icon="gtk-execute" help="Current Sales Forecasts"/>
-                    <field name="period_id" select="1"/>
-                    <field name="product_id" select="1"/>
-                    <field name="user_id" widget="selection" select="1">
-                    	<filter domain="[('user_id','=',uid)]" icon="gtk-execute" help="My Forecasts" default="1"/>
-                    </field>
-                </search>
-            </field>
-        </record>
-        
-       <record id="view_stock_planning_prevision_graph" model="ir.ui.view">
-             <field name="name">stock.planning.sale.prevision.graph</field>
-            <field name="model">stock.planning.sale.prevision</field>
+       <record id="view_stock_sale_forecast_graph" model="ir.ui.view">
+             <field name="name">stock.sale.forecast.graph</field>
+            <field name="model">stock.sale.forecast</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-                <graph string="Stock Planning" type = "bar">
-                    <field name="product_id" select="1"/>
+                <graph string="Stock and Sales Forecast" type = "bar">
+                    <field name="period_id"/>
                     <field name="product_qty"/>
+                    <field name="product_id"/>
                 </graph>
             </field>
         </record>
+
+
+       <record id="view_stock_sale_forecast_filter" model="ir.ui.view">
+            <field name="name">stock.sale.forecast.list.select</field>
+            <field name="model">stock.sale.forecast</field>
+            <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-purchase" string="Validated" domain="[('state','=','validated')]" separator="1"/>
+                    <field name="company_id" select="1" widget="selection"/>
+                    <field name="warehouse_id" select="1" widget="selection"/>
+                    <field name="period_id" select="1" widget="selection"/>
+                    <field name="product_id" select="1" widget="selection"/>
+                    <field name="create_uid" select="1" widget="selection">
+                        <filter icon="terp-purchase" domain="[('create_uid','=',uid)]" help="My Forecasts"/>
+                    </field>
+                </group>
+              </search>
+            </field>
+        </record>
+
         
-        
-        <record id="action_view_stock_planning_prevision_form" model="ir.actions.act_window">
-            <field name="name">Sales Forecast</field>
-            <field name="res_model">stock.planning.sale.prevision</field>
+        <record id="action_view_stock_sale_forecast_form" model="ir.actions.act_window">
+            <field name="name">Stock and Sales Forecast</field>
+            <field name="res_model">stock.sale.forecast</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
+            <field name="search_view_id" ref="view_stock_sale_forecast_filter"/>
         </record>
         
-        <record id="action_view_stock_planning_prevision_form_my" model="ir.actions.act_window">
-            <field name="name">My Sales Forecasts</field>
-            <field name="res_model">stock.planning.sale.prevision</field>
+        <menuitem id="menu_stock_sale_forecast_all" 
+                  name="Stock and Sales Forecasts" 
+                  parent="menu_stock_sale_forecast" 
+                  action="action_view_stock_sale_forecast_form"/>
+        
+<!-- Create Planning section -->
+
+        <menuitem id="menu_stock_planning_main" name="Stock Planning" parent="stock.menu_stock_root"/>
+
+       <record id="view_stock_planning_createlines_form" model="ir.ui.view">
+            <field name="name">stock.planning.createlines.form</field>
+            <field name="model">stock.planning.createlines</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Stock Planning">                            
+		    <field name="company_id" widget= "selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
+                    <newline/>
+                    <field name="period_id2" widget="selection"/>
+                    <newline/>
+                    <field name="warehouse_id2" domain = "[('company_id','=',company_id)] "/>
+                    <newline/>
+                    <field name="forecasted_products"/>
+                    <newline/>
+                    <field name="product_categ_id2" attrs="{'required':[('forecasted_products','=',0)]}" widget="selection"/>
+                    <separator colspan ="4" string="Stock planning lines creation"/>
+                    <label  colspan ="4" string="Creates planning lines for selected period and warehouse. Doesn't duplicate existing lines created by you."/>
+                    <group colspan="4">
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-ok" name="create_planning" string="Create Stock Planning" type="object"/>
+                    </group>         
+                </form>
+            </field>
+        </record>      
+
+        <record id="action_stock_planning_createlines_form" model="ir.actions.act_window">
+            <field name="name">Create Stock Planning Lines</field>
+            <field name="res_model">stock.planning.createlines</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('user_id','=',uid)]</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_stock_planning_createlines_form"/>
+            <field name="target">new</field>
         </record>
-        
-        <menuitem id="menu_stock_manual_plannification" name="Procurement Forecast" parent="stock.menu_stock_root"/>
-        
-        <menuitem id="menu_stock_prevision" name="Sales Forecasts" parent="base.menu_sales"/>
-        
-        <menuitem id="menu_stock_prevision_all" name="Sales Forecasts" parent="menu_stock_prevision" action="action_view_stock_planning_prevision_form"/>
-        
-<!--        <menuitem id="menu_stock_prevision_current" name="Sales Forecast of Current Period" parent="menu_stock_prevision_all" action="action_view_stock_planning_prevision_form"/>-->
 
-<!--        <menuitem id="menu_stock_prevision_my" name="My Sales Forecasts" parent="menu_stock_prevision" action="action_view_stock_planning_prevision_form_my"/>-->
+        <menuitem
+            id="menu_stock_planning_createlines" 
+            parent="menu_stock_planning_main"
+            action="action_stock_planning_createlines_form" sequence = "5"/>
+
+<!-- Planning section -->
 
-<!--        <menuitem id="menu_stock_prevision_my_current" name="My Forecasts of Current Period" parent="menu_stock_prevision_my" action="action_view_stock_planning_prevision_form"/>-->
-        
         <record id="view_stock_planning_form" model="ir.ui.view">
             <field name="name">stock.planning.form</field>
             <field name="model">stock.planning</field>
             <field name="type">form</field>
+            <field name="priority">50</field>
             <field name="arch" type="xml">
                 <form string="Stock Planning">
-                	<separator string="Product Information" colspan="4"/> 
-                	<group colspan="4">
-                    	<field name="period_id" select="1"/>
-                    	<field name="warehouse_id"/>
-                    	<field name="product_id" select="1" on_change="product_id_change(product_id,product_uom)" />
-                    	<field name="product_uom" on_change="product_id_change(product_id,product_uom)" />
+                    <group colspan="4" col="7">
+                        <group colspan ="3" col="2">
+                            <separator colspan ="2" string = "General Info"/>
+
+                            <field name="company_id" select = "1" widget= "selection" 
+                                         on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
+                            <field name="warehouse_id" select="1" domain = "[('company_id','=',company_id)] " />
+                            <field name="period_id" select="1"  />
+                            <field name="product_id" on_change="product_id_change(product_id)"  />
+			    <field name="product_uom_categ"  invisible = "True"/>
+			    <field name="product_uos_categ"  invisible = "True"/>
+                            <field name="product_uom"  
+                                         domain = "[('category_id','in',[product_uom_categ,product_uos_categ])]"
+                                         on_change = "onchange_uom(product_uom)"/>
+<!--                            <field name="state"/>    -->
+                            <separator colspan ="2" string = "Forecasts"/>
+                            <field name="warehouse_forecast"/>
+                            <field name="company_forecast"/>
+                            <field name="confirmed_forecasts_only"/>
+
+
+                        </group>
+                        <group colspan ="2" col="2">
+                            <separator colspan ="2" string = "Current Period Situation"/>
+                            <field name="stock_start"/>
+                            <field name="already_out"/>
+                            <field name="already_in"/>
+                            <separator colspan ="2" string = "Planning and Situation for Calculated Period"/>
+                            <field name="planned_outgoing"/>
+                            <field name="outgoing"/>
+                            <field name="outgoing_left"/>
+                            <field name="to_procure"/>
+                            <field name="incoming"/>
+                            <field name="incoming_left"/>
+                            <button name="calculate_planning" string="Calculate Planning" type="object" colspan="2"/>
+                            <field name="stock_only"/> 
+                        </group>
+                        <group colspan ="2" col="2">
+                            <separator colspan ="2" string = "Minimum Stock Rule Indicators"/>
+                            <field name="minimum_op"/>
+                            <field name="maximum_op"/>
+                            <separator colspan ="2" string = "Calculated Period Simulation"/>
+                            <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"/>
+                            <field name="procure_to_stock"/> 
+                            <separator colspan ="2" string = "Internal Supply"/>
+			    <button name="internal_supply" string="Supply from Another Warehouse" type="object" colspan="2"/>
+                            <field name="supply_warehouse_id" domain = "[('company_id','=',company_id)] "/> 
+                            <field name="stock_supply_location"/> 
+                        </group>
                     </group>
-                    <separator string="Forecast" colspan="4"/>
-                    <group colspan="4" col="6">
-	                    <field name="planned_sale"/>
-                    	<field name="stock_start"/>
-                    	<newline/>					
-	                    <field name="planned_outgoing"/>
-	                    <field name="outgoing"/>
-	                    <field name="outgoing_left"/>
-	                    <field name="to_procure"/>
-	                    <field name="incoming"/>
-	                    <field name="incoming_left"/>
-                    	<newline/>
-					</group>
-					<separator colspan="4"/>
-                    <field name="state"/>
-                    <button name="procure_incomming_left" states="draft" 
-                    	confirm="Are you sure you want to create a Procurement Order using 'Delta In' quantity, for the given Warehouse?" string="Procure Delta In" type="object"/>
+                    <separator colspan ="4" string = "Requisition history"/>
+                    <field name = "history" colspan = "2" nolabel = "1"/>
                 </form>
             </field>
         </record>
+
+       <record id="view_stock_planning_filter" model="ir.ui.view">
+            <field name="name">stock.planning.list.select</field>
+            <field name="model">stock.planning</field>
+            <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" select="1" widget="selection"/>
+                    <field name="warehouse_id" select="1" widget="selection"/>
+                    <field name="period_id" select="1" widget="selection"/>
+                    <field name="product_id" select="1" widget="selection"/>
+                 </group>
+              </search>
+            </field>
+        </record>
+
+
         <record id="view_stock_planning_tree" model="ir.ui.view">
              <field name="name">stock.planning.tree</field>
             <field name="model">stock.planning</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Master Procurement Schedule" editable="bottom" colors ="blue:line_time=='Past';black:line_time=='Future'">
-                    <field name="period_id" select="1"/>
-                    <field name="product_id" select="1" on_change="product_id_change(product_id,product_uom)" />
-                    <field name="product_uom" on_change="product_id_change(product_id,product_uom)" />
-                    <field name="stock_start" string="Stock Simulation"/>
-                    <field name="planned_sale"/>
+                <tree string="Master Procurement Schedule" colors ="blue:line_time=='Past';black:line_time=='Future'">
+                    <field name="warehouse_id" domain = "[('company_id','=',company_id)] " />
+                    <field name="period_id"/>
+                    <field name="product_id" on_change="product_id_change(product_id)" />
+                    <field name="product_uom"/>
+                    <field name="warehouse_forecast" string="Forecast"/>
                     <field name="planned_outgoing"/>
-                    <field name="outgoing" />
-                    <field name="outgoing_left"/>
                     <field name="to_procure"/>
-                    <field name="incoming" string="Confirmed In"/>
-                    <field name="incoming_left"/>
-                    <field name="line_time"/>
-                    <field name="state"/>
+                    <field name="stock_simulation" string="Stock"/>   <!-- previously stock_start -->
                 </tree>
             </field>
         </record>
@@ -222,13 +417,15 @@
         <record id="action_view_stock_planning_form" model="ir.actions.act_window">
             <field name="name">Master Procurement Schedule</field>
             <field name="res_model">stock.planning</field>
+            <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_stock_planning_filter"/>
         </record>
 
         <menuitem
             id="menu_stock_planning" 
-            parent="menu_stock_manual_plannification"
+            parent="menu_stock_planning_main"
             action="action_view_stock_planning_form"/>
         
 </data>

From d45dbadce3062d2796719429506cda3efd26b4cf Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Mon, 15 Mar 2010 15:02:47 +0530
Subject: [PATCH 119/251] [ADD] stock_planning: Added access rules.

bzr revid: uco@tinyerp.co.in-20100315093247-m9jtsv7dx9l2msc7
---
 addons/stock_planning/security/ir.model.access.csv | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/stock_planning/security/ir.model.access.csv b/addons/stock_planning/security/ir.model.access.csv
index cfd8cc17c4c..b0ee2853b87 100644
--- a/addons/stock_planning/security/ir.model.access.csv
+++ b/addons/stock_planning/security/ir.model.access.csv
@@ -1,2 +1,7 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_stock_planning","stock.planning","model_stock_planning","stock.group_stock_user",1,1,1,1
\ No newline at end of file
+"access_stock_planning","stock.planning","model_stock_planning","stock.group_stock_user",1,1,1,1
+"access_stock_period_create_lines","stock.period.createlines","model_stock_period_createlines","stock.group_stock_user",1,1,1,1
+"access_stock_period","stock.period","model_stock_period","stock.group_stock_user",1,1,1,1
+"access_stock_sale_forecast_createlines","stock.sale.forecast.createlines","model_stock_sale_forecast_createlines","stock.group_stock_user",1,1,1,1
+"access_stock_sale_forecast","stock.sale.forecast","model_stock_sale_forecast","stock.group_stock_user",1,1,1,1
+"access_stock_planning_createlines","stock.planning.createlines","model_stock_planning_createlines","stock.group_stock_user",1,1,1,1

From 6b35370983e5299713bd1ecdceb54b9e126f9ccf Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 15 Mar 2010 18:12:13 +0530
Subject: [PATCH 120/251] [IMP] auction: remove the action and set the
 act_window to all wizard

bzr revid: sbh@tinyerp.com-20100315124213-cgh3pru9ndbi8e0a
---
 .../auction/wizard/auction_lots_able_view.xml | 27 +++++------------
 .../wizard/auction_lots_auction_move_view.xml | 27 +++++------------
 .../wizard/auction_lots_enable_view.xml       | 29 ++++++-------------
 .../auction_lots_make_invoice_buyer_view.xml  | 29 +++++--------------
 .../wizard/auction_lots_make_invoice_view.xml | 26 +++++------------
 .../wizard/auction_lots_sms_send_view.xml     | 28 +++++-------------
 .../auction/wizard/auction_pay_buy_view.xml   | 28 +++++-------------
 .../auction/wizard/auction_payer_sel_view.xml | 26 +++++------------
 8 files changed, 59 insertions(+), 161 deletions(-)

diff --git a/addons/auction/wizard/auction_lots_able_view.xml b/addons/auction/wizard/auction_lots_able_view.xml
index c0ac577a8d7..96135460c72 100644
--- a/addons/auction/wizard/auction_lots_able_view.xml
+++ b/addons/auction/wizard/auction_lots_able_view.xml
@@ -19,25 +19,12 @@
                </form>
             </field>
   		</record>
-  		
-        <record id="action_auction_lots_able" model="ir.actions.act_window">
-            <field name="name">Mark as taken away</field>
-            <field name="res_model">auction.lots.able</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_auction_lots_able"/> 
-           <field name="target">new</field>
-           <field name="context">{'record_id' : active_id}</field>
-        </record>
-        
-        <record id="auction_lots_able_values" model="ir.values">
-            <field name="model_id" ref="auction.model_auction_lots" />
-            <field name="object" eval="1" />
-            <field name="name">Mark as taken away</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_auction_lots_able'))" />
-            <field name="key">action</field> 
-            <field name="model">auction.lots</field>
-        </record>
+        <act_window name="Mark as taken away"		    
+		    res_model="auction.lots.able"
+		    src_model="auction.lots"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_auction_lots_able"/>       
     </data>
 </openerp>
diff --git a/addons/auction/wizard/auction_lots_auction_move_view.xml b/addons/auction/wizard/auction_lots_auction_move_view.xml
index 0e81697c51b..dd116a8bc6c 100644
--- a/addons/auction/wizard/auction_lots_auction_move_view.xml
+++ b/addons/auction/wizard/auction_lots_auction_move_view.xml
@@ -21,25 +21,12 @@
             </field>
   		</record>
   		
-        <record id="action_auction_lots_auction_move" model="ir.actions.act_window">
-            <field name="name">Change Auction Date</field>
-            <field name="res_model">auction.lots.auction.move</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_auction_lots_auction_move"/> 
-           <field name="target">new</field>
-           <field name="context">{'record_id' : active_id}</field>
-        </record>
-        
-        <record id="auction_lots_auction_move_values" model="ir.values">
-            <field name="model_id" ref="auction.model_auction_lots" />
-            <field name="object" eval="1" />
-            <field name="name">Change Auction Date</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_auction_lots_auction_move'))" />
-            <field name="key">action</field> 
-            <field name="model">auction.lots</field>
-        </record>
-        
+        <act_window name="Change Auction Date"		    
+		    res_model="auction.lots.auction.move"
+		    src_model="auction.lots"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_auction_lots_auction_move"/>    
     </data>
 </openerp>
diff --git a/addons/auction/wizard/auction_lots_enable_view.xml b/addons/auction/wizard/auction_lots_enable_view.xml
index ce99308798c..8384524dad2 100644
--- a/addons/auction/wizard/auction_lots_enable_view.xml
+++ b/addons/auction/wizard/auction_lots_enable_view.xml
@@ -20,26 +20,15 @@
             </field>
   		</record>
   		
-        <record id="action_auction_lots_enable" model="ir.actions.act_window">
-            <field name="name">Unmark as taken away</field>
-            <field name="res_model">auction.lots.enable</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_auction_lots_enable"/> 
-           <field name="target">new</field>
-           <field name="context">{'record_id' : active_id}</field>
-        </record>
-        
-        <record id="auction_lots_enable_values" model="ir.values">
-            <field name="model_id" ref="auction.model_auction_lots" />
-            <field name="object" eval="1" />
-            <field name="name">Unmark as taken away</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_auction_lots_enable'))" />
-            <field name="key">action</field> 
-            <field name="model">auction.lots</field>
-        </record>
-        
+  		
+        <act_window name="Unmark as taken away"		    
+		    res_model="auction.lots.enable"
+		    src_model="auction.lots"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_auction_lots_enable"/>    
+		      		
         
     </data>
 </openerp>
diff --git a/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml b/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
index a813ca6c609..ba4aac79ca6 100644
--- a/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
+++ b/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
@@ -23,27 +23,14 @@
             </field>
   		</record>
   		
-        <record id="action_auction_lots_make_invoice_buyer" model="ir.actions.act_window">
-            <field name="name">Invoice Buyer objects</field>
-            <field name="res_model">auction.lots.make.invoice.buyer</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_auction_lots_make_invoice_buyer"/> 
-           <field name="target">new</field>
-           <field name="context">{'record_id' : active_id}</field>
-        </record>
-        
-        <record id="auction_lots_make_invoice_buyer_values" model="ir.values">
-            <field name="model_id" ref="auction.model_auction_lots" />
-            <field name="object" eval="1" />
-            <field name="name">Invoice Buyer objects</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_auction_lots_make_invoice_buyer'))" />
-            <field name="key">action</field> 
-            <field name="model">auction.lots</field>
-        </record>
-        
-        
+       <act_window name="Invoice Buyer objects"		    
+		    res_model="auction.lots.make.invoice.buyer"
+		    src_model="auction.lots"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_auction_lots_make_invoice_buyer"/>    
+		      		        
         
     </data>
 </openerp>
diff --git a/addons/auction/wizard/auction_lots_make_invoice_view.xml b/addons/auction/wizard/auction_lots_make_invoice_view.xml
index 4e06d8e15cc..29ef3e09348 100644
--- a/addons/auction/wizard/auction_lots_make_invoice_view.xml
+++ b/addons/auction/wizard/auction_lots_make_invoice_view.xml
@@ -21,25 +21,13 @@
             </field>
   		</record>
   		
-        <record id="action_auction_lots_make_invoice" model="ir.actions.act_window">
-            <field name="name">Invoice Seller objects</field>
-            <field name="res_model">auction.lots.make.invoice</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_auction_lots_make_invoice"/> 
-           <field name="target">new</field>
-           <field name="context">{'record_id' : active_id}</field>
-        </record>
-        
-         <record id="auction_lots_make_invoice_values" model="ir.values">
-            <field name="model_id" ref="auction.model_auction_lots" />
-            <field name="object" eval="1" />
-            <field name="name">Invoice Seller objects</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_auction_lots_make_invoice'))" />
-            <field name="key">action</field> 
-            <field name="model">auction.lots</field>
-        </record>
+       <act_window name="Invoice Seller objects"		    
+		    res_model="auction.lots.make.invoice"
+		    src_model="auction.lots"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_auction_lots_make_invoice"/>            
         
     </data>
 </openerp>
diff --git a/addons/auction/wizard/auction_lots_sms_send_view.xml b/addons/auction/wizard/auction_lots_sms_send_view.xml
index b3c49077534..22aa9d681ac 100644
--- a/addons/auction/wizard/auction_lots_sms_send_view.xml
+++ b/addons/auction/wizard/auction_lots_sms_send_view.xml
@@ -24,26 +24,12 @@
                </form>
             </field>
   		</record>
-  		
-        <record id="action_auction_lots_sms_send" model="ir.actions.act_window">
-            <field name="name">SMS Send</field>
-            <field name="res_model">auction.lots.sms.send</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_auction_lots_sms_send"/> 
-           <field name="target">new</field>
-           <field name="context">{'record_id' : active_id}</field>
-        </record>
-        
-       <record id="auction_lots_sms_send_values" model="ir.values">
-            <field name="model_id" ref="auction.model_auction_lots" />
-            <field name="object" eval="1" />
-            <field name="name">SMS Send</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_auction_lots_sms_send'))" />
-            <field name="key">action</field> 
-            <field name="model">auction.lots</field>
-        </record>
-
+       <act_window name="SMS Send"		    
+		    res_model="auction.lots.sms.send"
+		    src_model="auction.lots"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_auction_lots_sms_send"/>  
     </data>
 </openerp>
diff --git a/addons/auction/wizard/auction_pay_buy_view.xml b/addons/auction/wizard/auction_pay_buy_view.xml
index dea8600b477..0a9a3a6dcee 100644
--- a/addons/auction/wizard/auction_pay_buy_view.xml
+++ b/addons/auction/wizard/auction_pay_buy_view.xml
@@ -26,26 +26,12 @@
                </form>
             </field>
   		</record>
-  		
-  		<record id="action_auction_pay_buy" model="ir.actions.act_window">
-            <field name="name">Pay objects of the buyer</field>
-            <field name="res_model">auction.pay.buy</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_auction_pay_buy"/> 
-           <field name="target">new</field>
-           <field name="context">{'record_id' : active_id}</field>
-  		</record>
-  		
-  		 <record id="auction_pay_buy_values" model="ir.values">
-            <field name="model_id" ref="auction.model_auction_lots" />
-            <field name="object" eval="1" />
-            <field name="name">Pay objects of the buyer</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_auction_pay_buy'))" />
-            <field name="key">action</field> 
-            <field name="model">auction.lots</field>
-        </record>
-
+       <act_window name="Pay objects of the buyer"		    
+		    res_model="auction.pay.buy"
+		    src_model="auction.lots"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_auction_pay_buy"/>   
     </data>
 </openerp>
diff --git a/addons/auction/wizard/auction_payer_sel_view.xml b/addons/auction/wizard/auction_payer_sel_view.xml
index 9e8ca5ec5d2..57c43df8fe4 100644
--- a/addons/auction/wizard/auction_payer_sel_view.xml
+++ b/addons/auction/wizard/auction_payer_sel_view.xml
@@ -31,25 +31,13 @@
             </field>
   		</record>
   		
-        <record id="action_auction_payer_sel" model="ir.actions.act_window">
-            <field name="name">Mark as paid for seller</field>
-            <field name="res_model">auction.payer.sel</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_auction_payer_sel"/> 
-           <field name="target">new</field>
-           <field name="context">{'record_id' : active_id}</field>
-        </record>
-        
-        <record id="auction_payer_sel_values" model="ir.values">
-            <field name="model_id" ref="auction.model_auction_lots" />
-            <field name="object" eval="1" />
-            <field name="name">Mark as paid for seller</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_auction_payer_sel'))" />
-            <field name="key">action</field> 
-            <field name="model">auction.lots</field>
-        </record>
+       <act_window name="Mark as paid for seller"		    
+		    res_model="auction.payer.sel"
+		    src_model="auction.lots"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_auction_payer_sel"/>          
         
     </data>
 </openerp>

From a558d4fd30a657e3a257176002e1d1d7594fb54c Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Mon, 15 Mar 2010 18:20:44 +0530
Subject: [PATCH 121/251] [FIX, IMP] stock: Fixed bug in Make Picking wizard.
 Check wizards available on pickings, remove some of them, from the wizard's
 list. (like: we can not confirm a list of picking, because we have to provide
 the quantities. We can only use this wizard from the form view through a
 button).

bzr revid: uco@tinyerp.co.in-20100315125044-ef8f6oldp5g4mq1t
---
 addons/stock/stock_view.xml                | 57 ++++++++++++++++++++--
 addons/stock/stock_wizard.xml              | 27 ++++++----
 addons/stock/wizard/wizard_picking_make.py |  5 +-
 3 files changed, 72 insertions(+), 17 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 0cc33d229d7..2ab932140f5 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -588,7 +588,19 @@
                         <field name="min_date" select="1"/>
                         <field name="type"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                    </group>
+	                    <button name="%(make_picking)d" 
+	                    		states="confirmed,assigned" 
+	                    		string="Make Picking" 
+	                    		type="action" 
+	                    		icon="gtk-go-forward" 
+	                    		help="Make Picking" colspan="2"/>
+	                    <button name="%(return_picking)d" 
+	                    		states="done" 
+	                    		string="Return Picking" 
+	                    		type="action" 
+	                    		icon="gtk-go-back" 
+	                    		help="Return Picking" colspan="2"/>
+	                </group>
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
@@ -744,8 +756,19 @@
                         <field name="min_date" select="1"/>
                         <field name="type"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-
-                    </group>
+	                    <button name="%(make_picking)d" 
+	                    		states="assigned" 
+	                    		string="Make Picking" 
+	                    		type="action" 
+	                    		icon="gtk-go-forward" 
+	                    		help="Make Picking" colspan="2"/>
+	                    <button name="%(return_picking)d" 
+	                    		states="done" 
+	                    		string="Return Picking" 
+	                    		type="action" 
+	                    		icon="gtk-go-back" 
+	                    		help="Return Picking" colspan="2"/>
+	                </group>
                         <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
@@ -928,7 +951,19 @@
                         <field name="backorder_id" select="2" readonly="1"/>
                         <field name="origin" select="2" readonly="1"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                    </group>
+	                    <button name="%(make_picking)d" 
+	                    		states="assigned" 
+	                    		string="Make Picking" 
+	                    		type="action" 
+	                    		icon="gtk-go-forward" 
+	                    		help="Make Picking" colspan="2"/>
+	                    <button name="%(return_picking)d" 
+	                    		states="done" 
+	                    		string="Return Picking" 
+	                    		type="action" 
+	                    		icon="gtk-go-back" 
+	                    		help="Return Picking" colspan="2"/>
+	                </group>
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
@@ -1108,7 +1143,19 @@
                         <field name="invoice_state" select="2" string="Invoice Control"/>
                         <field name="type"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                    </group>
+	                    <button name="%(make_picking)d" 
+	                    		states="confirmed,assigned" 
+	                    		string="Make Picking" 
+	                    		type="action" 
+	                    		icon="gtk-go-forward" 
+	                    		help="Make Picking" colspan="2"/>
+	                    <button name="%(return_picking)d" 
+	                    		states="done" 
+	                    		string="Return Picking" 
+	                    		type="action" 
+	                    		icon="gtk-go-back" 
+	                    		help="Return Picking" colspan="2"/>
+	                </group>
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_in_id': address_id}">
diff --git a/addons/stock/stock_wizard.xml b/addons/stock/stock_wizard.xml
index d562ddfbb9f..86b91e462d8 100644
--- a/addons/stock/stock_wizard.xml
+++ b/addons/stock/stock_wizard.xml
@@ -17,10 +17,27 @@
         <wizard
             id="partial_picking"
             model="stock.picking"
-            multi="True"
+            menu="False"
+			keyword="client_action_multi"
             name="stock.partial_picking"
             string="Partial picking"/>
 
+		<wizard 
+			id="make_picking" 
+			model="stock.picking"
+			menu="False"
+			keyword="client_action_multi"
+			name="stock.picking.make" 
+			string="Make Picking"/>
+
+	    <wizard
+	        id="return_picking"
+	        model="stock.picking"
+	        menu="False"
+			keyword="client_action_multi"
+	        name="stock.return.picking"
+	        string="Return picking"/>
+
 	<wizard
             id="partial_move"
             model="stock.move"
@@ -35,14 +52,6 @@
         name="stock.inventory.line.split"
         string="Split inventory lines"/>
 
-    <wizard id="make_picking" model="stock.picking" multi="True" name="stock.picking.make" string="Make picking"/>
-
-    <wizard
-        id="return_picking"
-        model="stock.picking"
-        name="stock.return.picking"
-        string="Return picking"/>
-
     <wizard
         string="Merge inventories"
         model="stock.inventory"
diff --git a/addons/stock/wizard/wizard_picking_make.py b/addons/stock/wizard/wizard_picking_make.py
index df4c9f63e8d..287fb066f7c 100644
--- a/addons/stock/wizard/wizard_picking_make.py
+++ b/addons/stock/wizard/wizard_picking_make.py
@@ -32,7 +32,7 @@ ARCH = '''<?xml version="1.0"?>
 FIELDS = {
     'pickings': {
         'string': 'Picking',
-        'type': 'one2many',
+        'type': 'many2many',
         'relation': 'stock.picking',
         'readonly': True,
     },
@@ -52,8 +52,7 @@ def _make_packing(obj, cursor, user, data, context):
     wkf_service = netsvc.LocalService('workflow')
     pool = pooler.get_pool(cursor.dbname)
     picking_obj = pool.get('stock.picking')
-    ids = [x[1] for x in data['form']['pickings']]
-
+    ids = data['form']['pickings'][0][2]
     picking_obj.force_assign(cursor, user, ids)
     picking_obj.action_move(cursor, user, ids)
     for picking_id in ids:

From c7bdad1756d3b999e011719c941089c7db540ac8 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 15 Mar 2010 18:42:49 +0530
Subject: [PATCH 122/251] [Add] auction: Add the  access rules

bzr revid: sbh@tinyerp.com-20100315131249-58izhud323ysi9tn
---
 addons/auction/security/ir.model.access.csv | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/addons/auction/security/ir.model.access.csv b/addons/auction/security/ir.model.access.csv
index 642209edd05..1c1df0828ca 100644
--- a/addons/auction/security/ir.model.access.csv
+++ b/addons/auction/security/ir.model.access.csv
@@ -22,3 +22,13 @@
 "access_report_object_encoded","report.object.encoded","model_report_object_encoded","base.group_user",1,0,0,0
 "access_report_object_encoded_manager","report.object.encoded.manager","model_report_object_encoded_manager","base.group_user",1,0,0,0
 "access_report_unclassified_objects","report.unclassified.objects","model_report_unclassified_objects","base.group_user",1,0,0,0
+"access_auction_lots_able","auction.lots.able","model_auction_lots_able","base.group_user",1,0,0,0
+"access_auction_lots_auction_move","auction.lots.auction.move","model_auction_lots_auction_move","base.group_user",1,0,0,0
+"access_auction_lots_enable","auction.lots.enable","model_auction_lots_enable","base.group_user",1,0,0,0
+"access_auction_lots_make_invoice_buyer","auction.lots.make.invoice.buyer","model_auction_lots_make_invoice_buyer","base.group_user",1,0,0,0
+"access_auction_lots_make_invoice","auction.lots.make.invoice","model_auction_lots_make_invoice","base.group_user",1,0,0,0
+"access_auction_lots_sms_send","auction.lots.sms.send","model_auction_lots_sms_send","base.group_user",1,0,0,0
+"access_auction_pay_buy","auction.pay.buy","model_auction_pay_buy","base.group_user",1,0,0,0
+"acess_auction_payer","auction.payer","model_auction_payer","base.group_user",1,0,0,0
+"access_auction_pay_sel","auction.pay.sel","model_auction_payer_sel","base.group_user",1,0,0,0
+"acess_auction_taken","auction.taken","model_auction_taken","base.group_user",1,0,0,0

From 5fa7b9e5705312ebe1c31705647b8c024ddd064d Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Mon, 15 Mar 2010 18:46:40 +0530
Subject: [PATCH 123/251] [IMP] stock: Put button in inventory lines list view
 in invenntory form.

bzr revid: uco@tinyerp.co.in-20100315131640-t611ptbeuit7ps01
---
 addons/stock/stock.py       | 6 ++----
 addons/stock/stock_view.xml | 3 ++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 344eca867a6..87538db508b 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1714,11 +1714,9 @@ class stock_inventory_line(osv.osv):
         'product_qty': fields.float('Quantity'),
         'company_id': fields.related('inventory_id','company_id',type='many2one',relation='res.company',string='Company',store=True),
         'prod_lot_id': fields.many2one('stock.production.lot', 'Production Lot', domain="[('product_id','=',product_id)]"),
-#        'state': fields.selection( (('draft', 'Draft'), ('done', 'Done'), ('cancel','Cancelled')), 'State', readonly=True),
+        'state': fields.related('inventory_id','state',type='char',string='State',readonly=True),
     }
-#    _defaults = {
-#        'state': lambda *a: 'draft',
-#    }
+
     def on_change_product_id(self, cr, uid, ids, location_id, product, uom=False):
         if not product:
             return {}
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 2ab932140f5..c5a0430a405 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -91,7 +91,8 @@
                                 <field name="product_uom"/>
                                 <field name="prod_lot_id"/>
                                 <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>
-									<button name="%(stock.action_view_stock_inventory_line_split)d"
+								<field name="state" invisible="1"/>
+								<button name="%(stock.action_view_stock_inventory_line_split)d"
                     		 		string="Split inventory lines"
                       		 		type="action" icon="gtk-justify-fill" states="draft"/>
                             </tree>

From f9df3c53123de562e9effe631f29c0560e6d2c06 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Mon, 15 Mar 2010 19:06:41 +0530
Subject: [PATCH 124/251] [ADD] stock, sale: Added security rules for new
 objects.

bzr revid: uco@tinyerp.co.in-20100315133641-wc9gl61rq2lf889d
---
 addons/sale/security/ir.model.access.csv  | 7 +++++++
 addons/stock/security/ir.model.access.csv | 7 ++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 937322578cd..44ce9f7d1fa 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -21,3 +21,10 @@
 "access_sale_order_line_manager","sale.order.line.manager","model_sale_order_line","group_sale_manager",1,1,1,1
 "access_sale_report","sale.report","model_sale_report","group_sale_user",1,1,1,0
 "access_sale_report_manager","sale.report","model_sale_report","group_sale_manager",1,1,1,1
+"access_sale_order_line_make_invoice","sale.order.line.make.invoice","model_sale_order_line_make_invoice","group_sale_user",1,1,1,0
+"access_sale_order_line_make_invoice_manager","sale.order.line.make.invoice","model_sale_order_line_make_invoice","group_sale_manager",1,1,1,1
+"access_sale_advance_payment_inv","sale.advance.payment.inv","model_sale_advance_payment_inv","group_sale_user",1,1,1,0
+"access_sale_advance_payment_inv_manager","sale.advance.payment.inv","model_sale_advance_payment_inv","group_sale_manager",1,1,1,1
+"access_sale_open_invoice","sale.open.invoice","model_sale_open_invoice","group_sale_user",1,1,1,0
+"access_sale_open_invoice_manager","sale.open.invoice","model_sale_open_invoice","group_sale_manager",1,1,1,1
+
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index 581308694b8..29c3321cda9 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -28,4 +28,9 @@
 "access_stock_move_consume","stock.move.consume","model_stock_move_consume","stock.group_stock_user",1,0,0,0
 "access_stock_move_scrap","stock.move.scrap","model_stock_move_scrap","stock.group_stock_user",1,0,0,0
 "access_stock_move_split","stock.move.split","model_stock_move_split","stock.group_stock_user",1,0,0,0
-"access_stock_move_split_lines","stock.move.split.lines","model_stock_move_split_lines","stock.group_stock_user",1,0,0,0
\ No newline at end of file
+"access_stock_move_split_lines","stock.move.split.lines","model_stock_move_split_lines","stock.group_stock_user",1,0,0,0
+"access_stock_inventory_set_stock_zero","stock.inventory.set.stock.zero","model_stock_inventory_set_stock_zero","stock.group_stock_user",1,0,0,0
+"access_stock_fill_inventory","stock.fill.inventory","model_stock_fill_inventory","stock.group_stock_user",1,0,0,0
+"access_stock_inventory_line_split","stock.inventory.line.split","model_stock_inventory_line_split","stock.group_stock_user",1,0,0,0
+"access_stock_invoice_onshipping","stock.invoice.onshipping","model_stock_invoice_onshipping","stock.group_stock_user",1,0,0,0
+"access_stock_location_product","stock.location.product","model_stock_location_product","stock.group_stock_user",1,0,0,0

From 28e7983164aada4bab76400b5777e5461ac270cc Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 16 Mar 2010 12:16:43 +0530
Subject: [PATCH 125/251] [IMP]: stock: Improvement for default function

bzr revid: rpa@tinyerp.com-20100316064643-n99w7xqhfrp1oobq
---
 addons/stock/wizard/stock_move.py | 70 ++++++-------------------------
 1 file changed, 12 insertions(+), 58 deletions(-)

diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index 6d438f9a661..a9b1613b7b1 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -66,73 +66,27 @@ class stock_move_consume(osv.osv_memory):
         'location_id': fields.many2one('stock.location', 'Location', required=True)
               }
 
-    def _get_product_id(self, cr, uid, context):
+    def default_get(self, cr, uid, fields_list, context=None):
         """ 
-             @summary:To get product id
+             Get default values
             
              @param self: The object pointer.
              @param cr: A database cursor
              @param uid: ID of the user currently logged in
+             @param fields_list: List of fields for default value 
              @param context: A standard dictionary 
              
-             @return: product id
+             @return: default values of fields_list
         
-        """                        
+        """
         move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
-        return move.product_id.id
-    
-    def _get_product_qty(self, cr, uid, context):
-        """ 
-             @summary:To get product quantity
-            
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param context: A standard dictionary 
-             
-             @return: quantity
-        
-        """                
-        move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
-        return move.product_qty
-    
-    def _get_product_uom(self, cr, uid, context):
-        """ 
-             @summary:To get Unit of measure
-            
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param context: A standard dictionary 
-             
-             @return: uom
-        
-        """                
-        move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
-        return move.product_uom.id
-    
-    def _get_location_id(self, cr, uid, context):
-        """ 
-             @summary:To get location id
-            
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param context: A standard dictionary 
-             
-             @return: location id
-        
-        """                
-        
-        move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
-        return move.location_id.id
-    
-    _defaults = {
-                 'product_id': _get_product_id, 
-                 'product_qty': _get_product_qty, 
-                 'product_uom': _get_product_uom, 
-                 'location_id': _get_location_id
-                 }
+        val = {
+               'product_id':  move.product_id.id, 
+               'product_uom': move.product_uom.id, 
+               'product_qty': move.product_qty, 
+               'location_id': move.location_id.id, 
+               }
+        return val
 
     def do_move_consume(self, cr, uid, ids, context={}):
         """ 

From 70848a33ce6368e6e9d927cbbb3c00d618e9433e Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Tue, 16 Mar 2010 18:35:53 +0530
Subject: [PATCH 126/251] [IMP]: auction:Old wizard entries are removed from
 the __init__.py

bzr revid: mso@mso-20100316130553-962hcxobdg5c1uu8
---
 addons/auction/wizard/__init__.py | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/addons/auction/wizard/__init__.py b/addons/auction/wizard/__init__.py
index b82dcda5307..eba1b0b5113 100644
--- a/addons/auction/wizard/__init__.py
+++ b/addons/auction/wizard/__init__.py
@@ -19,18 +19,6 @@
 #
 ##############################################################################
 
-#import wizard_aie_send
-#import wizard_aie_send_result
-#import wizard_lots_buyer_map
-#import wizard_lots_cancel
-#import wizard_lots_invoice
-#import wizard_lots_numerotate
-#import wizard_lots_pay
-#import wizard_pay
-#import wizard_lot_date_move
-#import wizard_transfer_unsold_object
-#import auction_catalog_flagey
-
 import auction_lots_able
 import auction_lots_enable
 import auction_lots_make_invoice_buyer

From 04b333863cebccca6e31ee6b4e4a25a6f9461665 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Tue, 16 Mar 2010 19:04:19 +0530
Subject: [PATCH 127/251] [ADD] stock: If changing cost of a product, to take
 this valuation delta into account with a corresponding accounting entry.

bzr revid: uco@tinyerp.co.in-20100316133419-9zzx22kcxyaoosab
---
 addons/stock/__terp__.py                      |   1 +
 addons/stock/product_view.xml                 |  14 ++
 addons/stock/wizard/__init__.py               |   2 +
 .../wizard/stock_change_standard_price.py     | 132 ++++++++++++++++++
 .../stock_change_standard_price_view.xml      |  31 ++++
 5 files changed, 180 insertions(+)
 create mode 100644 addons/stock/wizard/stock_change_standard_price.py
 create mode 100644 addons/stock/wizard/stock_change_standard_price_view.xml

diff --git a/addons/stock/__terp__.py b/addons/stock/__terp__.py
index 72ebda3b16e..746a75e851f 100644
--- a/addons/stock/__terp__.py
+++ b/addons/stock/__terp__.py
@@ -48,6 +48,7 @@ Thanks to the double entry management, the inventory controlling is powerful and
         "wizard/stock_invoice_onshipping_view.xml",
         "wizard/stock_location_product_view.xml",
         "wizard/stock_inventory_line_split_view.xml",
+        "wizard/stock_change_standard_price_view.xml",
         "stock_workflow.xml",
         "stock_incoterms.xml",
         "stock_wizard.xml",        
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 9f9dd4b6ec2..d027465c34d 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -54,6 +54,20 @@
             </field>
         </record>
 
+		<record id="view_product_standard_price_form" model="ir.ui.view">
+            <field name="name">product.product.standard.price.form.inherit</field>
+            <field name="model">product.product</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+				<field name="standard_price" position="replace">
+					<group col="4" colspan="2">
+						<field name="standard_price" readonly="True"/>
+						<button name="%(action_view_change_standard_price)d" string="Change Price" type="action" icon="gtk-execute"/>
+	           		</group>
+	           	</field>
+	        </field>
+	    </record>
 
         <record id="view_normal_property_acc_form" model="ir.ui.view">
             <field name="name">product.normal.stock.acc.property.form.inherit</field>
diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py
index 4d0db45aa45..fabee37650c 100644
--- a/addons/stock/wizard/__init__.py
+++ b/addons/stock/wizard/__init__.py
@@ -36,5 +36,7 @@ import stock_inventory_line_split
 import stock_invoice_onshipping
 import stock_location_product
 
+import stock_change_standard_price
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/stock/wizard/stock_change_standard_price.py b/addons/stock/wizard/stock_change_standard_price.py
new file mode 100644
index 00000000000..982dd252a62
--- /dev/null
+++ b/addons/stock/wizard/stock_change_standard_price.py
@@ -0,0 +1,132 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+
+class change_standard_price(osv.osv_memory):
+    _name = "stock.change.standard.price"
+    _description = "Change Standard Price"
+    _columns = {
+            'new_price': fields.float('Price', required=True),
+    }
+    
+    def default_get(self, cr, uid, fields, context):
+        """ 
+             @summary: To get default values for the object.
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param fields: List of fields for which we want default values 
+             @param context: A standard dictionary 
+             
+             @return: A dictionary which of fields with values. 
+        
+        """ 
+        rec_id = context and context.get('active_id', False)
+        res = {}
+        price = self.pool.get('product.product').browse(cr, uid, rec_id)
+        res['new_price'] = price.standard_price
+        return res
+    
+    def change_price(self, cr, uid, ids, context):
+        """ 
+             @summary: Changes the Standard Price of Product. 
+                       And creates an account move accordingly.
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: List of IDs selected 
+             @param context: A standard dictionary 
+             
+             @return:  
+        
+        """
+        rec_id = context and context.get('active_id', False)
+        prod_obj = self.pool.get('product.template')
+        location_obj = self.pool.get('stock.location')
+        lot_obj = self.pool.get('stock.report.prodlots')
+        move_obj = self.pool.get('account.move')
+        move_line_obj = self.pool.get('account.move.line')
+        
+        res = self.read(cr, uid, ids[0], ['new_price'])
+        new_price = res.get('new_price',[])
+        data = prod_obj.browse(cr, uid, rec_id)
+        diff = data.standard_price - new_price
+        prod_obj.write(cr, uid, rec_id, {'standard_price': new_price})
+        
+        loc_ids = location_obj.search(cr, uid, [('account_id','<>',False),('usage','=','internal')])
+        lot_ids = lot_obj.search(cr, uid, [('location_id', 'in', loc_ids),('product_id','=',rec_id)])
+        qty = 0
+        debit = 0.0
+        credit = 0.0
+        stock_input_acc = data.property_stock_account_input.id or data.categ_id.property_stock_account_input_categ.id
+        stock_output_acc = data.property_stock_account_output.id or data.categ_id.property_stock_account_output_categ.id
+            
+        for lots in lot_obj.browse(cr, uid, lot_ids):
+            qty += lots.name
+
+        if stock_input_acc and stock_output_acc:
+            move_id = move_obj.create(cr, uid, {'journal_id': data.property_stock_journal.id})
+            if diff > 0:
+                credit = qty * diff
+                move_line_obj.create(cr, uid, {
+                                'name': data.name,
+                                'account_id': stock_input_acc,
+                                'credit': credit,
+                                'move_id': move_id
+                                })
+                for lots in lot_obj.browse(cr, uid, lot_ids):
+                    credit = lots.name * diff
+                    move_line_obj.create(cr, uid, {
+                                    'name': 'Expense',
+                                    'account_id': lots.location_id.account_id.id,
+                                    'debit': credit,
+                                    'move_id': move_id
+                                    })
+            elif diff < 0:
+                debit = qty * -diff
+                move_line_obj.create(cr, uid, {
+                                'name': data.name,
+                                'account_id': stock_output_acc,
+                                'debit': debit,
+                                'move_id': move_id
+                                })
+                for lots in lot_obj.browse(cr, uid, lot_ids):
+                    debit = lots.name * -diff
+                    move_line_obj.create(cr, uid, {
+                                    'name': 'Income',
+                                    'account_id': lots.location_id.account_id.id,
+                                    'credit': debit,
+                                    'move_id': move_id
+                                    })
+            else:
+                raise osv.except_osv(_('Warning!'),_('No Change in Price.'))
+        else:
+            raise osv.except_osv(_('Warning!'),_('No Accounts are defined for ' 
+                        'this product on its location.\nCan\'t create Move.'))
+        return {}
+
+change_standard_price()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/stock_change_standard_price_view.xml b/addons/stock/wizard/stock_change_standard_price_view.xml
new file mode 100644
index 00000000000..38ba579848d
--- /dev/null
+++ b/addons/stock/wizard/stock_change_standard_price_view.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+   		<record id="view_change_standard_price" model="ir.ui.view">
+            <field name="name">Change Standard Price</field>
+            <field name="model">stock.change.standard.price</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Change Standard Price">
+              		<field name="new_price"/>
+              		<newline/>
+              		<group col="2" colspan="4">
+	              		<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	              		<button name="change_price" string="Change" type="object" icon="gtk-ok"/>
+              		</group>
+              </form>
+            </field>
+		</record>
+
+		<record id="action_view_change_standard_price" model="ir.actions.act_window">
+            <field name="name">Change Standard Price</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.change.standard.price</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_change_standard_price"/>
+            <field name="target">new</field>            
+        </record>
+
+    </data>
+</openerp>

From 1a6c6161fc165785446fac276c5d8ada7a3dc193 Mon Sep 17 00:00:00 2001
From: mtr <>
Date: Tue, 16 Mar 2010 19:27:58 +0530
Subject: [PATCH 128/251] [IMP]: Purchase: Old wizard has been replaced by OSV
 memory wizard

bzr revid: mso@mso-20100316135758-bzp8yfk28ca9p74b
---
 addons/purchase/purchase_view.xml             |   8 +
 addons/purchase/wizard/purchase_order_group   | 147 +++++++++++++++
 .../wizard/purchase_wizard_group_view.xml     |  46 +++++
 addons/purchase/wizard/wizard_group.py        | 173 ------------------
 4 files changed, 201 insertions(+), 173 deletions(-)
 create mode 100644 addons/purchase/wizard/purchase_order_group
 create mode 100644 addons/purchase/wizard/purchase_wizard_group_view.xml
 delete mode 100644 addons/purchase/wizard/wizard_group.py

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index b8be61e1665..53e9754a9d0 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -289,5 +289,13 @@
             res_model="purchase.order.line"
             src_model="product.product"/>
 
+	<record model="ir.values" id="action_merge_purchase_order">
+                <field name="object" eval="1" />
+                <field name="name">Purchase Order</field>
+                <field name="key2">client_action_multi</field>
+                <field name="value" eval="'ir.actions.act_window,' + str(ref('action_view_purchase_order_group'))" />
+                <field name="key">action</field>
+                <field name="model">purchase.order</field>
+         </record>
     </data>
 </openerp>
diff --git a/addons/purchase/wizard/purchase_order_group b/addons/purchase/wizard/purchase_order_group
new file mode 100644
index 00000000000..4c92fda53d8
--- /dev/null
+++ b/addons/purchase/wizard/purchase_order_group
@@ -0,0 +1,147 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+from service import web_services
+import netsvc
+import pooler
+import time
+import wizard
+from osv.orm import browse_record, browse_null
+
+class purchase_order_group(osv.osv_memory):
+	_name = "purchase.order.group"
+	_description = "Purchase Wizard"
+	_columns = {
+		  
+		} 
+
+	def merge_orders(self, cr, uid, ids, context):
+	        order_obj = self.pool.get('purchase.order')
+		mod_obj =self.pool.get('ir.model.data')
+		result = mod_obj._get_id(cr, uid, 'purchase', 'view_purchase_order_filter')
+		id = mod_obj.read(cr, uid, result, ['res_id'])
+      
+
+ 	
+		def make_key(br, fields):
+			list_key = []
+			for field in fields:
+			    field_val = getattr(br, field)
+			    if field in ('product_id', 'move_dest_id', 'account_analytic_id'):
+				if not field_val:
+				    field_val = False
+			    if isinstance(field_val, browse_record):
+				field_val = field_val.id
+			    elif isinstance(field_val, browse_null):
+				field_val = False
+			    elif isinstance(field_val, list):
+				field_val = ((6, 0, tuple([v.id for v in field_val])),)
+			    list_key.append((field, field_val))
+			list_key.sort()
+			return tuple(list_key)
+
+    # compute what the new orders should contain
+  
+		new_orders = {}
+    
+		for porder in [order for order in order_obj.browse(cr, uid, context['active_ids']) if order.state == 'draft']:
+			order_key = make_key(porder, ('partner_id', 'location_id', 'pricelist_id'))
+
+			new_order = new_orders.setdefault(order_key, ({}, []))
+			new_order[1].append(porder.id)
+			order_infos = new_order[0]
+			if not order_infos:
+			    order_infos.update({
+				'origin': porder.origin,
+				'date_order': time.strftime('%Y-%m-%d'),
+				'partner_id': porder.partner_id.id,
+				'partner_address_id': porder.partner_address_id.id,
+				'dest_address_id': porder.dest_address_id.id,
+				'warehouse_id': porder.warehouse_id.id,
+				'location_id': porder.location_id.id,
+				'pricelist_id': porder.pricelist_id.id,
+				'state': 'draft',
+				'order_line': {},
+				'notes': '%s' % (porder.notes or '',),
+			    })
+			else:
+			    #order_infos['name'] += ', %s' % porder.name
+			    if porder.notes:
+				order_infos['notes'] = (order_infos['notes'] or '') + ('\n%s' % (porder.notes,))
+			    if porder.origin:
+				order_infos['origin'] = (order_infos['origin'] or '') + ' ' + porder.origin
+
+			for order_line in porder.order_line:
+			    line_key = make_key(order_line, ('name', 'date_planned', 'taxes_id', 'price_unit', 'notes', 'product_id', 'move_dest_id', 'account_analytic_id'))
+			    o_line = order_infos['order_line'].setdefault(line_key, {})
+			    if o_line:
+				# merge the line with an existing line
+				o_line['product_qty'] += order_line.product_qty * order_line.product_uom.factor / o_line['uom_factor']
+			    else:
+				# append a new "standalone" line
+				for field in ('product_qty', 'product_uom'):
+				    field_val = getattr(order_line, field)
+				    if isinstance(field_val, browse_record):
+					field_val = field_val.id
+				    o_line[field] = field_val
+				o_line['uom_factor'] = order_line.product_uom and order_line.product_uom.factor or 1.0
+
+		wf_service = netsvc.LocalService("workflow")
+
+		allorders = []
+		for order_key, (order_data, old_ids) in new_orders.iteritems():
+			# skip merges with only one order
+			if len(old_ids) < 2:
+			    allorders += (old_ids or [])
+			    continue
+
+			# cleanup order line data
+			for key, value in order_data['order_line'].iteritems():
+				del value['uom_factor']
+				value.update(dict(key))
+			order_data['order_line'] = [(0, 0, value) for value in order_data['order_line'].itervalues()]
+
+			# create the new order
+			neworder_id = order_obj.create(cr, uid, order_data)
+			allorders.append(neworder_id)
+
+			# make triggers pointing to the old orders point to the new order
+			for old_id in old_ids:
+			    wf_service.trg_redirect(uid, 'purchase.order', old_id, neworder_id, cr)
+			    wf_service.trg_validate(uid, 'purchase.order', old_id, 'purchase_cancel', cr)
+
+		return {
+		'domain': "[('id','in', [" + ','.join(map(str, allorders)) + "])]",
+		'name': 'Purchase Orders',
+		'view_type': 'form',
+		'view_mode': 'tree,form',
+		'res_model': 'purchase.order',
+		'view_id': False,
+		'type': 'ir.actions.act_window',
+		'search_view_id': id['res_id']
+		}
+
+		     
+
+   
+purchase_order_group()
+
diff --git a/addons/purchase/wizard/purchase_wizard_group_view.xml b/addons/purchase/wizard/purchase_wizard_group_view.xml
new file mode 100644
index 00000000000..332aa5b041b
--- /dev/null
+++ b/addons/purchase/wizard/purchase_wizard_group_view.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_purchase_order_group" model="ir.ui.view">
+            <field name="name">Merger Purchase Orders</field>
+            <field name="model">purchase.order.group</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+               <form string="Merge orders">
+        			<separator string="Are you sure you want to merge these orders ?" colspan="4"/>
+       				<newline/>
+    				<label string="Please note that:" colspan="4"/>
+				<newline/>
+      				<label string="-orders will only be merged if:" colspan="4"/>
+        			<newline/>
+    				<label string="* their status is draft" colspan="4"/>
+				<newline/>
+    				<label string="* they belong to the same partner" colspan="4"/>
+				<newline/>
+    				<label string="* are going to the same location" colspan="4"/>
+				<newline/>
+    				<label string="* have the same pricelist" colspan="4"/>
+				<newline/>
+    				<label string="- lines will only be merged if:" colspan="4"/>
+				<newline/>
+    				<label string="* they are exactly the same except for the quantity and unit" colspan="4"/>
+        			<separator string="" colspan="4" />
+					<button special="cancel" string="Cancel" />
+            	    <button name="merge_orders" string="Merge orders" type="object" />
+    			</form>
+            </field>
+		</record>
+
+	<record id="action_view_purchase_order_group" model="ir.actions.act_window">
+			<field name="name">Merge Purchase order</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">purchase.order.group</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">form</field>
+			<field name="target">new</field>
+			<field name="view_id" ref="view_purchase_order_group"/>
+		</record>
+			
+    </data>
+</openerp>
+
diff --git a/addons/purchase/wizard/wizard_group.py b/addons/purchase/wizard/wizard_group.py
deleted file mode 100644
index 050be8c88d6..00000000000
--- a/addons/purchase/wizard/wizard_group.py
+++ /dev/null
@@ -1,173 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import time
-
-import wizard
-import netsvc
-import pooler
-from osv.orm import browse_record, browse_null
-
-
-merge_form = """<?xml version="1.0"?>
-<form string="Merge orders">
-    <separator string="Are you sure you want to merge these orders ?"/>
-    <newline/>
-    <label>Please note that:
-      - orders will only be merged if:
-        * their status is draft
-        * they belong to the same partner
-        * are going to the same location
-        * have the same pricelist
-      - lines will only be merged if:
-        * they are exactly the same except for the quantity and unit</label>
-</form>
-"""
-
-merge_fields = {
-}
-
-ack_form = """<?xml version="1.0"?>
-<form string="Merge orders">
-    <separator string="Orders merged"/>
-</form>"""
-
-ack_fields = {}
-
-
-def _merge_orders(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    order_obj = pool.get('purchase.order')
-    mod_obj = pool.get('ir.model.data')
-    result = mod_obj._get_id(cr, uid, 'purchase', 'view_purchase_order_filter')
-    id = mod_obj.read(cr, uid, result, ['res_id'])
-
-    def make_key(br, fields):
-        list_key = []
-        for field in fields:
-            field_val = getattr(br, field)
-            if field in ('product_id', 'move_dest_id', 'account_analytic_id'):
-                if not field_val:
-                    field_val = False
-            if isinstance(field_val, browse_record):
-                field_val = field_val.id
-            elif isinstance(field_val, browse_null):
-                field_val = False
-            elif isinstance(field_val, list):
-                field_val = ((6, 0, tuple([v.id for v in field_val])),)
-            list_key.append((field, field_val))
-        list_key.sort()
-        return tuple(list_key)
-
-    # compute what the new orders should contain
-    new_orders = {}
-    for porder in [order for order in order_obj.browse(cr, uid, data['ids']) if order.state == 'draft']:
-        order_key = make_key(porder, ('partner_id', 'location_id', 'pricelist_id'))
-
-        new_order = new_orders.setdefault(order_key, ({}, []))
-        new_order[1].append(porder.id)
-        order_infos = new_order[0]
-        if not order_infos:
-            order_infos.update({
-                'origin': porder.origin,
-                'date_order': time.strftime('%Y-%m-%d'),
-                'partner_id': porder.partner_id.id,
-                'partner_address_id': porder.partner_address_id.id,
-                'dest_address_id': porder.dest_address_id.id,
-                'warehouse_id': porder.warehouse_id.id,
-                'location_id': porder.location_id.id,
-                'pricelist_id': porder.pricelist_id.id,
-                'state': 'draft',
-                'order_line': {},
-                'notes': '%s' % (porder.notes or '',),
-            })
-        else:
-            #order_infos['name'] += ', %s' % porder.name
-            if porder.notes:
-                order_infos['notes'] = (order_infos['notes'] or '') + ('\n%s' % (porder.notes,))
-            if porder.origin:
-                order_infos['origin'] = (order_infos['origin'] or '') + ' ' + porder.origin
-
-        for order_line in porder.order_line:
-            line_key = make_key(order_line, ('name', 'date_planned', 'taxes_id', 'price_unit', 'notes', 'product_id', 'move_dest_id', 'account_analytic_id'))
-            o_line = order_infos['order_line'].setdefault(line_key, {})
-            if o_line:
-                # merge the line with an existing line
-                o_line['product_qty'] += order_line.product_qty * order_line.product_uom.factor / o_line['uom_factor']
-            else:
-                # append a new "standalone" line
-                for field in ('product_qty', 'product_uom'):
-                    field_val = getattr(order_line, field)
-                    if isinstance(field_val, browse_record):
-                        field_val = field_val.id
-                    o_line[field] = field_val
-                o_line['uom_factor'] = order_line.product_uom and order_line.product_uom.factor or 1.0
-
-    wf_service = netsvc.LocalService("workflow")
-
-    allorders = []
-    for order_key, (order_data, old_ids) in new_orders.iteritems():
-        # skip merges with only one order
-        if len(old_ids) < 2:
-            allorders += (old_ids or [])
-            continue
-
-        # cleanup order line data
-        for key, value in order_data['order_line'].iteritems():
-            del value['uom_factor']
-            value.update(dict(key))
-        order_data['order_line'] = [(0, 0, value) for value in order_data['order_line'].itervalues()]
-
-        # create the new order
-        neworder_id = order_obj.create(cr, uid, order_data)
-        allorders.append(neworder_id)
-
-        # make triggers pointing to the old orders point to the new order
-        for old_id in old_ids:
-            wf_service.trg_redirect(uid, 'purchase.order', old_id, neworder_id, cr)
-            wf_service.trg_validate(uid, 'purchase.order', old_id, 'purchase_cancel', cr)
-
-    return {
-        'domain': "[('id','in', [" + ','.join(map(str, allorders)) + "])]",
-        'name': 'Purchase Orders',
-        'view_type': 'form',
-        'view_mode': 'tree,form',
-        'res_model': 'purchase.order',
-        'view_id': False,
-        'type': 'ir.actions.act_window',
-        'search_view_id': id['res_id']
-    }
-
-
-class merge_orders(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch': merge_form, 'fields' : merge_fields, 'state' : [('end', 'Cancel'), ('merge', 'Merge orders') ]}
-        },
-        'merge': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _merge_orders, 'state': 'end'}
-        },
-    }
-
-merge_orders("purchase.order.merge")
-

From 178ecac31076ef84501fe7830b8ac592ac3004f1 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@mga>
Date: Tue, 16 Mar 2010 20:03:37 +0530
Subject: [PATCH 129/251] [REVIEW]: review record rules for the sale, purchase,
 account, stock, and produc

bzr revid: mga@mga-20100316143337-ng6bmx315jq3ymu4
---
 addons/account/security/account_security.xml  |  8 +++---
 addons/product/security/product_security.xml  |  2 +-
 addons/project/security/project_security.xml  |  4 +--
 .../purchase/security/purchase_security.xml   |  4 +--
 addons/sale/security/sale_security.xml        |  5 ++--
 addons/stock/security/stock_security.xml      | 26 +++++++++----------
 6 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index f551d77ccaa..cd9727d5903 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -46,7 +46,7 @@
         <field model="ir.model.fields" name="field_id" search="[('model','=','account.move'),('name','=','company_id')]"/>
         <field name="operator">child_of</field>
         <field name="operand">user.company_id.id</field>
-		<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>        
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>        
         <field name="rule_group" ref="account_move_comp_rule_group"/>
     </record>
 
@@ -60,7 +60,7 @@
         <field model="ir.model.fields" name="field_id" search="[('model','=','account.move.line'),('name','=','company_id')]"/>
         <field name="operator">child_of</field>
         <field name="operand">user.company_id.id</field>
-		<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
         <field name="rule_group" ref="account_move_line_comp_rule_group"/>
     </record>
     <record id="journal_period_comp_rule_group" model="ir.rule.group">
@@ -72,7 +72,7 @@
         <field model="ir.model.fields" name="field_id" search="[('model','=','account.journal.period'),('name','=','company_id')]"/>
         <field name="operator">child_of</field>
         <field name="operand">user.company_id.id</field>
-        <field name="domain_force">['|','|',('company_id','=',False),('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
         <field name="rule_group" ref="journal_period_comp_rule_group"/>
     </record>
 
@@ -85,7 +85,7 @@
         <field model="ir.model.fields" name="field_id" search="[('model','=','account.journal'),('name','=','company_id')]"/>
         <field name="operator">child_of</field>
         <field name="operand">user.company_id.id</field>
-        <field name="domain_force">['|','|',('company_id','=',False),('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
         <field name="rule_group" ref="journal_comp_rule_group"/>
     </record>
     <record id="analytic_journal_comp_rule_group" model="ir.rule.group">
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index 9dca54aad1a..4d71b0d480a 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -17,7 +17,7 @@
     </record>
     <record id="product_comp_rule" model="ir.rule">
         <field name="rule_group" ref="product_comp_rule_group"/>
-        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="group_product_variant" model="res.groups" context="{'noadmin':True}">
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 7c34807517a..7fcb2e6fedb 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -23,7 +23,7 @@
     </record>
     <record model="ir.rule" id="project_comp_rule">
         <field name="rule_group" ref="project_comp_rule_group"/>
-        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule.group" id="task_comp_rule_group">
@@ -32,7 +32,7 @@
         <field name="global" eval="True"/>
     </record>
     <record model="ir.rule" id="task_comp_rule">
-        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
         <field name="rule_group" ref="task_comp_rule_group"/>
     </record>
 
diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml
index 84b9a87ff05..2685e52d909 100644
--- a/addons/purchase/security/purchase_security.xml
+++ b/addons/purchase/security/purchase_security.xml
@@ -18,7 +18,7 @@
     <record model="ir.rule" id="purchase_order_comp_rule">
         <field name="field_id" search="[('model','=','purchase.order'),('name','=','company_id')]" model="ir.model.fields"/>
         <field name="rule_group" ref="purchase_order_comp_rule_group"/>
-        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule.group" id="purchase_order_line_comp_rule_group">
@@ -29,7 +29,7 @@
     <record model="ir.rule" id="purchase_order_line_comp_rule">
         <field name="field_id" search="[('model','=','purchase.order.line'),('name','=','company_id')]" model="ir.model.fields"/>
         <field name="rule_group" ref="purchase_order_line_comp_rule_group"/>
-        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
 </data>
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 6f9bcc52bb1..590a849ab9a 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -9,7 +9,6 @@
         <field name="name">Sale / Salesman</field>
     </record>
 
-
     <record model='ir.ui.menu' id='menu_action_shop_form'>
         <field name="groups_id" eval="[(6,0,[ref('group_sale_manager')])]"/>
     </record>
@@ -22,7 +21,7 @@
     <record model="ir.rule" id="sale_order_comp_rule">
         <field name="field_id" search="[('model','=','sale.order'),('name','=','company_id')]" model="ir.model.fields"/>
         <field name="rule_group" ref="sale_order_comp_rule_group"/>
-        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule.group" id="sale_order_line_comp_rule_group">
@@ -33,7 +32,7 @@
     <record model="ir.rule" id="sale_order_line_comp_rule">
         <field name="field_id" search="[('model','=','sale.order.line'),('name','=','company_id')]" model="ir.model.fields"/>
         <field name="rule_group" ref="sale_order_line_comp_rule_group"/>
-        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
 
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index 2d91d958957..e1e412690fc 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -25,14 +25,14 @@
         <field name="global" eval="True"/>
      </record>
      <record model="ir.rule" id="stock_picking_rule">
-		<field model="ir.model.fields" name="field_id" search="[('model','=','stock.picking'),('name','=','company_id')]"/>
-        <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
-		<field name="operator">child_of</field>
-		<field name="operand">user.company_id.id</field>
+        <field model="ir.model.fields" name="field_id" search="[('model','=','stock.picking'),('name','=','company_id')]"/>
+        <field name="domain_force">['|',('company_id','=',False),,('company_id','=',False)]</field>
+        <field name="operator">child_of</field>
+        <field name="operand">user.company_id.id</field>
         <field name="rule_group" ref="stock_picking_rule_group"/>
      </record>
 
-	<record model="ir.rule.group" id="stock_warehouse_comp_rule_group">
+    <record model="ir.rule.group" id="stock_warehouse_comp_rule_group">
         <field name="name">Warehouse multi-company</field>
         <field name="model_id" ref="model_stock_warehouse"/>
         <field name="global" eval="True"/>
@@ -41,7 +41,7 @@
     <record model="ir.rule" id="stock_warehouse_comp_rule">
         <field name="field_id" search="[('model','=','stock.warehouse'),('name','=','company_id')]" model="ir.model.fields"/>
         <field name="rule_group" ref="stock_warehouse_comp_rule_group"/>
-        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),,('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule.group" id="stock_location_comp_rule_group">
@@ -52,7 +52,7 @@
     <record model="ir.rule" id="stock_location_comp_rule">
         <field name="field_id" search="[('model','=','stock.location'),('name','=','company_id')]" model="ir.model.fields"/>
         <field name="rule_group" ref="stock_location_comp_rule_group"/>
-        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),,('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
      <record model="ir.rule.group" id="stock_move_rule_group">
@@ -61,10 +61,10 @@
         <field name="global" eval="True"/>
      </record>
      <record model="ir.rule" id="stock_move_rule">
-      	<field model="ir.model.fields" name="field_id" search="[('model','=','stock.move'),('name','=','company_id')]"/>
-        <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
-		<field name="operator">child_of</field>
-   	    <field name="operand">user.company_id.id</field>
+        <field model="ir.model.fields" name="field_id" search="[('model','=','stock.move'),('name','=','company_id')]"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="operator">child_of</field>
+        <field name="operand">user.company_id.id</field>
         <field name="rule_group" ref="stock_move_rule_group"/>
      </record>
 
@@ -76,7 +76,7 @@
     <record model="ir.rule" id="stock_inventory_line_comp_rule">
         <field name="field_id" search="[('model','=','stock.inventory.line'),('name','=','company_id')]" model="ir.model.fields"/>
         <field name="rule_group" ref="stock_inventory_line_comp_rule_group"/>
-        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),,('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule.group" id="stock_inventory_comp_rule_group">
@@ -87,7 +87,7 @@
     <record model="ir.rule" id="stock_inventory_comp_rule">
         <field name="field_id" search="[('model','=','stock.inventory'),('name','=','company_id')]" model="ir.model.fields"/>
         <field name="rule_group" ref="stock_inventory_comp_rule_group"/>
-        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">[('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
 </data>

From 27a9138fe1f839ec6b77547e30896da0ed0dd1fd Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@mga>
Date: Tue, 16 Mar 2010 23:32:06 +0530
Subject: [PATCH 130/251] [FIX]: fix a proble of usablity * convert few lines
 from tabs to space(4)

bzr revid: mga@mga-20100316180206-dcy4r04ood1d94mg
---
 addons/product/product_view.xml    |   7 +-
 addons/sale/sale_view.xml          |  13 +-
 addons/stock/report_stock_view.xml |   2 +
 addons/stock/stock_report.xml      |   8 -
 addons/stock/stock_view.xml        | 754 ++++++++++++++---------------
 5 files changed, 392 insertions(+), 392 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 5c947be57ff..5eec70237fd 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -24,6 +24,10 @@
                    <newline/>
                    <group col='8' colspan='15' expand='1' string='Group by...'>
                        <filter string='Category' icon="terp-stock" domain="[]" context="{'group_by' : 'categ_id'}" />
+                       <separator orientation="vertical"/>
+                       <filter string='Default UOM' icon="terp-stock" domain="[]" context="{'group_by' : 'uom_id'}" />
+                       <separator orientation="vertical"/>
+                       <filter string='Type' icon="terp-stock" domain="[]" context="{'group_by' : 'type'}" />
                    </group>
                 </search>
             </field>
@@ -41,6 +45,7 @@
                     <field name="categ_id" />
                     <field name="variants" groups="product.group_product_variant"/>
                     <field name="uom_id"/>
+                    <field name="type"/>
                     <field name="qty_available"/>
                     <field name="virtual_available"/>
                     <field name="lst_price"/>
@@ -303,7 +308,7 @@
                     <field name="name" select="1"/>
                     <field name="category_id" select="1"/>
                     <field name="factor" select="1" attrs="{'readonly':[('uom_factor','=','bigger')]}"/>
-					<field name="factor_inv_data" select="1" string="Factor Data" attrs="{'readonly':[('uom_factor','=','smaller')]}"/>
+                    <field name="factor_inv_data" select="1" string="Factor Data" attrs="{'readonly':[('uom_factor','=','smaller')]}"/>
                     <field name="factor_inv" invisible="1"/>
                     <field name="rounding"/>
                     <field name="uom_factor"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 2508ae0d6df..54e206407e1 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -84,6 +84,7 @@
                     <field name="invoiced_rate" widget="progressbar"/>
                     <field name="amount_untaxed" sum="Total Untaxed amount"/>
                     <field name="amount_total" sum="Total amount"/>
+                    <field name="user_id"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -150,11 +151,11 @@
                                             <group col="3" colspan="2">
                                                 <field name="invoiced" select="2"/>
                                                 <button colspan="1"
-                                                	name="%(action_view_sale_order_line_make_invoice)d"
-                                                	states="confirmed"
-                                                	string="Make Invoice"
-                                                	type="action"
-                                                	icon="gtk-print" />
+                                                    name="%(action_view_sale_order_line_make_invoice)d"
+                                                    states="confirmed"
+                                                    string="Make Invoice"
+                                                    type="action"
+                                                    icon="gtk-print" />
                                             </group>
                                         </page>
                                         <page groups="base.group_extended" string="Extra Info">
@@ -266,6 +267,8 @@
                         <filter string="Customer" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Order Date" icon="terp-sale" domain="[]" context="{'group_by':'date_order'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Salesman" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
                     </group>
                </search>
             </field>
diff --git a/addons/stock/report_stock_view.xml b/addons/stock/report_stock_view.xml
index 21f7d91a806..655b65a70ee 100644
--- a/addons/stock/report_stock_view.xml
+++ b/addons/stock/report_stock_view.xml
@@ -12,10 +12,12 @@
                         <filter icon="terp-stock" string="Internal Locations" domain="[('location_id.usage', '=', 'internal')]" help="Internal Locations" default="1" />
                         <filter icon="terp-stock" string="Customer Locations" domain="[('location_id.usage', '=', 'customer')]" help="Customer Locations" />
                         <filter icon="terp-stock" string="Supplier Locations" domain="[('location_id.usage', '=', 'supplier')]" help="Supplier Locations" />
+                        
                         <separator orientation="vertical"/>
                         <field name="location_id" select="1" />
                         <field name="product_id" select="1" />
                     </group>
+                    <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="10">
                         <filter string="Location" icon="terp-stock" domain="[]"  context="{'group_by':'location_id'}"/>
                         <filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
diff --git a/addons/stock/stock_report.xml b/addons/stock/stock_report.xml
index d72106eead6..7b8d9eb13b3 100644
--- a/addons/stock/stock_report.xml
+++ b/addons/stock/stock_report.xml
@@ -1,19 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <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" xml="stock/report/picking.xml" xsl="stock/report/picking.xsl"/>-->
         <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Picking list" rml="stock/report/picking.rml"/>
         <report id="report_move_labels" model="stock.move" name="stock.move.label" string="Print 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"/>
-
         <report auto="False" id="report_lot_location" model="stock.location" name="lot.location" rml="stock/report/lot_location.rml" string="Lots by location"/>
-
         <report id="report_location_overview_all" model="stock.location" name="lot.stock.overview_all" string="Location Content (With children)" rml="stock/report/lot_overview_all.rml"/>
-
     </data>
 </openerp>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index c5a0430a405..808e0f9d317 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -4,7 +4,7 @@
         <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse" sequence="2"/>
         <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1"/>
         <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="3"/>
-   		<menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
+        <menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
         <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="6"/>
         <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="2"/>
 
@@ -18,11 +18,10 @@
                     <field name="product_qty"/>
                     <field name="product_uom"/>
                     <field name="prod_lot_id"/>
-					<button name="%(stock.action_view_stock_inventory_line_split)d"
-                    		 		string="Split inventory lines"
-                      		 		type="action" icon="gtk-justify-fill"/>                    
+                    <button name="%(stock.action_view_stock_inventory_line_split)d"
+                            string="Split inventory lines"
+                            type="action" icon="gtk-justify-fill"/>                    
                     <field name="location_id"/>
-                    
                 </tree>
             </field>
         </record>
@@ -37,9 +36,9 @@
                     <field name="product_uom"/>
                     <field name="prod_lot_id"/>
                     <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>                  
-                    	 <button name="%(stock.action_view_stock_inventory_line_split)d"
-                    		 		string="Split inventory lines"
-                      		 		type="action" icon="gtk-justify-fill"/>
+                        <button name="%(stock.action_view_stock_inventory_line_split)d"
+                            string="Split inventory lines"
+                            type="action" icon="gtk-justify-fill"/>
                 </form>
             </field>
         </record>
@@ -91,10 +90,10 @@
                                 <field name="product_uom"/>
                                 <field name="prod_lot_id"/>
                                 <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>
-								<field name="state" invisible="1"/>
-								<button name="%(stock.action_view_stock_inventory_line_split)d"
-                    		 		string="Split inventory lines"
-                      		 		type="action" icon="gtk-justify-fill" states="draft"/>
+                                <field name="state" invisible="1"/>
+                                <button name="%(stock.action_view_stock_inventory_line_split)d"
+                                    string="Split inventory lines"
+                                    type="action" icon="gtk-justify-fill" states="draft"/>
                             </tree>
                             <form string="Inventory Lines">
                                 <field colspan="4" context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" select="1" domain="[('type','&lt;&gt;','service')]"/>
@@ -103,10 +102,10 @@
                                 <field  domain="[('usage','=','internal')]" name="location_id" select="1"/>
                                 <field name="prod_lot_id"/>
                                 <group colspan="2" col="3">
-                                   <button name="%(stock.action_view_stock_inventory_line_split)d"
-                     		 				string="Split inventory lines"
-                      		 				type="action" icon="gtk-justify-fill"/>
-								</group>
+                                    <button name="%(stock.action_view_stock_inventory_line_split)d"
+                                        string="Split inventory lines"
+                                        type="action" icon="gtk-justify-fill"/>
+                                </group>
                             </form>
                         </field>
                     </page><page string="Posted Inventory">
@@ -284,7 +283,6 @@
             </field>
         </record>
 
-
         <record id="action_production_lot_form" model="ir.actions.act_window">
             <field name="name">Production Lots</field>
             <field name="type">ir.actions.act_window</field>
@@ -431,6 +429,7 @@
                 </form>
             </field>
         </record>
+        
         <record id="view_location_tree2" model="ir.ui.view">
             <field name="name">stock.location.tree</field>
             <field name="model">stock.location</field>
@@ -589,19 +588,19 @@
                         <field name="min_date" select="1"/>
                         <field name="type"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-	                    <button name="%(make_picking)d" 
-	                    		states="confirmed,assigned" 
-	                    		string="Make Picking" 
-	                    		type="action" 
-	                    		icon="gtk-go-forward" 
-	                    		help="Make Picking" colspan="2"/>
-	                    <button name="%(return_picking)d" 
-	                    		states="done" 
-	                    		string="Return Picking" 
-	                    		type="action" 
-	                    		icon="gtk-go-back" 
-	                    		help="Return Picking" colspan="2"/>
-	                </group>
+                        <button name="%(make_picking)d" 
+                            states="confirmed,assigned" 
+                            string="Make Picking" 
+                            type="action" 
+                            icon="gtk-go-forward"
+                            help="Make Picking" colspan="2"/>
+                        <button name="%(return_picking)d" 
+                            states="done" 
+                            string="Return Picking" 
+                            type="action"
+                            icon="gtk-go-back" 
+                            help="Return Picking" colspan="2"/>
+                    </group>
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
@@ -617,53 +616,53 @@
                                     <field name="date_planned"/>
                                     <field name="state"/>
                                     <button
-                           				name="%(stock.track_line)d"
-                           				string="Split in production lots"
-                           				type="action" icon="gtk-justify-fill"
-                           				states="draft,waiting,confirmed,assigned" />
-                           			<button
-                           				name="%(stock.move_scrap)d"
-                           				string="D" type="action"
-                           				icon="gtk-convert"
-                           				states="draft,waiting,confirmed,assigned" />
+                                        name="%(stock.track_line)d"
+                                        string="Split in production lots"
+                                           type="action" icon="gtk-justify-fill"
+                                           states="draft,waiting,confirmed,assigned" />
+                                       <button
+                                           name="%(stock.move_scrap)d"
+                                           string="D" type="action"
+                                           icon="gtk-convert"
+                                           states="draft,waiting,confirmed,assigned" />
                                 </tree>
                                 <form string="Stock Moves">
-                                	<notebook colspan="4">
-                                		<page string="General Information">
-		                                    <separator colspan="4" string="Move Information"/>
-		                                    <field name="location_id" select="1" domain="[('usage','=','internal')]"/>
-		                                    <field name="location_dest_id" select="1" domain="[('usage','=','internal')]"/>
-		                                    <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
-		                                    <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-		                                    <field name="product_uom" select="1"/>
-		                                    <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-		                                    <field groups="product.group_uos" name="product_uos_qty"/>
-		                                    <field colspan="4" invisible="1" name="name" select="1"/>
-		                                    <field invisible="1" name="date"/>
-		                                    <field name="date_planned"/>
-		                                    <field name="address_id" select="1" context="{'contact_display':'partner'}"/>
-		                                    <field groups="base.group_extended" name="product_packaging"/>
-		                                    <field name="prodlot_id" select="2"
-		                                        context="{'location_id':location_id, 'product_id':product_id}"
-		                                        domain="[('product_id','=?',product_id)]"
-		                                        on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
-		                                    <field groups="base.group_extended" name="tracking_id" select="2"/>
-		                                    <newline/>
-		                                    <label/>
-		                                    <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
+                                    <notebook colspan="4">
+                                        <page string="General Information">
+                                            <separator colspan="4" string="Move Information"/>
+                                            <field name="location_id" select="1" domain="[('usage','=','internal')]"/>
+                                            <field name="location_dest_id" select="1" domain="[('usage','=','internal')]"/>
+                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
+                                            <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                            <field name="product_uom" select="1"/>
+                                            <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                            <field groups="product.group_uos" name="product_uos_qty"/>
+                                            <field colspan="4" invisible="1" name="name" select="1"/>
+                                            <field invisible="1" name="date"/>
+                                            <field name="date_planned"/>
+                                            <field name="address_id" select="1" context="{'contact_display':'partner'}"/>
+                                            <field groups="base.group_extended" name="product_packaging"/>
+                                            <field name="prodlot_id" select="2"
+                                                context="{'location_id':location_id, 'product_id':product_id}"
+                                                domain="[('product_id','=?',product_id)]"
+                                                on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
+                                            <field groups="base.group_extended" name="tracking_id" select="2"/>
+                                            <newline/>
+                                            <label/>
+                                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
                                             <button name="%(move_scrap)d" string="Scrap Move Line" type="action" icon="gtk-justify-fill"/>
-		                                    <separator colspan="4" string="Move State"/>
-		                                    <field name="state" select="1"/>
-		                                    <group>
-		                                        <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-		                                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-no"/>
-		                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
-		                                    </group>
-		                                </page>
-		                                <page string="Return Picking History">
-                        					<field name="move_stock_return_history" nolabel="1"/>
-                        				</page>
-                        			</notebook>
+                                            <separator colspan="4" string="Move State"/>
+                                            <field name="state" select="1"/>
+                                            <group>
+                                                <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
+                                                <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-no"/>
+                                                <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
+                                            </group>
+                                        </page>
+                                        <page string="Return Picking History">
+                                            <field name="move_stock_return_history" nolabel="1"/>
+                                        </page>
+                                    </notebook>
                                 </form>
                             </field>
                             <group col="7" colspan="4">
@@ -696,7 +695,6 @@
             </field>
         </record>
 
-
         <record id="view_stock_picking_filter" model="ir.ui.view">
             <field name="name">stock.picking.list.select</field>
             <field name="model">stock.picking</field>
@@ -757,19 +755,19 @@
                         <field name="min_date" select="1"/>
                         <field name="type"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-	                    <button name="%(make_picking)d" 
-	                    		states="assigned" 
-	                    		string="Make Picking" 
-	                    		type="action" 
-	                    		icon="gtk-go-forward" 
-	                    		help="Make Picking" colspan="2"/>
-	                    <button name="%(return_picking)d" 
-	                    		states="done" 
-	                    		string="Return Picking" 
-	                    		type="action" 
-	                    		icon="gtk-go-back" 
-	                    		help="Return Picking" colspan="2"/>
-	                </group>
+                        <button name="%(make_picking)d" 
+                                states="assigned" 
+                                string="Make Picking" 
+                                type="action" 
+                                icon="gtk-go-forward" 
+                                help="Make Picking" colspan="2"/>
+                        <button name="%(return_picking)d" 
+                                states="done" 
+                                string="Return Picking" 
+                                type="action" 
+                                icon="gtk-go-back" 
+                                help="Return Picking" colspan="2"/>
+                    </group>
                         <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
@@ -785,48 +783,48 @@
                                     <field name="date_planned"/>
                                     <field name="state"/>
                                     <button
-                           				name="%(stock.track_line)d"
-                           				string="Split in production lots"
-                           				type="action" icon="gtk-justify-fill"
-                           				states="draft,waiting,confirmed,assigned" />
-                           			<button
-                           				name="%(stock.move_scrap)d"
-                           				string="D" type="action"
-                           				icon="gtk-convert"
-                           				states="draft,waiting,confirmed,assigned" />
+                                           name="%(stock.track_line)d"
+                                           string="Split in production lots"
+                                           type="action" icon="gtk-justify-fill"
+                                           states="draft,waiting,confirmed,assigned" />
+                                       <button
+                                           name="%(stock.move_scrap)d"
+                                           string="D" type="action"
+                                           icon="gtk-convert"
+                                           states="draft,waiting,confirmed,assigned" />
                                 </tree>
                                 <form string="Stock Moves">
-                                	<notebook colspan="4">
-                                		<page string="General Information">
-		                                    <separator colspan="4" string="Move Information"/>
-		                                    <field name="location_id" select="1" domain="[('usage','=','internal')]"/>
-		                                    <field name="location_dest_id" select="1" domain="[('usage','&lt;&gt;','view')]"/>
-		                                    <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
-		                                    <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-		                                    <field name="product_uom" select="1"/>
-		                                    <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-		                                    <field groups="product.group_uos" name="product_uos_qty"/>
-		                                    <field colspan="4" invisible="1" name="name" select="1"/>
-		                                    <field invisible="1" name="date"/>
-		                                    <field name="date_planned"/>
-		                                    <field groups="base.group_extended" name="product_packaging"/>
-		                                    <field name="prodlot_id" select="2"
-		                                        context="{'location_id':location_id, 'product_id':product_id}"
-		                                        domain="[('product_id','=?',product_id)]"
-		                                        on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
-		                                    <field groups="base.group_extended" name="tracking_id" select="1"/>
-		                                    <separator colspan="4" string="Move State"/>
-		                                    <field name="state" select="1"/>
-		                                    <group>
-		                                        <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-		                                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
-		                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
-		                                    </group>
-		                                </page>
-		                                <page string="Return Picking History">
-                        					<field name="move_stock_return_history" nolabel="1"/>
-                        				</page>
-                        			</notebook>
+                                    <notebook colspan="4">
+                                        <page string="General Information">
+                                            <separator colspan="4" string="Move Information"/>
+                                            <field name="location_id" select="1" domain="[('usage','=','internal')]"/>
+                                            <field name="location_dest_id" select="1" domain="[('usage','&lt;&gt;','view')]"/>
+                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
+                                            <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                            <field name="product_uom" select="1"/>
+                                            <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                            <field groups="product.group_uos" name="product_uos_qty"/>
+                                            <field colspan="4" invisible="1" name="name" select="1"/>
+                                            <field invisible="1" name="date"/>
+                                            <field name="date_planned"/>
+                                            <field groups="base.group_extended" name="product_packaging"/>
+                                            <field name="prodlot_id" select="2"
+                                                context="{'location_id':location_id, 'product_id':product_id}"
+                                                domain="[('product_id','=?',product_id)]"
+                                                on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
+                                            <field groups="base.group_extended" name="tracking_id" select="1"/>
+                                            <separator colspan="4" string="Move State"/>
+                                            <field name="state" select="1"/>
+                                            <group>
+                                                <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
+                                                <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
+                                                <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
+                                            </group>
+                                        </page>
+                                        <page string="Return Picking History">
+                                            <field name="move_stock_return_history" nolabel="1"/>
+                                        </page>
+                                    </notebook>
                                 </form>
                             </field>
                             <group col="7" colspan="4">
@@ -854,7 +852,7 @@
                             <field name="date_done" select="2"/>
                             <field name="move_type"/>
                         </page>
-                    </notebook>					
+                    </notebook>                    
                 </form>
             </field>
         </record>
@@ -952,19 +950,19 @@
                         <field name="backorder_id" select="2" readonly="1"/>
                         <field name="origin" select="2" readonly="1"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-	                    <button name="%(make_picking)d" 
-	                    		states="assigned" 
-	                    		string="Make Picking" 
-	                    		type="action" 
-	                    		icon="gtk-go-forward" 
-	                    		help="Make Picking" colspan="2"/>
-	                    <button name="%(return_picking)d" 
-	                    		states="done" 
-	                    		string="Return Picking" 
-	                    		type="action" 
-	                    		icon="gtk-go-back" 
-	                    		help="Return Picking" colspan="2"/>
-	                </group>
+                        <button name="%(make_picking)d" 
+                                states="assigned" 
+                                string="Make Picking" 
+                                type="action" 
+                                icon="gtk-go-forward" 
+                                help="Make Picking" colspan="2"/>
+                        <button name="%(return_picking)d" 
+                                states="done" 
+                                string="Return Picking" 
+                                type="action" 
+                                icon="gtk-go-back" 
+                                help="Return Picking" colspan="2"/>
+                    </group>
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
@@ -980,51 +978,51 @@
                                     <field name="date_planned"/>
                                     <field name="state"/>
                                     <button
-                           				name="%(stock.track_line)d"
-                           				string="Split in production lots"
-                           				type="action" icon="gtk-justify-fill"
-                           				states="draft,waiting,confirmed,assigned" />
-                           			<button
-                           				name="%(stock.move_scrap)d"
-                           				string="D" type="action"
-                           				icon="gtk-convert"
-                           				states="draft,waiting,confirmed,assigned" />
+                                           name="%(stock.track_line)d"
+                                           string="Split in production lots"
+                                           type="action" icon="gtk-justify-fill"
+                                           states="draft,waiting,confirmed,assigned" />
+                                       <button
+                                           name="%(stock.move_scrap)d"
+                                           string="D" type="action"
+                                           icon="gtk-convert"
+                                           states="draft,waiting,confirmed,assigned" />
                                 </tree>
                                 <form string="Stock Moves">
-                                	<notebook colspan="4">
- 										<page string="General Information">
-		                                    <separator colspan="4" string="Move Information"/>
-		                                    <field name="location_id" select="1" domain="[('usage','=','internal')]"/>
-		                                    <field name="location_dest_id" select="1" domain="[('usage','&lt;&gt;','view')]"/>
-		                                    <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
-		                                    <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" />
-		                                    <field name="product_uom" select="1"/>
-		                                    <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-		                                    <field groups="product.group_uos" name="product_uos_qty"/>
-		                                    <field colspan="4" invisible="1" name="name" select="1"/>
-		                                    <field invisible="1" name="date"/>
-		                                    <field name="date_planned"/>
-		                                    <field groups="base.group_extended" name="product_packaging"/>
-		                                    <field name="prodlot_id" select="1"
-		                                        context="{'location_id':location_id, 'product_id':product_id}"
-		                                        domain="[('product_id','=?',product_id)]"
-		                                        on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
-		                                    <field groups="base.group_extended" name="tracking_id" select="1"/>
-		                                    <label/>
-		                                    <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
-		                                    <separator colspan="4" string="Move State"/>
-		                                    <field name="state" select="1"/>
-		                                    <group>
-		                                        <button name="force_assign" states="confirmed" string="Force Availability" type="object"  icon="gtk-jump-to"/>
-		                                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"  icon="gtk-no"/>
-		                                        <button name="action_cancel" states="assigned" string="Cancel" type="object"  icon="gtk-cancel"/>
-		                                    </group>
-                                    	</page>
-                                		<page string="Return Picking History">
-                        					<field name="move_stock_return_history" nolabel="1"/>
-                        				</page>
-                        			</notebook>
-								</form>
+                                    <notebook colspan="4">
+                                         <page string="General Information">
+                                            <separator colspan="4" string="Move Information"/>
+                                            <field name="location_id" select="1" domain="[('usage','=','internal')]"/>
+                                            <field name="location_dest_id" select="1" domain="[('usage','&lt;&gt;','view')]"/>
+                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
+                                            <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" />
+                                            <field name="product_uom" select="1"/>
+                                            <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                            <field groups="product.group_uos" name="product_uos_qty"/>
+                                            <field colspan="4" invisible="1" name="name" select="1"/>
+                                            <field invisible="1" name="date"/>
+                                            <field name="date_planned"/>
+                                            <field groups="base.group_extended" name="product_packaging"/>
+                                            <field name="prodlot_id" select="1"
+                                                context="{'location_id':location_id, 'product_id':product_id}"
+                                                domain="[('product_id','=?',product_id)]"
+                                                on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
+                                            <field groups="base.group_extended" name="tracking_id" select="1"/>
+                                            <label/>
+                                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
+                                            <separator colspan="4" string="Move State"/>
+                                            <field name="state" select="1"/>
+                                            <group>
+                                                <button name="force_assign" states="confirmed" string="Force Availability" type="object"  icon="gtk-jump-to"/>
+                                                <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"  icon="gtk-no"/>
+                                                <button name="action_cancel" states="assigned" string="Cancel" type="object"  icon="gtk-cancel"/>
+                                            </group>
+                                        </page>
+                                        <page string="Return Picking History">
+                                            <field name="move_stock_return_history" nolabel="1"/>
+                                        </page>
+                                    </notebook>
+                                </form>
                             </field>
                             <group col="7" colspan="4">
                                 <label colspan="6"/>
@@ -1056,13 +1054,13 @@
             </field>
         </record>
 
-		<record id="view_picking_out_search" model="ir.ui.view">
+        <record id="view_picking_out_search" model="ir.ui.view">
             <field name="name">stock.picking.out.search</field>
             <field name="model">stock.picking</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Picking list">
-                	<group col="8" colspan="4">
+                    <group col="8" colspan="4">
                         <filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Assigned Outgoing Orders"/>
                         <filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Outgoing Orders"/>
                         <separator orientation="vertical"/>
@@ -1074,8 +1072,8 @@
                     <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
                         <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-						<filter string="Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
-					</group>
+                        <filter string="Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -1144,19 +1142,19 @@
                         <field name="invoice_state" select="2" string="Invoice Control"/>
                         <field name="type"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-	                    <button name="%(make_picking)d" 
-	                    		states="confirmed,assigned" 
-	                    		string="Make Picking" 
-	                    		type="action" 
-	                    		icon="gtk-go-forward" 
-	                    		help="Make Picking" colspan="2"/>
-	                    <button name="%(return_picking)d" 
-	                    		states="done" 
-	                    		string="Return Picking" 
-	                    		type="action" 
-	                    		icon="gtk-go-back" 
-	                    		help="Return Picking" colspan="2"/>
-	                </group>
+                        <button name="%(make_picking)d" 
+                                states="confirmed,assigned" 
+                                string="Make Picking" 
+                                type="action" 
+                                icon="gtk-go-forward" 
+                                help="Make Picking" colspan="2"/>
+                        <button name="%(return_picking)d" 
+                                states="done" 
+                                string="Return Picking" 
+                                type="action" 
+                                icon="gtk-go-back" 
+                                help="Return Picking" colspan="2"/>
+                    </group>
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_in_id': address_id}">
@@ -1168,50 +1166,50 @@
                                     <field name="prodlot_id"/>
                                     <field name="state"/>
                                     <button
-                           				name="%(stock.track_line)d"
-                           				string="Split in production lots"
-                           				type="action" icon="gtk-justify-fill"
-                           				states="draft,waiting,confirmed,assigned" />
-                           			<button
-                           				name="%(stock.move_scrap)d"
-                           				string="D" type="action"
-                           				icon="gtk-convert"
-                           				states="done,cancel" />
+                                           name="%(stock.track_line)d"
+                                           string="Split in production lots"
+                                           type="action" icon="gtk-justify-fill"
+                                           states="draft,waiting,confirmed,assigned" />
+                                       <button
+                                           name="%(stock.move_scrap)d"
+                                           string="D" type="action"
+                                           icon="gtk-convert"
+                                           states="done,cancel" />
                                 </tree>
                                 <form string="Stock Moves">
-                                	<notebook colspan="4">
-                                		<page string="General Information">
-		                                    <separator colspan="4" string="Move Information"/>
-		                                    <field name="location_id" select="1" domain="[('usage','&lt;&gt;','view')]"/>
-		                                    <field domain="[('usage','=','internal')]" name="location_dest_id" select="1"/>
-		                                    <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
-		                                    <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-		                                    <field name="product_uom" select="1"/>
-		                                    <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-		                                    <field groups="product.group_uos" name="product_uos_qty"/>
-		                                    <field colspan="4" invisible="1" name="name" select="1"/>
-		                                    <field groups="base.group_extended" name="date_planned"/>
-		                                    <newline/>
-		                                    <newline/>
-		                                    <field groups="base.group_extended" name="product_packaging"/>
-		                                    <newline/>
-		                                    <field name="prodlot_id" select="1"
-		                                        context="{'location_id':location_id, 'product_id':product_id}"
-		                                        domain="[('product_id','=?',product_id)]"
-		                                        on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
-		                                    <field groups="base.group_extended" name="tracking_id" select="1"/>
-		                                    <newline/>
-		                                    <label/>
-		                                    <button groups="base.group_extended" name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
-		                                    <separator colspan="4" string="Move State"/>
-		                                    <field name="state" select="1"/>
-		                                    <group>
-		                                        <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon=""/>
-		                                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon=""/>
-		                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon=""/>
-		                                    </group>
-		                                </page>
-		                                <page string="Return Picking History">
+                                    <notebook colspan="4">
+                                        <page string="General Information">
+                                            <separator colspan="4" string="Move Information"/>
+                                            <field name="location_id" select="1" domain="[('usage','&lt;&gt;','view')]"/>
+                                            <field domain="[('usage','=','internal')]" name="location_dest_id" select="1"/>
+                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
+                                            <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                            <field name="product_uom" select="1"/>
+                                            <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                            <field groups="product.group_uos" name="product_uos_qty"/>
+                                            <field colspan="4" invisible="1" name="name" select="1"/>
+                                            <field groups="base.group_extended" name="date_planned"/>
+                                            <newline/>
+                                            <newline/>
+                                            <field groups="base.group_extended" name="product_packaging"/>
+                                            <newline/>
+                                            <field name="prodlot_id" select="1"
+                                                context="{'location_id':location_id, 'product_id':product_id}"
+                                                domain="[('product_id','=?',product_id)]"
+                                                on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
+                                            <field groups="base.group_extended" name="tracking_id" select="1"/>
+                                            <newline/>
+                                            <label/>
+                                            <button groups="base.group_extended" name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
+                                            <separator colspan="4" string="Move State"/>
+                                            <field name="state" select="1"/>
+                                            <group>
+                                                <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon=""/>
+                                                <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon=""/>
+                                                <button name="action_cancel" states="assigned" string="Cancel" type="object" icon=""/>
+                                            </group>
+                                        </page>
+                                        <page string="Return Picking History">
                                                     <field name="move_stock_return_history" nolabel="1"/>
                                                 </page>
                                             </notebook>
@@ -1467,11 +1465,11 @@
         </record>
         <menuitem action="action_picking_all" id="menu_action_picking_all" parent="menu_stock_warehouse_mgmt" sequence="3"/>
 
-	    ====================================
+        ====================================
         Reception Picking (By Stock Move)
         ====================================
 
-	    <record id="view_move_tree_reception_picking" model="ir.ui.view">
+        <record id="view_move_tree_reception_picking" model="ir.ui.view">
             <field name="name">stock.move.tree2</field>
             <field name="model">stock.move</field>
             <field name="type">tree</field>
@@ -1494,84 +1492,84 @@
             </field>
         </record>
 
-	    <record id="view_move_form_reception_picking" model="ir.ui.view">
+        <record id="view_move_form_reception_picking" model="ir.ui.view">
             <field name="name">stock.move.form2</field>
             <field name="model">stock.move</field>
             <field name="type">form</field>
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Moves">
-                	<notebook colspan="4">
-                		<page string="General Information">
-		                    <separator colspan="4" string="Move Information"/>
-		                    <field name="location_id" select="1"/>
-		                    <field name="location_dest_id" select="1"/>
-		                    <field colspan="4" name="product_id" select="1" on_change="onchange_product_id(product_id,location_id,location_dest_id)"/>
-		                    <field name="product_qty" select="2" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-		                    <field name="product_uom" select="2"/>
-		                    <field name="product_uos" select="2"/>
-		                    <field colspan="4" name="name" select="2"/>
-		                    <field name="date"/>
-		                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-		                    <field name="date_planned"/>
-		                    <field name="priority"/>
-		                    <field name="address_id" select="2" context="{'contact_display':'partner'}"/>
-		                    <newline/>
-		                    <field name="picking_id" select="2"/>
-		                    <newline/>
-		                    <field name="prodlot_id" select="2"
-		                        context="{'location_id':location_id, 'product_id':product_id}"
-		                        domain="[('product_id','=?',product_id)]"
-		                        on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
-		                    <field name="tracking_id" select="2"/>
-		                    <newline/>
-		                    <label/>
-		                    <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
-		                    <separator colspan="4" string="Move State"/>
-		                    <field name="state" select="1"/>
-		                    <group col="5" colspan="2">
-		                        <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
-		                        <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
-		                        <button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>
+                    <notebook colspan="4">
+                        <page string="General Information">
+                            <separator colspan="4" string="Move Information"/>
+                            <field name="location_id" select="1"/>
+                            <field name="location_dest_id" select="1"/>
+                            <field colspan="4" name="product_id" select="1" on_change="onchange_product_id(product_id,location_id,location_dest_id)"/>
+                            <field name="product_qty" select="2" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                            <field name="product_uom" select="2"/>
+                            <field name="product_uos" select="2"/>
+                            <field colspan="4" name="name" select="2"/>
+                            <field name="date"/>
+                            <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                            <field name="date_planned"/>
+                            <field name="priority"/>
+                            <field name="address_id" select="2" context="{'contact_display':'partner'}"/>
+                            <newline/>
+                            <field name="picking_id" select="2"/>
+                            <newline/>
+                            <field name="prodlot_id" select="2"
+                                context="{'location_id':location_id, 'product_id':product_id}"
+                                domain="[('product_id','=?',product_id)]"
+                                on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
+                            <field name="tracking_id" select="2"/>
+                            <newline/>
+                            <label/>
+                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
+                            <separator colspan="4" string="Move State"/>
+                            <field name="state" select="1"/>
+                            <group col="5" colspan="2">
+                                <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
+                                <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
+                                <button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>
                                 <button name="%(partial_move)d" states="assigned" string="Partial" type="action" icon="gtk-justify-fill"/>
-		                        <button name="action_done" states="assigned" string="Done" type="object" icon="gtk-jump-to"/>
-		                    </group>
-		                </page>
-		                <page string="Return Picking History">
-							<field name="move_stock_return_history" nolabel="1"/>
- 						</page>
-		            </notebook>
+                                <button name="action_done" states="assigned" string="Done" type="object" icon="gtk-jump-to"/>
+                            </group>
+                        </page>
+                        <page string="Return Picking History">
+                            <field name="move_stock_return_history" nolabel="1"/>
+                         </page>
+                    </notebook>
                 </form>
             </field>
         </record>
 
-	    <record id="view_move_search_reception_picking" model="ir.ui.view">
+        <record id="view_move_search_reception_picking" model="ir.ui.view">
             <field name="name">stock.move.search2</field>
             <field name="model">stock.move</field>
             <field name="type">search</field>
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
-            	<search string="Stock Moves">
-            		<group col="8" colspan="4">
-	            		<filter icon="terp-stock" string="To Receive" domain="[('state','in',('confirmed','assigned'))]" default="1" help="Stock to be received"/>
-	            		<filter icon="terp-stock" string="Back Orders" domain="[('backorder_id','!=',False)]" help="Back Orders"/>
-	            		<filter icon="terp-stock" string="Planned Today" domain="[('date_planned::date','=',time.strftime('%%Y-%%m-%%d'))]" help="Orders planned for today"/>
-	            		<separator orientation="vertical"/>
+                <search string="Stock Moves">
+                    <group col="8" colspan="4">
+                        <filter icon="terp-stock" string="To Receive" domain="[('state','in',('confirmed','assigned'))]" default="1" help="Stock to be received"/>
+                        <filter icon="terp-stock" string="Back Orders" domain="[('backorder_id','!=',False)]" help="Back Orders"/>
+                        <filter icon="terp-stock" string="Planned Today" domain="[('date_planned::date','=',time.strftime('%%Y-%%m-%%d'))]" help="Orders planned for today"/>
+                        <separator orientation="vertical"/>
                         <field name="origin" string="Latest Requisition" select="1"/>
-	            		<field name="partner_id" string="Supplier" select="1"/>
-	                    <field name="product_id"/>
+                        <field name="partner_id" string="Supplier" select="1"/>
+                        <field name="product_id"/>
                     </group>   
                     <newline/>                 
                     <group expand="1" string="Group By..." colspan="4" col="8">
-						<filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
-						<filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-						<filter string="Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
-					</group>
-            	</search>
+                        <filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
+                    </group>
+                </search>
             </field>
         </record>
 
-    	<record id="action_reception_picking_move" model="ir.actions.act_window">
+        <record id="action_reception_picking_move" model="ir.actions.act_window">
             <field name="name">Incoming Products</field>
             <field name="res_model">stock.move</field>
             <field name="type">ir.actions.act_window</field>
@@ -1583,17 +1581,17 @@
         </record>
 
         <record model="ir.actions.act_window.view" id="action_move_reception_picking_tree">
-	        <field name="sequence" eval="1"/>
-	        <field name="view_mode">tree</field>
-	        <field name="view_id" ref="view_move_tree_reception_picking"/>
-	        <field name="act_window_id" ref="action_reception_picking_move"/>
-	    </record>
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_move_tree_reception_picking"/>
+            <field name="act_window_id" ref="action_reception_picking_move"/>
+        </record>
         <record model="ir.actions.act_window.view" id="action_move_reception_picking_form">
-	        <field name="sequence" eval="2"/>
-	        <field name="view_mode">form</field>
-	        <field name="view_id" ref="view_move_form_reception_picking"/>
-	        <field name="act_window_id" ref="action_reception_picking_move"/>
-	    </record>
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_move_form_reception_picking"/>
+            <field name="act_window_id" ref="action_reception_picking_move"/>
+        </record>
 <!--        <menuitem action="action_reception_picking_move" id="menu_action_reception_picking_move" parent="menu_stock_warehouse_mgmt" sequence="4"/>-->
 
 
@@ -1680,78 +1678,78 @@
             <field eval="True" name="object"/>
         </record>  
 
-		<!-- Graph Views -->
-		<!--  Products To Received Vs Planned -->
-		<record model="ir.ui.view" id="view_move_graph_reception_picking_tree">
-	        <field name="name">Products To Received</field>
-	        <field name="model">report.products.to.received.planned</field>
-	        <field name="type">tree</field>
-	        <field name="arch" type="xml">
-		        <tree string="Products To Received" >
-		            <field name="qty" />
-		            <field name="planned_qty" />
-		            <field name="date"/>
-		        </tree>
-	        </field>
-	    </record>
+        <!-- Graph Views -->
+        <!--  Products To Received Vs Planned -->
+        <record model="ir.ui.view" id="view_move_graph_reception_picking_tree">
+            <field name="name">Products To Received</field>
+            <field name="model">report.products.to.received.planned</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Products To Received" >
+                    <field name="qty" />
+                    <field name="planned_qty" />
+                    <field name="date"/>
+                </tree>
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="view_move_graph_reception_picking">
-	        <field name="name">Products To Received</field>
-	        <field name="model">report.products.to.received.planned</field>
-	        <field name="type">graph</field>
-	        <field name="arch" type="xml">
-	        <graph string="Products To Received" type="bar" orientation="vertical">
-				<field name="date"/>
-	            <field name="qty" operator="+"/>
-	            <field name="planned_qty" operator="+"/>
-	        </graph>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="view_move_graph_reception_picking">
+            <field name="name">Products To Received</field>
+            <field name="model">report.products.to.received.planned</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+            <graph string="Products To Received" type="bar" orientation="vertical">
+                <field name="date"/>
+                <field name="qty" operator="+"/>
+                <field name="planned_qty" operator="+"/>
+            </graph>
+            </field>
+        </record>
 
-	    <record id="action_move_graph_reception_picking" model="ir.actions.act_window">
-	        <field name="name">Number of Products to receive Vs planned</field>
-	        <field name="res_model">report.products.to.received.planned</field>
-	        <field name="type">ir.actions.act_window</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">graph,tree</field>
-	        <field name="view_id" ref="view_move_graph_reception_picking"/>
-	    </record>
+        <record id="action_move_graph_reception_picking" model="ir.actions.act_window">
+            <field name="name">Number of Products to receive Vs planned</field>
+            <field name="res_model">report.products.to.received.planned</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_move_graph_reception_picking"/>
+        </record>
 
-		<!--  Delivery Product Vs Planned -->
-		<record model="ir.ui.view" id="view_move_delivery_products_planned_tree">
-	        <field name="name">Delivery Products</field>
-	        <field name="model">report.delivery.products.planned</field>
-	        <field name="type">tree</field>
-	        <field name="arch" type="xml">
-		        <tree string="Products To Received" >
-		            <field name="qty" />
-		            <field name="planned_qty" />
-		            <field name="date"/>
-		        </tree>
-	        </field>
-	    </record>
+        <!--  Delivery Product Vs Planned -->
+        <record model="ir.ui.view" id="view_move_delivery_products_planned_tree">
+            <field name="name">Delivery Products</field>
+            <field name="model">report.delivery.products.planned</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Products To Received" >
+                    <field name="qty" />
+                    <field name="planned_qty" />
+                    <field name="date"/>
+                </tree>
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="view_move_delivery_products_planned_graph">
-	        <field name="name">Delivery Products</field>
-	        <field name="model">report.delivery.products.planned</field>
-	        <field name="type">graph</field>
-	        <field name="arch" type="xml">
-	        <graph string="Products To Received" type="bar" orientation="vertical">
-	        	<field name="date"/>
-	            <field name="qty" operator="+"/>
-	            <field name="planned_qty" operator="+"/>
-	        </graph>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="view_move_delivery_products_planned_graph">
+            <field name="name">Delivery Products</field>
+            <field name="model">report.delivery.products.planned</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+            <graph string="Products To Received" type="bar" orientation="vertical">
+                <field name="date"/>
+                <field name="qty" operator="+"/>
+                <field name="planned_qty" operator="+"/>
+            </graph>
+            </field>
+        </record>
 
-	    <record id="action_move_delivery_products_planned" model="ir.actions.act_window">
-	        <field name="name">Delivery Products Vs Planned</field>
-	        <field name="res_model">report.delivery.products.planned</field>
-	        <field name="type">ir.actions.act_window</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">graph,tree</field>
-	        <field name="view_id" ref="view_move_delivery_products_planned_graph"/>
-	    </record>
+        <record id="action_move_delivery_products_planned" model="ir.actions.act_window">
+            <field name="name">Delivery Products Vs Planned</field>
+            <field name="res_model">report.delivery.products.planned</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_move_delivery_products_planned_graph"/>
+        </record>
 
     </data>
 </openerp>

From 49fb0247c657f2310796c01772b972030da77de1 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@mga>
Date: Tue, 16 Mar 2010 23:36:07 +0530
Subject: [PATCH 131/251] [FIX]: usablity review

bzr revid: mga@mga-20100316180607-v0tfu14ueb4oj4o4
---
 addons/sale/sale_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 54e206407e1..6a9afb92eb9 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -267,7 +267,6 @@
                         <filter string="Customer" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Order Date" icon="terp-sale" domain="[]" context="{'group_by':'date_order'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Salesman" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
                     </group>
                </search>

From a465c7445bf1dfe993fa4a4ebcf0f5c8d96a1443 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@mga>
Date: Tue, 16 Mar 2010 23:52:20 +0530
Subject: [PATCH 132/251] [FIX]: usablity

bzr revid: mga@mga-20100316182220-5165smho7wlesln0
---
 addons/mrp/mrp_view.xml | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 2d40c4d2f82..7c47548a4f6 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -5,10 +5,10 @@
         <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing"
             groups="group_mrp_user,group_mrp_manager" sequence="3"/>
         <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4"/>
-		<menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="base.menu_mrp_root" sequence="1"/>
+        <menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="base.menu_mrp_root" sequence="1"/>
 
         <menuitem name="Control" id="menu_mrp_control" parent="base.menu_mrp_root"  sequence="3" />
-     	<menuitem name="Master Data"
+        <menuitem name="Master Data"
                   id="menu_mrp_bom"
                   parent="base.menu_mrp_root"
                   sequence="5" />
@@ -929,6 +929,7 @@
                 <tree string="Minimum Stock Rules">
                     <field name="name"/>
                     <field name="warehouse_id"/>
+                    <field name="location_id"/>
                     <field name="product_id"/>
                     <field name="product_uom"/>
                     <field name="product_min_qty"/>
@@ -943,11 +944,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Minimum Stock Rules Search">
-                    <field name="name" select="1" />
-                    <field name="warehouse_id" select="1" widget="selection"/>
-                    <field name="location_id" select="1" />
-                    <field name="company_id" select="1" widget="selection"/>
-                    <field name="product_id" select="1"/>
+                    <group col="10" colspan="4">
+                        <field name="name" select="1" />
+                        <field name="warehouse_id" select="1" widget="selection"/>
+                        <field name="location_id" select="1" />
+                        <field name="company_id" select="1" widget="selection"/>
+                        <field name="product_id" select="1"/>
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By..." colspan="4" col="10">
+                        <filter string="Warehouse" icon="terp-stock" domain="[]"  context="{'group_by':'warehouse_id'}"/>
+                        <filter string="Location" icon="terp-stock" domain="[]" context="{'group_by':'location_id'}"/>
+                    </group>
                 </search>
             </field>
         </record>

From 49e9a1ee0de150645be482613c6401daae6f79d1 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Wed, 17 Mar 2010 10:43:35 +0530
Subject: [PATCH 133/251] [FIX] stock: Small fix on Change Standard Price
 wizard.

bzr revid: uco@tinyerp.co.in-20100317051335-w9mhswtpelv79a56
---
 addons/stock/wizard/stock_change_standard_price.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/wizard/stock_change_standard_price.py b/addons/stock/wizard/stock_change_standard_price.py
index 982dd252a62..c1ab02e83bf 100644
--- a/addons/stock/wizard/stock_change_standard_price.py
+++ b/addons/stock/wizard/stock_change_standard_price.py
@@ -87,7 +87,7 @@ class change_standard_price(osv.osv_memory):
             qty += lots.name
 
         if stock_input_acc and stock_output_acc:
-            move_id = move_obj.create(cr, uid, {'journal_id': data.property_stock_journal.id})
+            move_id = move_obj.create(cr, uid, {'journal_id': data.categ_id.property_stock_journal.id})
             if diff > 0:
                 credit = qty * diff
                 move_line_obj.create(cr, uid, {

From 27505b3654354496d3c85db930b95ef320ef8a83 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Wed, 17 Mar 2010 11:41:43 +0530
Subject: [PATCH 134/251] [IMP] product:
 https://blueprints.launchpad.net/openobject-addons/+spec/view-normal-product-category.
 Added type field for product category.

bzr revid: uco@tinyerp.co.in-20100317061143-642585pn1cy91z2c
---
 addons/product/product.py       | 6 ++++++
 addons/product/product_view.xml | 1 +
 2 files changed, 7 insertions(+)

diff --git a/addons/product/product.py b/addons/product/product.py
index e77f71950f8..6078347c02c 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -208,7 +208,13 @@ class product_category(osv.osv):
         'parent_id': fields.many2one('product.category','Parent Category', select=True),
         'child_id': fields.one2many('product.category', 'parent_id', string='Child Categories'),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of product categories."),
+        'type': fields.selection([('view','View'), ('normal','Normal')], 'Category Type'),
     }
+    
+    _defaults = {
+        'type' : lambda *a : 'normal',
+    }
+    
     _order = "sequence"
     def _check_recursion(self, cr, uid, ids):
         level = 100
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 5c947be57ff..31a6c54833f 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -212,6 +212,7 @@
                     <field name="name" select="1"/>
                     <field name="parent_id"/>
                     <field name="sequence"/>
+                    <field name="type"/>
                     <newline/>
                 </form>
             </field>

From 82387d26c97e6f6d7cd48222986f4a6a467929bf Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Wed, 17 Mar 2010 11:43:03 +0530
Subject: [PATCH 135/251] [IMP] mrp:
 https://blueprints.launchpad.net/openobject-addons/+spec/automatic-orderpoint-delete-cascade-on-product-delete.
 Delete automatic orderpoint on delete of related product.

bzr revid: uco@tinyerp.co.in-20100317061303-spbiay7u2ma3f2ch
---
 addons/mrp/mrp.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 96e2c0a91b1..4c6f7217082 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -1251,7 +1251,7 @@ class stock_warehouse_orderpoint(osv.osv):
         'logic': fields.selection([('max','Order to Max'),('price','Best price (not yet active!)')], 'Reordering Mode', required=True),
         'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True),
         'location_id': fields.many2one('stock.location', 'Location', required=True),
-        'product_id': fields.many2one('product.product', 'Product', required=True, domain=[('type','=','product')]),
+        'product_id': fields.many2one('product.product', 'Product', ondelete='cascade', required=True, domain=[('type','=','product')]),
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True ),
         'product_min_qty': fields.float('Min Quantity', required=True,
             help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\

From a268acb4c76524f914dc49b30a0f29a58e73eeaf Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Wed, 17 Mar 2010 13:04:13 +0530
Subject: [PATCH 136/251] [REF] delivery, mrp, mrp_repair, point_of_sale,
 product_margin, slae, stock: Removed '@summary' from docstring.

bzr revid: uco@tinyerp.co.in-20100317073413-ks8i2ppev0pxm3cf
---
 addons/delivery/wizard/delivery_sale_order.py |  4 +--
 addons/mrp/wizard/change_production_qty.py    |  4 +--
 addons/mrp/wizard/make_procurement_product.py |  6 ++---
 addons/mrp/wizard/mrp_product_produce.py      |  4 +--
 addons/mrp_repair/wizard/cancel_repair.py     |  4 +--
 addons/mrp_repair/wizard/make_invoice.py      |  2 +-
 .../point_of_sale/wizard/pos_add_product.py   |  2 +-
 .../point_of_sale/wizard/pos_box_entries.py   |  6 ++---
 addons/point_of_sale/wizard/pos_box_out.py    |  4 +--
 .../wizard/pos_close_statement.py             |  2 +-
 addons/point_of_sale/wizard/pos_confirm.py    |  2 +-
 addons/point_of_sale/wizard/pos_discount.py   |  4 +--
 addons/point_of_sale/wizard/pos_get_sale.py   |  2 +-
 .../wizard/pos_open_statement.py              |  2 +-
 .../product_margin/wizard/product_margin.py   |  2 --
 addons/sale/wizard/sale_line_invoice.py       |  4 +--
 .../sale/wizard/sale_make_invoice_advance.py  |  4 +--
 .../wizard/stock_change_standard_price.py     | 27 +++++++++++++++----
 addons/stock/wizard/stock_fill_inventory.py   |  2 +-
 .../wizard/stock_inventory_line_split.py      |  4 +--
 .../wizard/stock_inventory_set_stock_zero.py  |  2 +-
 .../stock/wizard/stock_invoice_onshipping.py  |  4 +--
 addons/stock/wizard/stock_location_product.py |  2 +-
 addons/stock/wizard/stock_move.py             | 10 +++----
 24 files changed, 62 insertions(+), 47 deletions(-)

diff --git a/addons/delivery/wizard/delivery_sale_order.py b/addons/delivery/wizard/delivery_sale_order.py
index c1896e6d851..a2fd83c29c5 100644
--- a/addons/delivery/wizard/delivery_sale_order.py
+++ b/addons/delivery/wizard/delivery_sale_order.py
@@ -36,7 +36,7 @@ class make_delivery(osv.osv_memory):
 
     def default_get(self, cr, uid, fields, context):
         """ 
-             @summary: To get default values for the object.
+             To get default values for the object.
             
              @param self: The object pointer.
              @param cr: A database cursor
@@ -61,7 +61,7 @@ class make_delivery(osv.osv_memory):
     
     def delivery_set(self, cr, uid, ids, context):
         """ 
-             @summary: Adds delivery costs to Sale Order Line.
+             Adds delivery costs to Sale Order Line.
             
              @param self: The object pointer.
              @param cr: A database cursor
diff --git a/addons/mrp/wizard/change_production_qty.py b/addons/mrp/wizard/change_production_qty.py
index fbe4c10dfe7..8092cf1dc8d 100644
--- a/addons/mrp/wizard/change_production_qty.py
+++ b/addons/mrp/wizard/change_production_qty.py
@@ -36,7 +36,7 @@ class change_production_qty(osv.osv_memory):
 
     def default_get(self, cr, uid, fields, context):
         """ 
-             @summary: To get default values for the object.
+             To get default values for the object.
             
              @param self: The object pointer.
              @param cr: A database cursor
@@ -61,7 +61,7 @@ class change_production_qty(osv.osv_memory):
     
     def change_prod_qty(self, cr, uid, ids, context):
         """ 
-             @summary: Changes the Quantity of Product.
+             Changes the Quantity of Product.
             
              @param self: The object pointer.
              @param cr: A database cursor
diff --git a/addons/mrp/wizard/make_procurement_product.py b/addons/mrp/wizard/make_procurement_product.py
index c1eaa8d8086..b0c3d5ad131 100644
--- a/addons/mrp/wizard/make_procurement_product.py
+++ b/addons/mrp/wizard/make_procurement_product.py
@@ -30,7 +30,7 @@ class make_procurement(osv.osv_memory):
     
     def onchange_product_id(self, cr, uid, ids, prod_id):
         """ 
-             @summary: On Change of Product ID getting the value of related UoM.
+             On Change of Product ID getting the value of related UoM.
         
              @param self: The object pointer.
              @param cr: A database cursor
@@ -59,7 +59,7 @@ class make_procurement(osv.osv_memory):
     
     def make_procurement(self, cr, uid, ids, context=None):
         """ 
-             @summary: Creates procurement order for selected product.
+             Creates procurement order for selected product.
         
              @param self: The object pointer.
              @param cr: A database cursor
@@ -110,7 +110,7 @@ class make_procurement(osv.osv_memory):
     
     def default_get(self, cr, uid, fields, context=None):
         """ 
-             @summary: To get default values for the object.
+             To get default values for the object.
             
              @param self: The object pointer.
              @param cr: A database cursor
diff --git a/addons/mrp/wizard/mrp_product_produce.py b/addons/mrp/wizard/mrp_product_produce.py
index 387465efe3f..5c1a59f2115 100644
--- a/addons/mrp/wizard/mrp_product_produce.py
+++ b/addons/mrp/wizard/mrp_product_produce.py
@@ -35,7 +35,7 @@ class mrp_product_produce(osv.osv_memory):
 
     def _get_product_qty(self, cr, uid, context):
         """ 
-             @summary: to obtain product quantity
+             To obtain product quantity
         
              @param self: The object pointer.
              @param cr: A database cursor
@@ -58,7 +58,7 @@ class mrp_product_produce(osv.osv_memory):
 
     def do_produce(self, cr, uid, ids, context={}):
         """ 
-             @summary: to check the product type
+             To check the product type
         
              @param self: The object pointer.
              @param cr: A database cursor
diff --git a/addons/mrp_repair/wizard/cancel_repair.py b/addons/mrp_repair/wizard/cancel_repair.py
index 1dc4159257e..00b0f7695c7 100644
--- a/addons/mrp_repair/wizard/cancel_repair.py
+++ b/addons/mrp_repair/wizard/cancel_repair.py
@@ -29,7 +29,7 @@ class repair_cancel(osv.osv_memory):
 
     def cancel_repair(self, cr, uid, ids, context):
         """ 
-             @summary: Cancels the repair
+             Cancels the repair
         
              @param self: The object pointer.
              @param cr: A database cursor
@@ -55,7 +55,7 @@ class repair_cancel(osv.osv_memory):
     
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         """ 
-             @summary: Changes the view dynamically
+             Changes the view dynamically
         
              @param self: The object pointer.
              @param cr: A database cursor
diff --git a/addons/mrp_repair/wizard/make_invoice.py b/addons/mrp_repair/wizard/make_invoice.py
index cc82f0590da..063040590e6 100644
--- a/addons/mrp_repair/wizard/make_invoice.py
+++ b/addons/mrp_repair/wizard/make_invoice.py
@@ -32,7 +32,7 @@ class make_invoice(osv.osv_memory):
 
     def make_invoices(self, cr, uid, ids, context):
         """ 
-             @summary: Generates invoice(s) of selected records.
+             Generates invoice(s) of selected records.
         
              @param self: The object pointer.
              @param cr: A database cursor
diff --git a/addons/point_of_sale/wizard/pos_add_product.py b/addons/point_of_sale/wizard/pos_add_product.py
index 6b1b472f223..f02d8bd3b30 100644
--- a/addons/point_of_sale/wizard/pos_add_product.py
+++ b/addons/point_of_sale/wizard/pos_add_product.py
@@ -37,7 +37,7 @@ class add_product(osv.osv_memory):
     
     def select_product(self, cr, uid, ids, context):
         """ 
-             @summary: To get the product and quantity and add in order .            
+             To get the product and quantity and add in order .            
              @param self: The object pointer.
              @param cr: A database cursor
              @param uid: ID of the user currently logged in
diff --git a/addons/point_of_sale/wizard/pos_box_entries.py b/addons/point_of_sale/wizard/pos_box_entries.py
index 7ef9eed6634..83e3e576044 100644
--- a/addons/point_of_sale/wizard/pos_box_entries.py
+++ b/addons/point_of_sale/wizard/pos_box_entries.py
@@ -28,7 +28,7 @@ from tools.translate import _
 
 def get_journal(self,cr,uid,context):
     """ 
-             @summary:   Make the selection list of Cash Journal  .       
+             Make the selection list of Cash Journal  .       
              @param self: The object pointer.
              @param cr: A database cursor
              @param uid: ID of the user currently logged in
@@ -53,7 +53,7 @@ class pos_box_entries(osv.osv_memory):
     def _get_income_product(self,cr,uid,context):
         
         """ 
-             @summary:   Make the selection list of purchasing  products.            
+             Make the selection list of purchasing  products.            
              @param self: The object pointer.
              @param cr: A database cursor
              @param uid: ID of the user currently logged in
@@ -84,7 +84,7 @@ class pos_box_entries(osv.osv_memory):
 
         
         """ 
-             @summary:  Create the entry of statement in journal   .            
+             Create the entry of statement in journal   .            
              @param self: The object pointer.
              @param cr: A database cursor
              @param uid: ID of the user currently logged in
diff --git a/addons/point_of_sale/wizard/pos_box_out.py b/addons/point_of_sale/wizard/pos_box_out.py
index c2dcec98a49..52d2be0a3d0 100644
--- a/addons/point_of_sale/wizard/pos_box_out.py
+++ b/addons/point_of_sale/wizard/pos_box_out.py
@@ -35,7 +35,7 @@ class pos_box_out(osv.osv_memory):
     def _get_expense_product(self,cr,uid,context):
         
         """ 
-             @summary:   Make the selection list of expense product.            
+             Make the selection list of expense product.            
              @param self: The object pointer.
              @param cr: A database cursor
              @param uid: ID of the user currently logged in
@@ -64,7 +64,7 @@ class pos_box_out(osv.osv_memory):
     def get_out(self, cr, uid, ids, context):
         
         """ 
-             @summary:  Create the entries in the CashBox   .            
+             Create the entries in the CashBox   .            
              @param self: The object pointer.
              @param cr: A database cursor
              @param uid: ID of the user currently logged in
diff --git a/addons/point_of_sale/wizard/pos_close_statement.py b/addons/point_of_sale/wizard/pos_close_statement.py
index 8dd8c051fa9..4a1d305973d 100644
--- a/addons/point_of_sale/wizard/pos_close_statement.py
+++ b/addons/point_of_sale/wizard/pos_close_statement.py
@@ -31,7 +31,7 @@ class pos_close_statement(osv.osv_memory):
     
     def close_statement(self, cr, uid, ids, context):
         """ 
-             @summary: Close the statements          
+             Close the statements          
              @param self: The object pointer.
              @param cr: A database cursor
              @param uid: ID of the user currently logged in
diff --git a/addons/point_of_sale/wizard/pos_confirm.py b/addons/point_of_sale/wizard/pos_confirm.py
index f73d7e60828..f2765a5b74a 100644
--- a/addons/point_of_sale/wizard/pos_confirm.py
+++ b/addons/point_of_sale/wizard/pos_confirm.py
@@ -28,7 +28,7 @@ class pos_confirm(osv.osv_memory):
     _description = 'Point of Sale Confirm'
     def action_confirm(self, cr, uid, ids, context):
         """ 
-             @summary:   Confirm the order and close the sales  .            
+             Confirm the order and close the sales  .            
              @param self: The object pointer.
              @param cr: A database cursor
              @param uid: ID of the user currently logged in
diff --git a/addons/point_of_sale/wizard/pos_discount.py b/addons/point_of_sale/wizard/pos_discount.py
index a6b537193d7..801ecc9739b 100644
--- a/addons/point_of_sale/wizard/pos_discount.py
+++ b/addons/point_of_sale/wizard/pos_discount.py
@@ -37,7 +37,7 @@ class pos_discount(osv.osv_memory):
     
     def apply_discount(self, cr, uid, ids, context):
         """ 
-             @summary: To give the discount of  product and check the  .            
+             To give the discount of  product and check the  .            
              @param self: The object pointer.
              @param cr: A database cursor
              @param uid: ID of the user currently logged in
@@ -82,7 +82,7 @@ class pos_discount(osv.osv_memory):
     
     def check_discount(self, cr, uid, record_id,discount, context):
         """ 
-             @summary: Check the discount of define by company  .            
+             Check the discount of define by company  .            
              @param self: The object pointer.
              @param cr: A database cursor
              @param uid: ID of the user currently logged in
diff --git a/addons/point_of_sale/wizard/pos_get_sale.py b/addons/point_of_sale/wizard/pos_get_sale.py
index fae826f70b9..901cc3a521f 100644
--- a/addons/point_of_sale/wizard/pos_get_sale.py
+++ b/addons/point_of_sale/wizard/pos_get_sale.py
@@ -33,7 +33,7 @@ class pos_get_sale(osv.osv_memory):
     
     def sale_complete(self, cr, uid, ids, context):
         """ 
-             @summary: Select the picking order and add the in Point of sale order          
+             Select the picking order and add the in Point of sale order          
              @param self: The object pointer.
              @param cr: A database cursor
              @param uid: ID of the user currently logged in
diff --git a/addons/point_of_sale/wizard/pos_open_statement.py b/addons/point_of_sale/wizard/pos_open_statement.py
index a3ee7efa6ce..1c02221677c 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.py
+++ b/addons/point_of_sale/wizard/pos_open_statement.py
@@ -30,7 +30,7 @@ class pos_open_statement(osv.osv_memory):
     
     def open_statement(self, cr, uid, ids, context):
         """ 
-             @summary: open the statements          
+             Open the statements          
              @param self: The object pointer.
              @param cr: A database cursor
              @param uid: ID of the user currently logged in
diff --git a/addons/product_margin/wizard/product_margin.py b/addons/product_margin/wizard/product_margin.py
index effa42dc77c..dcde53571cd 100644
--- a/addons/product_margin/wizard/product_margin.py
+++ b/addons/product_margin/wizard/product_margin.py
@@ -34,8 +34,6 @@ class product_margin(osv.osv_memory):
 
     def action_open_window(self, cr, uid, ids, context):
         """
-            @summary:
-
             @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
             @param ids: the ID or list of IDs if we want more than one
diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py
index dac1a99b9c1..4bf3074db54 100644
--- a/addons/sale/wizard/sale_line_invoice.py
+++ b/addons/sale/wizard/sale_line_invoice.py
@@ -38,7 +38,7 @@ class sale_order_line_make_invoice(osv.osv_memory):
 
     def make_invoices(self, cr, uid, ids, context):
         """ 
-             @summary: To make invoices.
+             To make invoices.
             
              @param self: The object pointer.
              @param cr: A database cursor
@@ -56,7 +56,7 @@ class sale_order_line_make_invoice(osv.osv_memory):
     #TODO: merge with sale.py/make_invoice
         def make_invoice(order, lines):
             """ 
-                 @summary: To make invoices.
+                 To make invoices.
                 
                  @param order: 
                  @param lines: 
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 112aac7895c..6c9ca17b836 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -40,7 +40,7 @@ class sale_advance_payment_inv(osv.osv_memory):
                }
     def create_invoices(self, cr, uid, ids, context={}):
         """ 
-             @summary: To create invoices.
+             To create invoices.
             
              @param self: The object pointer.
              @param cr: A database cursor
@@ -143,7 +143,7 @@ class sale_open_invoice(osv.osv_memory):
 
     def open_invoice(self, cr, uid, ids, context):
         """ 
-             @summary: To open invoice.
+             To open invoice.
             
              @param self: The object pointer.
              @param cr: A database cursor
diff --git a/addons/stock/wizard/stock_change_standard_price.py b/addons/stock/wizard/stock_change_standard_price.py
index c1ab02e83bf..90412c3b388 100644
--- a/addons/stock/wizard/stock_change_standard_price.py
+++ b/addons/stock/wizard/stock_change_standard_price.py
@@ -31,7 +31,7 @@ class change_standard_price(osv.osv_memory):
     
     def default_get(self, cr, uid, fields, context):
         """ 
-             @summary: To get default values for the object.
+             To get default values for the object.
             
              @param self: The object pointer.
              @param cr: A database cursor
@@ -50,8 +50,8 @@ class change_standard_price(osv.osv_memory):
     
     def change_price(self, cr, uid, ids, context):
         """ 
-             @summary: Changes the Standard Price of Product. 
-                       And creates an account move accordingly.
+             Changes the Standard Price of Product. 
+             And creates an account move accordingly.
             
              @param self: The object pointer.
              @param cr: A database cursor
@@ -68,6 +68,7 @@ class change_standard_price(osv.osv_memory):
         lot_obj = self.pool.get('stock.report.prodlots')
         move_obj = self.pool.get('account.move')
         move_line_obj = self.pool.get('account.move.line')
+        data_obj = self.pool.get('ir.model.data')
         
         res = self.read(cr, uid, ids[0], ['new_price'])
         new_price = res.get('new_price',[])
@@ -85,7 +86,7 @@ class change_standard_price(osv.osv_memory):
             
         for lots in lot_obj.browse(cr, uid, lot_ids):
             qty += lots.name
-
+        
         if stock_input_acc and stock_output_acc:
             move_id = move_obj.create(cr, uid, {'journal_id': data.categ_id.property_stock_journal.id})
             if diff > 0:
@@ -125,7 +126,23 @@ class change_standard_price(osv.osv_memory):
         else:
             raise osv.except_osv(_('Warning!'),_('No Accounts are defined for ' 
                         'this product on its location.\nCan\'t create Move.'))
-        return {}
+        
+        id2 = data_obj._get_id(cr, uid, 'account', 'view_move_tree')
+        id3 = data_obj._get_id(cr, uid, 'account', 'view_move_form')
+        
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        if id3:
+            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+        
+        return {
+                'view_type': 'form',
+                'view_mode': 'tree,form',
+                'res_model': 'account.move',
+                'res_id' : move_id,
+                'views': [(id3,'form'),(id2,'tree')],
+                'type': 'ir.actions.act_window',
+        }
 
 change_standard_price()
 
diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index 0c5ff199244..c96638c8d52 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -39,7 +39,7 @@ class stock_fill_inventory(osv.osv_memory):
 
     def fill_inventory(self, cr, uid, ids, context):
         """ 
-             @summary: To fill stock inventory according to products available in the selected locations..
+             To fill stock inventory according to products available in the selected locations..
             
              @param self: The object pointer.
              @param cr: A database cursor
diff --git a/addons/stock/wizard/stock_inventory_line_split.py b/addons/stock/wizard/stock_inventory_line_split.py
index 4a77660ed8a..31fe8f88c32 100644
--- a/addons/stock/wizard/stock_inventory_line_split.py
+++ b/addons/stock/wizard/stock_inventory_line_split.py
@@ -38,7 +38,7 @@ class stock_inventory_line_split(osv.osv_memory):
 
     def _check_production_lot(self, cr, uid, context):
         """ 
-             @summary: to check the availability of production lot. 
+             To check the availability of production lot. 
             
              @param self: The object pointer.
              @param cr: A database cursor
@@ -63,7 +63,7 @@ inventory lines, make sure the production lot is assigned to this product.'))
 
     def split_lines(self, cr, uid, ids, context):
         """ 
-             @summary: to split stock inventory lines according to production lot
+             To split stock inventory lines according to production lot
             
              @param self: The object pointer.
              @param cr: A database cursor
diff --git a/addons/stock/wizard/stock_inventory_set_stock_zero.py b/addons/stock/wizard/stock_inventory_set_stock_zero.py
index 8e10ab42bb5..63296b69875 100644
--- a/addons/stock/wizard/stock_inventory_set_stock_zero.py
+++ b/addons/stock/wizard/stock_inventory_set_stock_zero.py
@@ -38,7 +38,7 @@ class inventory_set_stock_zero(osv.osv_memory):
     
     def do_merge(self, cr, uid, ids, context):
         """ 
-             @summary:To set stock to Zero 
+             To set stock to Zero 
             
              @param self: The object pointer.
              @param cr: A database cursor
diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py
index 26788d8ad76..22e48631f8b 100644
--- a/addons/stock/wizard/stock_invoice_onshipping.py
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@@ -43,7 +43,7 @@ class stock_invoice_onshipping(osv.osv_memory):
 
     def _get_type(self, cr, uid, context):
         """ 
-             @summary:To get invoice type
+             To get invoice type
             
              @param self: The object pointer.
              @param cr: A database cursor
@@ -82,7 +82,7 @@ class stock_invoice_onshipping(osv.osv_memory):
 
     def create_invoice(self, cr, uid, ids, context):
         """ 
-             @summary:To create invoice
+             To create invoice
             
              @param self: The object pointer.
              @param cr: A database cursor
diff --git a/addons/stock/wizard/stock_location_product.py b/addons/stock/wizard/stock_location_product.py
index 4f9e45196ac..3966f696475 100755
--- a/addons/stock/wizard/stock_location_product.py
+++ b/addons/stock/wizard/stock_location_product.py
@@ -38,7 +38,7 @@ class stock_location_product(osv.osv_memory):
 
     def action_open_window(self, cr, uid, ids, context):
         """ 
-             @summary:To open location wise product information specific to given duration
+             To open location wise product information specific to given duration
             
              @param self: The object pointer.
              @param cr: A database cursor
diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index a9b1613b7b1..8c407117bed 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -37,7 +37,7 @@ class stock_move_track(osv.osv_memory):
     
     def track_lines(self, cr, uid, ids, context={}):
         """ 
-             @summary:To track stock moves lines
+             To track stock moves lines
             
              @param self: The object pointer.
              @param cr: A database cursor
@@ -90,7 +90,7 @@ class stock_move_consume(osv.osv_memory):
 
     def do_move_consume(self, cr, uid, ids, context={}):
         """ 
-             @summary:To move consumed products
+             To move consumed products
             
              @param self: The object pointer.
              @param cr: A database cursor
@@ -123,7 +123,7 @@ class stock_move_scrap(osv.osv_memory):
 
     def move_scrap(self, cr, uid, ids, context={}):
         """ 
-             @summary:To move scraped products
+             To move scraped products
             
              @param self: The object pointer.
              @param cr: A database cursor
@@ -164,7 +164,7 @@ class split_in_production_lot(osv.osv_memory):
 
     def split_lot(self, cr, uid, ids, context=None):
         """ 
-             @summary:To split a lot
+             To split a lot
             
              @param self: The object pointer.
              @param cr: A database cursor
@@ -180,7 +180,7 @@ class split_in_production_lot(osv.osv_memory):
 
     def split(self, cr, uid, ids, move_ids, context=None):
         """ 
-             @summary:To split stock moves into production lot
+             To split stock moves into production lot
             
              @param self: The object pointer.
              @param cr: A database cursor

From aa2f69916736de26bfdb10399be4271535f03db0 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Wed, 17 Mar 2010 13:26:05 +0530
Subject: [PATCH 137/251] [IMP] stock, mrp: code improve on scrap, consume,
 split line

bzr revid: hmo@tinyerp.com-20100317075605-7md35k8okenczlg9
---
 addons/mrp/__init__.py            |   1 +
 addons/mrp/mrp.py                 | 206 ---------------------------
 addons/mrp/mrp_view.xml           |   4 +
 addons/mrp/stock.py               | 225 ++++++++++++++++++++++++++++++
 addons/stock/stock.py             | 143 ++++++++++---------
 addons/stock/wizard/stock_move.py |   6 +-
 6 files changed, 303 insertions(+), 282 deletions(-)
 create mode 100644 addons/mrp/stock.py

diff --git a/addons/mrp/__init__.py b/addons/mrp/__init__.py
index 90ca012bc48..11d210e791e 100644
--- a/addons/mrp/__init__.py
+++ b/addons/mrp/__init__.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import mrp
+import stock
 import installer
 import wizard
 import report
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 96e2c0a91b1..05034c2ae36 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -794,15 +794,6 @@ class mrp_production(osv.osv):
 
 mrp_production()
 
-
-class stock_move(osv.osv):
-    _name = 'stock.move'
-    _inherit = 'stock.move'
-    _columns = {
-        'production_id': fields.many2one('mrp.production', 'Production', select=True),
-    }
-stock_move()
-
 class mrp_production_workcenter_line(osv.osv):
     _name = 'mrp.production.workcenter.line'
     _description = 'Work Orders'
@@ -1240,202 +1231,5 @@ class mrp_procurement(osv.osv):
         self._procure_orderpoint_confirm(cr, uid, automatic=automatic,\
                 use_new_cursor=use_new_cursor, context=context)
 mrp_procurement()
-
-
-class stock_warehouse_orderpoint(osv.osv):
-    _name = "stock.warehouse.orderpoint"
-    _description = "Orderpoint minimum rule"
-    _columns = {
-        'name': fields.char('Name', size=32, required=True),
-        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the orderpoint without removing it."),
-        'logic': fields.selection([('max','Order to Max'),('price','Best price (not yet active!)')], 'Reordering Mode', required=True),
-        'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True),
-        'location_id': fields.many2one('stock.location', 'Location', required=True),
-        'product_id': fields.many2one('product.product', 'Product', required=True, domain=[('type','=','product')]),
-        'product_uom': fields.many2one('product.uom', 'Product UOM', required=True ),
-        'product_min_qty': fields.float('Min Quantity', required=True,
-            help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
-            "a requisition to bring the virtual stock to the Max Quantity."),
-        'product_max_qty': fields.float('Max Quantity', required=True,
-            help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
-            "a requisition to bring the virtual stock to the Max Quantity."),
-        'qty_multiple': fields.integer('Qty Multiple', required=True,
-            help="The requisition quantity will by rounded up to this multiple."),
-        'procurement_id': fields.many2one('mrp.procurement', 'Latest Requisition'),
-        'company_id': fields.many2one('res.company','Company',required=True),
-    }
-    _defaults = {
-        'active': lambda *a: 1,
-        'logic': lambda *a: 'max',
-        'qty_multiple': lambda *a: 1,
-        'name': lambda x,y,z,c: x.pool.get('ir.sequence').get(y,z,'mrp.warehouse.orderpoint') or '',
-        'product_uom': lambda sel, cr, uid, context: context.get('product_uom', False),
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.warehouse.orderpoint', context=c)
-    }
-    def onchange_warehouse_id(self, cr, uid, ids, warehouse_id, context={}):
-        if warehouse_id:
-            w=self.pool.get('stock.warehouse').browse(cr,uid,warehouse_id, context)
-            v = {'location_id':w.lot_stock_id.id}
-            return {'value': v}
-        return {}
-    def onchange_product_id(self, cr, uid, ids, product_id, context={}):
-        if product_id:
-            prod=self.pool.get('product.product').browse(cr,uid,product_id)
-            v = {'product_uom':prod.uom_id.id}
-            return {'value': v}
-        return {}
-    def copy(self, cr, uid, id, default=None,context={}):
-        if not default:
-            default = {}
-        default.update({
-            'name': self.pool.get('ir.sequence').get(cr, uid, 'mrp.warehouse.orderpoint') or '',
-        })
-        return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context)
-stock_warehouse_orderpoint()
-
-
-class StockMove(osv.osv):
-    _inherit = 'stock.move'
-    _columns = {
-        'procurements': fields.one2many('mrp.procurement', 'move_id', 'Requisitions'),
-    }
-    def copy(self, cr, uid, id, default=None, context=None):
-        default = default or {}
-        default['procurements'] = []
-        return super(StockMove, self).copy(cr, uid, id, default, context)
-
-    def _action_explode(self, cr, uid, move, context={}):
-        if move.product_id.supply_method=='produce' and move.product_id.procure_method=='make_to_order':
-            bis = self.pool.get('mrp.bom').search(cr, uid, [
-                ('product_id','=',move.product_id.id),
-                ('bom_id','=',False),
-                ('type','=','phantom')])
-            if bis:
-                factor = move.product_qty
-                bom_point = self.pool.get('mrp.bom').browse(cr, uid, bis[0])
-                res = self.pool.get('mrp.bom')._bom_explode(cr, uid, bom_point, factor, [])
-                dest = move.product_id.product_tmpl_id.property_stock_production.id
-                state = 'confirmed'
-                if move.state=='assigned':
-                    state='assigned'
-                for line in res[0]:                    
-                    valdef = {
-                        'picking_id': move.picking_id.id,
-                        'product_id': line['product_id'],
-                        'product_uom': line['product_uom'],
-                        'product_qty': line['product_qty'],
-                        'product_uos': line['product_uos'],
-                        'product_uos_qty': line['product_uos_qty'],
-                        'move_dest_id': move.id,
-                        'state': state,
-                        'name': line['name'],
-                        'location_dest_id': dest,
-                        'move_history_ids': [(6,0,[move.id])],
-                        'move_history_ids2': [(6,0,[])],
-                        'procurements': [],
-                    }
-                    mid = self.pool.get('stock.move').copy(cr, uid, move.id, default=valdef)
-                    prodobj = self.pool.get('product.product').browse(cr, uid, line['product_id'], context=context)
-                    proc_id = self.pool.get('mrp.procurement').create(cr, uid, {
-                        'name': (move.picking_id.origin or ''),
-                        'origin': (move.picking_id.origin or ''),
-                        'date_planned': move.date_planned,
-                        'product_id': line['product_id'],
-                        'product_qty': line['product_qty'],
-                        'product_uom': line['product_uom'],
-                        'product_uos_qty': line['product_uos'] and line['product_uos_qty'] or False,
-                        'product_uos':  line['product_uos'],
-                        'location_id': move.location_id.id,
-                        'procure_method': prodobj.procure_method,
-                        'move_id': mid,
-                        'company_id': line['company_id'],
-                    })
-                    wf_service = netsvc.LocalService("workflow")
-                    wf_service.trg_validate(uid, 'mrp.procurement', proc_id, 'button_confirm', cr)
-                self.pool.get('stock.move').write(cr, uid, [move.id], {
-                    'location_id': move.location_dest_id.id,
-                    'auto_validate': True,
-                    'picking_id': False,
-                    'location_id': dest,
-                    'state': 'waiting'
-                })
-                for m in self.pool.get('mrp.procurement').search(cr, uid, [('move_id','=',move.id)], context):
-                    wf_service = netsvc.LocalService("workflow")
-                    wf_service.trg_validate(uid, 'mrp.procurement', m, 'button_wait_done', cr)
-        return True
-    
-    
-    def consume_moves(self, cr, uid, ids, product_qty, location_id=False, location_dest_id=False, consume=True, context=None):
-        res = []
-        production_obj = self.pool.get('mrp.production')
-        wf_service = netsvc.LocalService("workflow")
-        for move in self.browse(cr, uid, ids):
-            new_moves = super(StockMove, self).consume_moves(cr, uid, [move.id], product_qty, location_id, location_dest_id, consume, context=context)
-            production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
-            for prod in production_obj.browse(cr, uid, production_ids, context=context):
-                if prod.state == 'confirmed':
-                    production_obj.force_production(cr, uid, [prod.id])
-                wf_service.trg_validate(uid, 'mrp.production', prod.id, 'button_produce', cr)
-            for new_move in new_moves:
-                production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]})
-                res.append(new_move)
-        return res
-    
-    def scrap_moves(self, cr, uid, ids, product_qty, location_id, context=None):
-        res = []
-        production_obj = self.pool.get('mrp.production')
-        wf_service = netsvc.LocalService("workflow")
-        for move in self.browse(cr, uid, ids):
-            new_moves = super(StockMove, self).scrap_moves(cr, uid, [move.id], product_qty, location_id, context=context)
-            production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
-            for prod_id in production_ids:
-                wf_service.trg_validate(uid, 'mrp.production', prod_id, 'button_produce', cr)
-            for new_move in new_moves:
-                production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]})
-                res.append(new_move)
-        return {}
-
-StockMove()
-
-
-class StockPicking(osv.osv):
-    _inherit = 'stock.picking'
-
-    def test_finnished(self, cursor, user, ids):
-        wf_service = netsvc.LocalService("workflow")
-        res = super(StockPicking, self).test_finnished(cursor, user, ids)
-        for picking in self.browse(cursor, user, ids):
-            for move in picking.move_lines:
-                if move.state == 'done' and move.procurements:
-                    for procurement in move.procurements:
-                        wf_service.trg_validate(user, 'mrp.procurement',
-                                procurement.id, 'button_check', cursor)
-        return res
-
-    #
-    # Explode picking by replacing phantom BoMs
-    #
-    def action_explode(self, cr, uid, picks, *args):
-        for move in self.pool.get('stock.move').browse(cr, uid, picks):
-            self.pool.get('stock.move')._action_explode(cr, uid, move)
-        return picks
-
-StockPicking()
-
-
-class spilt_in_production_lot(osv.osv_memory):
-    _inherit = "stock.move.split"
-    def split(self, cr, uid, ids, move_ids, context=None):
-        production_obj = self.pool.get('mrp.production')
-        move_obj = self.pool.get('stock.move')  
-        res = []      
-        for move in move_obj.browse(cr, uid, move_ids, context=context):
-            new_moves = super(spilt_in_production_lot, self).split(cr, uid, ids, move_ids, context=context)
-            production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
-            for new_move in new_moves:
-                production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]})                
-        return res
-spilt_in_production_lot()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 7c47548a4f6..83685a7aa36 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -485,6 +485,7 @@
                                     <field name="product_id" />
 				                    <field name="product_qty"  string="Qty"/>
 				                    <field name="product_uom"  string="UOM"/>
+                                    <field name="state" invisible="1"/>
 				                    <button name="%(stock.move_consume)d"
 				                    	string="Consume Products" type="action"
 				                    	icon="gtk-go-forward" context="{'consume': True}"
@@ -504,6 +505,7 @@
 				                    <field name="product_uom" readonly="1" string="UOM"/>
                                     <field name="location_dest_id"  readonly="1" string="Destination"/>
 				                    <field name="prodlot_id" />
+                                    <field name="state" invisible="1"/>
                            			<button
                            				name="%(stock.track_line)d"
                            				string="Split in production lots"
@@ -536,6 +538,7 @@
                                     <field name="product_id" />
 				                    <field name="product_qty"  string="Qty"/>
 				                    <field name="product_uom"  string="UOM"/>
+                                    <field name="state" invisible="1"/>
 				                    <button name="%(stock.move_consume)d"
 				                    	string="Consume Products" type="action"
 				                    	icon="gtk-go-forward" context="{'consume': True}"
@@ -555,6 +558,7 @@
                            			<field name="product_uom" readonly="1" />                           			
                            			<field name="location_id" readonly="1"/>
                            			<field name="prodlot_id" />
+                                    <field name="state" invisible="1"/>
                            			<button name="%(stock.track_line)d"
                                             string="Split in production lots" type="action" icon="gtk-justify-fill" states="done,cancel"/>
                            			<button name="%(stock.move_scrap)d"
diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
new file mode 100644
index 00000000000..4ddfddf6d90
--- /dev/null
+++ b/addons/mrp/stock.py
@@ -0,0 +1,225 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from mx import DateTime
+from osv import fields
+from osv import osv
+from tools.translate import _
+import ir
+import netsvc
+import time
+
+
+class stock_warehouse_orderpoint(osv.osv):
+    _name = "stock.warehouse.orderpoint"
+    _description = "Orderpoint minimum rule"
+    _columns = {
+        'name': fields.char('Name', size=32, required=True),
+        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the orderpoint without removing it."),
+        'logic': fields.selection([('max','Order to Max'),('price','Best price (not yet active!)')], 'Reordering Mode', required=True),
+        'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True),
+        'location_id': fields.many2one('stock.location', 'Location', required=True),
+        'product_id': fields.many2one('product.product', 'Product', required=True, domain=[('type','=','product')]),
+        'product_uom': fields.many2one('product.uom', 'Product UOM', required=True ),
+        'product_min_qty': fields.float('Min Quantity', required=True,
+            help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
+            "a requisition to bring the virtual stock to the Max Quantity."),
+        'product_max_qty': fields.float('Max Quantity', required=True,
+            help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
+            "a requisition to bring the virtual stock to the Max Quantity."),
+        'qty_multiple': fields.integer('Qty Multiple', required=True,
+            help="The requisition quantity will by rounded up to this multiple."),
+        'procurement_id': fields.many2one('mrp.procurement', 'Latest Requisition'),
+        'company_id': fields.many2one('res.company','Company',required=True),
+    }
+    _defaults = {
+        'active': lambda *a: 1,
+        'logic': lambda *a: 'max',
+        'qty_multiple': lambda *a: 1,
+        'name': lambda x,y,z,c: x.pool.get('ir.sequence').get(y,z,'mrp.warehouse.orderpoint') or '',
+        'product_uom': lambda sel, cr, uid, context: context.get('product_uom', False),
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.warehouse.orderpoint', context=c)
+    }
+    def onchange_warehouse_id(self, cr, uid, ids, warehouse_id, context={}):
+        if warehouse_id:
+            w=self.pool.get('stock.warehouse').browse(cr,uid,warehouse_id, context)
+            v = {'location_id':w.lot_stock_id.id}
+            return {'value': v}
+        return {}
+    def onchange_product_id(self, cr, uid, ids, product_id, context={}):
+        if product_id:
+            prod=self.pool.get('product.product').browse(cr,uid,product_id)
+            v = {'product_uom':prod.uom_id.id}
+            return {'value': v}
+        return {}
+    def copy(self, cr, uid, id, default=None,context={}):
+        if not default:
+            default = {}
+        default.update({
+            'name': self.pool.get('ir.sequence').get(cr, uid, 'mrp.warehouse.orderpoint') or '',
+        })
+        return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context)
+stock_warehouse_orderpoint()
+
+class StockMove(osv.osv):
+    _inherit = 'stock.move'
+    _columns = {
+        'production_id': fields.many2one('mrp.production', 'Production', select=True),
+        'procurements': fields.one2many('mrp.procurement', 'move_id', 'Requisitions'),
+    }
+    def copy(self, cr, uid, id, default=None, context=None):
+        default = default or {}
+        default['procurements'] = []
+        return super(StockMove, self).copy(cr, uid, id, default, context)
+
+    def _action_explode(self, cr, uid, move, context={}):
+        if move.product_id.supply_method=='produce' and move.product_id.procure_method=='make_to_order':
+            bis = self.pool.get('mrp.bom').search(cr, uid, [
+                ('product_id','=',move.product_id.id),
+                ('bom_id','=',False),
+                ('type','=','phantom')])
+            if bis:
+                factor = move.product_qty
+                bom_point = self.pool.get('mrp.bom').browse(cr, uid, bis[0])
+                res = self.pool.get('mrp.bom')._bom_explode(cr, uid, bom_point, factor, [])
+                dest = move.product_id.product_tmpl_id.property_stock_production.id
+                state = 'confirmed'
+                if move.state=='assigned':
+                    state='assigned'
+                for line in res[0]:                    
+                    valdef = {
+                        'picking_id': move.picking_id.id,
+                        'product_id': line['product_id'],
+                        'product_uom': line['product_uom'],
+                        'product_qty': line['product_qty'],
+                        'product_uos': line['product_uos'],
+                        'product_uos_qty': line['product_uos_qty'],
+                        'move_dest_id': move.id,
+                        'state': state,
+                        'name': line['name'],
+                        'location_dest_id': dest,
+                        'move_history_ids': [(6,0,[move.id])],
+                        'move_history_ids2': [(6,0,[])],
+                        'procurements': [],
+                    }
+                    mid = self.pool.get('stock.move').copy(cr, uid, move.id, default=valdef)
+                    prodobj = self.pool.get('product.product').browse(cr, uid, line['product_id'], context=context)
+                    proc_id = self.pool.get('mrp.procurement').create(cr, uid, {
+                        'name': (move.picking_id.origin or ''),
+                        'origin': (move.picking_id.origin or ''),
+                        'date_planned': move.date_planned,
+                        'product_id': line['product_id'],
+                        'product_qty': line['product_qty'],
+                        'product_uom': line['product_uom'],
+                        'product_uos_qty': line['product_uos'] and line['product_uos_qty'] or False,
+                        'product_uos':  line['product_uos'],
+                        'location_id': move.location_id.id,
+                        'procure_method': prodobj.procure_method,
+                        'move_id': mid,
+                        'company_id': line['company_id'],
+                    })
+                    wf_service = netsvc.LocalService("workflow")
+                    wf_service.trg_validate(uid, 'mrp.procurement', proc_id, 'button_confirm', cr)
+                self.pool.get('stock.move').write(cr, uid, [move.id], {
+                    'location_id': move.location_dest_id.id,
+                    'auto_validate': True,
+                    'picking_id': False,
+                    'location_id': dest,
+                    'state': 'waiting'
+                })
+                for m in self.pool.get('mrp.procurement').search(cr, uid, [('move_id','=',move.id)], context):
+                    wf_service = netsvc.LocalService("workflow")
+                    wf_service.trg_validate(uid, 'mrp.procurement', m, 'button_wait_done', cr)
+        return True
+    
+    
+    def action_consume(self, cr, uid, ids, product_qty, location_id=False, context=None):        
+        res = []
+        production_obj = self.pool.get('mrp.production')
+        wf_service = netsvc.LocalService("workflow")
+        for move in self.browse(cr, uid, ids):
+            new_moves = super(StockMove, self).action_consume(cr, uid, [move.id], product_qty, location_id, context=context)
+            production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
+            for prod in production_obj.browse(cr, uid, production_ids, context=context):
+                if prod.state == 'confirmed':
+                    production_obj.force_production(cr, uid, [prod.id])
+                wf_service.trg_validate(uid, 'mrp.production', prod.id, 'button_produce', cr)
+            for new_move in new_moves:
+                production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]})
+                res.append(new_move)
+        return res
+    
+    def action_scrap(self, cr, uid, ids, product_qty, location_id, context=None):
+        res = []
+        production_obj = self.pool.get('mrp.production')
+        wf_service = netsvc.LocalService("workflow")
+        for move in self.browse(cr, uid, ids):
+            new_moves = super(StockMove, self).action_scrap(cr, uid, [move.id], product_qty, location_id, context=context)
+            production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
+            for prod_id in production_ids:
+                wf_service.trg_validate(uid, 'mrp.production', prod_id, 'button_produce', cr)
+            for new_move in new_moves:
+                production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]})
+                res.append(new_move)
+        return {}
+
+StockMove()
+
+
+class StockPicking(osv.osv):
+    _inherit = 'stock.picking'
+
+    def test_finnished(self, cursor, user, ids):
+        wf_service = netsvc.LocalService("workflow")
+        res = super(StockPicking, self).test_finnished(cursor, user, ids)
+        for picking in self.browse(cursor, user, ids):
+            for move in picking.move_lines:
+                if move.state == 'done' and move.procurements:
+                    for procurement in move.procurements:
+                        wf_service.trg_validate(user, 'mrp.procurement',
+                                procurement.id, 'button_check', cursor)
+        return res
+
+    #
+    # Explode picking by replacing phantom BoMs
+    #
+    def action_explode(self, cr, uid, picks, *args):
+        for move in self.pool.get('stock.move').browse(cr, uid, picks):
+            self.pool.get('stock.move')._action_explode(cr, uid, move)
+        return picks
+
+StockPicking()
+
+
+class spilt_in_production_lot(osv.osv_memory):
+    _inherit = "stock.move.split"
+    def split(self, cr, uid, ids, move_ids, context=None):
+        production_obj = self.pool.get('mrp.production')
+        move_obj = self.pool.get('stock.move')  
+        res = []      
+        for move in move_obj.browse(cr, uid, move_ids, context=context):
+            new_moves = super(spilt_in_production_lot, self).split(cr, uid, ids, move_ids, context=context)
+            production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
+            for new_move in new_moves:
+                production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]})                
+        return res
+spilt_in_production_lot()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 87538db508b..c063678c4a0 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1308,41 +1308,8 @@ class stock_move(osv.osv):
         for id in ids:
             wf_service.trg_trigger(uid, 'stock.move', id, cr)
         #self.action_cancel(cr,uid, ids2, context)
-        return True
+        return True    
     
-    def action_scrap(self, cr, uid, ids,context=None):
-        '''
-        add the damaged product into consumed product by updating its state to cancel and 
-        add same product since we need that product to manufacture the parent product.
-        
-        :param cr: the database cursor
-        :param uid: the user id
-        :param ids: ids of product object to be scraped
-        :param context: context arguments
-        :return: 
-        '''   
-#        to find the parent id(manufacturing order) of the active record(product to consume), 
-#        obtain active record id 1st and then get the production_id from mrp_production_move_ids
-        active_id=ids[0]
-        cr.execute("select production_id from mrp_production_move_ids where move_id=%s" % (active_id))
-#        it gives parent id in [list(tuple)] format so extract it [(21,)]
-        parent_id = int(cr.fetchall()[0][0])
-#        get the parent object
-        parent_obj = self.pool.get('mrp.production').browse(cr, uid, parent_id)
-#       create copy for multiple id processing for product to consume which r scraped 
-        for id in ids:
-            #create copy of the product records which are scraped due to damage since they are 
-            #still required to manufacture the product.
-            new_rec_id = self.copy(cr, uid, id, {'state': 'waiting'}, context)
-            
-            #assign all new products which will replace damaged product to the current manufacturing order
-            cr.execute('insert into mrp_production_move_ids (production_id,move_id) values (%s,%s)', (parent_id,  new_rec_id))
-        
-#        all damaged product needs to be in consumed product window having cancel state.
-        vals={'state': 'cancel', 'date_planned': time.strftime('%Y-%m-%d %H:%M:%S')}
-        self.pool.get('stock.move').write(cr, uid, ids,vals )      
-                  
-        return True
     def action_done(self, cr, uid, ids, context=None):
         track_flag = False
         picking_ids = []
@@ -1483,8 +1450,51 @@ class stock_move(osv.osv):
         prodlot_obj.write(cr, uid, [prodlot_id], {'ref': ref})
         return prodlot_id
 
-    def split_lines(self, cr, uid, ids, quantity, split_by_qty=1, prefix=False, with_lot=True, context=None):
+
+    def action_scrap(self, cr, uid, ids, quantity, location_id, context=None):
+        '''
+        Move the scrap/damaged product into scrap location       
         
+        @ param cr: the database cursor
+        @ param uid: the user id
+        @ param ids: ids of stock move object to be scraped
+        @ param quantity : specify scrap qty
+        @ param location_id : specify scrap location
+        @ param context: context arguments
+
+        @ return: True
+        '''   
+        if quantity <= 0:
+            raise osv.except_osv(_('Warning!'), _('Please provide Proper Quantity !'))
+        res = []       
+        for move in self.browse(cr, uid, ids, context=context):            
+            move_qty = move.product_qty
+            uos_qty = quantity / move_qty * move.product_uos_qty
+            default_val = {
+                    'product_qty': quantity, 
+                    'product_uos_qty': uos_qty, 
+                    'state': move.state, 
+                    'location_dest_id': location_id
+                }
+            new_move = self.copy(cr, uid, move.id, default_val)
+            res += [new_move]  
+                  
+        return True
+
+    def action_split(self, cr, uid, ids, quantity, split_by_qty=1, prefix=False, with_lot=True, context=None):
+        '''
+        Split Stock Move lines into production lot which specified split by quantity.
+        
+        @ param cr: the database cursor
+        @ param uid: the user id
+        @ param ids: ids of stock move object to be splited
+        @ param split_by_qty : specify split by qty
+        @ param prefix : specify prefix of production lot
+        @ param with_lot : if true, prodcution lot will assign for split line otherwise not.
+        @ param context: context arguments
+
+        @ return: True
+        '''   
 
         if quantity <= 0:
             raise osv.except_osv(_('Warning!'), _('Please provide Proper Quantity !'))
@@ -1534,7 +1544,19 @@ class stock_move(osv.osv):
                 self.write(cr, uid, [current_move], update_val)
         return res    
 
-    def consume_moves(self, cr, uid, ids, quantity, location_id=False, location_dest_id=False, consume=True, context=None):        
+    def action_consume(self, cr, uid, ids, quantity, location_id=False,  context=None):        
+        '''
+        Consumed product with specific quatity from specific source location
+        
+        @ param cr: the database cursor
+        @ param uid: the user id
+        @ param ids: ids of stock move object to be consumed
+        @ param quantity : specify consume quantity
+        @ param location_id : specify source location         
+        @ param context: context arguments
+
+        @ return: True
+        '''   
         if not context:
             context = {}
                 
@@ -1547,7 +1569,7 @@ class stock_move(osv.osv):
             quantity_rest = move.product_qty
 
             quantity_rest -= quantity            
-            uos_qty_rest = quantity_rest / move_qty * move.product_uos_qty
+            uos_qty_rest = quantity_rest / move_qty * move.product_uos_qty            
             if quantity_rest <= 0:
                 quantity_rest = 0 
                 uos_qty_rest = 0
@@ -1560,14 +1582,11 @@ class stock_move(osv.osv):
                     'product_qty': quantity, 
                     'product_uos_qty': uos_qty, 
                     'state': move.state, 
-                }
-                if location_dest_id:
-                   default_val.update({'location_dest_id': location_dest_id}) 
-                if location_id:
-                   default_val.update({'location_id': location_id}) 
-                
+                    'location_id': location_id
+                }                                              
                 if move.product_id.track_production and location_id:
-                    res += self.split_lines(cr, uid, [move.id], quantity, split_by_qty=1, context=context)
+                    # IF product has checked track for production lot, move lines will be split by 1
+                    res += self.action_split(cr, uid, [move.id], quantity, split_by_qty=1, context=context)
                 else:
                     current_move = self.copy(cr, uid, move.id, default_val)
                     res += [current_move]
@@ -1585,38 +1604,16 @@ class stock_move(osv.osv):
                     res += self.split_lines(cr, uid, [move.id], quantity_rest, split_by_qty=1, context=context)
                 else:                     
                     res += [move.id] 
-                    update_val = {}                                  
-                    update_val['product_qty'] = quantity_rest
-                    update_val['product_uos_qty'] = uos_qty_rest
-                    if location_dest_id:
-                       update_val.update({'location_dest_id': location_dest_id}) 
-                    if location_id:
-                       update_val.update({'location_id': location_id}) 
+                    update_val = {
+                        'product_qty' : quantity_rest,
+                        'product_uos_qty' : uos_qty_rest,
+                        'location_id': location_id
+                    }                                                    
 
                     self.write(cr, uid, [move.id], update_val)
 
-        if consume:
-            self.action_done(cr, uid, res)  
-        else:
-            self.action_scrap(cr, uid, res,context) 
-        return res
-
-    def scrap_moves(self, cr, uid, ids, quantity, location_dest_id, context=None):
-        if quantity <= 0:
-            raise osv.except_osv(_('Warning!'), _('Please provide Proper Quantity !'))
-        res = []       
-        for move in self.browse(cr, uid, ids, context=context):            
-            move_qty = move.product_qty
-            uos_qty = quantity / move_qty * move.product_uos_qty
-            default_val = {
-                    'product_qty': quantity, 
-                    'product_uos_qty': uos_qty, 
-                    'state': move.state, 
-                    'location_dest_id': location_dest_id
-                }
-            new_move = self.copy(cr, uid, move.id, default_val)
-            res += [new_move]
-        return res
+        self.action_done(cr, uid, res)          
+        return res    
 
 stock_move()
 
diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index a9b1613b7b1..1a6231e0816 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -64,7 +64,7 @@ class stock_move_consume(osv.osv_memory):
         'product_qty': fields.float('Quantity', required=True), 
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True), 
         'location_id': fields.many2one('stock.location', 'Location', required=True)
-              }
+    }
 
     def default_get(self, cr, uid, fields_list, context=None):
         """ 
@@ -104,7 +104,7 @@ class stock_move_consume(osv.osv_memory):
         move_obj = self.pool.get('stock.move')
         move_ids = context['active_ids']
         for data in self.read(cr, uid, ids):            
-            move_obj.consume_moves(cr, uid, move_ids, 
+            move_obj.action_consume(cr, uid, move_ids, 
                              data['product_qty'], data['location_id'], 
                              context=context)
         return {}
@@ -137,7 +137,7 @@ class stock_move_scrap(osv.osv_memory):
         move_obj = self.pool.get('stock.move')        
         move_ids = context['active_ids']
         for data in self.read(cr, uid, ids):
-            move_obj.scrap_moves(cr, uid, move_ids, 
+            move_obj.action_scrap(cr, uid, move_ids, 
                              data['product_qty'], data['location_id'], 
                              context=context)
         return {}

From 4198a0bd62b478bf72bc0b417ff5d8e8c2a2ae03 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Wed, 17 Mar 2010 13:34:28 +0530
Subject: [PATCH 138/251] [IMP] stock, mrp: put same icons for scrap button in
 production order form

bzr revid: hmo@tinyerp.com-20100317080428-kc60t8ax408ttbte
---
 addons/mrp/mrp_view.xml | 6 +++---
 addons/stock/stock.py   | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 83685a7aa36..7eb8466d8a2 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -492,7 +492,7 @@
 				                    	states="draft,waiting,confirmed,assigned" />
 				                    <button name="%(stock.move_scrap)d"
 				                    	string="Scrap Products" type="action"
-				                    	icon="gtk-justify-fill" context="{'scrap': True}"
+				                    	icon="gtk-convert" context="{'scrap': True}"
 				                    	states="draft,waiting,confirmed,assigned" />				                    
                                 </tree>
                             </field>
@@ -545,7 +545,7 @@
 				                    	states="draft,waiting,confirmed,assigned" />
 				                    <button name="%(stock.move_scrap)d"
 				                    	string="Scrap Products" type="action"
-				                    	icon="gtk-justify-fill" context="{'scrap': True}"
+				                    	icon="gtk-convert" context="{'scrap': True}"
 				                    	states="draft,waiting,confirmed,assigned" />				                    
                                 </tree>
                             </field>
@@ -562,7 +562,7 @@
                            			<button name="%(stock.track_line)d"
                                             string="Split in production lots" type="action" icon="gtk-justify-fill" states="done,cancel"/>
                            			<button name="%(stock.move_scrap)d"
-                           				string="Scrap Products" type="action" icon="gtk-go-forward"
+                           				string="Scrap Products" type="action" icon="gtk-convert"
                            				states="done,cancel" />
                            		</tree>
                            	</field>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index c063678c4a0..edccdcd29db 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1462,7 +1462,7 @@ class stock_move(osv.osv):
         @ param location_id : specify scrap location
         @ param context: context arguments
 
-        @ return: True
+        @ return: Scraped lines
         '''   
         if quantity <= 0:
             raise osv.except_osv(_('Warning!'), _('Please provide Proper Quantity !'))
@@ -1479,7 +1479,7 @@ class stock_move(osv.osv):
             new_move = self.copy(cr, uid, move.id, default_val)
             res += [new_move]  
                   
-        return True
+        return res
 
     def action_split(self, cr, uid, ids, quantity, split_by_qty=1, prefix=False, with_lot=True, context=None):
         '''
@@ -1493,7 +1493,7 @@ class stock_move(osv.osv):
         @ param with_lot : if true, prodcution lot will assign for split line otherwise not.
         @ param context: context arguments
 
-        @ return: True
+        @ return: splited move lines
         '''   
 
         if quantity <= 0:
@@ -1555,7 +1555,7 @@ class stock_move(osv.osv):
         @ param location_id : specify source location         
         @ param context: context arguments
 
-        @ return: True
+        @ return: Consumed lines
         '''   
         if not context:
             context = {}

From d3247db07685d66dd8a293b81125ff6940d4bb0a Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Wed, 17 Mar 2010 13:49:51 +0530
Subject: [PATCH 139/251] [IMP] mrp: improve produce wizard

bzr revid: hmo@tinyerp.com-20100317081951-9b1q587vlx2pnwb4
---
 addons/mrp/mrp.py                        | 24 +++++++++++++++++++++---
 addons/mrp/wizard/mrp_product_produce.py |  2 +-
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 05034c2ae36..3f9058b2ce9 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -577,7 +577,23 @@ class mrp_production(osv.osv):
                res = False        
         return res
 
-    def do_produce(self, cr, uid, production_id, production_qty, production_mode, context=None):
+    def action_produce(self, cr, uid, production_id, production_qty, production_mode, context=None):
+        """ 
+             @summary: To produce final product base on production mode (consume/consume&produce).
+                       If Production mode is consume, all stock move lines of raw materials will be done/consumed.
+                       If Production mode is consume & produce, all stock move lines of raw materials will be done/consumed
+                                    and stock move lines of final product will be also done/produced.
+        
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param production_id: the ID of mrp.production object
+             @param production_qty: specify qty to produce
+             @param production_mode: specify production mode (consume/consume&produce).
+
+             @return:  True
+        
+        """              
         stock_mov_obj = self.pool.get('stock.move')
         production = self.browse(cr, uid, production_id)
         
@@ -585,6 +601,7 @@ class mrp_production(osv.osv):
         final_product_todo = []        
         
         if production_mode in ['consume','consume_produce']:
+            # To consume remaining qty of raw materials 
             consumed_products = {}
             produced_qty = 0
             for consumed_product in production.move_lines2:
@@ -602,9 +619,10 @@ class mrp_production(osv.osv):
                 if rest_qty > production.product_qty:
                    rest_qty = production.product_qty            
                 if rest_qty > 0:
-                    stock_mov_obj.consume_moves(cr, uid, [raw_product.id], rest_qty, production.location_src_id.id, context=context)
+                    stock_mov_obj.action_consume(cr, uid, [raw_product.id], rest_qty, production.location_src_id.id, context=context)
 
         if production_mode == 'consume_produce':
+            # To produce remaining qty of final product
             vals = {'state':'confirmed'}
             final_product_todo = [x.id for x in production.move_created_ids]
             stock_mov_obj.write(cr, uid, final_product_todo, vals)
@@ -620,7 +638,7 @@ class mrp_production(osv.osv):
                 if rest_qty <= production_qty:
                    production_qty = rest_qty 
                 if rest_qty > 0 :
-                    stock_mov_obj.consume_moves(cr, uid, [produce_product.id], production_qty, production.location_dest_id.id, context=context)            
+                    stock_mov_obj.action_consume(cr, uid, [produce_product.id], production_qty, production.location_dest_id.id, context=context)            
         
         
         for raw_product in production.move_lines2: 
diff --git a/addons/mrp/wizard/mrp_product_produce.py b/addons/mrp/wizard/mrp_product_produce.py
index 387465efe3f..b1579f563f1 100644
--- a/addons/mrp/wizard/mrp_product_produce.py
+++ b/addons/mrp/wizard/mrp_product_produce.py
@@ -72,7 +72,7 @@ class mrp_product_produce(osv.osv_memory):
         move_ids = context['active_ids']
         for data in self.read(cr, uid, ids):
             for move_id in move_ids:
-                prod_obj.do_produce(cr, uid, move_id, 
+                prod_obj.action_produce(cr, uid, move_id, 
                                     data['product_qty'], data['mode'], context=context)
         return {}
 

From f2cb13680e0faab495b198273a2d2beef53792f0 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Wed, 17 Mar 2010 14:05:15 +0530
Subject: [PATCH 140/251] [IMP]purchase:Osv memory wizard modified, naming
 conventions, act_window added

bzr revid: mso@mso-20100317083515-2u06q12zen7tmzc2
---
 addons/purchase/__terp__.py                   |  2 +-
 addons/purchase/purchase_view.xml             |  3 ++-
 addons/purchase/purchase_wizard.xml           |  2 ++
 addons/purchase/wizard/__init__.py            |  2 +-
 ...se_order_group => purchase_order_group.py} | 25 +++++++++++++++----
 ...view.xml => purchase_order_group_view.xml} | 18 ++++++-------
 6 files changed, 34 insertions(+), 18 deletions(-)
 rename addons/purchase/wizard/{purchase_order_group => purchase_order_group.py} (89%)
 rename addons/purchase/wizard/{purchase_wizard_group_view.xml => purchase_order_group_view.xml} (76%)

diff --git a/addons/purchase/__terp__.py b/addons/purchase/__terp__.py
index 7c5aa05f640..98c8b73b789 100644
--- a/addons/purchase/__terp__.py
+++ b/addons/purchase/__terp__.py
@@ -36,9 +36,9 @@
         'purchase_workflow.xml',
         'purchase_sequence.xml',
         'purchase_data.xml',
+        'wizard/purchase_order_group_view.xml',
         'purchase_view.xml',
         'purchase_report.xml',
-        'purchase_wizard.xml',
         'stock_view.xml',
         'partner_view.xml',
         'process/purchase_process.xml'
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 53e9754a9d0..70942eacdcf 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -288,7 +288,7 @@
             name="Product purchases"
             res_model="purchase.order.line"
             src_model="product.product"/>
-
+<!-- 
 	<record model="ir.values" id="action_merge_purchase_order">
                 <field name="object" eval="1" />
                 <field name="name">Purchase Order</field>
@@ -297,5 +297,6 @@
                 <field name="key">action</field>
                 <field name="model">purchase.order</field>
          </record>
+          -->
     </data>
 </openerp>
diff --git a/addons/purchase/purchase_wizard.xml b/addons/purchase/purchase_wizard.xml
index e7fd3ce6efc..d76ce1e3819 100644
--- a/addons/purchase/purchase_wizard.xml
+++ b/addons/purchase/purchase_wizard.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
   <data>
+  <!-- 
     <wizard id="purchase_order_merge"
             model="purchase.order"
             multi="True"
             keyword="client_action_multi"
             name="purchase.order.merge"
             string="Merge purchases"/>
+             -->
   </data>
 </openerp>
diff --git a/addons/purchase/wizard/__init__.py b/addons/purchase/wizard/__init__.py
index e79d70fbaeb..73bb88500a8 100644
--- a/addons/purchase/wizard/__init__.py
+++ b/addons/purchase/wizard/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import wizard_group
+import purchase_order_group
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/purchase/wizard/purchase_order_group b/addons/purchase/wizard/purchase_order_group.py
similarity index 89%
rename from addons/purchase/wizard/purchase_order_group
rename to addons/purchase/wizard/purchase_order_group.py
index 4c92fda53d8..c34b610f26b 100644
--- a/addons/purchase/wizard/purchase_order_group
+++ b/addons/purchase/wizard/purchase_order_group.py
@@ -35,6 +35,18 @@ class purchase_order_group(osv.osv_memory):
 		} 
 
 	def merge_orders(self, cr, uid, ids, context):
+		""" 
+		     To merge similar type of purchase orders.
+		    
+		     @param self: The object pointer.
+		     @param cr: A database cursor
+		     @param uid: ID of the user currently logged in
+		     @param ids: the ID or list of IDs 
+		     @param context: A standard dictionary 
+		     
+		     @return: purchase order view
+			
+		"""      		
 	        order_obj = self.pool.get('purchase.order')
 		mod_obj =self.pool.get('ir.model.data')
 		result = mod_obj._get_id(cr, uid, 'purchase', 'view_purchase_order_filter')
@@ -43,6 +55,14 @@ class purchase_order_group(osv.osv_memory):
 
  	
 		def make_key(br, fields):
+			""" 
+			     Returns tuple indicating the value corresponding to fields
+			    
+			     @param br: record object
+			     @param fields: name of fields
+			     @return: Returns tuple indicating the value corresponding to fields
+				
+			"""      			
 			list_key = []
 			for field in fields:
 			    field_val = getattr(br, field)
@@ -65,7 +85,6 @@ class purchase_order_group(osv.osv_memory):
     
 		for porder in [order for order in order_obj.browse(cr, uid, context['active_ids']) if order.state == 'draft']:
 			order_key = make_key(porder, ('partner_id', 'location_id', 'pricelist_id'))
-
 			new_order = new_orders.setdefault(order_key, ({}, []))
 			new_order[1].append(porder.id)
 			order_infos = new_order[0]
@@ -139,9 +158,5 @@ class purchase_order_group(osv.osv_memory):
 		'type': 'ir.actions.act_window',
 		'search_view_id': id['res_id']
 		}
-
-		     
-
-   
 purchase_order_group()
 
diff --git a/addons/purchase/wizard/purchase_wizard_group_view.xml b/addons/purchase/wizard/purchase_order_group_view.xml
similarity index 76%
rename from addons/purchase/wizard/purchase_wizard_group_view.xml
rename to addons/purchase/wizard/purchase_order_group_view.xml
index 332aa5b041b..b943c64520d 100644
--- a/addons/purchase/wizard/purchase_wizard_group_view.xml
+++ b/addons/purchase/wizard/purchase_order_group_view.xml
@@ -31,16 +31,14 @@
             </field>
 		</record>
 
-	<record id="action_view_purchase_order_group" model="ir.actions.act_window">
-			<field name="name">Merge Purchase order</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">purchase.order.group</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="target">new</field>
-			<field name="view_id" ref="view_purchase_order_group"/>
-		</record>
-			
+         <act_window name="Merge Purchase orders"		    
+		    res_model="purchase.order.group"
+		    src_model="purchase.order"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_view_purchase_order_group"/>	
+		    			
     </data>
 </openerp>
 

From 6be5a0c212c5dadd5a7b0f65d239e3dd933f75a9 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Wed, 17 Mar 2010 17:43:57 +0530
Subject: [PATCH 141/251] [FIX] mrp

bzr revid: hmo@tinyerp.com-20100317121357-48xpq5lda7xd10ea
---
 addons/mrp/mrp.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 073e46b3380..0a6d03aa0a3 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -1112,7 +1112,8 @@ class mrp_procurement(osv.osv):
         @return  : True
         """
         res = self.make_mo(cr, uid, ids, context=context)
-        return 1 #TO CHECK: why workflow is generated error if return True
+        res = res.values()
+        return len(res) and res[0] or 0 #TO CHECK: why workflow is generated error if return not integer value
 
     def make_mo(self, cr, uid, ids, context={}):
         """
@@ -1157,7 +1158,8 @@ class mrp_procurement(osv.osv):
         @return  : True
         """
         res = self.make_po(cr, uid, ids, context=context)
-        return 1 #TO CHECK: why workflow is generated error if return True
+        res = res.values()
+        return len(res) and res[0] or 0 #TO CHECK: why workflow is generated error if return not integer value
 
     def make_po(self, cr, uid, ids, context={}):
         """

From 10aa53bf33e28b118f9a63692a38d4a5963b1d23 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Wed, 17 Mar 2010 17:44:42 +0530
Subject: [PATCH 142/251] [IMP] stock: Changed title name into 'Latest
 inventories dates by products'

bzr revid: uco@tinyerp.co.in-20100317121442-vet27e2mj4qdtaye
---
 addons/stock/report_stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/report_stock_view.xml b/addons/stock/report_stock_view.xml
index 21f7d91a806..72b2788636a 100644
--- a/addons/stock/report_stock_view.xml
+++ b/addons/stock/report_stock_view.xml
@@ -152,7 +152,7 @@
         </record>
 
         <record model="ir.actions.act_window" id="action_stock_line_date">
-            <field name="name">Latest Inventory Date by Product</field>
+            <field name="name">Latest Inventories Dates by Product</field>
             <field name="res_model">report.stock.lines.date</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>

From ed4c72de1dda42bde0a184ee07463be0eda2a3a4 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Wed, 17 Mar 2010 17:48:11 +0530
Subject: [PATCH 143/251] [IMP] stock: Small Improvement in 'Change Price'
 wizard.

bzr revid: uco@tinyerp.co.in-20100317121811-thc1d6mlra9anrzf
---
 addons/stock/wizard/stock_change_standard_price.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/wizard/stock_change_standard_price.py b/addons/stock/wizard/stock_change_standard_price.py
index 90412c3b388..b4f12e7f545 100644
--- a/addons/stock/wizard/stock_change_standard_price.py
+++ b/addons/stock/wizard/stock_change_standard_price.py
@@ -87,7 +87,7 @@ class change_standard_price(osv.osv_memory):
         for lots in lot_obj.browse(cr, uid, lot_ids):
             qty += lots.name
         
-        if stock_input_acc and stock_output_acc:
+        if stock_input_acc and stock_output_acc and lot_ids:
             move_id = move_obj.create(cr, uid, {'journal_id': data.categ_id.property_stock_journal.id})
             if diff > 0:
                 credit = qty * diff

From 5b43ba950519f1a8656c2de53ad4387edc3fe61a Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 17 Mar 2010 18:43:55 +0530
Subject: [PATCH 144/251] [Add] stock: Add the new object for storing the
 detail of stock_delivery and modify the partial_picking wizard

bzr revid: sbh@tinyerp.com-20100317131355-2ymb13ebtt1pl88z
---
 addons/stock/stock.py                         | 21 +++++++-
 addons/stock/stock_view.xml                   | 51 ++++++++++++++++++-
 addons/stock/wizard/wizard_partial_picking.py | 15 ++++++
 3 files changed, 85 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index c20df03802b..d2653e39b07 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -951,7 +951,10 @@ class stock_production_lot_revision(osv.osv):
     }
 
 stock_production_lot_revision()
-
+    
+class stock_delivery(osv.osv):
+    _name = "stock.delivery"
+stock_delivery()
 # ----------------------------------------------------
 # Move
 # ----------------------------------------------------
@@ -1035,6 +1038,7 @@ class stock_move(osv.osv):
         'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Orders"),
         'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Origin"),
         'move_stock_return_history': fields.many2many('stock.move', 'stock_move_return_history', 'move_id', 'return_move_id', 'Move Return History',readonly=True),
+        'delivered_id': fields.many2one('stock.delivery', 'Product delivered'),
     }
     _constraints = [
         (_check_tracking,
@@ -1748,7 +1752,22 @@ class stock_warehouse(osv.osv):
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.inventory', context=c),
     }
 stock_warehouse()
+    
+class stock_delivery(osv.osv):
+    
+    """ Tracability of partialdeliveries """
+    
+    _name = "stock.delivery"
+    _description = "Delivery"
+    _rec_name = 'partner_id'
+    _columns = {
+        'date': fields.datetime('Date'),
+        'partner_id': fields.many2one('res.partner', 'Partner'),
+        'product_delivered':fields.one2many('stock.move', 'delivered_id', 'Product Delivered', domain=[('picking_id.type','=','in')]),
+    }
 
+    
+stock_delivery()
 
 # Move wizard :
 #    get confirm or assign stock move lines of partner and put in current picking.
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 808e0f9d317..68bb705b5d2 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1363,6 +1363,7 @@
                             <group colspan="2" col="2">
                                 <separator colspan="2" string="Move Information"/>
                                 <field name="name" select="2"/>
+								<field name="delivered_id"/>                                
                                 <field name="product_id" select="1" on_change="onchange_product_id(product_id,location_id,location_dest_id)"/>
                                 <field name="product_qty" select="2" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                 <field name="product_uom" select="2"/>
@@ -1502,6 +1503,7 @@
                     <notebook colspan="4">
                         <page string="General Information">
                             <separator colspan="4" string="Move Information"/>
+                            <field name="delivered_id"/>
                             <field name="location_id" select="1"/>
                             <field name="location_dest_id" select="1"/>
                             <field colspan="4" name="product_id" select="1" on_change="onchange_product_id(product_id,location_id,location_dest_id)"/>
@@ -1750,6 +1752,53 @@
             <field name="view_mode">graph,tree</field>
             <field name="view_id" ref="view_move_delivery_products_planned_graph"/>
         </record>
-
+          <!-- Product Delivered  -->
+        <record id="view_stock_delivery_form" model="ir.ui.view">
+            <field name="name">stock.delivery.from</field>
+            <field name="model">stock.delivery</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Product">
+	                    <field name="date"/>
+	                    <field name="partner_id"/>
+	                    <separator string="Product Delivered Information" colspan="4" />
+	                    <field name="product_delivered" colspan="4" nolabel="1" widget="one2many" mode="tree,form">
+	                       <tree string="Stock Moves" editable="top">
+			                    <field name="picking_id" string="Reference"/>
+			                    <field name="origin" string="Latest Requisition"/>
+			                    <field name="partner_id" string="Supplier"/>
+			                    <field name="product_id"/>
+			                    <field name="product_qty" />
+			                    <field name="product_uom" string="UOM"/>
+			                    <field name="prodlot_id" string="Lot"/>
+		            		</tree>
+	           			</field> 
+                </form>
+            </field>
+        </record>
+        <record id="view_stock_delivery_tree" model="ir.ui.view">
+            <field name="name">stock.delivery.tree</field>
+            <field name="model">stock.delivery</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Product">
+                    <field name="date"/>
+                    <field name="partner_id"/>
+                    <field name="product_delivered"/>
+                </tree>
+            </field>
+        </record>
+	    
+    	<record id="action_stock_delivery" model="ir.actions.act_window">
+            <field name="name">Delivery Products</field>
+            <field name="res_model">stock.delivery</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+           <!-- <field name="target">new</field>      -->      
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" ref="view_stock_delivery_tree"/>
+        </record>        
+		
+		<menuitem action="action_stock_delivery" id="menu_action_picking_all" parent="menu_traceability" sequence="4"/>
     </data>
 </openerp>
diff --git a/addons/stock/wizard/wizard_partial_picking.py b/addons/stock/wizard/wizard_partial_picking.py
index bb0c72dff02..3f9a48ef254 100644
--- a/addons/stock/wizard/wizard_partial_picking.py
+++ b/addons/stock/wizard/wizard_partial_picking.py
@@ -103,6 +103,7 @@ def _get_moves(self, cr, uid, data, context):
 def _do_split(self, cr, uid, data, context):
     move_obj = pooler.get_pool(cr.dbname).get('stock.move')
     pick_obj = pooler.get_pool(cr.dbname).get('stock.picking')
+    delivery_obj = pooler.get_pool(cr.dbname).get('stock.delivery')
     pick = pick_obj.browse(cr, uid, [data['id']])[0]
     new_picking = None
     new_moves = []
@@ -171,6 +172,20 @@ def _do_split(self, cr, uid, data, context):
                     'move_dest_id': False,
                     'price_unit': move.price_unit,
                 })
+            partner_id = False
+            if move.picking_id:
+                    partner_id = move.picking_id.address_id and (move.picking_id.address_id.partner_id and move.picking_id.address_id.partner_id.id or False) or False
+            delivery_id = delivery_obj.search(cr,uid, [('partner_id','=',partner_id)])   
+            if  not  delivery_id :
+                delivery_id = delivery_obj.create(cr, uid, {
+                        'partner_id': partner_id,
+                        'date': move.date,
+                    }, context=context)   
+                delivery_obj.write(cr, uid, [delivery_id], {'product_delivered': [(4, new_obj)]})
+            if not isinstance(delivery_id, (int, long)): 
+               delivery_id=delivery_id[0]
+               delivery_obj.write(cr, uid, [delivery_id], {'product_delivered': [(4, new_obj)]})
+                        
         move_obj.write(cr, uid, [move.id],
                 {
                     'product_qty' : move.product_qty - data['form']['move%s' % move.id],

From 366d0abea868fa01a218da6f66d257ffae366ecb Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 18 Mar 2010 11:40:48 +0530
Subject: [PATCH 145/251] [IMP] auction: remove the defaults value function and
 used default_get

bzr revid: sbh@tinyerp.com-20100318061048-q9mlhmrc1c9wwid6
---
 .../wizard/auction_lots_make_invoice.py       | 41 +++++++-------
 .../wizard/auction_lots_make_invoice_buyer.py | 53 ++++++++-----------
 addons/auction/wizard/auction_pay_buy.py      | 51 +++++++++---------
 3 files changed, 71 insertions(+), 74 deletions(-)

diff --git a/addons/auction/wizard/auction_lots_make_invoice.py b/addons/auction/wizard/auction_lots_make_invoice.py
index ec2fd58bfb0..595bd067f4a 100644
--- a/addons/auction/wizard/auction_lots_make_invoice.py
+++ b/addons/auction/wizard/auction_lots_make_invoice.py
@@ -28,24 +28,29 @@ import wizard
 
 class auction_lots_make_invoice(osv.osv_memory):
     
-    def _value_amount(self, cr, uid, context={}):
-        """
-        For Amount default value
-        @return:default auction lots amount value in amount fields. 
-        """
-        lots= self.pool.get('auction.lots').browse(cr, uid, context['active_ids'])
-        amount_total=0.0
-        for lot in lots:
-            amount_total+=lot.seller_price
-        return amount_total
+    
+    def default_get(self, cr, uid, fields, context):
+        """ 
+             @summary: To get default values for the object.
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param fields: List of fields for which we want default values 
+             @param context: A standard dictionary 
+             
+             @return: A dictionary which of fields with values. 
         
-    def _value_object(self, cr, uid, context={}):
-        """
-        For object default value.
-        @return:length of id  in Object field.
-        """
-        object = len(context['active_ids'])
-        return object
+        """        
+        res = {}
+        record_id = context and context.get('active_id',False)
+        if not record_id:
+           return res
+
+        lot= self.pool.get('auction.lots').browse(cr, uid, record_id)
+        res['amount']=lot.buyer_price
+        res['objects'] = len(context['active_ids'])
+        return res
     
     def makeInvoices(self, cr, uid, ids, context):
         """
@@ -85,8 +90,6 @@ class auction_lots_make_invoice(osv.osv_memory):
               
                }
     _defaults={
-               'amount':_value_amount, 
-               'objects':_value_object, 
                'number':lambda *a: False, 
                
                }
diff --git a/addons/auction/wizard/auction_lots_make_invoice_buyer.py b/addons/auction/wizard/auction_lots_make_invoice_buyer.py
index 990318bdf40..e87a1df9865 100644
--- a/addons/auction/wizard/auction_lots_make_invoice_buyer.py
+++ b/addons/auction/wizard/auction_lots_make_invoice_buyer.py
@@ -28,34 +28,29 @@ import wizard
 
 class auction_lots_make_invoice_buyer(osv.osv_memory):
     
-    def _value_amount(self, cr, uid, context={}):
-        """
-        For Amount default value
-        @return:default auction lots amount value in amount fields. 
-        """
-        lots= self.pool.get('auction.lots').browse(cr, uid, context['active_ids'])
-        amount_total=0.0
-        for lot in lots:
-            amount_total+=lot.buyer_price
-        return amount_total
+    def default_get(self, cr, uid, fields, context):
+        """ 
+             @summary: To get default values for the object.
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param fields: List of fields for which we want default values 
+             @param context: A standard dictionary 
+             
+             @return: A dictionary which of fields with values. 
         
-    def _value_object(self, cr, uid, context={}):
-        """
-        For object default value.
-        @return:length of id  in Object field.
-        """
-        object = len(context['active_ids'])
-        return object
-    
-    def _value_buyer_id(self, cr, uid, context={}):
-        """
-        For default buyer id value
-        @return:auction lots buyer id in buyer id field.
-        """
-        lots= self.pool.get('auction.lots').browse(cr, uid, context['active_ids'])
-        for lot in lots:
-            buyer=lot and lot.ach_uid.id or False
-        return buyer  
+        """        
+        res = {}
+        record_id = context and context.get('active_id',False)
+        if not record_id:
+           return res
+
+        lot= self.pool.get('auction.lots').browse(cr, uid, record_id)
+        res['amount']=lot.buyer_price
+        res['buyer_id']=lot.ach_uid and lot.ach_uid.id or False
+        res['objects'] = len(context['active_ids'])
+        return res
 
     def makeInvoices(self, cr, uid, ids, context):
         """
@@ -100,11 +95,7 @@ class auction_lots_make_invoice_buyer(osv.osv_memory):
                'buyer_id':fields.many2one('res.partner', 'Buyer', required=True), 
                }
     _defaults={
-               'amount':_value_amount,
-               'objects':_value_object,
                'number':lambda *a: False,
-               'buyer_id':_value_buyer_id
-               
                }
 
 auction_lots_make_invoice_buyer()
diff --git a/addons/auction/wizard/auction_pay_buy.py b/addons/auction/wizard/auction_pay_buy.py
index 511272cec3a..3c36bb24f94 100644
--- a/addons/auction/wizard/auction_pay_buy.py
+++ b/addons/auction/wizard/auction_pay_buy.py
@@ -29,24 +29,33 @@ import wizard
 
 class auction_pay_buy(osv.osv_memory):
     
-    def _start(self, cr, uid, context):
-        rec = self.pool.get('auction.lots').browse(cr, uid, context['active_ids'], context)
-        amount1 = 0.0
-        for r in rec:
-            amount1+= r.buyer_price
-            if r.is_ok:
-                raise osv.except_osv('Error !', 'Some lots of the selection are already paid.')
-        return amount1
-    
-    def _value_buyer_id(self, cr, uid, context={}):
-        """
-        For default buyer id value
-        @return:auction lots buyer id in buyer id field.
-        """
-        lots= self.pool.get('auction.lots').browse(cr, uid, context['active_ids'])
-        for lot in lots:
-            buyer=lot and lot.ach_uid.id or False
-        return buyer
+    def default_get(self, cr, uid, fields, context):
+        """ 
+             @summary: To get default values for the object.
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param fields: List of fields for which we want default values 
+             @param context: A standard dictionary 
+             
+             @return: A dictionary which of fields with values. 
+        
+        """        
+        res = {}
+        record_id = context and context.get('active_id',False)
+        if not record_id:
+           return res
+
+        lot= self.pool.get('auction.lots').browse(cr, uid, record_id)
+        if lot.is_ok :
+           raise osv.except_osv('Error !', 'Some lots of the selection are already paid.')
+         
+        res['amount']=lot.buyer_price
+        res['total']=lot.buyer_price
+        res['buyer_id']=lot.ach_uid and lot.ach_uid.id or False
+        res['objects'] = len(context['active_ids'])
+        return res
     
     def pay_and_reconcile(self, cr, uid, ids, context):
         """
@@ -103,12 +112,6 @@ class auction_pay_buy(osv.osv_memory):
                'statement_id3':fields.many2one('account.bank.statement', 'Statement'), 
                'total': fields.float('Amount paid', digits = (16, int(tools.config['price_accuracy'])), readonly =True), 
                }
-    _defaults={
-               'amount' : _start,
-               'total' : _start,
-               'buyer_id' : _value_buyer_id
-               }
-    
 auction_pay_buy()
 
 

From b65b3ea80efb2297aaa192e4cff98d2f71281c39 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 18 Mar 2010 12:01:17 +0530
Subject: [PATCH 146/251] [IMP] auction,stock,delivery: Used default_get method
 instead of _default

bzr revid: sbh@tinyerp.com-20100318063117-hkddpaydbbc09zic
---
 .../wizard/auction_lots_make_invoice.py       |  1 +
 .../wizard/auction_lots_make_invoice_buyer.py |  1 +
 addons/auction/wizard/auction_pay_buy.py      |  1 +
 addons/delivery/wizard/delivery_sale_order.py |  2 ++
 .../wizard/stock_inventory_line_split.py      | 29 ++++++++++++++-----
 5 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/addons/auction/wizard/auction_lots_make_invoice.py b/addons/auction/wizard/auction_lots_make_invoice.py
index 595bd067f4a..231802bcba4 100644
--- a/addons/auction/wizard/auction_lots_make_invoice.py
+++ b/addons/auction/wizard/auction_lots_make_invoice.py
@@ -43,6 +43,7 @@ class auction_lots_make_invoice(osv.osv_memory):
         
         """        
         res = {}
+        res = super(auction_lots_make_invoice, self).default_get(cr, uid, fields, context=context)        
         record_id = context and context.get('active_id',False)
         if not record_id:
            return res
diff --git a/addons/auction/wizard/auction_lots_make_invoice_buyer.py b/addons/auction/wizard/auction_lots_make_invoice_buyer.py
index e87a1df9865..71a4563812b 100644
--- a/addons/auction/wizard/auction_lots_make_invoice_buyer.py
+++ b/addons/auction/wizard/auction_lots_make_invoice_buyer.py
@@ -43,6 +43,7 @@ class auction_lots_make_invoice_buyer(osv.osv_memory):
         """        
         res = {}
         record_id = context and context.get('active_id',False)
+        res = super(auction_lots_make_invoice_buyer, self).default_get(cr, uid, fields, context=context)
         if not record_id:
            return res
 
diff --git a/addons/auction/wizard/auction_pay_buy.py b/addons/auction/wizard/auction_pay_buy.py
index 3c36bb24f94..919d62cce66 100644
--- a/addons/auction/wizard/auction_pay_buy.py
+++ b/addons/auction/wizard/auction_pay_buy.py
@@ -43,6 +43,7 @@ class auction_pay_buy(osv.osv_memory):
         
         """        
         res = {}
+        res = super(auction_pay_buy, self).default_get(cr, uid, fields, context=context)              
         record_id = context and context.get('active_id',False)
         if not record_id:
            return res
diff --git a/addons/delivery/wizard/delivery_sale_order.py b/addons/delivery/wizard/delivery_sale_order.py
index c1896e6d851..8bf09e70974 100644
--- a/addons/delivery/wizard/delivery_sale_order.py
+++ b/addons/delivery/wizard/delivery_sale_order.py
@@ -49,6 +49,8 @@ class make_delivery(osv.osv_memory):
         """        
         rec_id = context and context.get('active_id',False)        
         res = {}
+        
+        res = super(make_delivery, self).default_get(cr, uid, fields, context=context)
         order_obj = self.pool.get('sale.order')
         order = order_obj.browse(cr, uid, rec_id)
     
diff --git a/addons/stock/wizard/stock_inventory_line_split.py b/addons/stock/wizard/stock_inventory_line_split.py
index 1634e32731b..bc28c2866f1 100644
--- a/addons/stock/wizard/stock_inventory_line_split.py
+++ b/addons/stock/wizard/stock_inventory_line_split.py
@@ -34,14 +34,29 @@ class stock_inventory_line_split(osv.osv_memory):
     _description = "Split inventory lines"
 
     
+    def default_get(self, cr, uid, fields, context):
+        """ 
+             @summary: To get default values for the object.
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param fields: List of fields for which we want default values 
+             @param context: A standard dictionary 
+             
+             @return: A dictionary which of fields with values. 
+        
+        """        
+        res = {}
+        record_id = context and context.get('active_id',False)
+        res = super(stock_inventory_line_split, self).default_get(cr, uid, fields, context=context)
+        if not record_id:
+           return res
 
-    def _get_product_id(self, cr, uid, context):
-        line = self.pool.get('stock.inventory.line').browse(cr, uid, context['active_id'], context=context)
-        return line.product_id.id
-
-    _defaults = {
-        'product_id': _get_product_id, 
-    }
+        lot=  self.pool.get('stock.inventory.line').browse(cr, uid, record_id)
+        res['product_id']=line.product_id.id
+        return res
+    
     
 
     def split(self, cr, uid, ids, line_ids, context=None):

From 4a20342dc85ad5089989c534754138b8d6a2f1ff Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Thu, 18 Mar 2010 12:42:23 +0530
Subject: [PATCH 147/251] [IMP] stock: Added a warning message for user if the
 moves are not confirmed on Picking.

bzr revid: uco@tinyerp.co.in-20100318071223-g19vrebxjv930xta
---
 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 d2653e39b07..1cd2e412c61 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -546,6 +546,8 @@ class stock_picking(osv.osv):
     def action_assign(self, cr, uid, ids, *args):
         for pick in self.browse(cr, uid, ids):
             move_ids = [x.id for x in pick.move_lines if x.state == 'confirmed']
+            if not move_ids:
+                raise osv.except_osv(_('Warning !'),_('Not Available. Moves are not confirmed.'))
             self.pool.get('stock.move').action_assign(cr, uid, move_ids)
         return True
 
@@ -1279,7 +1281,7 @@ class stock_move(osv.osv):
         if done:
             count += len(done)
             self.write(cr, uid, done, {'state': 'assigned'})
-
+            
         if count:
             for pick_id in pickings:
                 wf_service = netsvc.LocalService("workflow")

From 1ece7a20f69887a7e0cf7eedf6905ea05deb4cdf Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Thu, 18 Mar 2010 12:44:05 +0530
Subject: [PATCH 148/251] [IMP] stock: stock_location_product wizard:
 Suppressed filter on location in the extended options and inactivates
 preselected filter in present case.

bzr revid: uco@tinyerp.co.in-20100318071405-2pmbpwn2sluxaozd
---
 addons/stock/wizard/stock_location_product.py | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/addons/stock/wizard/stock_location_product.py b/addons/stock/wizard/stock_location_product.py
index 4f9e45196ac..0a47de31a86 100755
--- a/addons/stock/wizard/stock_location_product.py
+++ b/addons/stock/wizard/stock_location_product.py
@@ -20,13 +20,6 @@
 ##############################################################################
 
 from osv import fields, osv
-from service import web_services
-from tools.misc import UpdateableStr, UpdateableDict
-from tools.translate import _
-import netsvc
-import pooler
-import time
-import wizard
 
 class stock_location_product(osv.osv_memory):
     _name = "stock.location.product"
@@ -34,7 +27,7 @@ class stock_location_product(osv.osv_memory):
     _columns = {
                 'from_date': fields.datetime('From'), 
                 'to_date': fields.datetime('To'), 
-                }
+    }
 
     def action_open_window(self, cr, uid, ids, context):
         """ 
@@ -51,10 +44,8 @@ class stock_location_product(osv.osv_memory):
         """                
         mod_obj = self.pool.get('ir.model.data')
         for location_obj in self.read(cr, uid, ids, ['from_date', 'to_date']):
-            result = mod_obj._get_id(cr, uid, 'product', 'product_search_form_view')
-            id = mod_obj.read(cr, uid, result, ['res_id'])
             return {
-                    'name': 'product', 
+                    'name': False, 
                     'view_type': 'form', 
                     'view_mode': 'tree,form', 
                     'res_model': 'product.product', 
@@ -63,8 +54,7 @@ class stock_location_product(osv.osv_memory):
                            'from_date': location_obj['from_date'], 
                            'to_date': location_obj['to_date']}, 
                     'domain': [('type', '<>', 'service')], 
-                    'search_view_id': id['res_id']
-                    }
+            }
 
 stock_location_product()
 

From f426dc1306fad9f5e1aed6c105ada56b27ac8ca8 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Thu, 18 Mar 2010 13:07:13 +0530
Subject: [PATCH 149/251] [FIX] sale: Small Fix. Changed button name.

bzr revid: uco@tinyerp.co.in-20100318073713-2n66lag6nm3nnyzm
---
 addons/sale/wizard/sale_make_invoice_advance.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
index e0ad5605977..5fc8b993921 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.xml
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -15,7 +15,7 @@
              	<separator string="" colspan="4"/>
              	<label string=""  colspan="2" />
               	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-               	<button name="createInvoices" string="Create Advance Invoice" type="object" icon="gtk-ok"/>
+               	<button name="create_invoices" string="Create Advance Invoice" type="object" icon="gtk-ok"/>
              </form>
             </field>
 		</record>

From 56383ef05367bd275704354529abb0693093da0e Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Thu, 18 Mar 2010 14:45:27 +0530
Subject: [PATCH 150/251] [IMP]:stock:renamed the separator Traceability from
 Tracability

bzr revid: mso@mso-20100318091527-5w4sla34hcw2es4i
---
 addons/stock/stock_view.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 68bb705b5d2..dcd7dc68b9e 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -152,9 +152,6 @@
                     <field name="serial" select="1"/>
                     <field name="date" select="1"/>
                     <field name="active" select="1"/>
-                    <group colspan="4">
-                    </group>
-                    <field name="active" />
                 </form>
             </field>
         </record>
@@ -1387,7 +1384,7 @@
                             </group>
 
                             <group colspan="2" col="4">
-                                <separator string="Tracability" colspan="4" />
+                                <separator string="Traceability" colspan="4" />
                                 <field name="tracking_id" select="1" colspan="4" />
                                 <field name="prodlot_id" select="2"
                                     context="{'location_id':location_id, 'product_id':product_id}"

From fad70b1cb21d60b6f7aadb60a1d235c9719a51d7 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 18 Mar 2010 14:48:38 +0530
Subject: [PATCH 151/251] [Add] Point_of_sale: Add the report of pos_details

bzr revid: sbh@tinyerp.com-20100318091838-vpfesi6lv4br700o
---
 addons/point_of_sale/__terp__.py            |  1 +
 addons/point_of_sale/pos_view.xml           |  1 +
 addons/point_of_sale/wizard/__init__.py     |  1 +
 addons/point_of_sale/wizard/pos_details.py  | 59 +++++++++++++++++++++
 addons/point_of_sale/wizard/pos_details.xml | 34 ++++++++++++
 5 files changed, 96 insertions(+)
 create mode 100644 addons/point_of_sale/wizard/pos_details.py
 create mode 100644 addons/point_of_sale/wizard/pos_details.xml

diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__terp__.py
index 1721d6609d5..938ad7628a9 100644
--- a/addons/point_of_sale/__terp__.py
+++ b/addons/point_of_sale/__terp__.py
@@ -51,6 +51,7 @@ Main features :
         'wizard/pos_close_statement.xml',  
         'wizard/pos_box_entries.xml',  
         'wizard/pos_box_out.xml',  
+        'wizard/pos_details.xml',
         'pos_view.xml',
         'pos_sequence.xml',
         'posrule_data.xml',
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 0a72e5f1a50..530a06d4fba 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -995,6 +995,7 @@ invoiced
 				id="menu_pos_payment_report_user" parent="menu_trans_pos_tree_today" type="wizard" sequence="6" groups="base.group_extended"/>
 		<menuitem icon="STOCK_PRINT" action="wizard_pos_sales_user_today_current_user"
 				id="menu_pos_sales_user_today_current_user" parent="menu_cashboxes_by_day" type="wizard" sequence="7"/>
+    	
     	<menuitem icon="STOCK_PRINT" action="wizard_pos_details"
 				id="menu_pos_details" parent="menu_cashboxes_by_day" type="wizard" />
 
diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index 641736a3460..8eafa86daf3 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -42,5 +42,6 @@ import pos_open_statement
 import pos_close_statement
 import pos_box_entries
 import pos_box_out
+import pos_details
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/wizard/pos_details.py b/addons/point_of_sale/wizard/pos_details.py
new file mode 100644
index 00000000000..69a7ba2c308
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_details.py
@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import netsvc
+from osv import osv,fields
+from tools.translate import _
+from mx import DateTime
+import time
+
+class pos_details(osv.osv_memory):
+    _name = 'pos.details'
+    _description = 'Order Details'
+
+    _columns = {
+                'date_start': fields.datetime('Date Start',),
+                'date_end': fields.datetime('Date End'),
+    }
+    
+    def print_report(self, cr, uid, ids, context=None):
+
+        """ 
+             @summary: To get the date and print the report           
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary 
+             @return : retrun report
+        """        
+#        reportname='report.pos.details'
+#        srv = netsvc.LocalService(reportname)
+##        pdf, _ = srv.create(cr, uid, ids, {}, context=context)
+        
+        return { 
+                'type' : 'ir.actions.report.xml',
+                'report_name':'pos.details',
+                 }
+
+pos_details()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/wizard/pos_details.xml b/addons/point_of_sale/wizard/pos_details.xml
new file mode 100644
index 00000000000..61b7cf5c97e
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_details.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        
+        <!--   pos.details -->
+        
+		<record id="view_pos_details" model="ir.ui.view">
+            <field name="name">POS Details</field>
+            <field name="model">pos.details</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Pos Details :">
+				    <group col="2" colspan="4">
+				    	<field name="date_start"/>
+				    	<field name="date_end"/>
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Close" />
+                		<button name="print_report" string="Print Report"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+  	<act_window name="POS Details "		    
+		    res_model="pos.details"
+		    src_model="pos.order"
+		    view_mode="form"
+		    target="new"       
+		    context="{'record_id' : active_id}"
+            key2="client_action_multi"    
+		    id="action_view_pos_details"/>		
+        
+	</data>
+</openerp>	        
\ No newline at end of file

From 722a3a7c93379bdf05de46c507fbe2c8c4e1b3e9 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 18 Mar 2010 15:27:15 +0530
Subject: [PATCH 152/251] [IMP] auction: Improve the  deafult_get method and
 clean the code

bzr revid: sbh@tinyerp.com-20100318095715-x3k9r7eh2f09pfjj
---
 .../wizard/auction_lots_make_invoice.py       | 16 ++++++--------
 .../wizard/auction_lots_make_invoice_buyer.py | 16 ++++++--------
 .../auction/wizard/auction_lots_sms_send.py   |  1 -
 addons/auction/wizard/auction_pay_buy.py      | 22 +++++++------------
 4 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/addons/auction/wizard/auction_lots_make_invoice.py b/addons/auction/wizard/auction_lots_make_invoice.py
index 231802bcba4..11d177e45f7 100644
--- a/addons/auction/wizard/auction_lots_make_invoice.py
+++ b/addons/auction/wizard/auction_lots_make_invoice.py
@@ -42,16 +42,14 @@ class auction_lots_make_invoice(osv.osv_memory):
              @return: A dictionary which of fields with values. 
         
         """        
-        res = {}
-        res = super(auction_lots_make_invoice, self).default_get(cr, uid, fields, context=context)        
-        record_id = context and context.get('active_id',False)
-        if not record_id:
-           return res
+        res = super(auction_lots_make_invoice, self).default_get(cr, uid, fields, context=context) 
+        for lot in self.pool.get('auction.lots').browse(cr, uid, context.get('active_ids', [])):
+            if 'amount' in fields:
+                res.update({'amount': lot.buyer_price})                
+            if 'objects' in fields:
+                res.update({'objects': len(context['active_ids'])})   
+        return res               
 
-        lot= self.pool.get('auction.lots').browse(cr, uid, record_id)
-        res['amount']=lot.buyer_price
-        res['objects'] = len(context['active_ids'])
-        return res
     
     def makeInvoices(self, cr, uid, ids, context):
         """
diff --git a/addons/auction/wizard/auction_lots_make_invoice_buyer.py b/addons/auction/wizard/auction_lots_make_invoice_buyer.py
index 71a4563812b..6173c7d8b77 100644
--- a/addons/auction/wizard/auction_lots_make_invoice_buyer.py
+++ b/addons/auction/wizard/auction_lots_make_invoice_buyer.py
@@ -41,16 +41,14 @@ class auction_lots_make_invoice_buyer(osv.osv_memory):
              @return: A dictionary which of fields with values. 
         
         """        
-        res = {}
-        record_id = context and context.get('active_id',False)
         res = super(auction_lots_make_invoice_buyer, self).default_get(cr, uid, fields, context=context)
-        if not record_id:
-           return res
-
-        lot= self.pool.get('auction.lots').browse(cr, uid, record_id)
-        res['amount']=lot.buyer_price
-        res['buyer_id']=lot.ach_uid and lot.ach_uid.id or False
-        res['objects'] = len(context['active_ids'])
+        for lot in self.pool.get('auction.lots').browse(cr, uid, context.get('active_ids', [])):
+            if 'amount' in fields:
+                res.update({'amount': lot.buyer_price})                
+            if 'buyer_id' in fields:
+                res.update({'buyer_id': lot.ach_uid and lot.ach_uid.id or False})                        
+            if 'objects' in fields:
+                res.update({'objects': len(context['active_ids'])})   
         return res
 
     def makeInvoices(self, cr, uid, ids, context):
diff --git a/addons/auction/wizard/auction_lots_sms_send.py b/addons/auction/wizard/auction_lots_sms_send.py
index 3b26f2a914f..a5736ce4990 100644
--- a/addons/auction/wizard/auction_lots_sms_send.py
+++ b/addons/auction/wizard/auction_lots_sms_send.py
@@ -54,7 +54,6 @@ class auction_lots_sms_send(osv.osv_memory):
         partner_address_obj = self.pool.get('res.partner.address')
         for datas in self.read(cr, uid, ids):
             lots = lot_obj.read(cr, uid, context['active_ids'], ['obj_num','obj_price','ach_uid'])
-            print "lots",lots, [l['ach_uid'][0] for l in lots if l['ach_uid']]
             res = partner_obj.read(cr, uid, [l['ach_uid'][0] for l in lots if l['ach_uid']], ['gsm'], context)
             
             nbr = 0
diff --git a/addons/auction/wizard/auction_pay_buy.py b/addons/auction/wizard/auction_pay_buy.py
index 919d62cce66..bd0a026d2ba 100644
--- a/addons/auction/wizard/auction_pay_buy.py
+++ b/addons/auction/wizard/auction_pay_buy.py
@@ -42,20 +42,14 @@ class auction_pay_buy(osv.osv_memory):
              @return: A dictionary which of fields with values. 
         
         """        
-        res = {}
-        res = super(auction_pay_buy, self).default_get(cr, uid, fields, context=context)              
-        record_id = context and context.get('active_id',False)
-        if not record_id:
-           return res
-
-        lot= self.pool.get('auction.lots').browse(cr, uid, record_id)
-        if lot.is_ok :
-           raise osv.except_osv('Error !', 'Some lots of the selection are already paid.')
-         
-        res['amount']=lot.buyer_price
-        res['total']=lot.buyer_price
-        res['buyer_id']=lot.ach_uid and lot.ach_uid.id or False
-        res['objects'] = len(context['active_ids'])
+        res = super(auction_pay_buy, self).default_get(cr, uid, fields, context=context)       
+        for lot in self.pool.get('auction.lots').browse(cr, uid, context.get('active_ids', [])):
+            if 'amount' in fields:
+                res.update({'amount': lot.buyer_price})                
+            if 'buyer_id' in fields:
+                res.update({'buyer_id': lot.ach_uid and lot.ach_uid.id or False})                        
+            if 'total' in fields:
+                res.update({'total': lot.buyer_price})     
         return res
     
     def pay_and_reconcile(self, cr, uid, ids, context):

From fe28258171d02a08467f01680e8f22a198f18e36 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Thu, 18 Mar 2010 15:38:13 +0530
Subject: [PATCH 153/251] [IMP]: stock:unused import removed which was causing
 server failure

bzr revid: mso@mso-20100318100813-zqhn6scrdekcz316
---
 addons/stock/__init__.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/stock/__init__.py b/addons/stock/__init__.py
index a2df9bdd809..9cc33351689 100644
--- a/addons/stock/__init__.py
+++ b/addons/stock/__init__.py
@@ -24,8 +24,6 @@ import partner
 import product
 import report
 import wizard
-import stock_wizard
-
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

From dcd2c147a832988415be5af9ad52e1a4471b36c7 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 18 Mar 2010 16:29:42 +0530
Subject: [PATCH 154/251] [IMP] delivery : Improve the  deafult_get method and
 clean the code

bzr revid: sbh@tinyerp.com-20100318105942-pupazzylyy138dcs
---
 addons/delivery/wizard/delivery_sale_order.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/addons/delivery/wizard/delivery_sale_order.py b/addons/delivery/wizard/delivery_sale_order.py
index c1951f78fa3..5cbc5ea692f 100644
--- a/addons/delivery/wizard/delivery_sale_order.py
+++ b/addons/delivery/wizard/delivery_sale_order.py
@@ -47,20 +47,19 @@ class make_delivery(osv.osv_memory):
              @return: A dictionary which of fields with values. 
         
         """        
-        rec_id = context and context.get('active_id',False)        
-        res = {}
-        
         res = super(make_delivery, self).default_get(cr, uid, fields, context=context)
         order_obj = self.pool.get('sale.order')
-        order = order_obj.browse(cr, uid, rec_id)
-    
-        if not order.state in ('draft'):
-            raise osv.except_osv(_('Order not in draft state !'), _('The order state have to be draft to add delivery lines.'))
-    
-        carrier_id = order.partner_id.property_delivery_carrier.id
-        res['carrier_id'] = carrier_id
+        for order in order_obj.browse(cr, uid, context.get('active_ids', [])):
+             res.update({'carrier_id': order.partner_id.property_delivery_carrier.id})
         return res
     
+    def view_init(self, cr , uid , fields_list, context=None):
+         order_obj = self.pool.get('sale.order')
+         for order in order_obj.browse(cr, uid, context.get('active_ids', [])):     
+             if not order.state in ('draft'):
+                 raise osv.except_osv(_('Order not in draft state !'), _('The order state have to be draft to add delivery lines.'))
+         pass     
+        
     def delivery_set(self, cr, uid, ids, context):
         """ 
              Adds delivery costs to Sale Order Line.

From 365d5cc0e9edc44afc9f26cfe9dddf5300dd30fa Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 18 Mar 2010 16:35:03 +0530
Subject: [PATCH 155/251] Point_of_sale: remove the wizard of pos_detail

bzr revid: sbh@tinyerp.com-20100318110503-nwkbtiwuyb1vxay1
---
 addons/point_of_sale/__terp__.py            |   1 -
 addons/point_of_sale/wizard/__init__.py     |   2 +-
 addons/point_of_sale/wizard/pos_details.xml |  34 -------
 addons/point_of_sale/wizard/pos_discount.py | 104 --------------------
 4 files changed, 1 insertion(+), 140 deletions(-)
 delete mode 100644 addons/point_of_sale/wizard/pos_details.xml
 delete mode 100644 addons/point_of_sale/wizard/pos_discount.py

diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__terp__.py
index 938ad7628a9..1721d6609d5 100644
--- a/addons/point_of_sale/__terp__.py
+++ b/addons/point_of_sale/__terp__.py
@@ -51,7 +51,6 @@ Main features :
         'wizard/pos_close_statement.xml',  
         'wizard/pos_box_entries.xml',  
         'wizard/pos_box_out.xml',  
-        'wizard/pos_details.xml',
         'pos_view.xml',
         'pos_sequence.xml',
         'posrule_data.xml',
diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index 8eafa86daf3..e3d7dd07090 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -42,6 +42,6 @@ import pos_open_statement
 import pos_close_statement
 import pos_box_entries
 import pos_box_out
-import pos_details
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/wizard/pos_details.xml b/addons/point_of_sale/wizard/pos_details.xml
deleted file mode 100644
index 61b7cf5c97e..00000000000
--- a/addons/point_of_sale/wizard/pos_details.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>        
-        <!--   pos.details -->
-        
-		<record id="view_pos_details" model="ir.ui.view">
-            <field name="name">POS Details</field>
-            <field name="model">pos.details</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Pos Details :">
-				    <group col="2" colspan="4">
-				    	<field name="date_start"/>
-				    	<field name="date_end"/>
-                		<button icon='gtk-cancel' special="cancel"
-                			string="Close" />
-                		<button name="print_report" string="Print Report"
-                			colspan="1" type="object" icon="gtk-ok" />
-                	</group>
-                </form>
-            </field>
-        </record>
-
-  	<act_window name="POS Details "		    
-		    res_model="pos.details"
-		    src_model="pos.order"
-		    view_mode="form"
-		    target="new"       
-		    context="{'record_id' : active_id}"
-            key2="client_action_multi"    
-		    id="action_view_pos_details"/>		
-        
-	</data>
-</openerp>	        
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/pos_discount.py b/addons/point_of_sale/wizard/pos_discount.py
deleted file mode 100644
index 801ecc9739b..00000000000
--- a/addons/point_of_sale/wizard/pos_discount.py
+++ /dev/null
@@ -1,104 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import netsvc
-from osv import osv,fields
-from tools.translate import _
-
-class pos_discount(osv.osv_memory):
-    _name = 'pos.discount'
-    _description = 'Add Discount'
-
-    _columns = {
-                'discount': fields.float('Discount ', required=True),
-                'discount_notes': fields.char('Discount Notes',size= 128, required=True),
-    }
-    _defaults = {
-                    'discount': lambda *a: 5,
-                }
-    
-    def apply_discount(self, cr, uid, ids, context):
-        """ 
-             To give the discount of  product and check the  .            
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param context: A standard dictionary 
-             @return : nothing
-        """        
-        this = self.browse(cr, uid, ids[0], context=context)
-        record_id = context and context.get('record_id',False)
-        if isinstance(record_id, (int, long)):
-            record_id=[record_id]
-        
-        order_ref = self.pool.get('pos.order')
-        order_line_ref =self.pool.get('pos.order.line')
-        
-        for order in order_ref.browse(cr, uid, record_id, context=context):
-            for line in order.lines :
-                company_discount = order.company_id.company_discount
-                applied_discount =this.discount
-               
-                if applied_discount == 0.00:
-                    notice = 'No Discount'
-                elif company_discount >=  applied_discount:
-                    notice = 'Minimum Discount'
-                else:
-                    notice = this.discount_notes
-                    
-                if self.check_discount(cr, uid, record_id,this.discount,context) == 'apply_discount':
-                    order_line_ref.write(cr, uid, [line.id],
-                            {'discount': this.discount,
-                            'price_ded':line.price_unit*line.qty*(this.discount or 0)*0.01 or 0.0,
-                            'notice':notice
-                            },
-                            context=context,)
-                else :
-                    order_line_ref.write(cr, uid, [line.id],
-                            {'discount': this.discount,
-                            'notice': notice,
-                            'price_ded':line.price_unit*line.qty*(this.discount or 0)*0.01 or 0.0 
-                            },
-                            context=context,)
-        return {}
-    
-    def check_discount(self, cr, uid, record_id,discount, context):
-        """ 
-             Check the discount of define by company  .            
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param record_id:Current Order id
-             @param discount:Select Discount
-             @param context: A standard dictionary 
-             @return : retrun  to apply and used the company discount base on condition
-        """                
-        order_ref = self.pool.get('pos.order')
-        for order in order_ref.browse(cr, uid, record_id, context=context):
-            company_disc = order.company_id.company_discount
-            for line in order.lines :
-                prod_disc = discount
-                if prod_disc <= company_disc :
-                   return 'apply_discount'
-                else :
-                    return 'disc_discount'    
-pos_discount()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 50e42ae57e28e9426f3ef440fb43e786ffa000b2 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Thu, 18 Mar 2010 16:34:53 +0530
Subject: [PATCH 156/251] [REF] mrp: Removed 'raise..' from 'Change Qty'
 wizard. Not needed.

bzr revid: uco@tinyerp.co.in-20100318110453-hxn7rr96qo25llg1
---
 addons/mrp/wizard/change_production_qty.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/addons/mrp/wizard/change_production_qty.py b/addons/mrp/wizard/change_production_qty.py
index 8092cf1dc8d..42a3dd0bff2 100644
--- a/addons/mrp/wizard/change_production_qty.py
+++ b/addons/mrp/wizard/change_production_qty.py
@@ -53,12 +53,9 @@ class change_production_qty(osv.osv_memory):
            return res
         prod_obj = self.pool.get('mrp.production')
         prod = prod_obj.browse(cr, uid, record_id)
-        if prod.state in ('in_production','cancel', 'done'):
-            raise osv.except_osv(_('Warning !'), _('The production is in "%s" state. You can not change the production quantity anymore') % (prod.state).upper() )
- 
         res['product_qty'] = prod.product_qty        
         return res
-    
+        
     def change_prod_qty(self, cr, uid, ids, context):
         """ 
              Changes the Quantity of Product.

From 27be9e24a43005bee7496610ce3779bf97dee115 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Thu, 18 Mar 2010 17:30:32 +0530
Subject: [PATCH 157/251] [IMP] pos: pos detail wizard

bzr revid: hmo@tinyerp.com-20100318120032-j8mo6yy7znq5quvv
---
 addons/point_of_sale/wizard/pos_details.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/point_of_sale/wizard/pos_details.py b/addons/point_of_sale/wizard/pos_details.py
index 69a7ba2c308..bc59954104d 100644
--- a/addons/point_of_sale/wizard/pos_details.py
+++ b/addons/point_of_sale/wizard/pos_details.py
@@ -30,8 +30,8 @@ class pos_details(osv.osv_memory):
     _description = 'Order Details'
 
     _columns = {
-                'date_start': fields.datetime('Date Start',),
-                'date_end': fields.datetime('Date End'),
+                'date_start': fields.date('Date Start',),
+                'date_end': fields.date('Date End'),
     }
     
     def print_report(self, cr, uid, ids, context=None):
@@ -44,14 +44,16 @@ class pos_details(osv.osv_memory):
              @param context: A standard dictionary 
              @return : retrun report
         """        
-#        reportname='report.pos.details'
-#        srv = netsvc.LocalService(reportname)
-##        pdf, _ = srv.create(cr, uid, ids, {}, context=context)
+        datas = {'ids' : context.get('active_ids',[])}
+        res = self.read(cr, uid, ids, ['date_start','date_end'])
+        res = res and res[0] or {}        
+        datas['form'] = res
         
         return { 
                 'type' : 'ir.actions.report.xml',
                 'report_name':'pos.details',
-                 }
+                'datas' : datas,               
+       }
 
 pos_details()
 

From f3ebef015c99452d4c34de38fad31a4354bb6b76 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Thu, 18 Mar 2010 17:47:30 +0530
Subject: [PATCH 158/251] [IMP]: stock:Bug fixed regarding stock moves

bzr revid: mso@mso-20100318121730-xmib951ren2wu6rd
---
 addons/stock/stock.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 1407c219692..affc2c2bf5a 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1154,13 +1154,13 @@ class stock_move(osv.osv):
         product = self.pool.get('product.product').browse(cr, uid, [prod_id], context=ctx)[0]
         uos_id  = product.uos_id and product.uos_id.id or False
         result = {
-            'name': product.partner_ref,
             'product_uom': product.uom_id.id,
             'product_uos': uos_id,
             'product_qty': 1.00,
             'product_uos_qty' : self.pool.get('stock.move').onchange_quantity(cr, uid, ids, prod_id, 1.00, product.uom_id.id, uos_id)['value']['product_uos_qty']
         }
-
+        if not ids:
+            result['name'] = product.partner_ref
         if loc_id:
             result['location_id'] = loc_id
         if loc_dest_id:

From 0ab01daf59578ebe2c89ff417941a7e7379fb858 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 18 Mar 2010 17:55:58 +0530
Subject: [PATCH 159/251] [Add]point_of_sale: add the missing file

bzr revid: sbh@tinyerp.com-20100318122558-sqlji2a2xaoig38y
---
 addons/point_of_sale/wizard/pos_discount.py | 104 ++++++++++++++++++++
 1 file changed, 104 insertions(+)
 create mode 100644 addons/point_of_sale/wizard/pos_discount.py

diff --git a/addons/point_of_sale/wizard/pos_discount.py b/addons/point_of_sale/wizard/pos_discount.py
new file mode 100644
index 00000000000..a6b537193d7
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_discount.py
@@ -0,0 +1,104 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import netsvc
+from osv import osv,fields
+from tools.translate import _
+
+class pos_discount(osv.osv_memory):
+    _name = 'pos.discount'
+    _description = 'Add Discount'
+
+    _columns = {
+                'discount': fields.float('Discount ', required=True),
+                'discount_notes': fields.char('Discount Notes',size= 128, required=True),
+    }
+    _defaults = {
+                    'discount': lambda *a: 5,
+                }
+    
+    def apply_discount(self, cr, uid, ids, context):
+        """ 
+             @summary: To give the discount of  product and check the  .            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary 
+             @return : nothing
+        """        
+        this = self.browse(cr, uid, ids[0], context=context)
+        record_id = context and context.get('record_id',False)
+        if isinstance(record_id, (int, long)):
+            record_id=[record_id]
+        
+        order_ref = self.pool.get('pos.order')
+        order_line_ref =self.pool.get('pos.order.line')
+        
+        for order in order_ref.browse(cr, uid, record_id, context=context):
+            for line in order.lines :
+                company_discount = order.company_id.company_discount
+                applied_discount =this.discount
+               
+                if applied_discount == 0.00:
+                    notice = 'No Discount'
+                elif company_discount >=  applied_discount:
+                    notice = 'Minimum Discount'
+                else:
+                    notice = this.discount_notes
+                    
+                if self.check_discount(cr, uid, record_id,this.discount,context) == 'apply_discount':
+                    order_line_ref.write(cr, uid, [line.id],
+                            {'discount': this.discount,
+                            'price_ded':line.price_unit*line.qty*(this.discount or 0)*0.01 or 0.0,
+                            'notice':notice
+                            },
+                            context=context,)
+                else :
+                    order_line_ref.write(cr, uid, [line.id],
+                            {'discount': this.discount,
+                            'notice': notice,
+                            'price_ded':line.price_unit*line.qty*(this.discount or 0)*0.01 or 0.0 
+                            },
+                            context=context,)
+        return {}
+    
+    def check_discount(self, cr, uid, record_id,discount, context):
+        """ 
+             @summary: Check the discount of define by company  .            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param record_id:Current Order id
+             @param discount:Select Discount
+             @param context: A standard dictionary 
+             @return : retrun  to apply and used the company discount base on condition
+        """                
+        order_ref = self.pool.get('pos.order')
+        for order in order_ref.browse(cr, uid, record_id, context=context):
+            company_disc = order.company_id.company_discount
+            for line in order.lines :
+                prod_disc = discount
+                if prod_disc <= company_disc :
+                   return 'apply_discount'
+                else :
+                    return 'disc_discount'    
+pos_discount()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From e41aae3014f09d01b19f1495c8aee0a66e9c20af Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 18 Mar 2010 18:07:56 +0530
Subject: [PATCH 160/251] [Add] point_of_sale: add the missing file

bzr revid: sbh@tinyerp.com-20100318123756-pqedu3eabie83fot
---
 addons/point_of_sale/__terp__.py            |  3 +-
 addons/point_of_sale/wizard/__init__.py     |  1 +
 addons/point_of_sale/wizard/pos_details.xml | 33 +++++++++++++++++++++
 3 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 addons/point_of_sale/wizard/pos_details.xml

diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__terp__.py
index 1721d6609d5..bc520df882f 100644
--- a/addons/point_of_sale/__terp__.py
+++ b/addons/point_of_sale/__terp__.py
@@ -50,7 +50,8 @@ Main features :
         'wizard/pos_open_statement.xml',
         'wizard/pos_close_statement.xml',  
         'wizard/pos_box_entries.xml',  
-        'wizard/pos_box_out.xml',  
+        'wizard/pos_box_out.xml', 
+        'wizard/pos_details.xml',  
         'pos_view.xml',
         'pos_sequence.xml',
         'posrule_data.xml',
diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index e3d7dd07090..7f06e28b453 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -42,6 +42,7 @@ import pos_open_statement
 import pos_close_statement
 import pos_box_entries
 import pos_box_out
+import pos_details
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/wizard/pos_details.xml b/addons/point_of_sale/wizard/pos_details.xml
new file mode 100644
index 00000000000..95ad4b2d368
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_details.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        
+        <!--   pos.details -->
+        
+		<record id="view_pos_details" model="ir.ui.view">
+            <field name="name">POS Details</field>
+            <field name="model">pos.details</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="POS Details :">
+				    <group col="2" colspan="4">
+				    	<field name="date_start"/>
+				    	<field name="date_end"/>
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Close" />
+                		<button name="print_report" string="Print Report"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+    <act_window name="POS Details"
+            res_model="pos.order"
+            src_model="pos.details"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_report_pos_details"/>   
+        
+	</data>
+</openerp>	        
\ No newline at end of file

From 671324860c3a8ad1d4dcec4770007d0b39ea6640 Mon Sep 17 00:00:00 2001
From: sbh <>
Date: Thu, 18 Mar 2010 18:23:23 +0530
Subject: [PATCH 161/251] [IMP]: POS:Bug fixed regarding pos_detail.xml

bzr revid: mso@mso-20100318125323-2mpc5p10c4nq7lif
---
 addons/point_of_sale/__terp__.py            | 3 ++-
 addons/point_of_sale/wizard/pos_details.xml | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__terp__.py
index bc520df882f..2b9b3f5ac3c 100644
--- a/addons/point_of_sale/__terp__.py
+++ b/addons/point_of_sale/__terp__.py
@@ -51,7 +51,7 @@ Main features :
         'wizard/pos_close_statement.xml',  
         'wizard/pos_box_entries.xml',  
         'wizard/pos_box_out.xml', 
-        'wizard/pos_details.xml',  
+       
         'pos_view.xml',
         'pos_sequence.xml',
         'posrule_data.xml',
@@ -65,6 +65,7 @@ Main features :
     'update_xml': [
         'security/point_of_sale_security.xml',
         'security/ir.model.access.csv',
+        'wizard/pos_details.xml',  
         'pos_report.xml',
         'pos_wizard.xml',
         'pos_view.xml',
diff --git a/addons/point_of_sale/wizard/pos_details.xml b/addons/point_of_sale/wizard/pos_details.xml
index 95ad4b2d368..85513fc5a37 100644
--- a/addons/point_of_sale/wizard/pos_details.xml
+++ b/addons/point_of_sale/wizard/pos_details.xml
@@ -22,8 +22,8 @@
         </record>
 
     <act_window name="POS Details"
-            res_model="pos.order"
-            src_model="pos.details"
+            res_model="pos.details"
+            src_model="pos.order"
 		    view_mode="form"
 		    target="new"        
             key2="client_action_multi"    

From f9dd534a595e097e46b9160e56b90a364def05e7 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Thu, 18 Mar 2010 18:38:34 +0530
Subject: [PATCH 162/251] [ADD] mrp: Added an osv_memory wizard 'Product Cost
 Structure' for opening reports.

bzr revid: uco@tinyerp.co.in-20100318130834-cwqtjfk8rlu834mk
---
 addons/mrp/__terp__.py                        |  1 +
 addons/mrp/mrp_wizard.xml                     | 16 +++---
 addons/mrp/wizard/__init__.py                 |  2 +-
 .../wizard/{wizard_price.py => mrp_price.py}  | 52 +++++++++++--------
 addons/mrp/wizard/mrp_price_view.xml          | 33 ++++++++++++
 5 files changed, 72 insertions(+), 32 deletions(-)
 rename addons/mrp/wizard/{wizard_price.py => mrp_price.py} (51%)
 create mode 100644 addons/mrp/wizard/mrp_price_view.xml

diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py
index 9e0a65718fa..762e89c4614 100644
--- a/addons/mrp/__terp__.py
+++ b/addons/mrp/__terp__.py
@@ -64,6 +64,7 @@
         'wizard/make_procurement_view.xml',
         'wizard/change_production_qty_view.xml',
         'wizard/orderpoint_procurement_view.xml',
+        'wizard/mrp_price_view.xml',
         'mrp_view.xml',
         'wizard/schedulers_all_view.xml',
         'mrp_wizard.xml',
diff --git a/addons/mrp/mrp_wizard.xml b/addons/mrp/mrp_wizard.xml
index f42409559ba..88e4e047e50 100644
--- a/addons/mrp/mrp_wizard.xml
+++ b/addons/mrp/mrp_wizard.xml
@@ -4,14 +4,14 @@
 
         <wizard id="wizard_workcenter_load" model="mrp.workcenter" name="mrp.workcenter.load" string="Work Center load"/>
 
-        <wizard id="wizard_price" menu="False" model="product.product" name="product_price" string="Product Cost Structure"/>
-        <record id="ir_project_cost_structure" model="ir.values">
-            <field eval="'client_print_multi'" name="key2"/>
-            <field eval="'product.product'" name="model"/>
-            <field name="name">Product Cost Structure</field>
-            <field eval="'ir.actions.wizard,%d'%wizard_price" name="value"/>
-            <field eval="True" name="object"/>
-        </record>
+<!--        <wizard id="wizard_price" menu="False" model="product.product" name="product_price" string="Product Cost Structure"/>-->
+<!--        <record id="ir_project_cost_structure" model="ir.values">-->
+<!--            <field eval="'client_print_multi'" name="key2"/>-->
+<!--            <field eval="'product.product'" name="model"/>-->
+<!--            <field name="name">Product Cost Structure</field>-->
+<!--            <field eval="'ir.actions.wizard,%d'%wizard_price" name="value"/>-->
+<!--            <field eval="True" name="object"/>-->
+<!--        </record>-->
 
     </data>
 </openerp>
diff --git a/addons/mrp/wizard/__init__.py b/addons/mrp/wizard/__init__.py
index b18384fd0b2..5cf8a7187eb 100644
--- a/addons/mrp/wizard/__init__.py
+++ b/addons/mrp/wizard/__init__.py
@@ -23,7 +23,7 @@ import mrp_product_produce
 import orderpoint_procurement
 import wizard_procurement
 import schedulers_all
-import wizard_price
+import mrp_price
 import wizard_workcenter_load
 import wizard_track_prod
 import change_production_qty
diff --git a/addons/mrp/wizard/wizard_price.py b/addons/mrp/wizard/mrp_price.py
similarity index 51%
rename from addons/mrp/wizard/wizard_price.py
rename to addons/mrp/wizard/mrp_price.py
index dd84ad23be2..5d3c16cbaa5 100644
--- a/addons/mrp/wizard/wizard_price.py
+++ b/addons/mrp/wizard/mrp_price.py
@@ -19,31 +19,37 @@
 #
 ##############################################################################
 
-import wizard
+from osv import fields, osv
 
-price_form = '''<?xml version="1.0"?>
-<form string="Paid ?">
-    <field name="number"/>
-</form>'''
-
-price_fields = {
-    'number': {'string':'Number of products to produce', 'type':'integer', 'required':True},
-}
-
-class wizard_price(wizard.interface):
-    states = {
-        'init': {
-            'actions': [], 
-            'result': {'type':'form', 'arch':price_form, 'fields':price_fields, 'state':[('end','Cancel'),('price','Print product price') ]}
-        },
-        'price': {
-            'actions': [],
-            'result': {'type':'print', 'report':'product.price', 'state':'end'}
-        }
+class mrp_price(osv.osv_memory):
+    _name = 'mrp.product_price'
+    _description = 'Product Price'
+    _columns = {
+        'number': fields.integer('Number of products to produce', required=True),
     }
-wizard_price('product_price')
-
+    
+    def print_report(self, cr, uid, ids, context=None):
+        """ 
+             To print the report of Product cost structure
+                        
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary 
+             
+             @return : Report
+        """        
+        datas = {'ids' : context.get('active_ids',[])}
+        res = self.read(cr, uid, ids, ['number'])
+        res = res and res[0] or {}        
+        datas['form'] = res
+        
+        return { 
+                'type' : 'ir.actions.report.xml',
+                'report_name':'product.price',
+                'datas' : datas,               
+       }
 
+mrp_price()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/mrp/wizard/mrp_price_view.xml b/addons/mrp/wizard/mrp_price_view.xml
new file mode 100644
index 00000000000..e2e294c5739
--- /dev/null
+++ b/addons/mrp/wizard/mrp_price_view.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Product Cost Structure Report -->
+        
+		<record id="view_mrp_product_price_wizard" model="ir.ui.view">
+            <field name="name">Product Cost Structure</field>
+            <field name="model">mrp.product_price</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Paid ?">
+				    <field name="number"/>
+				    <newline/>
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="print_report" string="Print"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+       <act_window name="Product Cost Structure"
+            res_model="mrp.product_price"
+            src_model="product.product"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_view_mrp_product_price_wizard"/>
+	</data>
+</openerp>	

From 38c671e45816da3d9960d751caf2e644b3d384b7 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Thu, 18 Mar 2010 18:55:19 +0530
Subject: [PATCH 163/251] [ADD] mrp: Added an osv_memory wizard 'Work Center
 Load' for opening reports.

bzr revid: uco@tinyerp.co.in-20100318132519-dzzzb9943gujjmdj
---
 addons/mrp/__terp__.py                        |  1 +
 addons/mrp/mrp_wizard.xml                     | 10 ----
 addons/mrp/wizard/__init__.py                 |  2 +-
 addons/mrp/wizard/mrp_workcenter_load.py      | 57 +++++++++++++++++++
 .../mrp/wizard/mrp_workcenter_load_view.xml   | 35 ++++++++++++
 addons/mrp/wizard/wizard_workcenter_load.py   | 52 -----------------
 6 files changed, 94 insertions(+), 63 deletions(-)
 create mode 100644 addons/mrp/wizard/mrp_workcenter_load.py
 create mode 100644 addons/mrp/wizard/mrp_workcenter_load_view.xml
 delete mode 100644 addons/mrp/wizard/wizard_workcenter_load.py

diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py
index 762e89c4614..acf25b160e0 100644
--- a/addons/mrp/__terp__.py
+++ b/addons/mrp/__terp__.py
@@ -65,6 +65,7 @@
         'wizard/change_production_qty_view.xml',
         'wizard/orderpoint_procurement_view.xml',
         'wizard/mrp_price_view.xml',
+        'wizard/mrp_workcenter_load_view.xml',
         'mrp_view.xml',
         'wizard/schedulers_all_view.xml',
         'mrp_wizard.xml',
diff --git a/addons/mrp/mrp_wizard.xml b/addons/mrp/mrp_wizard.xml
index 88e4e047e50..f7bfdcd7395 100644
--- a/addons/mrp/mrp_wizard.xml
+++ b/addons/mrp/mrp_wizard.xml
@@ -2,16 +2,6 @@
 <openerp>
     <data>
 
-        <wizard id="wizard_workcenter_load" model="mrp.workcenter" name="mrp.workcenter.load" string="Work Center load"/>
-
-<!--        <wizard id="wizard_price" menu="False" model="product.product" name="product_price" string="Product Cost Structure"/>-->
-<!--        <record id="ir_project_cost_structure" model="ir.values">-->
-<!--            <field eval="'client_print_multi'" name="key2"/>-->
-<!--            <field eval="'product.product'" name="model"/>-->
-<!--            <field name="name">Product Cost Structure</field>-->
-<!--            <field eval="'ir.actions.wizard,%d'%wizard_price" name="value"/>-->
-<!--            <field eval="True" name="object"/>-->
-<!--        </record>-->
 
     </data>
 </openerp>
diff --git a/addons/mrp/wizard/__init__.py b/addons/mrp/wizard/__init__.py
index 5cf8a7187eb..043cdc94465 100644
--- a/addons/mrp/wizard/__init__.py
+++ b/addons/mrp/wizard/__init__.py
@@ -24,7 +24,7 @@ import orderpoint_procurement
 import wizard_procurement
 import schedulers_all
 import mrp_price
-import wizard_workcenter_load
+import mrp_workcenter_load
 import wizard_track_prod
 import change_production_qty
 import make_procurement_product
diff --git a/addons/mrp/wizard/mrp_workcenter_load.py b/addons/mrp/wizard/mrp_workcenter_load.py
new file mode 100644
index 00000000000..1b5478dcbeb
--- /dev/null
+++ b/addons/mrp/wizard/mrp_workcenter_load.py
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+
+class mrp_workcenter_load(osv.osv_memory):
+    _name = 'mrp.workcenter.load'
+    _description = 'Workcenter Load'
+    
+    _columns = {
+        'time_unit': fields.selection([('day', 'Day by day'),('week', 'Per week'),('month', 'Per month')],'Type of period', required=True),
+        'measure_unit': fields.selection([('hours', 'Amount in hours'),('cycles', 'Amount in cycles')],'Amount measuring unit', required=True),
+    }
+
+    def print_report(self, cr, uid, ids, context=None):
+        """ 
+             To print the report of Work Center Load
+                        
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary 
+             
+             @return : Report
+        """        
+        datas = {'ids' : context.get('active_ids',[])}
+        res = self.read(cr, uid, ids, ['time_unit','measure_unit'])
+        res = res and res[0] or {}        
+        datas['form'] = res
+        
+        return { 
+                'type' : 'ir.actions.report.xml',
+                'report_name':'mrp.workcenter.load',
+                'datas' : datas,               
+       }
+
+mrp_workcenter_load()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/wizard/mrp_workcenter_load_view.xml b/addons/mrp/wizard/mrp_workcenter_load_view.xml
new file mode 100644
index 00000000000..a6b7a4f987d
--- /dev/null
+++ b/addons/mrp/wizard/mrp_workcenter_load_view.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Work Center Load Report -->
+        
+		<record id="view_mrp_workcenter_load_wizard" model="ir.ui.view">
+            <field name="name">Work Center Load</field>
+            <field name="model">mrp.workcenter.load</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+				<form string="Select time unit">
+				    <field name="time_unit"/>
+				    <newline/>
+				    <field name="measure_unit"/>
+				    <newline/>
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="print_report" string="Print"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+				</form>
+			</field>
+		</record>
+		
+		<act_window name="Work Center Load"
+            res_model="mrp.workcenter.load"
+            src_model="mrp.workcenter"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_mrp_workcenter_load_wizard"/>
+	</data>
+</openerp>
diff --git a/addons/mrp/wizard/wizard_workcenter_load.py b/addons/mrp/wizard/wizard_workcenter_load.py
deleted file mode 100644
index 6465622c421..00000000000
--- a/addons/mrp/wizard/wizard_workcenter_load.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-
-_time_unit_form = '''<?xml version="1.0"?>
-<form string="Select time unit">
-    <field name="time_unit"/>
-    <newline/>
-    <field name="measure_unit"/>
-</form>'''
-
-_time_unit_fields = {
-    'time_unit': {'string':'Type of period', 'type':'selection', 'selection':[('day', 'Day by day'),('week', 'Per week'),('month', 'Per month')], 'required':True},
-    'measure_unit': {'string':'Amount measuring unit', 'type':'selection', 'selection':[('hours', 'Amount in hours'),('cycles', 'Amount in cycles')], 'required':True},
-}
-
-class wizard_mrp_workcenter(wizard.interface):
-    states = {
-        'init': {
-            'actions': [], 
-            'result': {'type':'form', 'arch':_time_unit_form, 'fields':_time_unit_fields, 'state':[('end','Cancel'),('report','Print') ]},
-        },
-        'report': {
-            'actions': [],
-            'result': {'type':'print', 'report':'mrp.workcenter.load', 'state':'end'},
-        },
-    }
-
-wizard_mrp_workcenter('mrp.workcenter.load')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From 6a141e19d20fbb637384717487d3f6e700508d78 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Thu, 18 Mar 2010 19:19:09 +0530
Subject: [PATCH 164/251] [FIX] mrp: Solved bug in query of report 'Work Center
 Load'.

bzr revid: uco@tinyerp.co.in-20100318134909-gubg1qn5i2drt0f6
---
 addons/mrp/report/workcenter_load.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/mrp/report/workcenter_load.py b/addons/mrp/report/workcenter_load.py
index a65a51d03f7..248e9e5707e 100644
--- a/addons/mrp/report/workcenter_load.py
+++ b/addons/mrp/report/workcenter_load.py
@@ -134,9 +134,9 @@ class report_custom(report_int):
 
         # select workcenters
         cr.execute(
-            "SELECT id, name FROM mrp_workcenter " \
-            "WHERE id=ANY(%s)" \
-            "ORDER BY mrp_workcenter.id" ,(ids,))
+            "SELECT mw.id, rs.name FROM mrp_workcenter mw, resource_resource rs " \
+            "WHERE mw.id=ANY(%s) and mw.resource_id=rs.id " \
+            "ORDER BY mw.id" ,(ids,))
         workcenters = cr.dictfetchall()
 
         data = []
@@ -144,13 +144,13 @@ class report_custom(report_int):
             vals = []
             for workcenter in workcenters:
                 cr.execute("SELECT SUM(mrp_production_workcenter_line.hour) AS hours, SUM(mrp_production_workcenter_line.cycle) AS cycles, \
-                                mrp_workcenter.name AS name, mrp_workcenter.id AS id \
-                            FROM mrp_production_workcenter_line, mrp_production, mrp_workcenter \
+                                resource_resource.name AS name, mrp_workcenter.id AS id \
+                            FROM mrp_production_workcenter_line, mrp_production, mrp_workcenter, resource_resource \
                             WHERE (mrp_production_workcenter_line.production_id=mrp_production.id) \
                                 AND (mrp_production_workcenter_line.workcenter_id=mrp_workcenter.id) \
                                 AND (mrp_workcenter.id=%s) \
                                 AND (mrp_production.date_planned BETWEEN %s AND %s) \
-                            GROUP BY mrp_production_workcenter_line.workcenter_id, mrp_workcenter.name, mrp_workcenter.id \
+                            GROUP BY mrp_production_workcenter_line.workcenter_id, resource_resource.name, mrp_workcenter.id \
                             ORDER BY mrp_workcenter.id", (workcenter['id'], dates[date]['start'] + ' 00:00:00', dates[date]['stop'] + ' 23:59:59'))
                 res = cr.dictfetchall()
                 if not res:

From 350cfd98b11acdd6ea3b80d7c6f6edb2299b4fe0 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@mga>
Date: Thu, 18 Mar 2010 23:39:22 +0530
Subject: [PATCH 165/251] [FIX]: review file

bzr revid: mga@mga-20100318180922-yngpo2zhwqjnqz9j
---
 addons/point_of_sale/wizard/pos_details.py | 34 ++++++++++------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/addons/point_of_sale/wizard/pos_details.py b/addons/point_of_sale/wizard/pos_details.py
index bc59954104d..512e4f7b5a7 100644
--- a/addons/point_of_sale/wizard/pos_details.py
+++ b/addons/point_of_sale/wizard/pos_details.py
@@ -30,32 +30,30 @@ class pos_details(osv.osv_memory):
     _description = 'Order Details'
 
     _columns = {
-                'date_start': fields.date('Date Start',),
-                'date_end': fields.date('Date End'),
+        'date_start': fields.date('Date Start'),
+        'date_end': fields.date('Date End'),
     }
     
-    def print_report(self, cr, uid, ids, context=None):
-
+    def print_report(self, cr, uid, ids, context={}):
         """ 
-             @summary: To get the date and print the report           
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param context: A standard dictionary 
-             @return : retrun report
-        """        
-        datas = {'ids' : context.get('active_ids',[])}
-        res = self.read(cr, uid, ids, ['date_start','date_end'])
+         To get the date and print the report           
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param context: A standard dictionary 
+         @return : retrun report
+        """
+        
+        datas = {'ids' : context.get('active_ids', [])}
+        res = self.read(cr, uid, ids, ['date_start','date_end'], context)
         res = res and res[0] or {}        
         datas['form'] = res
         
         return { 
-                'type' : 'ir.actions.report.xml',
-                'report_name':'pos.details',
-                'datas' : datas,               
+            'type':'ir.actions.report.xml',
+            'report_name':'pos.details',
+            'datas':datas,               
        }
-
 pos_details()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

From b3093ab23708442c424fd5615bafc312b153967e Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 19 Mar 2010 11:24:25 +0530
Subject: [PATCH 166/251] stock: add the suppiler and address in
 partical_picking and imporve the code

bzr revid: sbh@tinyerp.com-20100319055425-jjh3deq4nbr2nqtw
---
 addons/point_of_sale/__terp__.py              |  17 ++-
 addons/point_of_sale/wizard/pos_discount.py   | 105 ++++++++++--------
 addons/stock/stock.py                         |   2 +-
 addons/stock/stock_view.xml                   |   6 +-
 addons/stock/wizard/wizard_partial_picking.py |  27 ++++-
 5 files changed, 92 insertions(+), 65 deletions(-)

diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__terp__.py
index 2b9b3f5ac3c..440da0e19a9 100644
--- a/addons/point_of_sale/__terp__.py
+++ b/addons/point_of_sale/__terp__.py
@@ -43,15 +43,6 @@ Main features :
         'security/ir.model.access.csv',
         'pos_report.xml',
         'pos_wizard.xml',
-        'wizard/pos_add_product.xml',
-        'wizard/pos_confirm.xml',
-        'wizard/pos_discount.xml',
-        'wizard/pos_get_sale.xml',
-        'wizard/pos_open_statement.xml',
-        'wizard/pos_close_statement.xml',  
-        'wizard/pos_box_entries.xml',  
-        'wizard/pos_box_out.xml', 
-       
         'pos_view.xml',
         'pos_sequence.xml',
         'posrule_data.xml',
@@ -66,6 +57,14 @@ Main features :
         'security/point_of_sale_security.xml',
         'security/ir.model.access.csv',
         'wizard/pos_details.xml',  
+        'wizard/pos_add_product.xml',
+        'wizard/pos_confirm.xml',
+        'wizard/pos_discount.xml',
+        'wizard/pos_get_sale.xml',
+        'wizard/pos_open_statement.xml',
+        'wizard/pos_close_statement.xml',  
+        'wizard/pos_box_entries.xml',  
+        'wizard/pos_box_out.xml', 
         'pos_report.xml',
         'pos_wizard.xml',
         'pos_view.xml',
diff --git a/addons/point_of_sale/wizard/pos_discount.py b/addons/point_of_sale/wizard/pos_discount.py
index a6b537193d7..f99fe0d7b94 100644
--- a/addons/point_of_sale/wizard/pos_discount.py
+++ b/addons/point_of_sale/wizard/pos_discount.py
@@ -28,24 +28,25 @@ class pos_discount(osv.osv_memory):
     _description = 'Add Discount'
 
     _columns = {
-                'discount': fields.float('Discount ', required=True),
-                'discount_notes': fields.char('Discount Notes',size= 128, required=True),
+        'discount': fields.float('Discount ', required=True),
+        'discount_notes': fields.char('Discount Notes',size= 128, required=True),
     }
     _defaults = {
-                    'discount': lambda *a: 5,
-                }
+        'discount': lambda *a: 5,
+    }
     
     def apply_discount(self, cr, uid, ids, context):
         """ 
-             @summary: To give the discount of  product and check the  .            
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param context: A standard dictionary 
-             @return : nothing
+         To give the discount of  product and check the.
+         
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param context: A standard dictionary 
+         @return : nothing
         """        
         this = self.browse(cr, uid, ids[0], context=context)
-        record_id = context and context.get('record_id',False)
+        record_id = context and context.get('record_id', False)
         if isinstance(record_id, (int, long)):
             record_id=[record_id]
         
@@ -53,52 +54,58 @@ class pos_discount(osv.osv_memory):
         order_line_ref =self.pool.get('pos.order.line')
         
         for order in order_ref.browse(cr, uid, record_id, context=context):
+            
             for line in order.lines :
                 company_discount = order.company_id.company_discount
-                applied_discount =this.discount
-               
+                applied_discount = this.discount
+                
                 if applied_discount == 0.00:
                     notice = 'No Discount'
                 elif company_discount >=  applied_discount:
                     notice = 'Minimum Discount'
                 else:
                     notice = this.discount_notes
-                    
-                if self.check_discount(cr, uid, record_id,this.discount,context) == 'apply_discount':
-                    order_line_ref.write(cr, uid, [line.id],
-                            {'discount': this.discount,
-                            'price_ded':line.price_unit*line.qty*(this.discount or 0)*0.01 or 0.0,
-                            'notice':notice
-                            },
-                            context=context,)
-                else :
-                    order_line_ref.write(cr, uid, [line.id],
-                            {'discount': this.discount,
-                            'notice': notice,
-                            'price_ded':line.price_unit*line.qty*(this.discount or 0)*0.01 or 0.0 
-                            },
-                            context=context,)
+                
+                res_new = {
+                }
+                
+                if this.discount <= company_discount:
+                    res_new = {
+                        'discount': this.discount,
+                        'notice': notice,
+                        'price_ded': line.price_unit * line.qty * (this.discount or 0) * 0.01 or 0.0
+                    }
+                else:
+                    res_new = {
+                        'discount': this.discount,
+                        'notice': notice,
+                        'price_ded': line.price_unit * line.qty * (this.discount or 0) * 0.01 or 0.0 
+                    }
+                
+                order_line_ref.write(cr, uid, [line.id], res_new, context=context)
         return {}
-    
-    def check_discount(self, cr, uid, record_id,discount, context):
-        """ 
-             @summary: Check the discount of define by company  .            
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param record_id:Current Order id
-             @param discount:Select Discount
-             @param context: A standard dictionary 
-             @return : retrun  to apply and used the company discount base on condition
-        """                
-        order_ref = self.pool.get('pos.order')
-        for order in order_ref.browse(cr, uid, record_id, context=context):
-            company_disc = order.company_id.company_discount
-            for line in order.lines :
-                prod_disc = discount
-                if prod_disc <= company_disc :
-                   return 'apply_discount'
-                else :
-                    return 'disc_discount'    
+
+#    def check_discount(self, cr, uid, record_id, discount, context):
+#        """ 
+#         Check the discount of define by company  .            
+#         @param self: The object pointer.
+#         @param cr: A database cursor
+#         @param uid: ID of the user currently logged in
+#         @param record_id:Current Order id
+#         @param discount:Select Discount
+#         @param context: A standard dictionary 
+#         @return : retrun  to apply and used the company discount base on condition
+#        """
+
+#        order_ref = self.pool.get('pos.order')
+#        
+#        for order in order_ref.browse(cr, uid, record_id, context=context):
+#            company_disc = order.company_id.company_discount
+#            for line in order.lines :
+#                prod_disc = discount
+#                if prod_disc <= company_disc :
+#                   return 'apply_discount'
+#                else :
+#                    return 'disc_discount'    
 pos_discount()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index affc2c2bf5a..8bbe1bdaf5b 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1765,8 +1765,8 @@ class stock_delivery(osv.osv):
     
     _name = "stock.delivery"
     _description = "Delivery"
-    _rec_name = 'partner_id'
     _columns = {
+        'name': fields.char('Name', size=60, required=True),  
         'date': fields.datetime('Date'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
         'product_delivered':fields.one2many('stock.move', 'delivered_id', 'Product Delivered', domain=[('picking_id.type','=','in')]),
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index dcd7dc68b9e..f4663b36d25 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1756,6 +1756,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Product">
+                		<field name="name"/>
 	                    <field name="date"/>
 	                    <field name="partner_id"/>
 	                    <separator string="Product Delivered Information" colspan="4" />
@@ -1778,7 +1779,8 @@
             <field name="model">stock.delivery</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Product">
+                <tree string="Delivered Product">	
+                	<field name="name"/>
                     <field name="date"/>
                     <field name="partner_id"/>
                     <field name="product_delivered"/>
@@ -1787,7 +1789,7 @@
         </record>
 	    
     	<record id="action_stock_delivery" model="ir.actions.act_window">
-            <field name="name">Delivery Products</field>
+            <field name="name">Delivered Products</field>
             <field name="res_model">stock.delivery</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
diff --git a/addons/stock/wizard/wizard_partial_picking.py b/addons/stock/wizard/wizard_partial_picking.py
index 3f9a48ef254..aad6a4b38b3 100644
--- a/addons/stock/wizard/wizard_partial_picking.py
+++ b/addons/stock/wizard/wizard_partial_picking.py
@@ -37,6 +37,7 @@ _moves_arch_end = '''<?xml version="1.0"?>
     <label string="The picking has been successfully made !" colspan="4"/>
     <field name="back_order_notification" colspan="4" nolabel="1"/>
 </form>'''
+
 _moves_fields_end = {
     'back_order_notification': {'string':'Back Order' ,'type':'text', 'readonly':True}
                      }
@@ -63,7 +64,8 @@ def _get_moves(self, cr, uid, data, context):
         quantity = m.product_qty
         if m.state!='assigned':
             quantity = 0
-
+            _moves_fields
+            
         _moves_arch_lst.append('<field name="move%s" />' % (m.id,))
         _moves_fields['move%s' % m.id] = {
                 'string': _to_xml(m.name),
@@ -92,10 +94,22 @@ def _get_moves(self, cr, uid, data, context):
             _moves_fields['currency%s' % m.id] = {'string': 'Currency',
                     'type': 'many2one', 'relation': 'res.currency',
                     'required': True, 'default': make_default(currency)}
+        
+                    
+        _moves_arch_lst.append('<newline/>')
 
+                
         _moves_arch_lst.append('<newline/>')
         res.setdefault('moves', []).append(m.id)
-
+    
+    _moves_arch_lst.append('<field name="partner_id%d"/>' % (m.id,))
+    _moves_fields['partner_id%s' % m.id] ={'string':'Partner', 
+            'type':'many2one', 'relation':'res.partner', 'required' : '1'}
+    _moves_arch_lst.append('<newline/>')
+    _moves_arch_lst.append('<field name="address_id%d"/>' % (m.id,))
+    
+    _moves_fields['address_id%s' % m.id] ={'string':'Delivery Address', 
+                                                'type':'many2one', 'relation':'res.partner.address', 'required' : '1'}
     _moves_arch_lst.append('</form>')
     _moves_arch.string = '\n'.join(_moves_arch_lst)
     return res
@@ -163,6 +177,7 @@ def _do_split(self, cr, uid, data, context):
                         'state':'draft',
                     })
         if data['form']['move%s' % move.id] != 0:
+
             new_obj = move_obj.copy(cr, uid, move.id,
                 {
                     'product_qty' : data['form']['move%s' % move.id],
@@ -170,18 +185,21 @@ def _do_split(self, cr, uid, data, context):
                     'picking_id' : new_picking,
                     'state': 'assigned',
                     'move_dest_id': False,
+                    'partner_id': data['form']['partner_id%s' % move.id],
+                    'address_id': data['form']['address_id%s' % move.id],
                     'price_unit': move.price_unit,
                 })
             partner_id = False
             if move.picking_id:
                     partner_id = move.picking_id.address_id and (move.picking_id.address_id.partner_id and move.picking_id.address_id.partner_id.id or False) or False
-            delivery_id = delivery_obj.search(cr,uid, [('partner_id','=',partner_id)])   
+            delivery_id = delivery_obj.search(cr,uid, [('name','=',pick.name)]) 
             if  not  delivery_id :
                 delivery_id = delivery_obj.create(cr, uid, {
+                        'name':  pick.name,                                 
                         'partner_id': partner_id,
                         'date': move.date,
+                        'product_delivered':[(6,0, [new_obj])]
                     }, context=context)   
-                delivery_obj.write(cr, uid, [delivery_id], {'product_delivered': [(4, new_obj)]})
             if not isinstance(delivery_id, (int, long)): 
                delivery_id=delivery_id[0]
                delivery_obj.write(cr, uid, [delivery_id], {'product_delivered': [(4, new_obj)]})
@@ -190,6 +208,7 @@ def _do_split(self, cr, uid, data, context):
                 {
                     'product_qty' : move.product_qty - data['form']['move%s' % move.id],
                     'product_uos_qty':move.product_qty - data['form']['move%s' % move.id],
+                  #  'delivered_id':delivery_id
                 })
 
     if new_picking:

From 44df5c0710907d2c89ced634a72fb4fb28c470df Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 19 Mar 2010 12:06:44 +0530
Subject: [PATCH 167/251] [IMP] point_of_sale: set the file in terp

bzr revid: sbh@tinyerp.com-20100319063644-2ib2ii1rxf62ggc9
---
 addons/point_of_sale/__terp__.py            | 23 +++++++--------------
 addons/point_of_sale/pos_view.xml           |  4 ++--
 addons/point_of_sale/pos_wizard.xml         |  4 ++--
 addons/point_of_sale/wizard/pos_details.py  |  2 +-
 addons/point_of_sale/wizard/pos_details.xml | 14 +++++++++++--
 5 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__terp__.py
index 440da0e19a9..4de467c2028 100644
--- a/addons/point_of_sale/__terp__.py
+++ b/addons/point_of_sale/__terp__.py
@@ -38,21 +38,8 @@ Main features :
     'author': 'Tiny',
     'depends': ['sale', 'delivery'],
 #    'depends': ['sale', 'purchase', 'account', 'account_tax_include','board','mrp','board_manufacturing','delivery','profile_manufacturing','account','multi_company'],
-    'init_xml': [
-        'security/point_of_sale_security.xml',
-        'security/ir.model.access.csv',
-        'pos_report.xml',
-        'pos_wizard.xml',
-        'pos_view.xml',
-        'pos_sequence.xml',
-        'posrule_data.xml',
-        'pos_data.xml',
-        'pos_workflow.xml',
-        'statement_view.xml',
-        'statement_report.xml',
-        'statement_data.xml',
-        'statement_wizard.xml'
-    ],
+    'init_xml': [],
+
     'update_xml': [
         'security/point_of_sale_security.xml',
         'security/ir.model.access.csv',
@@ -71,7 +58,11 @@ Main features :
         'pos_sequence.xml',
         'posrule_data.xml',
         'pos_data.xml',
-        'pos_workflow.xml'
+        'pos_workflow.xml',
+        'statement_view.xml',
+        'statement_report.xml',
+        'statement_data.xml',
+        'statement_wizard.xml',    
     ],
     'demo_xml': ['pos_demo.xml','singer_statement_demo.xml','multi_company_stock_data.xml'],
     'installable': True,
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 530a06d4fba..1af8841817b 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -996,8 +996,8 @@ invoiced
 		<menuitem icon="STOCK_PRINT" action="wizard_pos_sales_user_today_current_user"
 				id="menu_pos_sales_user_today_current_user" parent="menu_cashboxes_by_day" type="wizard" sequence="7"/>
     	
-    	<menuitem icon="STOCK_PRINT" action="wizard_pos_details"
-				id="menu_pos_details" parent="menu_cashboxes_by_day" type="wizard" />
+    	<menuitem icon="STOCK_PRINT" action="action_report_pos_details"
+				id="menu_pos_details" parent="menu_cashboxes_by_day" type="action" />
 
 
     </data>
diff --git a/addons/point_of_sale/pos_wizard.xml b/addons/point_of_sale/pos_wizard.xml
index 711d33784a2..3adc250129e 100644
--- a/addons/point_of_sale/pos_wizard.xml
+++ b/addons/point_of_sale/pos_wizard.xml
@@ -52,8 +52,8 @@
 		<wizard id="wizard_pos_sales_user_today_current_user" menu="False"
 				model="pos.order" name="pos.sales.user.today.current.user" string="Sales for Current User"/>
 
-		<wizard id="wizard_pos_details" menu="False"
-				model="pos.order" name="pos.details" string="Sales Details"/>
+<!--		<wizard id="wizard_pos_details" menu="False"
+				model="pos.order" name="pos.details" string="Sales Details"/>-->
 
 <!--		<wizard string="Get From Order" model="pos.order"
 				name="pos.sale.get" id="pos_sale_get"/>
diff --git a/addons/point_of_sale/wizard/pos_details.py b/addons/point_of_sale/wizard/pos_details.py
index 512e4f7b5a7..3a945603f12 100644
--- a/addons/point_of_sale/wizard/pos_details.py
+++ b/addons/point_of_sale/wizard/pos_details.py
@@ -27,7 +27,7 @@ import time
 
 class pos_details(osv.osv_memory):
     _name = 'pos.details'
-    _description = 'Order Details'
+    _description = 'Sales Details'
 
     _columns = {
         'date_start': fields.date('Date Start'),
diff --git a/addons/point_of_sale/wizard/pos_details.xml b/addons/point_of_sale/wizard/pos_details.xml
index 85513fc5a37..3268e90733c 100644
--- a/addons/point_of_sale/wizard/pos_details.xml
+++ b/addons/point_of_sale/wizard/pos_details.xml
@@ -21,13 +21,23 @@
             </field>
         </record>
 
-    <act_window name="POS Details"
+
+        <record id="action_report_pos_details" model="ir.actions.act_window">
+            <field name="name">Print Report</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.details</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="context">{'record_id' : active_id}</field>
+        </record>
+<!--    <act_window name="POS Details"
             res_model="pos.details"
             src_model="pos.order"
 		    view_mode="form"
 		    target="new"        
             key2="client_action_multi"    
-		    id="action_report_pos_details"/>   
+		    id="action_report_pos_details"/>   -->
         
 	</data>
 </openerp>	        
\ No newline at end of file

From 33565b922699bf8d2d35529c60dc712230a3ddcc Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Fri, 19 Mar 2010 12:19:58 +0530
Subject: [PATCH 168/251] [REM] mrp: remove moved file

bzr revid: hmo@tinyerp.com-20100319064958-iih7nq42q1yi3d26
---
 addons/mrp/stock.py.moved | 225 --------------------------------------
 1 file changed, 225 deletions(-)
 delete mode 100644 addons/mrp/stock.py.moved

diff --git a/addons/mrp/stock.py.moved b/addons/mrp/stock.py.moved
deleted file mode 100644
index 4ddfddf6d90..00000000000
--- a/addons/mrp/stock.py.moved
+++ /dev/null
@@ -1,225 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from mx import DateTime
-from osv import fields
-from osv import osv
-from tools.translate import _
-import ir
-import netsvc
-import time
-
-
-class stock_warehouse_orderpoint(osv.osv):
-    _name = "stock.warehouse.orderpoint"
-    _description = "Orderpoint minimum rule"
-    _columns = {
-        'name': fields.char('Name', size=32, required=True),
-        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the orderpoint without removing it."),
-        'logic': fields.selection([('max','Order to Max'),('price','Best price (not yet active!)')], 'Reordering Mode', required=True),
-        'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True),
-        'location_id': fields.many2one('stock.location', 'Location', required=True),
-        'product_id': fields.many2one('product.product', 'Product', required=True, domain=[('type','=','product')]),
-        'product_uom': fields.many2one('product.uom', 'Product UOM', required=True ),
-        'product_min_qty': fields.float('Min Quantity', required=True,
-            help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
-            "a requisition to bring the virtual stock to the Max Quantity."),
-        'product_max_qty': fields.float('Max Quantity', required=True,
-            help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
-            "a requisition to bring the virtual stock to the Max Quantity."),
-        'qty_multiple': fields.integer('Qty Multiple', required=True,
-            help="The requisition quantity will by rounded up to this multiple."),
-        'procurement_id': fields.many2one('mrp.procurement', 'Latest Requisition'),
-        'company_id': fields.many2one('res.company','Company',required=True),
-    }
-    _defaults = {
-        'active': lambda *a: 1,
-        'logic': lambda *a: 'max',
-        'qty_multiple': lambda *a: 1,
-        'name': lambda x,y,z,c: x.pool.get('ir.sequence').get(y,z,'mrp.warehouse.orderpoint') or '',
-        'product_uom': lambda sel, cr, uid, context: context.get('product_uom', False),
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.warehouse.orderpoint', context=c)
-    }
-    def onchange_warehouse_id(self, cr, uid, ids, warehouse_id, context={}):
-        if warehouse_id:
-            w=self.pool.get('stock.warehouse').browse(cr,uid,warehouse_id, context)
-            v = {'location_id':w.lot_stock_id.id}
-            return {'value': v}
-        return {}
-    def onchange_product_id(self, cr, uid, ids, product_id, context={}):
-        if product_id:
-            prod=self.pool.get('product.product').browse(cr,uid,product_id)
-            v = {'product_uom':prod.uom_id.id}
-            return {'value': v}
-        return {}
-    def copy(self, cr, uid, id, default=None,context={}):
-        if not default:
-            default = {}
-        default.update({
-            'name': self.pool.get('ir.sequence').get(cr, uid, 'mrp.warehouse.orderpoint') or '',
-        })
-        return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context)
-stock_warehouse_orderpoint()
-
-class StockMove(osv.osv):
-    _inherit = 'stock.move'
-    _columns = {
-        'production_id': fields.many2one('mrp.production', 'Production', select=True),
-        'procurements': fields.one2many('mrp.procurement', 'move_id', 'Requisitions'),
-    }
-    def copy(self, cr, uid, id, default=None, context=None):
-        default = default or {}
-        default['procurements'] = []
-        return super(StockMove, self).copy(cr, uid, id, default, context)
-
-    def _action_explode(self, cr, uid, move, context={}):
-        if move.product_id.supply_method=='produce' and move.product_id.procure_method=='make_to_order':
-            bis = self.pool.get('mrp.bom').search(cr, uid, [
-                ('product_id','=',move.product_id.id),
-                ('bom_id','=',False),
-                ('type','=','phantom')])
-            if bis:
-                factor = move.product_qty
-                bom_point = self.pool.get('mrp.bom').browse(cr, uid, bis[0])
-                res = self.pool.get('mrp.bom')._bom_explode(cr, uid, bom_point, factor, [])
-                dest = move.product_id.product_tmpl_id.property_stock_production.id
-                state = 'confirmed'
-                if move.state=='assigned':
-                    state='assigned'
-                for line in res[0]:                    
-                    valdef = {
-                        'picking_id': move.picking_id.id,
-                        'product_id': line['product_id'],
-                        'product_uom': line['product_uom'],
-                        'product_qty': line['product_qty'],
-                        'product_uos': line['product_uos'],
-                        'product_uos_qty': line['product_uos_qty'],
-                        'move_dest_id': move.id,
-                        'state': state,
-                        'name': line['name'],
-                        'location_dest_id': dest,
-                        'move_history_ids': [(6,0,[move.id])],
-                        'move_history_ids2': [(6,0,[])],
-                        'procurements': [],
-                    }
-                    mid = self.pool.get('stock.move').copy(cr, uid, move.id, default=valdef)
-                    prodobj = self.pool.get('product.product').browse(cr, uid, line['product_id'], context=context)
-                    proc_id = self.pool.get('mrp.procurement').create(cr, uid, {
-                        'name': (move.picking_id.origin or ''),
-                        'origin': (move.picking_id.origin or ''),
-                        'date_planned': move.date_planned,
-                        'product_id': line['product_id'],
-                        'product_qty': line['product_qty'],
-                        'product_uom': line['product_uom'],
-                        'product_uos_qty': line['product_uos'] and line['product_uos_qty'] or False,
-                        'product_uos':  line['product_uos'],
-                        'location_id': move.location_id.id,
-                        'procure_method': prodobj.procure_method,
-                        'move_id': mid,
-                        'company_id': line['company_id'],
-                    })
-                    wf_service = netsvc.LocalService("workflow")
-                    wf_service.trg_validate(uid, 'mrp.procurement', proc_id, 'button_confirm', cr)
-                self.pool.get('stock.move').write(cr, uid, [move.id], {
-                    'location_id': move.location_dest_id.id,
-                    'auto_validate': True,
-                    'picking_id': False,
-                    'location_id': dest,
-                    'state': 'waiting'
-                })
-                for m in self.pool.get('mrp.procurement').search(cr, uid, [('move_id','=',move.id)], context):
-                    wf_service = netsvc.LocalService("workflow")
-                    wf_service.trg_validate(uid, 'mrp.procurement', m, 'button_wait_done', cr)
-        return True
-    
-    
-    def action_consume(self, cr, uid, ids, product_qty, location_id=False, context=None):        
-        res = []
-        production_obj = self.pool.get('mrp.production')
-        wf_service = netsvc.LocalService("workflow")
-        for move in self.browse(cr, uid, ids):
-            new_moves = super(StockMove, self).action_consume(cr, uid, [move.id], product_qty, location_id, context=context)
-            production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
-            for prod in production_obj.browse(cr, uid, production_ids, context=context):
-                if prod.state == 'confirmed':
-                    production_obj.force_production(cr, uid, [prod.id])
-                wf_service.trg_validate(uid, 'mrp.production', prod.id, 'button_produce', cr)
-            for new_move in new_moves:
-                production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]})
-                res.append(new_move)
-        return res
-    
-    def action_scrap(self, cr, uid, ids, product_qty, location_id, context=None):
-        res = []
-        production_obj = self.pool.get('mrp.production')
-        wf_service = netsvc.LocalService("workflow")
-        for move in self.browse(cr, uid, ids):
-            new_moves = super(StockMove, self).action_scrap(cr, uid, [move.id], product_qty, location_id, context=context)
-            production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
-            for prod_id in production_ids:
-                wf_service.trg_validate(uid, 'mrp.production', prod_id, 'button_produce', cr)
-            for new_move in new_moves:
-                production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]})
-                res.append(new_move)
-        return {}
-
-StockMove()
-
-
-class StockPicking(osv.osv):
-    _inherit = 'stock.picking'
-
-    def test_finnished(self, cursor, user, ids):
-        wf_service = netsvc.LocalService("workflow")
-        res = super(StockPicking, self).test_finnished(cursor, user, ids)
-        for picking in self.browse(cursor, user, ids):
-            for move in picking.move_lines:
-                if move.state == 'done' and move.procurements:
-                    for procurement in move.procurements:
-                        wf_service.trg_validate(user, 'mrp.procurement',
-                                procurement.id, 'button_check', cursor)
-        return res
-
-    #
-    # Explode picking by replacing phantom BoMs
-    #
-    def action_explode(self, cr, uid, picks, *args):
-        for move in self.pool.get('stock.move').browse(cr, uid, picks):
-            self.pool.get('stock.move')._action_explode(cr, uid, move)
-        return picks
-
-StockPicking()
-
-
-class spilt_in_production_lot(osv.osv_memory):
-    _inherit = "stock.move.split"
-    def split(self, cr, uid, ids, move_ids, context=None):
-        production_obj = self.pool.get('mrp.production')
-        move_obj = self.pool.get('stock.move')  
-        res = []      
-        for move in move_obj.browse(cr, uid, move_ids, context=context):
-            new_moves = super(spilt_in_production_lot, self).split(cr, uid, ids, move_ids, context=context)
-            production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
-            for new_move in new_moves:
-                production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]})                
-        return res
-spilt_in_production_lot()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 07c8efd1f40e13d97e4cafe9c8c9cce27fbf2135 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 19 Mar 2010 12:50:12 +0530
Subject: [PATCH 169/251] [IMP] stock,mrp: Used default_get instead of defaults
 and clean the  code

bzr revid: sbh@tinyerp.com-20100319072012-olyachwz80s9d3pv
---
 addons/mrp/wizard/change_production_qty.py    | 10 ++--
 addons/point_of_sale/wizard/pos_details.py    |  4 +-
 .../wizard/stock_change_standard_price.py     |  9 ++--
 .../wizard/stock_inventory_line_split.py      | 11 ++--
 addons/stock/wizard/stock_move.py             | 50 ++++++++++++-------
 5 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/addons/mrp/wizard/change_production_qty.py b/addons/mrp/wizard/change_production_qty.py
index 42a3dd0bff2..fbbbc356c7c 100644
--- a/addons/mrp/wizard/change_production_qty.py
+++ b/addons/mrp/wizard/change_production_qty.py
@@ -47,13 +47,11 @@ class change_production_qty(osv.osv_memory):
              @return: A dictionary which of fields with values. 
         
         """        
-        res = {}
-        record_id = context and context.get('active_id',False)
-        if not record_id:
-           return res
+        res = super(change_production_qty, self).default_get(cr, uid, fields, context=context)        
         prod_obj = self.pool.get('mrp.production')
-        prod = prod_obj.browse(cr, uid, record_id)
-        res['product_qty'] = prod.product_qty        
+        prod = prod_obj.browse(cr, uid, context.get('active_id'))
+        if 'product_qty' in fields:
+            res.update({'product_qty': prod.product_qty})  
         return res
         
     def change_prod_qty(self, cr, uid, ids, context):
diff --git a/addons/point_of_sale/wizard/pos_details.py b/addons/point_of_sale/wizard/pos_details.py
index 3a945603f12..8316d3a7c9c 100644
--- a/addons/point_of_sale/wizard/pos_details.py
+++ b/addons/point_of_sale/wizard/pos_details.py
@@ -30,8 +30,8 @@ class pos_details(osv.osv_memory):
     _description = 'Sales Details'
 
     _columns = {
-        'date_start': fields.date('Date Start'),
-        'date_end': fields.date('Date End'),
+        'date_start': fields.date('Date Start',required=True),
+        'date_end': fields.date('Date End',required=True)
     }
     
     def print_report(self, cr, uid, ids, context={}):
diff --git a/addons/stock/wizard/stock_change_standard_price.py b/addons/stock/wizard/stock_change_standard_price.py
index b4f12e7f545..15c82f81d04 100644
--- a/addons/stock/wizard/stock_change_standard_price.py
+++ b/addons/stock/wizard/stock_change_standard_price.py
@@ -42,10 +42,11 @@ class change_standard_price(osv.osv_memory):
              @return: A dictionary which of fields with values. 
         
         """ 
-        rec_id = context and context.get('active_id', False)
-        res = {}
-        price = self.pool.get('product.product').browse(cr, uid, rec_id)
-        res['new_price'] = price.standard_price
+
+        res = super(change_standard_price, self).default_get(cr, uid, fields, context=context)   
+        price = self.pool.get('product.product').browse(cr, uid, context.get('active_id', False))
+        if 'new_price' in fields:
+            res.update({'new_price':price.standard_price})         
         return res
     
     def change_price(self, cr, uid, ids, context):
diff --git a/addons/stock/wizard/stock_inventory_line_split.py b/addons/stock/wizard/stock_inventory_line_split.py
index 70256e7e800..9fe71582c7f 100644
--- a/addons/stock/wizard/stock_inventory_line_split.py
+++ b/addons/stock/wizard/stock_inventory_line_split.py
@@ -47,18 +47,13 @@ class stock_inventory_line_split(osv.osv_memory):
              @return: A dictionary which of fields with values. 
         
         """        
-        res = {}
         record_id = context and context.get('active_id',False)
         res = super(stock_inventory_line_split, self).default_get(cr, uid, fields, context=context)
-        if not record_id:
-           return res
-
-        lot=  self.pool.get('stock.inventory.line').browse(cr, uid, record_id)
-        res['product_id']=line.product_id.id
+        line=  self.pool.get('stock.inventory.line').browse(cr, uid, record_id)        
+        if 'product_id' in fields:
+            res.update({'product_id':line.product_id.id})       
         return res
     
-    
-
     def split(self, cr, uid, ids, line_ids, context=None):
         """ 
              To split stock inventory lines according to production lot
diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index 0069435a8ee..9eccd579f46 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -79,15 +79,18 @@ class stock_move_consume(osv.osv_memory):
              @return: default values of fields_list
         
         """
+        res = super(stock_move_consume, self).default_get(cr, uid, fields, context=context)        
         move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
-        val = {
-               'product_id':  move.product_id.id, 
-               'product_uom': move.product_uom.id, 
-               'product_qty': move.product_qty, 
-               'location_id': move.location_id.id, 
-               }
-        return val
-
+        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 'product_qty' in fields:
+            res.update({'product_qty': move.product_qty.id})    
+        if 'location_id' in fields:
+            res.update({'location_id': move.location_id.id})
+        return res   
+            
     def do_move_consume(self, cr, uid, ids, context={}):
         """ 
              To move consumed products
@@ -149,19 +152,30 @@ class split_in_production_lot(osv.osv_memory):
     _name = "stock.move.split"
     _description = "Split in Production lots"
     
+    def default_get(self, cr, uid, fields_list, context=None):
+        """ 
+             Get default values
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param fields_list: List of fields for default value 
+             @param context: A standard dictionary 
+             
+             @return: default values of fields_list
+        
+        """
+        
+        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})  
+        return res
+    
     _columns = {
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
         'line_ids': fields.one2many('stock.move.split.lines', 'lot_id', 'Lots Number')
      }
-    
-    def _get_product_id(self, cr, uid, context):
-        move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
-        return move.product_id.id
-    
-    _defaults = {
-                 'product_id': _get_product_id, 
-                 }
-
     def split_lot(self, cr, uid, ids, context=None):
         """ 
              To split a lot
@@ -242,8 +256,6 @@ class split_in_production_lot(osv.osv_memory):
                         update_val['product_qty'] = quantity_rest
                         update_val['product_uos_qty'] = uos_qty_rest                          
                         move_obj.write(cr, uid, [move.id], update_val)
-
-                    
         return new_move
 split_in_production_lot()
 

From f852c7a6a91e3829301e1c927d56fda8251b8e68 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 19 Mar 2010 12:52:54 +0530
Subject: [PATCH 170/251] [IMP] mrp: modify the default_get

bzr revid: sbh@tinyerp.com-20100319072254-el6slf38sn5biivo
---
 addons/mrp/wizard/make_procurement_product.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/addons/mrp/wizard/make_procurement_product.py b/addons/mrp/wizard/make_procurement_product.py
index b0c3d5ad131..a549d9f24b2 100644
--- a/addons/mrp/wizard/make_procurement_product.py
+++ b/addons/mrp/wizard/make_procurement_product.py
@@ -124,11 +124,9 @@ class make_procurement(osv.osv_memory):
         record_id = context and context.get('active_id', False) or False
 
         res = super(make_procurement, self).default_get(cr, uid, fields, context=context)
-
-        if record_id:
-            product_id = self.pool.get('product.product').browse(cr, uid, record_id, context=context).id
-            res['product_id'] = product_id
-
+        product_id = self.pool.get('product.product').browse(cr, uid, record_id, context=context).id
+        if 'product_id' in fields:
+            res.update({'product_id':product_id})  
         return res
 
 make_procurement()

From 946738526be67c8c0a9aa96b51773a7f0b6fdc9d Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 19 Mar 2010 12:56:34 +0530
Subject: [PATCH 171/251] Point_of_sale: remove the context of record_id

bzr revid: sbh@tinyerp.com-20100319072634-nvx3aw58reob199d
---
 addons/point_of_sale/wizard/pos_discount.py  | 2 +-
 addons/point_of_sale/wizard/pos_discount.xml | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/point_of_sale/wizard/pos_discount.py b/addons/point_of_sale/wizard/pos_discount.py
index f99fe0d7b94..8c9f9ac032d 100644
--- a/addons/point_of_sale/wizard/pos_discount.py
+++ b/addons/point_of_sale/wizard/pos_discount.py
@@ -46,7 +46,7 @@ class pos_discount(osv.osv_memory):
          @return : nothing
         """        
         this = self.browse(cr, uid, ids[0], context=context)
-        record_id = context and context.get('record_id', False)
+        record_id = context and context.get('active_id', False)
         if isinstance(record_id, (int, long)):
             record_id=[record_id]
         
diff --git a/addons/point_of_sale/wizard/pos_discount.xml b/addons/point_of_sale/wizard/pos_discount.xml
index a0e658b8c9c..a0a7c534a95 100644
--- a/addons/point_of_sale/wizard/pos_discount.xml
+++ b/addons/point_of_sale/wizard/pos_discount.xml
@@ -28,7 +28,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-            <field name="context">{'record_id' : active_id}</field>
         </record>
         
 	</data>

From b8102156c2bf2deef19061816ef2a53d809ad503 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 19 Mar 2010 13:50:03 +0530
Subject: [PATCH 172/251] [Add] point_of_sale: add the access rules

bzr revid: sbh@tinyerp.com-20100319082003-yr6emt81re08em18
---
 addons/point_of_sale/security/ir.model.access.csv | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/addons/point_of_sale/security/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv
index efbe26893f1..a761e78c362 100644
--- a/addons/point_of_sale/security/ir.model.access.csv
+++ b/addons/point_of_sale/security/ir.model.access.csv
@@ -19,3 +19,12 @@
 "access_report_sales_by_margin_pos","report.sales.by.margin.pos","model_report_sales_by_margin_pos","point_of_sale.group_pos_user",1,0,0,0
 "access_report_sales_by_margin_pos_month","report.sales.by.margin.pos.month","model_report_sales_by_margin_pos_month","point_of_sale.group_pos_user",1,0,0,0
 "access_singer_statement","singer.statement","model_singer_statement","point_of_sale.group_pos_user",1,0,0,0
+"access_add_product","pos.add.product ","model_pos_add_product","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_confirm","pos.confirm","model_pos_confirm","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_discount","pos.discount","model_pos_discount","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_get_sale","pos.get.sale","model_pos_get_sale","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_close_statement","pos.open.statement","model_pos_open_statement","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_open_statement","pos.close.statement","model_pos_close_statement","point_of_sale.group_pos_user",1,0,0,0
+"acess_pos_box_entries ","pos.box.entries ","model_pos_box_entries","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_box_out","pos.box.out","model_pos_box_out","point_of_sale.group_pos_user",1,0,0,0
+"acess_pos_details ","pos.details ","model_pos_details","point_of_sale.group_pos_user",1,0,0,0

From b540d1f83b5a52491fab6d97c8e17264b0e01ab4 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 19 Mar 2010 13:53:51 +0530
Subject: [PATCH 173/251] [IMP] mrp_repair: remove the context of order_id

bzr revid: sbh@tinyerp.com-20100319082351-ka7msofzoter6utz
---
 addons/mrp_repair/wizard/cancel_repair.py           | 2 +-
 addons/mrp_repair/wizard/mrp_repair_cancel_view.xml | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/mrp_repair/wizard/cancel_repair.py b/addons/mrp_repair/wizard/cancel_repair.py
index 00b0f7695c7..91df6fb01ef 100644
--- a/addons/mrp_repair/wizard/cancel_repair.py
+++ b/addons/mrp_repair/wizard/cancel_repair.py
@@ -65,7 +65,7 @@ class repair_cancel(osv.osv_memory):
              @return: New arch of view.
         
         """
-        record_id = context and context.get('order_id', False) or False        
+        record_id = context and context.get('active_id', False) or False        
         res = super(repair_cancel, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
         if record_id:
             repair_order = self.pool.get('mrp.repair').browse(cr, uid, record_id)
diff --git a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
index c4c939486d0..4af2a3394b0 100644
--- a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
@@ -29,7 +29,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-            <field name="context">{'order_id':active_id}</field>
         </record> 
  		
         

From bc687bcc0aeb799e309b6b3c8ffdeb9e12591ccf Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Fri, 19 Mar 2010 14:19:40 +0530
Subject: [PATCH 174/251] [ADD] mrp: Added the sequence field, invisible=1 on
 the tree view of boms. Updated demo data of BoM.

bzr revid: uco@tinyerp.co.in-20100319084940-f04i6mjdi52nzl2o
---
 addons/mrp/mrp_demo.xml | 46 +++++++++++++++++++++++++++++++++++++++++
 addons/mrp/mrp_view.xml |  1 +
 2 files changed, 47 insertions(+)

diff --git a/addons/mrp/mrp_demo.xml b/addons/mrp/mrp_demo.xml
index f0c1cfa5483..8962eb6e1c8 100644
--- a/addons/mrp/mrp_demo.xml
+++ b/addons/mrp/mrp_demo.xml
@@ -165,6 +165,7 @@
 
         <record id="mrp_bom_0" model="mrp.bom">
             <field name="name">Regular processor config</field>
+            <field name="sequence">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="routing_id" ref="mrp_routing_2"/>
@@ -174,6 +175,7 @@
 
         <record id="mrp_bom_1" model="mrp.bom">
             <field name="name">Assembly Basic+ PC</field>
+            <field name="sequence">5</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="routing_id" ref="mrp_routing_0"/>
@@ -181,18 +183,21 @@
         </record>
         <record id="mrp_bom_2" model="mrp.bom">
             <field name="name">Assembly Medium PC</field>
+            <field name="sequence">8</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field model="product.product" name="product_id" search="[('default_code','=','PC3')]"/>
         </record>
         <record id="mrp_bom_3" model="mrp.bom">
             <field name="name">Assembly Customizable PC</field>
+            <field name="sequence">11</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field model="product.product" name="product_id" search="[('default_code','=','PC4')]"/>
         </record>
         <record id="mrp_bom_4" model="mrp.bom">
             <field name="name">HDD on demand</field>
+            <field name="sequence">14</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
@@ -200,6 +205,7 @@
         </record>
         <record id="mrp_bom_5" model="mrp.bom">
             <field name="name">RAM on demand</field>
+            <field name="sequence">18</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
@@ -207,6 +213,7 @@
         </record>
         <record id="mrp_bom_6" model="mrp.bom">
             <field name="name">HDD on demand</field>
+            <field name="sequence">21</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
@@ -214,6 +221,7 @@
         </record>
         <record id="mrp_bom_7" model="mrp.bom">
             <field name="name">HDD on demand</field>
+            <field name="sequence">25</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
@@ -221,6 +229,7 @@
         </record>
         <record id="mrp_bom_8" model="mrp.bom">
             <field name="name">HDD Seagate</field>
+            <field name="sequence">26</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -228,6 +237,7 @@
         </record>
         <record id="mrp_bom_9" model="mrp.bom">
             <field name="name">Assembly Basic PC</field>
+            <field name="sequence">29</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="routing_id" ref="mrp_routing_0"/>
@@ -236,12 +246,14 @@
         </record>
         <record id="mrp_bom_10" model="mrp.bom">
             <field name="name">Complete PC with peripherals</field>
+            <field name="sequence">33</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field model="product.product" name="product_id" search="[('default_code','=','PC0')]"/>
         </record>
         <record id="mrp_bom_11" model="mrp.bom">
             <field name="name">RAM on demand</field>
+            <field name="sequence">36</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
@@ -250,6 +262,7 @@
 
         <record id="mrp_bom_13" model="mrp.bom">
             <field name="name">High Speed Processor + main board on demand</field>
+            <field name="sequence">38</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field model="product.product" name="product_id" search="[('default_code','=','CPU2')]"/>
@@ -258,6 +271,7 @@
         <record id="mrp_bom_kit" model="mrp.bom">
             <field name="code">KIT</field>
             <field name="name">Kit Mouse</field>
+            <field name="sequence">40</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -266,6 +280,7 @@
         </record>
         <record id="mrp_bom_clavier" model="mrp.bom">
             <field name="name">Keyboard</field>
+            <field name="sequence">42</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_kit"/>
@@ -273,6 +288,7 @@
         </record>
         <record id="mrp_bom_mouse" model="mrp.bom">
             <field name="name">Mouse</field>
+            <field name="sequence">44</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_kit"/>
@@ -280,6 +296,7 @@
         </record>
         <record id="mrp_bom_16" model="mrp.bom">
             <field name="name">Moon PC</field>
+            <field name="sequence">45</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_10"/>
@@ -287,6 +304,7 @@
         </record>
         <record id="mrp_bom_18" model="mrp.bom">
             <field name="name">Mainboard ASUStek A7N8X</field>
+            <field name="sequence">49</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_13"/>
@@ -294,6 +312,7 @@
         </record>
         <record id="mrp_bom_19" model="mrp.bom">
             <field name="name">Processor AMD Athlon 2200+</field>
+            <field name="sequence">51</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_13"/>
@@ -301,6 +320,7 @@
         </record>
         <record id="mrp_bom_1900" model="mrp.bom">
             <field name="name">Regular Case Fan</field>
+            <field name="sequence">54</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_13"/>
@@ -308,6 +328,7 @@
         </record>
         <record id="mrp_bom_23" model="mrp.bom">
             <field name="name">DDR 256MB PC333</field>
+            <field name="sequence">57</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_11"/>
@@ -315,6 +336,7 @@
         </record>
         <record id="mrp_bom_1901" model="mrp.bom">
             <field name="name">DDR 512MB PC400</field>
+            <field name="sequence">59</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_13"/>
@@ -322,6 +344,7 @@
         </record>
         <record id="mrp_bom_22" model="mrp.bom">
             <field name="name">DDR 1024MB PC400</field>
+            <field name="sequence">61</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_5"/>
@@ -329,6 +352,7 @@
         </record>
         <record id="mrp_bom_24" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 80GB</field>
+            <field name="sequence">64</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_7"/>
@@ -336,6 +360,7 @@
         </record>
         <record id="mrp_bom_25" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 120GB</field>
+            <field name="sequence">66</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -344,6 +369,7 @@
         </record>
         <record id="mrp_bom_26" model="mrp.bom">
             <field name="name">RAM on demand</field>
+            <field name="sequence">69</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_3"/>
@@ -351,6 +377,7 @@
         </record>
         <record id="mrp_bom_27" model="mrp.bom">
             <field name="name">HDD on demand</field>
+            <field name="sequence">73</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_3"/>
@@ -358,6 +385,7 @@
         </record>
         <record id="mrp_bom_28" model="mrp.bom">
             <field name="name">ATX middle-size case</field>
+            <field name="sequence">76</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -366,6 +394,7 @@
         </record>
         <record id="mrp_bom_29" model="mrp.bom">
             <field name="name">Processor on demand</field>
+            <field name="sequence">79</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -374,6 +403,7 @@
         </record>
         <record id="mrp_bom_30" model="mrp.bom">
             <field name="name">ATX Middle-size case</field>
+            <field name="sequence">81</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -382,6 +412,7 @@
         </record>
         <record id="mrp_bom_31" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 80GB</field>
+            <field name="sequence">83</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -390,6 +421,7 @@
         </record>
         <record id="mrp_bom_32" model="mrp.bom">
             <field name="name">High speed processor config</field>
+            <field name="sequence">85</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -398,6 +430,7 @@
         </record>
         <record id="mrp_bom_33" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 120GB</field>
+            <field name="sequence">87</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -406,6 +439,7 @@
         </record>
         <record id="mrp_bom_34" model="mrp.bom">
             <field name="name">Regular processor config</field>
+            <field name="sequence">89</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -414,6 +448,7 @@
         </record>
         <record id="mrp_bom_35" model="mrp.bom">
             <field name="name">ATX middle-size case</field>
+            <field name="sequence">92</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -422,6 +457,7 @@
         </record>
         <record id="mrp_bom_36" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 120GB</field>
+            <field name="sequence">95</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -430,6 +466,7 @@
         </record>
         <record id="mrp_bom_processor" model="mrp.bom">
             <field name="name">processor</field>
+            <field name="sequence">98</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -438,6 +475,7 @@
         </record>
         <record id="mrp_bom_38" model="mrp.bom">
             <field name="name">mainboard</field>
+            <field name="sequence">101</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -446,6 +484,7 @@
         </record>
         <record id="mrp_bom_fan" model="mrp.bom">
             <field name="name">fan</field>
+            <field name="sequence">105</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -454,6 +493,7 @@
         </record>
         <record id="mrp_bom_ram" model="mrp.bom">
             <field name="name">RAM</field>
+            <field name="sequence">108</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -462,6 +502,7 @@
         </record>
         <record id="mrp_bom_41" model="mrp.bom">
             <field name="name">Regular processor config</field>
+            <field name="sequence">111</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -470,6 +511,7 @@
         </record>
         <record id="mrp_bom_42" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 80GB</field>
+            <field name="sequence">113</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -478,6 +520,7 @@
         </record>
         <record id="mrp_bom_43" model="mrp.bom">
             <field name="name">ATX Middle-size case</field>
+            <field name="sequence">115</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -487,6 +530,7 @@
 
         <record id="mrp_bom_kit2" model="mrp.bom">
             <field name="code">KIT</field>
+            <field name="sequence">118</field>
             <field name="name">Kit Keyboard + Mouse</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
@@ -496,6 +540,7 @@
         </record>
         <record id="mrp_bom_mouse2" model="mrp.bom">
             <field name="name">Mouse</field>
+            <field name="sequence">121</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_kit2"/>
@@ -503,6 +548,7 @@
         </record>
         <record id="mrp_bom_clavier2" model="mrp.bom">
             <field name="name">Keyboard</field>
+            <field name="sequence">123</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_kit2"/>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index bf63d89666c..15729a8c985 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -291,6 +291,7 @@
             <field name="field_parent">child_complete_ids</field>
             <field name="arch" type="xml">
                 <tree string="BoM Structure" colors="blue:method">
+					<field name="sequence" invisible="1"/>
                     <field name="name"/>
                     <field name="code"/>
                     <field name="product_id"/>

From d8975f4afc93be748e8c4d0fc39bd28f3ff2dcf0 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Fri, 19 Mar 2010 14:38:58 +0530
Subject: [PATCH 175/251] [ADD] auction: Added an osv_memory wizard 'Auction
 Catalog Flagey' on auction.dates object.

bzr revid: uco@tinyerp.co.in-20100319090858-i9rf8s1l1kavqyrb
---
 addons/auction/__terp__.py                    |  1 +
 addons/auction/wizard/__init__.py             |  1 +
 .../auction/wizard/auction_catalog_flagey.py  | 49 -----------------
 .../wizard/auction_catalog_flagey_report.py   | 53 +++++++++++++++++++
 .../wizard/auction_catalog_flagey_view.xml    | 32 +++++++++++
 5 files changed, 87 insertions(+), 49 deletions(-)
 delete mode 100644 addons/auction/wizard/auction_catalog_flagey.py
 create mode 100644 addons/auction/wizard/auction_catalog_flagey_report.py
 create mode 100644 addons/auction/wizard/auction_catalog_flagey_view.xml

diff --git a/addons/auction/__terp__.py b/addons/auction/__terp__.py
index c3f9058f070..41c4a6f1a8d 100644
--- a/addons/auction/__terp__.py
+++ b/addons/auction/__terp__.py
@@ -43,6 +43,7 @@
         'wizard/auction_pay_buy_view.xml',
         'wizard/auction_payer_sel_view.xml',
         'wizard/auction_lots_sms_send_view.xml',
+        'wizard/auction_catalog_flagey_view.xml',
         
         'auction_view.xml',
         'auction_report.xml',
diff --git a/addons/auction/wizard/__init__.py b/addons/auction/wizard/__init__.py
index eba1b0b5113..e6748e31172 100644
--- a/addons/auction/wizard/__init__.py
+++ b/addons/auction/wizard/__init__.py
@@ -28,6 +28,7 @@ import auction_lots_auction_move
 import auction_pay_buy
 import auction_payer_sel
 import auction_lots_sms_send
+import auction_catalog_flagey_report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/auction/wizard/auction_catalog_flagey.py b/addons/auction/wizard/auction_catalog_flagey.py
deleted file mode 100644
index fd73e7dadc4..00000000000
--- a/addons/auction/wizard/auction_catalog_flagey.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-
-def _wo_check(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    current_auction=pool.get('auction.dates').browse(cr,uid,data['id'])
-    v_lots=pool.get('auction.lots').search(cr,uid,[('auction_id','=',current_auction.id)])
-    v_ids=pool.get('auction.lots').browse(cr,uid,v_lots)
-    for ab in v_ids:
-        if not ab.auction_id :
-            raise wizard.except_wizard('Error!','No Lots belong to this Auction Date')
-    return 'report'
-
-class wizard_report(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result' : {'type': 'choice', 'next_state': _wo_check }
-        },
-        'report': {
-            'actions': [],
-            'result': {'type':'print', 'report':'auction.cat_flagy', 'state':'end'}
-        }
-    }
-wizard_report('auction.catalog.flagey')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/auction/wizard/auction_catalog_flagey_report.py b/addons/auction/wizard/auction_catalog_flagey_report.py
new file mode 100644
index 00000000000..4babf667a70
--- /dev/null
+++ b/addons/auction/wizard/auction_catalog_flagey_report.py
@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import osv, fields
+import netsvc
+
+class auction_catalog_flagey(osv.osv_memory):
+    _name = 'auction.catalog.flagey'
+    _description = 'Auction Catalog Flagey'
+    
+    def default_get(self, cr, uid, fields, context):
+        res = super(auction_catalog_flagey, self).default_get(cr, uid, fields, context=context)
+        return res
+    
+    def view_init(self, cr, uid, fields_list, context):
+        current_auction = self.pool.get('auction.dates').browse(cr,uid,context.get('active_ids', []))
+        v_lots = self.pool.get('auction.lots').search(cr,uid,[('auction_id','=',current_auction.id)])
+        v_ids = self.pool.get('auction.lots').browse(cr,uid,v_lots)
+        for ab in v_ids:
+            if not ab.auction_id :
+                raise osv.except_osv('Error!','No Lots belong to this Auction Date')
+        pass
+    
+    def print_report(self, cr, uid, ids, context):
+        datas = {'ids': context.get('active_ids',[])}
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'auction.cat_flagy',
+            'datas': datas,
+        }
+    
+auction_catalog_flagey()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/auction_catalog_flagey_view.xml b/addons/auction/wizard/auction_catalog_flagey_view.xml
new file mode 100644
index 00000000000..ca87771cc37
--- /dev/null
+++ b/addons/auction/wizard/auction_catalog_flagey_view.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Auction Catalog Flagey Report -->
+        
+		<record id="view_auction_catalog_flagey_wizard" model="ir.ui.view">
+            <field name="name">Auction Catalog Flagey</field>
+            <field name="model">auction.catalog.flagey</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Catalog Flagey Report">
+                	<label string="Print Auction Catalog Flagey Report..."/>
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="print_report" string="Ok"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+       <act_window name="Auction Catalog Flagey"
+            res_model="auction.catalog.flagey"
+            src_model="auction.dates"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_auction_catalog_flagey_wizard"/>
+	</data>
+</openerp>	

From e1013773db290a4fb057fa464691718094dee09d Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 19 Mar 2010 14:54:27 +0530
Subject: [PATCH 176/251] [IMP] stock: Add the picking_id in partial_picking
 wizard

bzr revid: sbh@tinyerp.com-20100319092427-53al3539p12pbvc7
---
 addons/stock/stock.py                         | 1 +
 addons/stock/stock_view.xml                   | 1 +
 addons/stock/wizard/wizard_partial_picking.py | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 8bbe1bdaf5b..f0492c7dd77 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1770,6 +1770,7 @@ class stock_delivery(osv.osv):
         'date': fields.datetime('Date'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
         'product_delivered':fields.one2many('stock.move', 'delivered_id', 'Product Delivered', domain=[('picking_id.type','=','in')]),
+        'picking_id': fields.many2one('stock.picking', 'Picking list'),
     }
 
     
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index f4663b36d25..809d6a6fbb8 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1759,6 +1759,7 @@
                 		<field name="name"/>
 	                    <field name="date"/>
 	                    <field name="partner_id"/>
+	                    <field name="picking_id"/>
 	                    <separator string="Product Delivered Information" colspan="4" />
 	                    <field name="product_delivered" colspan="4" nolabel="1" widget="one2many" mode="tree,form">
 	                       <tree string="Stock Moves" editable="top">
diff --git a/addons/stock/wizard/wizard_partial_picking.py b/addons/stock/wizard/wizard_partial_picking.py
index aad6a4b38b3..68655f72d0d 100644
--- a/addons/stock/wizard/wizard_partial_picking.py
+++ b/addons/stock/wizard/wizard_partial_picking.py
@@ -198,7 +198,8 @@ def _do_split(self, cr, uid, data, context):
                         'name':  pick.name,                                 
                         'partner_id': partner_id,
                         'date': move.date,
-                        'product_delivered':[(6,0, [new_obj])]
+                        'product_delivered':[(6,0, [new_obj])],
+                        'picking_id':move.picking_id.id
                     }, context=context)   
             if not isinstance(delivery_id, (int, long)): 
                delivery_id=delivery_id[0]

From 13dd810ca64824b7e358cc7a05596ef98a97e73d Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Fri, 19 Mar 2010 17:32:06 +0530
Subject: [PATCH 177/251] [ADD] auction: Added docstring for wizard function.

bzr revid: uco@tinyerp.co.in-20100319120206-479g0fz3eqx4a4e1
---
 .../wizard/auction_catalog_flagey_report.py    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/addons/auction/wizard/auction_catalog_flagey_report.py b/addons/auction/wizard/auction_catalog_flagey_report.py
index 4babf667a70..117389770da 100644
--- a/addons/auction/wizard/auction_catalog_flagey_report.py
+++ b/addons/auction/wizard/auction_catalog_flagey_report.py
@@ -27,6 +27,15 @@ class auction_catalog_flagey(osv.osv_memory):
     _description = 'Auction Catalog Flagey'
     
     def default_get(self, cr, uid, fields, context):
+        """ 
+         To get default values for the object.
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param fields: List of fields for which we want default values 
+         @param context: A standard dictionary 
+         @return: A dictionary which of fields with values. 
+        """
         res = super(auction_catalog_flagey, self).default_get(cr, uid, fields, context=context)
         return res
     
@@ -40,6 +49,15 @@ class auction_catalog_flagey(osv.osv_memory):
         pass
     
     def print_report(self, cr, uid, ids, context):
+        """ 
+         Prints auction catalog flagey report.
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param ids: List of IDs selected 
+         @param context: A standard dictionary 
+         @return: Report  
+        """
         datas = {'ids': context.get('active_ids',[])}
         return {
             'type': 'ir.actions.report.xml',

From 757926595ac97f0ddb88db9e3c867a8ccccb9ca0 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 19 Mar 2010 17:38:32 +0530
Subject: [PATCH 178/251] [IMP] point_of_sale: convert the  pos_sale_user
 wizard into osv_memroy

bzr revid: sbh@tinyerp.com-20100319120832-hnw3y7mwzupr95sd
---
 addons/point_of_sale/__terp__.py              |  4 +-
 addons/point_of_sale/pos_view.xml             |  4 +-
 addons/point_of_sale/pos_wizard.xml           |  4 +-
 addons/point_of_sale/report/pos_sales_user.py |  2 +-
 addons/point_of_sale/wizard/__init__.py       |  1 -
 .../point_of_sale/wizard/pos_sales_user.xml   | 43 +++++++++++++++++++
 ...rd_pos_sales_user.py => pos_sales_user.py} |  0
 7 files changed, 51 insertions(+), 7 deletions(-)
 create mode 100644 addons/point_of_sale/wizard/pos_sales_user.xml
 rename addons/{point_of_sale/wizard/wizard_pos_sales_user.py => pos_sales_user.py} (100%)

diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__terp__.py
index 4de467c2028..262f2528480 100644
--- a/addons/point_of_sale/__terp__.py
+++ b/addons/point_of_sale/__terp__.py
@@ -51,7 +51,9 @@ Main features :
         'wizard/pos_open_statement.xml',
         'wizard/pos_close_statement.xml',  
         'wizard/pos_box_entries.xml',  
-        'wizard/pos_box_out.xml', 
+        'wizard/pos_box_out.xml',
+        'wizard/pos_sales_user.xml',
+        'wizard/all_closed_cashbox_of_the_day.xml',  
         'pos_report.xml',
         'pos_wizard.xml',
         'pos_view.xml',
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 1af8841817b..ddf769f41f6 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -981,8 +981,8 @@ invoiced
 <!--		<menuitem icon="STOCK_PRINT" action="wizard_pos_payment_report"
 				id="menu_pos_payment_report" parent="menu_cashboxes_by_day" type="wizard" sequence="4"/-->
 
-		<menuitem icon="STOCK_PRINT" action="wizard_pos_sales_user"
-				id="menu_pos_sales_user" parent="menu_trans_pos_tree" type="wizard" sequence="3" groups="base.group_extended" />
+		<menuitem icon="STOCK_PRINT" action="action_report_pos_sale_user"
+				id="menu_pos_sales_user" parent="menu_trans_pos_tree" sequence="3" groups="base.group_extended" />
 
 
 		<menuitem icon="STOCK_PRINT" action="wizard_pos_sales_user_today"
diff --git a/addons/point_of_sale/pos_wizard.xml b/addons/point_of_sale/pos_wizard.xml
index 3adc250129e..93a31d1b77d 100644
--- a/addons/point_of_sale/pos_wizard.xml
+++ b/addons/point_of_sale/pos_wizard.xml
@@ -36,9 +36,9 @@
 
 <!--		<wizard id="wizard_pos_payment_report" menu="False"
 				model="pos.order" name="pos.payment.report" string="All paid lines for the current User"/-->
-
+<!--
 		<wizard id="wizard_pos_sales_user" menu="False"
-				model="pos.order" name="pos.sales.user" string="Sales Report"/>
+				model="pos.order" name="pos.sales.user" string="Sales Report"/>-->
 
 		<wizard id="wizard_pos_sales_user_today" menu="False"
 				model="pos.order" name="pos.sales.user.today" string="Sales by Users"/>
diff --git a/addons/point_of_sale/report/pos_sales_user.py b/addons/point_of_sale/report/pos_sales_user.py
index 034587a8ae4..b1b7272a030 100644
--- a/addons/point_of_sale/report/pos_sales_user.py
+++ b/addons/point_of_sale/report/pos_sales_user.py
@@ -42,7 +42,7 @@ class pos_sales_user(report_sxw.rml_parse):
                         "from pos_order as po,res_users as ru,res_company as rc " \
                         "where po.date_order >= %s and po.date_order <= %s " \
                         "and po.company_id=rc.id and po.user_id=ru.id and po.user_id in %s " \
-                            ,(dt1,dt2,tuple(form['user_id'][0][-1])))
+                            ,(dt1,dt2,tuple(form['user_id'])))
 
         data = self.cr.dictfetchall()
         return data
diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index 7f06e28b453..3be282bc0a4 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -26,7 +26,6 @@ import wizard_scan_product
 import wizard_receipt
 import wizard_return
 import wizard_pos_payment_report
-import wizard_pos_sales_user
 import wizard_pos_sales_user_today
 import wizard_pos_payment_report_date
 import wizard_pos_payment_report_user
diff --git a/addons/point_of_sale/wizard/pos_sales_user.xml b/addons/point_of_sale/wizard/pos_sales_user.xml
new file mode 100644
index 00000000000..0fc46f81aac
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_sales_user.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        
+        <!--   pos.details -->
+        
+		<record id="view_pos_sale_user" model="ir.ui.view">
+            <field name="name">Sale By User</field>
+            <field name="model">pos.sale.user</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="POS Details :">
+				    <group col="2" colspan="4">
+				    	<field name="date_start"/>
+				    	<field name="date_end"/>
+				    	<field name="user_id"/>
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Close" />
+                		<button name="print_report" string="Print Report"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+
+        <record id="action_report_pos_sale_user" model="ir.actions.act_window">
+            <field name="name">Sale by User</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.sale.user</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+<!--    <act_window name="POS Details"
+            res_model="pos.details"
+            src_model="pos.order"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_report_pos_details"/>   -->
+        
+	</data>
+</openerp>	        
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/wizard_pos_sales_user.py b/addons/pos_sales_user.py
similarity index 100%
rename from addons/point_of_sale/wizard/wizard_pos_sales_user.py
rename to addons/pos_sales_user.py

From 3dc9e6e91ceb6cebcd46ba06ffd858678f919a1d Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 19 Mar 2010 17:47:50 +0530
Subject: [PATCH 179/251] [Add] Point_of_sale: add the file

bzr revid: sbh@tinyerp.com-20100319121750-wpbjyz0uo0rlpar7
---
 addons/point_of_sale/wizard/pos_sales_user.py | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 addons/point_of_sale/wizard/pos_sales_user.py

diff --git a/addons/point_of_sale/wizard/pos_sales_user.py b/addons/point_of_sale/wizard/pos_sales_user.py
new file mode 100644
index 00000000000..cbb2ddaead9
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_sales_user.py
@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import netsvc
+from osv import osv,fields
+from tools.translate import _
+from mx import DateTime
+import time
+
+class pos_sale_user(osv.osv_memory):
+    _name = 'pos.sale.user'
+    _description = 'Sale by User'
+
+    _columns = {
+        'date_start': fields.date('Date Start',required=True),
+        'date_end': fields.date('Date End',required=True),
+        'user_id': fields.many2many('res.users', 'sale_user_rel', 'user_id', 'uid', 'Salesman'),        
+    }
+    
+    def print_report(self, cr, uid, ids, context={}):
+        """ 
+         To get the date and print the report           
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param context: A standard dictionary 
+         @return : return report
+        """
+        
+        datas = {'ids' : context.get('active_ids', [])}
+        res = self.read(cr, uid, ids, ['date_start','date_end','user_id'], context)
+        res = res and res[0] or {}    
+        datas['form'] = res        
+        return { 
+            'type':'ir.actions.report.xml',
+            'report_name':'pos.sales.user',
+            'datas':datas,               
+       }
+pos_sale_user()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

From 3641b2094e1cd6ed2d3282089f295ac3bc3ccb05 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Fri, 19 Mar 2010 17:47:29 +0530
Subject: [PATCH 180/251] [ADD] mrp: Added security rules for new objects.

bzr revid: uco@tinyerp.co.in-20100319121729-btlb1mk2fy20n86q
---
 addons/mrp/security/ir.model.access.csv | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index c5ff2412fcd..48f27679435 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -39,3 +39,5 @@
 "access_mrp_production_order","mrp.production.order","model_mrp_production_order","mrp.group_mrp_user",1,0,0,0
 "access_report_workcenter_load","report.workcenter.load","model_report_workcenter_load","mrp.group_mrp_manager",1,0,0,0
 "access_report_mrp_inout","report.mrp.inout","model_report_mrp_inout","mrp.group_mrp_manager",1,0,0,0
+"access_mrp_product_price","mrp.product_price","model_mrp_product_price","mrp.group_mrp_manager",1,0,0,0
+"access_mrp_workcenter_load","mrp.workcenter.load","model_mrp_workcenter_load","mrp.group_mrp_manager",1,0,0,0

From 92b994847d16467ea92e0d4aa234c2a2025a9a5a Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Fri, 19 Mar 2010 17:59:49 +0530
Subject: [PATCH 181/251] [ADD] auction: Added 'Lots Invoice' wizard converting
 to osv_memory wizard to print report.

bzr revid: uco@tinyerp.co.in-20100319122949-y825szqzrjjfen6v
---
 addons/auction/wizard/auction_lots_invoice.py | 124 ++++++++++++++++++
 .../wizard/auction_lots_invoice_view.xml      |  39 ++++++
 addons/auction/wizard/wizard_lots_invoice.py  | 106 ---------------
 3 files changed, 163 insertions(+), 106 deletions(-)
 create mode 100644 addons/auction/wizard/auction_lots_invoice.py
 create mode 100644 addons/auction/wizard/auction_lots_invoice_view.xml
 delete mode 100644 addons/auction/wizard/wizard_lots_invoice.py

diff --git a/addons/auction/wizard/auction_lots_invoice.py b/addons/auction/wizard/auction_lots_invoice.py
new file mode 100644
index 00000000000..9581941266f
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_invoice.py
@@ -0,0 +1,124 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import osv, fields
+import netsvc
+from tools.translate import _
+
+class auction_lots_invoice(osv.osv_memory):
+    _name = 'auction.lots.invoice'
+    _description = "Auction Lots Invoice"
+    
+    _columns = {
+        'amount': fields.float('Invoiced Amount', required=True, readonly=True),
+        'amount_topay': fields.float('Amount to pay', required=True, readonly=True),
+        'amount_paid': fields.float('Amount paid', readonly=True),
+        'objects': fields.integer('# of objects', required=True, readonly=True),
+        'ach_uid': fields.many2one('res.partner','Buyer Name', required=True ),
+        'number': fields.integer('Invoice Number'),
+#        'tax_applied':{'string':'Tax Applied', 'type':'float', 'readonly':True},
+    }
+
+    def default_get(self, cr, uid, fields, context={}):
+        """ 
+         To get default values for the object.
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param fields: List of fields for which we want default values 
+         @param context: A standard dictionary 
+         @return: A dictionary which of fields with values. 
+        """
+        res = super(auction_lots_invoice, self).default_get(cr, uid, fields, context=context)
+        service = netsvc.LocalService("object_proxy")
+        lots = service.execute(cr.dbname, uid, 'auction.lots', 'read', context.get('active_ids', []))
+        auction = service.execute(cr.dbname,uid, 'auction.dates', 'read', [lots[0]['auction_id'][0]])[0]
+    
+        price = 0.0
+        price_topay = 0.0
+        price_paid = 0.0
+        #tax=data['form']['tax_applied']
+#        uid = False
+        for lot in lots:
+            price_lot = lot['obj_price'] or 0.0
+            
+            costs = service.execute(cr.dbname, uid, 'auction.lots', 'compute_buyer_costs', [lot['id']])
+            price_lot += costs['amount']
+#            for cost in costs:
+#                price_lot += cost['amount']
+    
+            price += price_lot
+    
+            if lot['ach_uid']:
+                if uid and (lot['ach_uid'][0]<>uid):
+                    raise osv.except_osv(_('UserError'), _('Two different buyers for the same invoice !\nPlease correct this problem before invoicing'))
+                uid = lot['ach_uid'][0]
+            elif lot['ach_login']:
+                refs = service.execute(uid, 'res.partner', 'search', [('ref','=',lot['ach_login'])])
+                if len(refs):
+                    uid = refs[-1]
+            if 'ach_pay_id' in lot and lot['ach_pay_id']:
+                price_paid += price_lot
+                #*tax
+            else:
+                price_topay += price_lot
+                #*tax
+    
+    #TODO: recuperer id next invoice (de la sequence)???
+        invoice_number = False
+        for lot in self.pool.get('auction.lots').browse(cr, uid, context.get('active_ids', [])):
+            if 'objects' in fields:
+                res.update({'objects':len(context.get('active_ids', []))})
+            if 'amount' in fields:
+                res.update({'amount': price})
+            if 'ach_uid' in fields:
+                res.update({'ach_uid': uid})
+            if 'amount_topay' in fields:
+                res.update({'amount_topay':price_topay})
+            if 'amount_paid' in fields:
+                res.update({'amount_paid':price_paid})
+            if 'number' in fields:
+                res.update({'number':invoice_number})
+        return res
+
+    def print_report(self, cr, uid, ids, context={}):
+        """
+        Create an invoice report.
+        @param cr: the current row, from the database cursor.
+        @param uid: the current user’s ID for security checks.
+        @param ids: List of Auction lots make invoice buyer’s IDs
+        @return: dictionary of  account invoice form.
+        """ 
+        service = netsvc.LocalService("object_proxy")
+        datas = {'ids' : context.get('active_ids',[])}
+        res = self.read(cr, uid, ids, ['number','ach_uid'])
+        res = res and res[0] or {}        
+        datas['form'] = res
+#        service.execute(cr.dbname, uid, 'auction.lots', 'lots_invoice_and_cancel_old_invoice', datas['ids'], datas['form']['number'], datas['form']['ach_uid'], 'invoice_open')
+        return {
+            'type' : 'ir.actions.report.xml',
+            'report_name':'auction.invoice',
+            'datas' : datas, 
+        }
+        
+auction_lots_invoice()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auction/wizard/auction_lots_invoice_view.xml b/addons/auction/wizard/auction_lots_invoice_view.xml
new file mode 100644
index 00000000000..4adc7098789
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_invoice_view.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Auction Lots Invoice Report -->
+        
+		<record id="view_auction_lots_invoice_wizard" model="ir.ui.view">
+            <field name="name">auction.lots.invoice.wizard</field>
+            <field name="model">auction.lots.invoice</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Paid ?">
+                	<field name="amount"/>
+                	<field name="objects"/>
+                	<field name="amount_topay"/>
+                	<field name="amount_paid"/>
+                	<newline/>
+                	<field name="ach_uid"/>
+                	<field name="number"/>
+                	<label string="Let this invoice's number"/>
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="print_report" string="Ok"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+       <act_window name="Auction Lots Invoice"
+            res_model="auction.lots.invoice"
+            src_model="auction.dates"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_auction_lots_invoice_wizard"/>
+	</data>
+</openerp>	
diff --git a/addons/auction/wizard/wizard_lots_invoice.py b/addons/auction/wizard/wizard_lots_invoice.py
deleted file mode 100644
index 636b12cc2ff..00000000000
--- a/addons/auction/wizard/wizard_lots_invoice.py
+++ /dev/null
@@ -1,106 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-
-invoice_form = '''<?xml version="1.0"?>
-<form title="Paid ?">
-    <field name="amount"/>
-    <field name="objects"/>
-    <field name="amount_topay"/>
-    <field name="amount_paid"/>
-    <!--field name= "tax_applied"/>-->
-    <newline/>
-    <field name="ach_uid" colspan="3"/>
-    <field name="number" colspan="3"/>
-    <field label="Let this invoice's number "/>
-</form>'''
-
-invoice_fields = {
-    'amount': {'string':'Invoiced Amount', 'type':'float', 'required':True, 'readonly':True},
-    'amount_topay': {'string':'Amount to pay', 'type':'float', 'required':True, 'readonly':True},
-    'amount_paid': {'string':'Amount paid', 'type':'float', 'readonly':True},
-    'objects': {'string':'# of objects', 'type':'integer', 'required':True, 'readonly':True},
-    'ach_uid': {'string':'Buyer Name', 'type':'many2one', 'required':True, 'relation':'res.partner'},
-    'number': {'string':'Invoice Number', 'type':'integer'},
-        #'tax_applied':{'string':'Tax Applied', 'type':'float', 'readonly':True},
-}
-
-def _get_value(self,cr,uid, datas,context={}):
-    service = netsvc.LocalService("object_proxy")
-    lots = service.execute(cr,uid, 'auction.lots', 'read', datas['ids'])
-    auction = service.execute(cr,uid, 'auction.dates', 'read', [lots[0]['auction_id'][0]])[0]
-
-    price = 0.0
-    price_topay = 0.0
-    price_paid = 0.0
-    #tax=data['form']['tax_applied']
-    uid = False
-    for lot in lots:
-        price_lot = lot['obj_price'] or 0.0
-
-        costs = service.execute(uid, 'auction.lots', 'compute_buyer_costs', [lot['id']])
-        for cost in costs:
-            price_lot += cost['amount']
-
-        price += price_lot
-
-        if lot['ach_uid']:
-            if uid and (lot['ach_uid'][0]<>uid):
-                raise wizard.except_wizard('UserError', ('Two different buyers for the same invoice !\nPlease correct this problem before invoicing', 'init'))
-            uid = lot['ach_uid'][0]
-        elif lot['ach_login']:
-            refs = service.execute(uid, 'res.partner', 'search', [('ref','=',lot['ach_login'])])
-            if len(refs):
-                uid = refs[-1]
-        if lot['ach_pay_id']:
-            price_paid += price_lot
-            #*tax
-        else:
-            price_topay += price_lot
-            #*tax
-
-#TODO: recuperer id next invoice (de la sequence)???
-    invoice_number = False
-    return {'objects':len(datas['ids']), 'amount':price, 'ach_uid':uid, 'amount_topay':price_topay, 'amount_paid':price_paid, 'number':invoice_number}
-
-def _invoice(self, uid, datas):
-    service = netsvc.LocalService("object_proxy")
-    service.execute(uid, 'auction.lots', 'lots_invoice_and_cancel_old_invoice', datas['ids'], datas['form']['number'], datas['form']['ach_uid'], 'invoice_open')
-    return {}
-
-class wiz_auc_lots_invoice(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_get_value],
-            'result': {'type': 'form', 'arch':invoice_form, 'fields': invoice_fields, 'state':[('invoice','Create Invoice'), ('end','Cancel')]}
-        },
-        'invoice': {
-            'actions': [_invoice],
-            'result': {'type': 'print', 'report':'auction.invoice', 'state':'end'}
-        }
-    }
-wiz_auc_lots_invoice('auction.lots.invoice');
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From d513008d508a3d6f1b3263aa522925c4d856c2cd Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 19 Mar 2010 18:25:51 +0530
Subject: [PATCH 182/251] [IMP]point_of_sale :convert the wizard of
 pos_sales_user_today into osv_memory

bzr revid: sbh@tinyerp.com-20100319125551-cp3nkwcu5e40w15a
---
 addons/point_of_sale/__terp__.py              |  3 +-
 addons/point_of_sale/pos_view.xml             |  6 +-
 addons/point_of_sale/pos_wizard.xml           |  4 +-
 .../report/pos_sales_user_today.py            |  2 +-
 addons/point_of_sale/wizard/__init__.py       |  4 +-
 addons/point_of_sale/wizard/pos_details.xml   |  4 +-
 .../wizard/pos_sales_user_today.py            | 58 ++++++++++++++++
 .../wizard/wizard_pos_sales_user_today.py     | 66 -------------------
 8 files changed, 71 insertions(+), 76 deletions(-)
 create mode 100644 addons/point_of_sale/wizard/pos_sales_user_today.py
 delete mode 100644 addons/point_of_sale/wizard/wizard_pos_sales_user_today.py

diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__terp__.py
index 262f2528480..baf4fe612e2 100644
--- a/addons/point_of_sale/__terp__.py
+++ b/addons/point_of_sale/__terp__.py
@@ -53,7 +53,8 @@ Main features :
         'wizard/pos_box_entries.xml',  
         'wizard/pos_box_out.xml',
         'wizard/pos_sales_user.xml',
-        'wizard/all_closed_cashbox_of_the_day.xml',  
+        #'wizard/all_closed_cashbox_of_the_day.xml',  
+        'wizard/pos_sale_user_today.xml',          
         'pos_report.xml',
         'pos_wizard.xml',
         'pos_view.xml',
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index ddf769f41f6..fdbddfe460a 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -985,8 +985,8 @@ invoiced
 				id="menu_pos_sales_user" parent="menu_trans_pos_tree" sequence="3" groups="base.group_extended" />
 
 
-		<menuitem icon="STOCK_PRINT" action="wizard_pos_sales_user_today"
-				id="menu_pos_sales_user_today" parent="menu_trans_pos_tree_today" type="wizard" sequence="2" groups="base.group_extended"/>
+		<menuitem icon="STOCK_PRINT" action="action_pos_sales_user_today"
+				id="menu_pos_sales_user_today" parent="menu_trans_pos_tree_today" sequence="2" groups="base.group_extended"/>
 
 		<menuitem icon="STOCK_PRINT" action="wizard_pos_payment_report_date"
 				id="menu_pos_payment_report_date" parent="menu_trans_pos_tree" type="wizard" sequence="5" groups="base.group_extended"/>
@@ -997,7 +997,7 @@ invoiced
 				id="menu_pos_sales_user_today_current_user" parent="menu_cashboxes_by_day" type="wizard" sequence="7"/>
     	
     	<menuitem icon="STOCK_PRINT" action="action_report_pos_details"
-				id="menu_pos_details" parent="menu_cashboxes_by_day" type="action" />
+				id="menu_pos_details" parent="menu_cashboxes_by_day"  />
 
 
     </data>
diff --git a/addons/point_of_sale/pos_wizard.xml b/addons/point_of_sale/pos_wizard.xml
index 93a31d1b77d..86b0ca86974 100644
--- a/addons/point_of_sale/pos_wizard.xml
+++ b/addons/point_of_sale/pos_wizard.xml
@@ -40,8 +40,8 @@
 		<wizard id="wizard_pos_sales_user" menu="False"
 				model="pos.order" name="pos.sales.user" string="Sales Report"/>-->
 
-		<wizard id="wizard_pos_sales_user_today" menu="False"
-				model="pos.order" name="pos.sales.user.today" string="Sales by Users"/>
+<!--		<wizard id="wizard_pos_sales_user_today" menu="False"
+				model="pos.order" name="pos.sales.user.today" string="Sales by Users"/>-->
 
 		<wizard id="wizard_pos_payment_report_date" menu="False"
 				model="pos.order" name="pos.payment.report.date" string="Sales lines Report"/>
diff --git a/addons/point_of_sale/report/pos_sales_user_today.py b/addons/point_of_sale/report/pos_sales_user_today.py
index 4e06a936116..a5caf899069 100644
--- a/addons/point_of_sale/report/pos_sales_user_today.py
+++ b/addons/point_of_sale/report/pos_sales_user_today.py
@@ -36,7 +36,7 @@ class pos_sales_user_today(report_sxw.rml_parse):
 
     def _get_data(self,form):
         data={}
-        ids = form['user_id'][0][-1]
+        ids = form['user_id']
         idss = map(str, ids)
 
         self.cr.execute("select po.name as pos,po.date_order,ru.name as user,po.state,rc.name " \
diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index 3be282bc0a4..05bbc0f1f92 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -26,7 +26,7 @@ import wizard_scan_product
 import wizard_receipt
 import wizard_return
 import wizard_pos_payment_report
-import wizard_pos_sales_user_today
+
 import wizard_pos_payment_report_date
 import wizard_pos_payment_report_user
 import wizard_pos_sales_user_current_user
@@ -42,6 +42,8 @@ import pos_close_statement
 import pos_box_entries
 import pos_box_out
 import pos_details
+import pos_sales_user
+import pos_sales_user_today
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/wizard/pos_details.xml b/addons/point_of_sale/wizard/pos_details.xml
index 3268e90733c..7d6dd346c12 100644
--- a/addons/point_of_sale/wizard/pos_details.xml
+++ b/addons/point_of_sale/wizard/pos_details.xml
@@ -15,7 +15,7 @@
                 		<button icon='gtk-cancel' special="cancel"
                 			string="Close" />
                 		<button name="print_report" string="Print Report"
-                			colspan="1" type="object" icon="gtk-ok" />
+                			colspan="1" type="object" icon="gtk-print" />
                 	</group>
                 </form>
             </field>
@@ -23,7 +23,7 @@
 
 
         <record id="action_report_pos_details" model="ir.actions.act_window">
-            <field name="name">Print Report</field>
+            <field name="name">Sale Details</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">pos.details</field>
             <field name="view_type">form</field>
diff --git a/addons/point_of_sale/wizard/pos_sales_user_today.py b/addons/point_of_sale/wizard/pos_sales_user_today.py
new file mode 100644
index 00000000000..50464b6936d
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_sales_user_today.py
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import netsvc
+from osv import osv,fields
+from tools.translate import _
+from mx import DateTime
+import time
+
+class pos_sales_user_today(osv.osv_memory):
+    _name = 'pos.sales.user.today'
+    _description = 'Sales User Today'
+
+    _columns = {
+       'user_id': fields.many2many('res.users', 'sale_user_rel_today', 'user_id', 'uid', 'Salesman'),
+    }
+    
+    def print_report(self, cr, uid, ids, context={}):
+        """ 
+         To get the date and print the report           
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param context: A standard dictionary 
+         @return : retrun report
+        """
+        
+        datas = {'ids' : context.get('active_ids', [])}
+        res = self.read(cr, uid, ids, ['user_id'], context)
+        res = res and res[0] or {}        
+        datas['form'] = res
+        
+        return { 
+            'type':'ir.actions.report.xml',
+            'report_name':'pos.sales.user.today',
+            'datas':datas,               
+       }
+pos_sales_user_today()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/wizard/wizard_pos_sales_user_today.py b/addons/point_of_sale/wizard/wizard_pos_sales_user_today.py
deleted file mode 100644
index 58d990ef4bc..00000000000
--- a/addons/point_of_sale/wizard/wizard_pos_sales_user_today.py
+++ /dev/null
@@ -1,66 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields
-from osv import osv
-import time
-import ir
-from mx import DateTime
-import datetime
-import pooler
-from tools import config
-import wizard
-import netsvc
-
-
-sale_pos_res_form= """<?xml version="1.0"?>
-<form string="Sale by User">
-     <field name="user_id" />
-
-</form>
-"""
-
-sale_pos_res_field= {
-   
-    'user_id': {'string': 'Salesman', 'type': 'many2many', 'relation': 'res.users', 'required': True},
-
-}
-
-
-class wizard_pos_sales_user_today(wizard.interface):
-
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'form',
-                    'arch' : sale_pos_res_form,
-                    'fields' : sale_pos_res_field,
-                    'state' : [('end', 'Cancel','gtk-cancel'),('print_report', 'Print Report','gtk-print') ]}
-        },
-        'print_report' : {
-            'actions' : [],
-            'result' : {'type' : 'print',
-                   'report':'pos.sales.user.today',
-                    'state' : 'end'}
-        },
-    }
-wizard_pos_sales_user_today('pos.sales.user.today')

From d9864e506dd446c8bd0cd6cb692c1764e1c3d2a4 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 19 Mar 2010 18:29:43 +0530
Subject: [PATCH 183/251] point_of_sale: add the file

bzr revid: sbh@tinyerp.com-20100319125943-y1d8afgzbsauop0f
---
 .../wizard/pos_sale_user_today.xml            | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 addons/point_of_sale/wizard/pos_sale_user_today.xml

diff --git a/addons/point_of_sale/wizard/pos_sale_user_today.xml b/addons/point_of_sale/wizard/pos_sale_user_today.xml
new file mode 100644
index 00000000000..78f01a4650f
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_sale_user_today.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        
+        <!--   pos.details -->
+        
+		<record id="view_pos_sales_user_today" model="ir.ui.view">
+            <field name="name">Sales User Today</field>
+            <field name="model">pos.sales.user.today</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Sales User Today">
+				    <group col="2" colspan="4">
+				    	<field name="user_id"/>
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Close" />
+                		<button name="print_report" string="Print Report"
+                			colspan="1" type="object" icon="gtk-print" />
+                	</group>
+                </form>
+            </field>
+        </record>
+        <record id="action_pos_sales_user_today" model="ir.actions.act_window">
+            <field name="name">Sale by Users</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.sales.user.today</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+       
+	</data>
+</openerp>	        
\ No newline at end of file

From fa91b75d006588b0b7d369efd8ff536bf6282f67 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 19 Mar 2010 18:47:21 +0530
Subject: [PATCH 184/251] [IMP]point_of_sale :convert the wizard of
 pos_sales_user_current_user into osv_memory

bzr revid: sbh@tinyerp.com-20100319131721-q68nioexgiwlxrk7
---
 addons/point_of_sale/__terp__.py              |  1 +
 addons/point_of_sale/pos_view.xml             |  4 +-
 addons/point_of_sale/wizard/__init__.py       |  3 +-
 .../wizard/pos_sales_user_current_user.py     | 57 +++++++++++++++++++
 .../wizard/pos_sales_user_current_user.xml    | 40 +++++++++++++
 .../wizard_pos_sales_user_current_user.py     | 40 -------------
 6 files changed, 102 insertions(+), 43 deletions(-)
 create mode 100644 addons/point_of_sale/wizard/pos_sales_user_current_user.py
 create mode 100644 addons/point_of_sale/wizard/pos_sales_user_current_user.xml
 delete mode 100644 addons/point_of_sale/wizard/wizard_pos_sales_user_current_user.py

diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__terp__.py
index baf4fe612e2..1f7da8ac7b3 100644
--- a/addons/point_of_sale/__terp__.py
+++ b/addons/point_of_sale/__terp__.py
@@ -54,6 +54,7 @@ Main features :
         'wizard/pos_box_out.xml',
         'wizard/pos_sales_user.xml',
         #'wizard/all_closed_cashbox_of_the_day.xml',  
+        'wizard/pos_sales_user_current_user.xml',
         'wizard/pos_sale_user_today.xml',          
         'pos_report.xml',
         'pos_wizard.xml',
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index fdbddfe460a..31b641845d1 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -993,8 +993,8 @@ invoiced
 
 		<menuitem icon="STOCK_PRINT" action="wizard_pos_payment_report_user"
 				id="menu_pos_payment_report_user" parent="menu_trans_pos_tree_today" type="wizard" sequence="6" groups="base.group_extended"/>
-		<menuitem icon="STOCK_PRINT" action="wizard_pos_sales_user_today_current_user"
-				id="menu_pos_sales_user_today_current_user" parent="menu_cashboxes_by_day" type="wizard" sequence="7"/>
+		<menuitem icon="STOCK_PRINT" action="action_report_pos_sales_user_today_current_user"
+				id="menu_pos_sales_user_today_current_user" parent="menu_cashboxes_by_day"  sequence="7"/>
     	
     	<menuitem icon="STOCK_PRINT" action="action_report_pos_details"
 				id="menu_pos_details" parent="menu_cashboxes_by_day"  />
diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index 05bbc0f1f92..e5c11a236dd 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -29,7 +29,7 @@ import wizard_pos_payment_report
 
 import wizard_pos_payment_report_date
 import wizard_pos_payment_report_user
-import wizard_pos_sales_user_current_user
+
 import wizard_pos_details
 #import wizard_open_statement
 import wizard_all_closed_cashbox_of_the_day
@@ -44,6 +44,7 @@ import pos_box_out
 import pos_details
 import pos_sales_user
 import pos_sales_user_today
+import pos_sales_user_current_user
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/wizard/pos_sales_user_current_user.py b/addons/point_of_sale/wizard/pos_sales_user_current_user.py
new file mode 100644
index 00000000000..22ac95a5451
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_sales_user_current_user.py
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import netsvc
+from osv import osv,fields
+from tools.translate import _
+from mx import DateTime
+import time
+
+class pos_sales_user_today_current_user(osv.osv_memory):
+    _name = 'pos.sales.user.today.current_user'
+    _description = 'Sales Details'
+
+    _columns = {
+    }
+    
+    def print_report(self, cr, uid, ids, context={}):
+        """ 
+         To get the date and print the report           
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param context: A standard dictionary 
+         @return : retrun report
+        """
+        
+        datas = {'ids' : context.get('active_ids', [])}
+        res = self.read(cr, uid, ids, [], context)
+        res = res and res[0] or {}        
+        datas['form'] = res
+        
+        return { 
+            'type':'ir.actions.report.xml',
+            'report_name':'pos.sales.user.today.current.user',
+            'datas':datas,               
+       }
+pos_sales_user_today_current_user()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/wizard/pos_sales_user_current_user.xml b/addons/point_of_sale/wizard/pos_sales_user_current_user.xml
new file mode 100644
index 00000000000..5625b70770f
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_sales_user_current_user.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        
+        <!--   Sales for Current User -->
+        
+		<record id="view_pos_sales_user_today_current_user" model="ir.ui.view">
+            <field name="name">Sales for Current User</field>
+            <field name="model">pos.sales.user.today.current_user</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Sales for Current User">
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Close" />
+                		<button name="print_report" string="Print Report"
+                			colspan="1" type="object" icon="gtk-print" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+
+        <record id="action_report_pos_sales_user_today_current_user" model="ir.actions.act_window">
+            <field name="name">Sales for Current User</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.sales.user.today.current_user</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+<!--    <act_window name="POS Details"
+            res_model="pos.details"
+            src_model="pos.order"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_report_pos_details"/>   -->
+        
+	</data>
+</openerp>	        
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/wizard_pos_sales_user_current_user.py b/addons/point_of_sale/wizard/wizard_pos_sales_user_current_user.py
deleted file mode 100644
index a76c0c97b59..00000000000
--- a/addons/point_of_sale/wizard/wizard_pos_sales_user_current_user.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import pooler
-import netsvc
-import wizard
-import time
-
-
-class wizard_pos_sales_user_today_current_user(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type':'print', 'report':'pos.sales.user.today.current.user', 'state':'end'}
-             },
-    }
-
-wizard_pos_sales_user_today_current_user('pos.sales.user.today.current.user')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From a48453fe166a312087fc7791d541400637e693b5 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Fri, 19 Mar 2010 19:28:33 +0530
Subject: [PATCH 185/251] [IMP]:pos:OSV_MEMORY wizards related to reports

bzr revid: mso@mso-20100319135833-4d79a9d092bk2wpx
---
 addons/point_of_sale/__terp__.py              |  6 +-
 addons/point_of_sale/pos_view.xml             |  6 ++
 addons/point_of_sale/pos_wizard.xml           |  7 +-
 .../report/pos_payment_report_date.py         |  4 +-
 .../report/pos_payment_report_user.py         |  2 +-
 addons/point_of_sale/wizard/__init__.py       |  6 +-
 .../wizard/pos_payment_report_date.py         | 65 ++++++++++++++++++
 .../wizard/pos_payment_report_date_view.xml   | 29 ++++++++
 .../wizard/pos_payment_report_user.py         | 56 ++++++++++++++++
 .../wizard/pos_payment_report_user_view.xml   | 27 ++++++++
 .../wizard/wizard_pos_payment_report_date.py  | 64 ------------------
 .../wizard/wizard_pos_payment_report_user.py  | 66 -------------------
 addons/product/product.py                     |  2 +-
 13 files changed, 197 insertions(+), 143 deletions(-)
 create mode 100644 addons/point_of_sale/wizard/pos_payment_report_date.py
 create mode 100644 addons/point_of_sale/wizard/pos_payment_report_date_view.xml
 create mode 100644 addons/point_of_sale/wizard/pos_payment_report_user.py
 create mode 100644 addons/point_of_sale/wizard/pos_payment_report_user_view.xml
 delete mode 100644 addons/point_of_sale/wizard/wizard_pos_payment_report_date.py
 delete mode 100644 addons/point_of_sale/wizard/wizard_pos_payment_report_user.py

diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__terp__.py
index 1f7da8ac7b3..245265b110e 100644
--- a/addons/point_of_sale/__terp__.py
+++ b/addons/point_of_sale/__terp__.py
@@ -50,8 +50,10 @@ Main features :
         'wizard/pos_get_sale.xml',
         'wizard/pos_open_statement.xml',
         'wizard/pos_close_statement.xml',  
-        'wizard/pos_box_entries.xml',  
-        'wizard/pos_box_out.xml',
+        'wizard/pos_box_entries.xml',
+        'wizard/pos_payment_report_user_view.xml',
+        'wizard/pos_payment_report_date_view.xml',
+        'wizard/pos_box_out.xml', 
         'wizard/pos_sales_user.xml',
         #'wizard/all_closed_cashbox_of_the_day.xml',  
         'wizard/pos_sales_user_current_user.xml',
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 31b641845d1..40be0e58e69 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -985,6 +985,11 @@ invoiced
 				id="menu_pos_sales_user" parent="menu_trans_pos_tree" sequence="3" groups="base.group_extended" />
 
 
+		<menuitem icon="STOCK_PRINT" action="action_report_pos_payment_repport_date"
+				id="menu_pos_payment_report_date" parent="menu_trans_pos_tree" sequence="5" groups="base.group_extended"/>
+ 
+		<menuitem icon="STOCK_PRINT" action="action_report_pos_payment_report_user"
+				id="menu_pos_payment_report_user" parent="menu_trans_pos_tree_today" sequence="6" groups="base.group_extended"/>
 		<menuitem icon="STOCK_PRINT" action="action_pos_sales_user_today"
 				id="menu_pos_sales_user_today" parent="menu_trans_pos_tree_today" sequence="2" groups="base.group_extended"/>
 
@@ -995,6 +1000,7 @@ invoiced
 				id="menu_pos_payment_report_user" parent="menu_trans_pos_tree_today" type="wizard" sequence="6" groups="base.group_extended"/>
 		<menuitem icon="STOCK_PRINT" action="action_report_pos_sales_user_today_current_user"
 				id="menu_pos_sales_user_today_current_user" parent="menu_cashboxes_by_day"  sequence="7"/>
+
     	
     	<menuitem icon="STOCK_PRINT" action="action_report_pos_details"
 				id="menu_pos_details" parent="menu_cashboxes_by_day"  />
diff --git a/addons/point_of_sale/pos_wizard.xml b/addons/point_of_sale/pos_wizard.xml
index 86b0ca86974..b7ea43b2007 100644
--- a/addons/point_of_sale/pos_wizard.xml
+++ b/addons/point_of_sale/pos_wizard.xml
@@ -40,15 +40,14 @@
 		<wizard id="wizard_pos_sales_user" menu="False"
 				model="pos.order" name="pos.sales.user" string="Sales Report"/>-->
 
-<!--		<wizard id="wizard_pos_sales_user_today" menu="False"
-				model="pos.order" name="pos.sales.user.today" string="Sales by Users"/>-->
-
+<!--
 		<wizard id="wizard_pos_payment_report_date" menu="False"
 				model="pos.order" name="pos.payment.report.date" string="Sales lines Report"/>
 
 		<wizard id="wizard_pos_payment_report_user" menu="False"
 				model="pos.order" name="pos.payment.report.user" string="Sales lines by Users"/>
-
+-->
+  
 		<wizard id="wizard_pos_sales_user_today_current_user" menu="False"
 				model="pos.order" name="pos.sales.user.today.current.user" string="Sales for Current User"/>
 
diff --git a/addons/point_of_sale/report/pos_payment_report_date.py b/addons/point_of_sale/report/pos_payment_report_date.py
index 1578f0e6958..82723a43125 100644
--- a/addons/point_of_sale/report/pos_payment_report_date.py
+++ b/addons/point_of_sale/report/pos_payment_report_date.py
@@ -43,7 +43,7 @@ class pos_payment_report_date(report_sxw.rml_parse):
                          "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
                          "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id  " \
                          "and po.state in ('paid','invoiced') and po.date_order  >= %s and po.date_order <= %s and po.user_id in %s " \
-                         ,(dt1,dt2,tuple(form['user_id'][0][-1])))
+                         ,(dt1,dt2,tuple(form['user_id'])))
         data=self.cr.dictfetchall()
         return data
 
@@ -55,7 +55,7 @@ class pos_payment_report_date(report_sxw.rml_parse):
                          "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
                          "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id " \
                          "and po.state in ('paid','invoiced') and po.date_order  >= %s and po.date_order <= %s and po.user_id in %s " \
-                         ,(dt1,dt2,tuple(form['user_id'][0][-1])))
+                         ,(dt1,dt2,tuple(form['user_id'])))
         res=self.cr.fetchone()[0]
         return res
 
diff --git a/addons/point_of_sale/report/pos_payment_report_user.py b/addons/point_of_sale/report/pos_payment_report_user.py
index cde5162425e..9af9377d64c 100644
--- a/addons/point_of_sale/report/pos_payment_report_user.py
+++ b/addons/point_of_sale/report/pos_payment_report_user.py
@@ -35,7 +35,7 @@ class pos_payment_report_user(report_sxw.rml_parse):
 
     def __pos_payment_user__(self,form):
         data={}
-        ids = form['user_id'][0][-1]
+        ids = form['user_id']
         idss = map(str, ids)
         sql = "select pt.name,pol.qty,pol.discount,pol.price_unit, " \
                          "(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) as total  " \
diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index e5c11a236dd..f9f66536d08 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -27,9 +27,9 @@ import wizard_receipt
 import wizard_return
 import wizard_pos_payment_report
 
-import wizard_pos_payment_report_date
-import wizard_pos_payment_report_user
-
+import pos_payment_report_user
+import pos_payment_report_date
+import wizard_pos_sales_user_current_user
 import wizard_pos_details
 #import wizard_open_statement
 import wizard_all_closed_cashbox_of_the_day
diff --git a/addons/point_of_sale/wizard/pos_payment_report_date.py b/addons/point_of_sale/wizard/pos_payment_report_date.py
new file mode 100644
index 00000000000..8f6471cdaa6
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_payment_report_date.py
@@ -0,0 +1,65 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+import time
+class pos_payment_report_date(osv.osv_memory):
+        '''
+        Open ERP Model
+        '''
+        _name = 'pos.payment.report.date'
+        _description = 'POS Payment Report according to date'
+        def print_report(self, cr, uid, ids, context=None):
+
+            """ 
+                 @summary: To get the date and print the report           
+                 @param self: The object pointer.
+                 @param cr: A database cursor
+                 @param uid: ID of the user currently logged in
+                 @param context: A standard dictionary 
+                 @return : retrun report
+            """        
+            datas = {'ids' : context.get('active_ids',[])}
+            res = self.read(cr, uid, ids, ['date_start','date_end','user_id'])
+            res = res and res[0] or {}        
+            datas['form'] = res
+
+            return { 
+                    'type' : 'ir.actions.report.xml',
+                    'report_name':'pos.payment.report.date',
+                    'datas' : datas,               
+            }
+        
+        _columns = {
+                'date_start': fields.date('Start Date',  required=True),
+                'date_end': fields.date('End Date',  required=True),
+                'user_id':fields.many2many('res.users','res_user_sale','user_id','sale_id','Salesman')
+        }
+        _defaults = {
+                'date_start': lambda *a: time.strftime('%Y-%m-%d'),
+                'date_end': lambda *a: time.strftime('%Y-%m-%d'),
+        }
+pos_payment_report_date()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/wizard/pos_payment_report_date_view.xml b/addons/point_of_sale/wizard/pos_payment_report_date_view.xml
new file mode 100644
index 00000000000..3d4655f8741
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_payment_report_date_view.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+                <data>
+                        <record id="pos_payment_report_date_form" model="ir.ui.view">
+                                <field name="name">pos.payment.report.date.form</field>
+                                <field name="model">pos.payment.report.date</field>
+                                <field name="type">form</field>
+                                <field name="arch" type="xml">
+                                <form string="Sale by Date and User">
+                                            <field name="date_start"/>
+                                            <field name="date_end"/>
+                                            <field name="user_id"/>
+                                                <button icon='gtk-cancel' special="cancel"
+                                                string="Close" />
+                                                <button name="print_report" string="Print Report"
+                                                colspan="1" type="object" icon="gtk-ok" />
+                                </form>
+                                </field>
+                        </record>
+                        
+                        <act_window name="Sales lines Report"
+                        res_model="pos.payment.report.date"
+                        src_model="pos.order"
+                        view_mode="form"
+                        target="new"        
+                        key2="client_action_multi"    
+                        id="action_report_pos_payment_repport_date"/> 
+                </data>
+</openerp>              
diff --git a/addons/point_of_sale/wizard/pos_payment_report_user.py b/addons/point_of_sale/wizard/pos_payment_report_user.py
new file mode 100644
index 00000000000..59df8d28881
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_payment_report_user.py
@@ -0,0 +1,56 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+
+class pos_payment_report_user(osv.osv_memory):
+        '''
+        Open ERP Model
+        '''
+        _name = 'pos.payment.report.user'
+        _description = 'Sales lines by Users'
+        def print_report(self, cr, uid, ids, context=None):
+
+            """ 
+                 To get the date and print the report           
+                 @param self: The object pointer.
+                 @param cr: A database cursor
+                 @param uid: ID of the user currently logged in
+                 @param context: A standard dictionary 
+                 @return : retrun report
+            """        
+            datas = {'ids' : context.get('active_ids',[])}
+            res = self.read(cr, uid, ids, ['user_id'])
+            res = res and res[0] or {}        
+            datas['form'] = res
+
+            return { 
+                    'type' : 'ir.actions.report.xml',
+                    'report_name':'pos.payment.report.user',
+                    'datas' : datas,               
+            }
+        
+        _columns = {
+                    'user_id':fields.many2many('res.users','res_user_sale','user_id','sale_id','Salesman')
+        }
+pos_payment_report_user()
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/pos_payment_report_user_view.xml b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
new file mode 100644
index 00000000000..463d864f310
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+                <data>
+                        <record id="pos_payment_report_user_form" model="ir.ui.view">
+                                <field name="name">pos.payment.report.user.form</field>
+                                <field name="model">pos.payment.report.user</field>
+                                <field name="type">form</field>
+                                <field name="arch" type="xml">
+                                <form string="Sale by User">
+                                            <field name="user_id"/>
+                                                <button icon='gtk-cancel' special="cancel"
+                                                string="Close" />
+                                                <button name="print_report" string="Print Report"
+                                                colspan="1" type="object" icon="gtk-ok" />
+                                </form>
+                                </field>
+                        </record>
+                        
+                        <act_window name="Sales lines by Users"
+                        res_model="pos.payment.report.user"
+                        src_model="pos.order"
+                        view_mode="form"
+                        target="new"        
+                        key2="client_action_multi"    
+                        id="action_report_pos_payment_report_user"/> 
+                </data>
+</openerp>              
diff --git a/addons/point_of_sale/wizard/wizard_pos_payment_report_date.py b/addons/point_of_sale/wizard/wizard_pos_payment_report_date.py
deleted file mode 100644
index 570b6de9ad7..00000000000
--- a/addons/point_of_sale/wizard/wizard_pos_payment_report_date.py
+++ /dev/null
@@ -1,64 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import pooler
-import netsvc
-import wizard
-import time
-
-pos_payment_report_date_form= """<?xml version="1.0"?>
-<form string="Sale by User">
-     <field name="date_start" />
-     <field name="date_end"/>
-     <field name="user_id"/>
-</form>
-"""
-
-pos_payment_report_date_field= {
-
-    'date_start': {'string':'Start Date','type':'date','required': True,'default': lambda *a: time.strftime('%Y-%m-%d')},
-    'date_end': {'string':'End Date','type':'date','required': True,'default': lambda *a: time.strftime('%Y-%m-%d')},
-    'user_id': {'string': 'Salesman', 'type': 'many2many', 'relation': 'res.users', 'required': True},
-}
-
-
-class wizard_pos_payment_report_date(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'form',
-                    'arch' : pos_payment_report_date_form,
-                    'fields' : pos_payment_report_date_field,
-                    'state' : [('end', 'Cancel','gtk-cancel'),('print_report', 'Print Report','gtk-print') ]}
-        },
-        'print_report' : {
-            'actions' : [],
-            'result' : {'type' : 'print',
-                   'report':'pos.payment.report.date',
-                    'state' : 'end'}
-        },
-    }
-
-wizard_pos_payment_report_date('pos.payment.report.date')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/point_of_sale/wizard/wizard_pos_payment_report_user.py b/addons/point_of_sale/wizard/wizard_pos_payment_report_user.py
deleted file mode 100644
index aaad1d328c5..00000000000
--- a/addons/point_of_sale/wizard/wizard_pos_payment_report_user.py
+++ /dev/null
@@ -1,66 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields
-from osv import osv
-import time
-import ir
-from mx import DateTime
-import datetime
-import pooler
-from tools import config
-import wizard
-import netsvc
-
-
-pos_payment_report_user_form= """<?xml version="1.0"?>
-<form string="Sale by User">
-     <field name="user_id" />
-
-</form>
-"""
-
-pos_payment_report_user_field= {
-
-    'user_id': {'string': 'Salesman', 'type': 'many2many', 'relation': 'res.users', 'required': True},
-
-}
-
-
-class wizard_pos_payment_report_user(wizard.interface):
-
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'form',
-                    'arch' : pos_payment_report_user_form,
-                    'fields' : pos_payment_report_user_field,
-                    'state' : [('end', 'Cancel','gtk-cancel'),('print_report', 'Print Report','gtk-print') ]}
-        },
-        'print_report' : {
-            'actions' : [],
-            'result' : {'type' : 'print',
-                   'report':'pos.payment.report.user',
-                    'state' : 'end'}
-        },
-    }
-wizard_pos_payment_report_user('pos.payment.report.user')
diff --git a/addons/product/product.py b/addons/product/product.py
index 6078347c02c..6b7bdefcb67 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -451,7 +451,7 @@ class product_product(osv.osv):
         'default_code' : fields.char('Code', size=64),
         'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the product without removing it."),
         'variants': fields.char('Variants', size=64),
-        'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True),
+        'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=False),
         'ean13': fields.char('EAN13', size=13),
         'packaging' : fields.one2many('product.packaging', 'product_id', 'Logistical Units', help="Gives the different ways to package the same product. This has no impact on the picking order and is mainly used if you use the EDI module."),
         'price_extra': fields.float('Variant Price Extra', digits_compute=dp.get_precision('Sale Price')),

From 60f17e19a117ee744d04cfdf1ee4cdfe0c8f24df Mon Sep 17 00:00:00 2001
From: MTR <>
Date: Fri, 19 Mar 2010 19:30:47 +0530
Subject: [PATCH 186/251] [IMP] point_of_sale:convert wizard into osv_memory

bzr revid: sbh@tinyerp.com-20100319140047-ry2iubfps6aflcka
---
 addons/point_of_sale/__terp__.py              |  5 +-
 addons/point_of_sale/pos_view.xml             |  2 +-
 addons/point_of_sale/pos_wizard.xml           |  5 --
 .../report/all_closed_cashbox_of_the_day.py   |  2 +-
 .../pos_receipt_without_remboursment.rml      |  2 +-
 addons/point_of_sale/statement_report.xml     | 10 +--
 addons/point_of_sale/statement_view.xml       |  4 +-
 addons/point_of_sale/statement_wizard.xml     | 13 +---
 addons/point_of_sale/wizard/__init__.py       |  6 +-
 ...ay.py => all_closed_cashbox_of_the_day.py} | 39 ++++++++---
 addons/point_of_sale/wizard/pos_receipt.py    | 64 +++++++++++++++++++
 addons/point_of_sale/wizard/wizard_receipt.py | 49 --------------
 12 files changed, 114 insertions(+), 87 deletions(-)
 rename addons/point_of_sale/wizard/{wizard_all_closed_cashbox_of_the_day.py => all_closed_cashbox_of_the_day.py} (52%)
 create mode 100644 addons/point_of_sale/wizard/pos_receipt.py
 delete mode 100644 addons/point_of_sale/wizard/wizard_receipt.py

diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__terp__.py
index 245265b110e..d307024a008 100644
--- a/addons/point_of_sale/__terp__.py
+++ b/addons/point_of_sale/__terp__.py
@@ -55,9 +55,10 @@ Main features :
         'wizard/pos_payment_report_date_view.xml',
         'wizard/pos_box_out.xml', 
         'wizard/pos_sales_user.xml',
-        #'wizard/all_closed_cashbox_of_the_day.xml',  
+        'wizard/all_closed_cashbox_of_the_day.xml',  
         'wizard/pos_sales_user_current_user.xml',
-        'wizard/pos_sale_user_today.xml',          
+        'wizard/pos_sale_user_today.xml',      
+        'wizard/pos_receipt_view.xml',    
         'pos_report.xml',
         'pos_wizard.xml',
         'pos_view.xml',
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 40be0e58e69..2d4be75ec44 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -69,7 +69,7 @@
                                 -->
 
                                 <button name="%(pos_payment)d" string="Ma_ke Payment" icon="gtk-ok" type="action" states="draft,advance"/>
-                                <button name="%(o_rec)d" string="_Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
+                                <button name="%(action_report_pos_receipt)d" string="_Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
 
 
                                 <!--
diff --git a/addons/point_of_sale/pos_wizard.xml b/addons/point_of_sale/pos_wizard.xml
index b7ea43b2007..50746c7ac85 100644
--- a/addons/point_of_sale/pos_wizard.xml
+++ b/addons/point_of_sale/pos_wizard.xml
@@ -9,11 +9,6 @@
         string="Return Goods"/>
 
 
-		<wizard string="Receipt" model="pos.order"
-				name="ord.receipt" id="o_rec"
-         keyword="client_print_multi"
-         menu="False"
-         />
 
 <!--		<wizard string="Box Entries" model="account.bank.statement"
 				name="pos.entry" id="pos_entry" menu="False"/>-->
diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
index 854acfde3a9..2490d5719cd 100644
--- a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
+++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
@@ -138,4 +138,4 @@ class all_closed_cashbox_of_the_day(report_sxw.rml_parse):
         res = self.cr.dictfetchall()
         return res[0]['net_total'] or 0.0
 
-report_sxw.report_sxw('report.all.closed.cashbox.of.the.day', 'account.bank.statement', 'addons/statement/report/all_closed_cashbox_of_the_day.rml', parser=all_closed_cashbox_of_the_day)
+report_sxw.report_sxw('report.all.closed.cashbox.of.the.day', 'account.bank.statement', 'addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml', parser=all_closed_cashbox_of_the_day)
diff --git a/addons/point_of_sale/report/pos_receipt_without_remboursment.rml b/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
index d863efd40f3..0eb0dba773a 100644
--- a/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
+++ b/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
@@ -71,7 +71,7 @@
     <para style="terp_default_Centre_9">Tel : [[ address and address.phone ]]</para>
     <para style="terp_default_Centre_9">E-mail : [[ address and address.email ]]</para>
     <para style="terp_default_Centre_9">Salesman : [[ o.user_id.name ]]</para>
-    <para style="terp_default_Centre_9">Sale Date : [[ o.date_order ]]</para>
+    <para style="terp_default_Centre_9">Sale Date : [[ str(o.date_order) ]]</para>
 	  <para style="P5">Purchase Voucher : [[o.name]]</para>
     <para style="P4">
       <font color="white"> </font>
diff --git a/addons/point_of_sale/statement_report.xml b/addons/point_of_sale/statement_report.xml
index 256d0644583..4a9d8600ff2 100644
--- a/addons/point_of_sale/statement_report.xml
+++ b/addons/point_of_sale/statement_report.xml
@@ -9,7 +9,7 @@
 			name="pos.user.product"
 			auto="False"
 			multi="True"
-			rml="statement/report/pos_users_product.rml"
+			rml="point_of_sale/report/pos_users_product.rml"
 			 />
 
 		<report
@@ -19,7 +19,7 @@
 			name="account.statement"
 			auto="False"
 			multi="True"
-			rml="statement/report/account_statement.rml"
+			rml="point_of_sale/report/account_statement.rml"
 			 />
 
 		<report
@@ -30,7 +30,7 @@
 			auto="False"
 			multi="True"
 			menu = 'False'
-			rml="statement/report/all_closed_cashbox_of_the_day.rml"
+			rml="point_of_sale/report/all_closed_cashbox_of_the_day.rml"
 			 />
 		<report
 			id="pos_users_product_re"
@@ -39,7 +39,7 @@
 			name="pos.user.product"
 			auto="False"
 			multi="True"
-			rml="statement/report/pos_users_product.rml"
+			rml="point_of_sale/report/pos_users_product.rml"
 			 />
 
 		<report
@@ -49,7 +49,7 @@
 			name="account.statement"
 			auto="False"
 			multi="True"
-			rml="statement/report/account_statement.rml"
+			rml="point_of_sale/report/account_statement.rml"
 			 />
 
 		<report
diff --git a/addons/point_of_sale/statement_view.xml b/addons/point_of_sale/statement_view.xml
index b76f17cf8d2..e6ff76e2828 100644
--- a/addons/point_of_sale/statement_view.xml
+++ b/addons/point_of_sale/statement_view.xml
@@ -425,7 +425,7 @@
             id="menu_open_statement" sequence="1" />
 
        <menuitem icon="STOCK_PRINT"
-       			 action="wizard_all_closed_cashbox_of_the_day"
+       			 action="action_report_all_closed_cashbox_of_the_day"
 				 id="menu_all_closed_cashbox_of_the_day"
 				 parent="menu_statement_tree_all"
 				 type="wizard"/>
@@ -435,5 +435,7 @@
             string="Close Register"
             action="action_pos_close_statement"
             id="menu_close_statement" sequence="2" />
+
+            
 	</data>
 </openerp>
diff --git a/addons/point_of_sale/statement_wizard.xml b/addons/point_of_sale/statement_wizard.xml
index d00668a5657..dd9715db628 100644
--- a/addons/point_of_sale/statement_wizard.xml
+++ b/addons/point_of_sale/statement_wizard.xml
@@ -16,17 +16,10 @@
 -->
 
 
-       <wizard
-        	id="wizard_all_closed_cashbox_of_the_day"
-        	model="account.bank.statement"
-        	menu="False"
-        	name="all.closed.cashbox.of.the.day"
-        	string="All Cashboxes Of the day"/>
-
+       
        <menuitem icon="STOCK_PRINT"
-       			 action="wizard_all_closed_cashbox_of_the_day"
+       			 action="action_report_all_closed_cashbox_of_the_day"
 				 id="menu_all_closed_cashbox_of_the_day"
-				 parent="menu_point_report_register"
-				 type="wizard"/>
+				 parent="menu_point_report_register"/>
     </data>
 </openerp>
diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index f9f66536d08..fc3f4a4543e 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -23,7 +23,7 @@
 import wizard_pos_payment
 import wizard_default_journal
 import wizard_scan_product
-import wizard_receipt
+
 import wizard_return
 import wizard_pos_payment_report
 
@@ -32,7 +32,7 @@ import pos_payment_report_date
 import wizard_pos_sales_user_current_user
 import wizard_pos_details
 #import wizard_open_statement
-import wizard_all_closed_cashbox_of_the_day
+
 import pos_add_product
 import pos_confirm
 import pos_discount
@@ -45,6 +45,8 @@ import pos_details
 import pos_sales_user
 import pos_sales_user_today
 import pos_sales_user_current_user
+import all_closed_cashbox_of_the_day
+import pos_receipt
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/wizard/wizard_all_closed_cashbox_of_the_day.py b/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py
similarity index 52%
rename from addons/point_of_sale/wizard/wizard_all_closed_cashbox_of_the_day.py
rename to addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py
index bdb7f72cb93..4e148f6cf45 100644
--- a/addons/point_of_sale/wizard/wizard_all_closed_cashbox_of_the_day.py
+++ b/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py
@@ -20,21 +20,40 @@
 #
 ##############################################################################
 
-import pooler
 import netsvc
-import wizard
+from osv import osv,fields
+from tools.translate import _
+from mx import DateTime
 import time
 
+class all_closed_cashbox_of_the_day(osv.osv_memory):
+    _name = 'all.closed.cashbox.of.the.day'
+    _description = 'All closed cashbox of the day'
 
-class wizard_all_closed_cashbox_of_the_day(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type':'print', 'report':'all.closed.cashbox.of.the.day', 'state':'end'}
-             },
+    _columns = {
+                
     }
+    
+    def print_report(self, cr, uid, ids, context=None):
 
-wizard_all_closed_cashbox_of_the_day('all.closed.cashbox.of.the.day')
+        """ 
+             @summary: To get the date and print the report           
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary 
+             @return : retrun report
+        """        
+        datas = {'ids' : context.get('active_ids',[])}
+        res =  {}        
+        datas['form'] = res
+        
+        return { 
+                'type' : 'ir.actions.report.xml',
+                'report_name':'all.closed.cashbox.of.the.day',
+                'datas' : datas,               
+       }
+
+all_closed_cashbox_of_the_day()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/point_of_sale/wizard/pos_receipt.py b/addons/point_of_sale/wizard/pos_receipt.py
new file mode 100644
index 00000000000..e41deb14c32
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_receipt.py
@@ -0,0 +1,64 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import netsvc
+from osv import osv,fields
+from tools.translate import _
+from mx import DateTime
+import time
+
+class pos_receipt(osv.osv_memory):
+    _name = 'pos.receipt'
+    _description = 'Point of sale receipt'
+
+    _columns = {
+                
+    }
+    def view_init(self, cr , uid , fields_list, context=None):
+        order_lst =self. pool.get('pos.order').browse(cr,uid,context['active_id'])
+        for order in order_lst:
+            if order.state_2 in ('to_verify'):
+                raise osv.except_osv(_('Error!', 'Can not print the receipt because of discount and/or payment '))
+        True    
+    def print_report(self, cr, uid, ids, context=None):
+
+        """ 
+             @summary: To get the date and print the report           
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary 
+             @return : retrun report
+        """        
+        datas = {'ids' : context.get('active_ids',[])}
+        res =  {}        
+        datas['form'] = res
+        
+        return { 
+                'type' : 'ir.actions.report.xml',
+                'report_name':'pos.receipt',
+                'datas' : datas,               
+       }
+
+pos_receipt()
+
+
+
diff --git a/addons/point_of_sale/wizard/wizard_receipt.py b/addons/point_of_sale/wizard/wizard_receipt.py
deleted file mode 100644
index 64e8a2e5685..00000000000
--- a/addons/point_of_sale/wizard/wizard_receipt.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-
-#import time
-#import netsvc
-#from tools.misc import UpdateableStr
-#import pooler
-import wizard
-import pooler
-from tools.translate import _
-
-def _check(self,cr,uid,data,*a):
-    pool = pooler.get_pool(cr.dbname)
-    order_lst = pool.get('pos.order').browse(cr,uid,data['ids'])
-    for order in order_lst:
-        if order.state_2 in ('to_verify'):
-            raise wizard.except_wizard('Error!', 'Can not print the receipt because of discount and/or payment ')
-    return data
-
-class print_order_receipt(wizard.interface):
-        states = {
-          'init': {
-              'actions': [_check],
-              'result': {'type':'print', 'report':'pos.receipt', 'state':'end'}
-          }
-      }
-
-print_order_receipt('ord.receipt')
-

From d47574cfbdc155384dee96d9e58833be6c0cfdbe Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 19 Mar 2010 20:30:20 +0530
Subject: [PATCH 187/251] [IMP] point_of_sale: fix the problem of wizard and
 add the pos_payment

bzr revid: sbh@tinyerp.com-20100319150020-9z7bnkmb93uw3508
---
 addons/point_of_sale/__terp__.py              |  4 +-
 addons/point_of_sale/pos_view.xml             |  8 +-
 addons/point_of_sale/statement_view.xml       |  3 +-
 addons/point_of_sale/wizard/__init__.py       | 12 +--
 .../wizard/all_closed_cashbox_of_the_day.xml  | 31 ++++++++
 .../wizard/pos_payment_report.py              | 74 +++++++++++++++++++
 .../wizard/pos_payment_report.xml             | 35 +++++++++
 .../wizard/pos_payment_report_date_view.xml   | 53 ++++++-------
 .../wizard/pos_payment_report_user.xml        | 40 ++++++++++
 .../wizard/pos_payment_report_user_view.xml   | 49 ++++++------
 .../point_of_sale/wizard/pos_receipt_view.xml | 37 ++++++++++
 .../wizard/wizard_pos_payment_report.py       | 40 ----------
 12 files changed, 284 insertions(+), 102 deletions(-)
 create mode 100644 addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.xml
 create mode 100644 addons/point_of_sale/wizard/pos_payment_report.py
 create mode 100644 addons/point_of_sale/wizard/pos_payment_report.xml
 create mode 100644 addons/point_of_sale/wizard/pos_payment_report_user.xml
 create mode 100644 addons/point_of_sale/wizard/pos_receipt_view.xml
 delete mode 100644 addons/point_of_sale/wizard/wizard_pos_payment_report.py

diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__terp__.py
index d307024a008..e2fcdffd1e3 100644
--- a/addons/point_of_sale/__terp__.py
+++ b/addons/point_of_sale/__terp__.py
@@ -58,7 +58,9 @@ Main features :
         'wizard/all_closed_cashbox_of_the_day.xml',  
         'wizard/pos_sales_user_current_user.xml',
         'wizard/pos_sale_user_today.xml',      
-        'wizard/pos_receipt_view.xml',    
+        'wizard/pos_receipt_view.xml',  
+        'wizard/pos_payment_report_user.xml',  
+        'wizard/pos_payment_report.xml',
         'pos_report.xml',
         'pos_wizard.xml',
         'pos_view.xml',
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 2d4be75ec44..9c15b5a2824 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -993,11 +993,11 @@ invoiced
 		<menuitem icon="STOCK_PRINT" action="action_pos_sales_user_today"
 				id="menu_pos_sales_user_today" parent="menu_trans_pos_tree_today" sequence="2" groups="base.group_extended"/>
 
-		<menuitem icon="STOCK_PRINT" action="wizard_pos_payment_report_date"
-				id="menu_pos_payment_report_date" parent="menu_trans_pos_tree" type="wizard" sequence="5" groups="base.group_extended"/>
+		<menuitem icon="STOCK_PRINT" action="action_report_pos_payment_repport_date"
+				id="menu_pos_payment_report_date" parent="menu_trans_pos_tree"  sequence="5" groups="base.group_extended"/>
 
-		<menuitem icon="STOCK_PRINT" action="wizard_pos_payment_report_user"
-				id="menu_pos_payment_report_user" parent="menu_trans_pos_tree_today" type="wizard" sequence="6" groups="base.group_extended"/>
+		<menuitem icon="STOCK_PRINT" action="action_report_pos_payment_report_user"
+				id="menu_pos_payment_report_user" parent="menu_trans_pos_tree_today" sequence="6" groups="base.group_extended"/>
 		<menuitem icon="STOCK_PRINT" action="action_report_pos_sales_user_today_current_user"
 				id="menu_pos_sales_user_today_current_user" parent="menu_cashboxes_by_day"  sequence="7"/>
 
diff --git a/addons/point_of_sale/statement_view.xml b/addons/point_of_sale/statement_view.xml
index e6ff76e2828..19e7bdc13e3 100644
--- a/addons/point_of_sale/statement_view.xml
+++ b/addons/point_of_sale/statement_view.xml
@@ -427,8 +427,7 @@
        <menuitem icon="STOCK_PRINT"
        			 action="action_report_all_closed_cashbox_of_the_day"
 				 id="menu_all_closed_cashbox_of_the_day"
-				 parent="menu_statement_tree_all"
-				 type="wizard"/>
+				 parent="menu_statement_tree_all"/>
 
 		<menuitem
             name="Close Register" parent="point_of_sale.menu_point_config"
diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index fc3f4a4543e..d4f826423ee 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -25,12 +25,11 @@ import wizard_default_journal
 import wizard_scan_product
 
 import wizard_return
-import wizard_pos_payment_report
 
-import pos_payment_report_user
-import pos_payment_report_date
-import wizard_pos_sales_user_current_user
-import wizard_pos_details
+
+
+
+
 #import wizard_open_statement
 
 import pos_add_product
@@ -47,6 +46,9 @@ import pos_sales_user_today
 import pos_sales_user_current_user
 import all_closed_cashbox_of_the_day
 import pos_receipt
+import pos_payment_report_user
+import pos_payment_report_date
+import pos_payment_report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.xml b/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.xml
new file mode 100644
index 00000000000..e78ef5c6d6a
--- /dev/null
+++ b/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        
+        <!--   pos.details -->
+        
+		<record id="view_all_closed_cashbox_of_the_day" model="ir.ui.view">
+            <field name="name">all closed cashbox of the day</field>
+            <field name="model">all.closed.cashbox.of.the.day</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="All Cashboxes Of the day :">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Close" />
+                		<button name="print_report" string="Print Report"
+                			colspan="1" type="object" icon="gtk-print" />				  
+                </form>
+            </field>
+        </record>
+
+ 
+       
+  		<record id="action_report_all_closed_cashbox_of_the_day" model="ir.actions.act_window">
+            <field name="name">All Cashboxes Of the day</field>
+            <field name="res_model">all.closed.cashbox.of.the.day</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+           	<field name="target">new</field>
+        </record>	
+		
+	</data>
+</openerp>	        
diff --git a/addons/point_of_sale/wizard/pos_payment_report.py b/addons/point_of_sale/wizard/pos_payment_report.py
new file mode 100644
index 00000000000..12cc044e448
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_payment_report.py
@@ -0,0 +1,74 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import pooler
+import netsvc
+import wizard
+import time# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import netsvc
+from osv import osv,fields
+from tools.translate import _
+from mx import DateTime
+import time
+
+class pos_payment_report(osv.osv_memory):
+    _name = 'pos.payment.report'
+    _description = 'Payment Report'
+
+    def print_report(self, cr, uid, ids, context={}):
+        """ 
+         To get the date and print the report           
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param context: A standard dictionary 
+         @return : retrun report
+        """
+        
+        datas = {'ids' : context.get('active_ids', [])}
+        return { 
+            'type':'ir.actions.report.xml',
+            'report_name':'pos.payment.report',
+            'datas':datas,               
+       }
+pos_payment_report()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/pos_payment_report.xml b/addons/point_of_sale/wizard/pos_payment_report.xml
new file mode 100644
index 00000000000..593068a9ebf
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_payment_report.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        
+        <!--   pos.details -->
+        
+		<record id="view_pos_payment_report" model="ir.ui.view">
+            <field name="name">Payment Report</field>
+            <field name="model">pos.payment.report</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="POS Details :">
+				    <group col="2" colspan="4">
+				    	<field name="date_start"/>
+				    	<field name="date_end"/>
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Close" />
+                		<button name="print_report" string="Print Report"
+                			colspan="1" type="object" icon="gtk-print" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_pos_payment_report" model="ir.actions.act_window">
+            <field name="name">Payment Report</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.details</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        
+	</data>
+</openerp>	        
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/pos_payment_report_date_view.xml b/addons/point_of_sale/wizard/pos_payment_report_date_view.xml
index 3d4655f8741..7a5bf58370b 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_date_view.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report_date_view.xml
@@ -1,29 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-                <data>
-                        <record id="pos_payment_report_date_form" model="ir.ui.view">
-                                <field name="name">pos.payment.report.date.form</field>
-                                <field name="model">pos.payment.report.date</field>
-                                <field name="type">form</field>
-                                <field name="arch" type="xml">
-                                <form string="Sale by Date and User">
-                                            <field name="date_start"/>
-                                            <field name="date_end"/>
-                                            <field name="user_id"/>
-                                                <button icon='gtk-cancel' special="cancel"
-                                                string="Close" />
-                                                <button name="print_report" string="Print Report"
-                                                colspan="1" type="object" icon="gtk-ok" />
-                                </form>
-                                </field>
-                        </record>
-                        
-                        <act_window name="Sales lines Report"
-                        res_model="pos.payment.report.date"
-                        src_model="pos.order"
-                        view_mode="form"
-                        target="new"        
-                        key2="client_action_multi"    
-                        id="action_report_pos_payment_repport_date"/> 
-                </data>
+	<data>
+		<record id="pos_payment_report_date_form" model="ir.ui.view">
+		        <field name="name">pos.payment.report.date.form</field>
+		        <field name="model">pos.payment.report.date</field>
+		        <field name="type">form</field>
+		        <field name="arch" type="xml">
+		        <form string="Sale by Date and User">
+		                    <field name="date_start"/>
+		                    <field name="date_end"/>
+		                    <field name="user_id"/>
+		                        <button icon='gtk-cancel' special="cancel"
+		                        string="Close" />
+		                        <button name="print_report" string="Print Report"
+		                        colspan="1" type="object" icon="gtk-ok" />
+		        </form>
+		        </field>
+		</record>
+
+        <record id="action_report_pos_payment_repport_date" model="ir.actions.act_window">
+            <field name="name">Sales lines Report</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.payment.report.date</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+		</data>
 </openerp>              
diff --git a/addons/point_of_sale/wizard/pos_payment_report_user.xml b/addons/point_of_sale/wizard/pos_payment_report_user.xml
new file mode 100644
index 00000000000..bccfe92a847
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_payment_report_user.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        
+        <!--   pos.details -->
+        
+		<record id="view_pos_payment_report" model="ir.ui.view">
+            <field name="name">Pyament Report</field>
+            <field name="model">pos.payment.report</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Pyament Report ">
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Close" />
+                		<button name="print_report" string="Print Report"
+                			colspan="1" type="object" icon="gtk-print" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+
+        <record id="action_report_pos_payment" model="ir.actions.act_window">
+            <field name="name">Pyament Report</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.payment.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+<!--    <act_window name="POS Details"
+            res_model="pos.details"
+            src_model="pos.order"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_report_pos_details"/>   -->
+        
+	</data>
+</openerp>	        
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/pos_payment_report_user_view.xml b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
index 463d864f310..f2ead0bcace 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
@@ -1,27 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-                <data>
-                        <record id="pos_payment_report_user_form" model="ir.ui.view">
-                                <field name="name">pos.payment.report.user.form</field>
-                                <field name="model">pos.payment.report.user</field>
-                                <field name="type">form</field>
-                                <field name="arch" type="xml">
-                                <form string="Sale by User">
-                                            <field name="user_id"/>
-                                                <button icon='gtk-cancel' special="cancel"
-                                                string="Close" />
-                                                <button name="print_report" string="Print Report"
-                                                colspan="1" type="object" icon="gtk-ok" />
-                                </form>
-                                </field>
-                        </record>
-                        
-                        <act_window name="Sales lines by Users"
-                        res_model="pos.payment.report.user"
-                        src_model="pos.order"
-                        view_mode="form"
-                        target="new"        
-                        key2="client_action_multi"    
-                        id="action_report_pos_payment_report_user"/> 
-                </data>
+	<data>
+			<record id="pos_payment_report_user_form" model="ir.ui.view">
+			    <field name="name">pos.payment.report.user.form</field>
+			    <field name="model">pos.payment.report.user</field>
+			    <field name="type">form</field>
+			    <field name="arch" type="xml">
+			    <form string="Sale by User">
+			                <field name="user_id"/>
+			                    <button icon='gtk-cancel' special="cancel"
+			                    string="Close" />
+			                    <button name="print_report" string="Print Report"
+			                    colspan="1" type="object" icon="gtk-ok" />
+			    </form>
+			    </field>
+			</record>
+
+        <record id="action_report_pos_payment_report_user" model="ir.actions.act_window">
+            <field name="name">Sales lines by Userst</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.payment.report.user</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+		</data>	        
 </openerp>              
diff --git a/addons/point_of_sale/wizard/pos_receipt_view.xml b/addons/point_of_sale/wizard/pos_receipt_view.xml
new file mode 100644
index 00000000000..5839e4fcb3e
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_receipt_view.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        
+        <!--   pos.details -->
+        
+		<record id="view_pos_receipt" model="ir.ui.view">
+            <field name="name">Receipt</field>
+            <field name="model">pos.receipt</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Receipt :">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Close" />
+                		<button name="print_report" string="Print Report"
+                			colspan="1" type="object" icon="gtk-ok" />				  
+                </form>
+            </field>
+        </record>
+
+ 	<act_window name="Fill Inventory"		    
+		    res_model="pos.receipt"
+		    src_model="pos.order"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_report_pos_receipt"/>	
+       
+  		<!--record id="action_report_pos_receipt" model="ir.actions.act_window">
+            <field name="name">Receipt</field>
+            <field name="res_model">pos.receipt</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+           	<field name="target">new</field>
+        </record-->	
+		
+	</data>
+</openerp>	        
diff --git a/addons/point_of_sale/wizard/wizard_pos_payment_report.py b/addons/point_of_sale/wizard/wizard_pos_payment_report.py
deleted file mode 100644
index 1f6ed1afda5..00000000000
--- a/addons/point_of_sale/wizard/wizard_pos_payment_report.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import pooler
-import netsvc
-import wizard
-import time
-
-
-class wizard_pos_payment_report(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type':'print', 'report':'pos.payment.report', 'state':'end'}
-             },
-    }
-
-wizard_pos_payment_report('pos.payment.report')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From 358384adbc501c72f2b44ce168707f5555f51b83 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 22 Mar 2010 11:16:37 +0530
Subject: [PATCH 188/251] [IMP] point_of_sale: improve the view  and set the
 indent

bzr revid: sbh@tinyerp.com-20100322054637-muo754xi0231tcub
---
 addons/point_of_sale/wizard/pos_details.py    |  5 ++-
 .../wizard/pos_payment_report_date_view.xml   | 30 +++++++++---------
 .../wizard/pos_payment_report_user_view.xml   | 31 +++++++++----------
 3 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/addons/point_of_sale/wizard/pos_details.py b/addons/point_of_sale/wizard/pos_details.py
index 8316d3a7c9c..d51b30bdca9 100644
--- a/addons/point_of_sale/wizard/pos_details.py
+++ b/addons/point_of_sale/wizard/pos_details.py
@@ -33,7 +33,10 @@ class pos_details(osv.osv_memory):
         'date_start': fields.date('Date Start',required=True),
         'date_end': fields.date('Date End',required=True)
     }
-    
+    _defaults = {
+                 'date_start': lambda *a: time.strftime('%Y-%m-%d'),
+                'date_end': lambda *a: time.strftime('%Y-%m-%d'),
+                }
     def print_report(self, cr, uid, ids, context={}):
         """ 
          To get the date and print the report           
diff --git a/addons/point_of_sale/wizard/pos_payment_report_date_view.xml b/addons/point_of_sale/wizard/pos_payment_report_date_view.xml
index 7a5bf58370b..4c05c8ac514 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_date_view.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report_date_view.xml
@@ -2,20 +2,22 @@
 <openerp>
 	<data>
 		<record id="pos_payment_report_date_form" model="ir.ui.view">
-		        <field name="name">pos.payment.report.date.form</field>
-		        <field name="model">pos.payment.report.date</field>
-		        <field name="type">form</field>
-		        <field name="arch" type="xml">
-		        <form string="Sale by Date and User">
-		                    <field name="date_start"/>
-		                    <field name="date_end"/>
-		                    <field name="user_id"/>
-		                        <button icon='gtk-cancel' special="cancel"
-		                        string="Close" />
-		                        <button name="print_report" string="Print Report"
-		                        colspan="1" type="object" icon="gtk-ok" />
-		        </form>
-		        </field>
+			<field name="name">pos.payment.report.date.form</field>
+		    <field name="model">pos.payment.report.date</field>
+		    <field name="type">form</field>
+		    <field name="arch" type="xml">
+		    <form string="Sale by Date and User">
+			     <group col="2" colspan="4">
+					<field name="date_start"/>
+	                <field name="date_end"/>
+	                <field name="user_id"/>
+					<button icon='gtk-cancel' special="cancel"
+	                    string="Close" />
+				<button name="print_report" string="Print Report"
+	                    colspan="1" type="object" icon="gtk-print" />
+			     </group>               
+		    </form>
+		    </field>
 		</record>
 
         <record id="action_report_pos_payment_repport_date" model="ir.actions.act_window">
diff --git a/addons/point_of_sale/wizard/pos_payment_report_user_view.xml b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
index f2ead0bcace..9d6e925ebd7 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 	<data>
-			<record id="pos_payment_report_user_form" model="ir.ui.view">
-			    <field name="name">pos.payment.report.user.form</field>
-			    <field name="model">pos.payment.report.user</field>
-			    <field name="type">form</field>
-			    <field name="arch" type="xml">
-			    <form string="Sale by User">
-			                <field name="user_id"/>
-			                    <button icon='gtk-cancel' special="cancel"
-			                    string="Close" />
-			                    <button name="print_report" string="Print Report"
-			                    colspan="1" type="object" icon="gtk-ok" />
-			    </form>
-			    </field>
-			</record>
-
+		<record id="pos_payment_report_user_form" model="ir.ui.view">
+		    <field name="name">pos.payment.report.user.form</field>
+		    <field name="model">pos.payment.report.user</field>
+		    <field name="type">form</field>
+		    <field name="arch" type="xml">
+				<form string="Sale by User">
+				 	<group col="2" colspan="4">
+					<field name="user_id"/>
+					<button icon='gtk-cancel' special="cancel" string="Close" />
+					<button name="print_report" string="Print Report" colspan="1" type="object" icon="gtk-print" />
+ 					</group >				
+				</form>
+		    </field>
+		</record>
         <record id="action_report_pos_payment_report_user" model="ir.actions.act_window">
-            <field name="name">Sales lines by Userst</field>
+            <field name="name">Sales lines by Users</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">pos.payment.report.user</field>
             <field name="view_type">form</field>

From 4738f1ed97a7275432a16241f7dd7644125a8927 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 22 Mar 2010 11:19:51 +0530
Subject: [PATCH 189/251] [Fix]  point_of_sale: fix the path of rml

bzr revid: sbh@tinyerp.com-20100322054951-if1n23krbofiammw
---
 addons/point_of_sale/statement_report.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/statement_report.xml b/addons/point_of_sale/statement_report.xml
index 4a9d8600ff2..8118d2e834d 100644
--- a/addons/point_of_sale/statement_report.xml
+++ b/addons/point_of_sale/statement_report.xml
@@ -60,7 +60,7 @@
 			auto="False"
 			multi="True"
 			menu = 'False'
-			rml="statement/report/all_closed_cashbox_of_the_day.rml"
+			rml="point_of_sale/report/all_closed_cashbox_of_the_day.rml"
 			 />
 
 	</data>

From f38b15a79c371c4541f6776f84efc5f31aa76aae Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 22 Mar 2010 11:31:06 +0530
Subject: [PATCH 190/251] [REM] point_of_sale: remove the old wizard of
 pos_detail

bzr revid: sbh@tinyerp.com-20100322060106-7e9cewt0pdl9swsi
---
 .../wizard/wizard_pos_details.py              | 67 -------------------
 1 file changed, 67 deletions(-)
 delete mode 100644 addons/point_of_sale/wizard/wizard_pos_details.py

diff --git a/addons/point_of_sale/wizard/wizard_pos_details.py b/addons/point_of_sale/wizard/wizard_pos_details.py
deleted file mode 100644
index 80a0593c08e..00000000000
--- a/addons/point_of_sale/wizard/wizard_pos_details.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields
-from osv import osv
-import time
-import ir
-from mx import DateTime
-import datetime
-import pooler
-from tools import config
-import wizard
-import netsvc
-
-
-pos_details_res_form= """<?xml version="1.0"?>
-<form string="Sale by User">
-     <field name="date_start" />
-     <field name="date_end" />
-</form>
-"""
-
-pos_details_res_field= {
-    'date_start': {'string':'Start Date','type':'date','required': True,'default': lambda *a: time.strftime('%Y-%m-%d')},
-    'date_end': {'string':'End Date','type':'date','required': True,'default': lambda *a: time.strftime('%Y-%m-%d')},
-
-
-}
-
-
-class wizard_pos_details(wizard.interface):
-
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'form',
-                    'arch' : pos_details_res_form,
-                    'fields' : pos_details_res_field,
-                    'state' : [('end', 'Cancel','gtk-cancel'),('print_report', 'Print Report','gtk-print') ]}
-        },
-        'print_report' : {
-            'actions' : [],
-            'result' : {'type' : 'print',
-                   'report':'pos.details',
-                    'state' : 'end'}
-        },
-    }
-wizard_pos_details('pos.details')

From fafd62d61ccb352813dfa8112a897095fb84f4df Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Mon, 22 Mar 2010 13:12:23 +0530
Subject: [PATCH 191/251] [IMP]: stock: account move when modifying a product
 price: If changing  cost of a product, no way to take this valuation delta
 into account with  a corresponding accounting entry.

bzr revid: mso@mso-20100322074223-corrom3x5jt1ponr
---
 .../wizard/stock_change_standard_price.py     | 79 ++++++++++---------
 1 file changed, 40 insertions(+), 39 deletions(-)

diff --git a/addons/stock/wizard/stock_change_standard_price.py b/addons/stock/wizard/stock_change_standard_price.py
index 15c82f81d04..4ee34c3294f 100644
--- a/addons/stock/wizard/stock_change_standard_price.py
+++ b/addons/stock/wizard/stock_change_standard_price.py
@@ -64,7 +64,7 @@ class change_standard_price(osv.osv_memory):
         
         """
         rec_id = context and context.get('active_id', False)
-        prod_obj = self.pool.get('product.template')
+        prod_obj = self.pool.get('product.product')
         location_obj = self.pool.get('stock.location')
         lot_obj = self.pool.get('stock.report.prodlots')
         move_obj = self.pool.get('account.move')
@@ -78,52 +78,53 @@ class change_standard_price(osv.osv_memory):
         prod_obj.write(cr, uid, rec_id, {'standard_price': new_price})
         
         loc_ids = location_obj.search(cr, uid, [('account_id','<>',False),('usage','=','internal')])
-        lot_ids = lot_obj.search(cr, uid, [('location_id', 'in', loc_ids),('product_id','=',rec_id)])
         qty = 0
-        debit = 0.0
-        credit = 0.0
+        amount_diff = 0.0
+        amount_diff = 0.0
         stock_input_acc = data.property_stock_account_input.id or data.categ_id.property_stock_account_input_categ.id
         stock_output_acc = data.property_stock_account_output.id or data.categ_id.property_stock_account_output_categ.id
-            
-        for lots in lot_obj.browse(cr, uid, lot_ids):
-            qty += lots.name
         
-        if stock_input_acc and stock_output_acc and lot_ids:
-            move_id = move_obj.create(cr, uid, {'journal_id': data.categ_id.property_stock_journal.id})
-            if diff > 0:
-                credit = qty * diff
-                move_line_obj.create(cr, uid, {
-                                'name': data.name,
-                                'account_id': stock_input_acc,
-                                'credit': credit,
-                                'move_id': move_id
-                                })
-                for lots in lot_obj.browse(cr, uid, lot_ids):
-                    credit = lots.name * diff
-                    move_line_obj.create(cr, uid, {
+        company_id = False
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        if user.company_id:
+            company_id = user.company_id.id
+           
+        if stock_input_acc and stock_output_acc:
+            move_id = move_obj.create(cr, uid, {'journal_id': data.categ_id.property_stock_journal.id, 'company_id': company_id})
+            for location_id in location_obj.browse(cr, uid, loc_ids):
+                product = prod_obj.browse(cr, uid, rec_id, context.update({'location':location_id}))
+                qty = product.qty_available
+                if qty:
+                    if diff > 0:                
+                        amount_diff = qty * diff        
+                        move_line_obj.create(cr, uid, {
+                                    'name': data.name,
+                                    'account_id': stock_input_acc,
+                                    'debit': amount_diff,
+                                    'move_id': move_id,
+                                    })
+                        move_line_obj.create(cr, uid, {
                                     'name': 'Expense',
-                                    'account_id': lots.location_id.account_id.id,
-                                    'debit': credit,
-                                    'move_id': move_id
+                                    'account_id': location_id.account_id.id,
+                                    'credit': amount_diff,
+                                    'move_id': move_id,
                                     })
-            elif diff < 0:
-                debit = qty * -diff
-                move_line_obj.create(cr, uid, {
-                                'name': data.name,
-                                'account_id': stock_output_acc,
-                                'debit': debit,
-                                'move_id': move_id
-                                })
-                for lots in lot_obj.browse(cr, uid, lot_ids):
-                    debit = lots.name * -diff
-                    move_line_obj.create(cr, uid, {
+                    elif diff < 0:               
+                        amount_diff = qty * -diff
+                        move_line_obj.create(cr, uid, {
+                                    'name': data.name,
+                                    'account_id': stock_output_acc,
+                                    'credit': amount_diff,
+                                    'move_id': move_id,
+                                    })
+                        move_line_obj.create(cr, uid, {
                                     'name': 'Income',
-                                    'account_id': lots.location_id.account_id.id,
-                                    'credit': debit,
-                                    'move_id': move_id
+                                    'account_id': location_id.account_id.id,
+                                    'debit': amount_diff,
+                                    'move_id': move_id,
                                     })
-            else:
-                raise osv.except_osv(_('Warning!'),_('No Change in Price.'))
+                    else:
+                        raise osv.except_osv(_('Warning!'),_('No Change in Price.'))
         else:
             raise osv.except_osv(_('Warning!'),_('No Accounts are defined for ' 
                         'this product on its location.\nCan\'t create Move.'))

From f562fde42df81557274ff30d1f019c593e4fd1de Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Mon, 22 Mar 2010 16:58:29 +0530
Subject: [PATCH 192/251] [IMP] mrp: Code optimization. Removed '@summary' from
 docstring. Removed 'self.pool.get()' from loops.

bzr revid: uco@tinyerp.co.in-20100322112829-6btns8fyixechwh3
---
 addons/mrp/mrp.py | 107 ++++++++++++++++++++++++++++------------------
 1 file changed, 65 insertions(+), 42 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 2a46fc0286c..b2817d052e3 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -301,11 +301,12 @@ class mrp_bom(osv.osv):
         rev_ids = res[0]['revision_ids']
         idx = 1
         new_idx = []
+        bom_rev_obj = self.pool.get('mrp.bom.revision')
         for rev_id in rev_ids:
             if res[0]['revision_type'] == 'numeric':
-                self.pool.get('mrp.bom.revision').write(cr, uid, [rev_id], {'indice' : idx})
+                bom_rev_obj.write(cr, uid, [rev_id], {'indice' : idx})
             else:
-                self.pool.get('mrp.bom.revision').write(cr, uid, [rev_id], {'indice' : "%c"%(idx+96,)})
+                bom_rev_obj.write(cr, uid, [rev_id], {'indice' : "%c"%(idx+96,)})
             idx+=1
         return True
 
@@ -514,15 +515,18 @@ class mrp_production(osv.osv):
 
     def action_compute(self, cr, uid, ids, properties=[]):
         results = []
+        bom_obj = self.pool.get('mrp.bom')
+        prod_line_obj = self.pool.get('mrp.production.product.line')
+        workcenter_line_obj = self.pool.get('mrp.production.workcenter.line')
         for production in self.browse(cr, uid, ids):
             cr.execute('delete from mrp_production_product_line where production_id=%s', (production.id,))
             cr.execute('delete from mrp_production_workcenter_line where production_id=%s', (production.id,))
             bom_point = production.bom_id
             bom_id = production.bom_id.id
             if not bom_point:
-                bom_id = self.pool.get('mrp.bom')._bom_find(cr, uid, production.product_id.id, production.product_uom.id, properties)
+                bom_id = bom_obj._bom_find(cr, uid, production.product_id.id, production.product_uom.id, properties)
                 if bom_id:
-                    bom_point = self.pool.get('mrp.bom').browse(cr, uid, bom_id)
+                    bom_point = bom_obj.browse(cr, uid, bom_id)
                     routing_id = bom_point.routing_id.id or False
                     self.write(cr, uid, [production.id], {'bom_id': bom_id, 'routing_id': routing_id})
 
@@ -533,32 +537,34 @@ class mrp_production(osv.osv):
             #   self.write(cr, uid, [production.id], {'location_src_id': bom_point.routing_id.location_id.id})
 
             factor = production.product_qty * production.product_uom.factor / bom_point.product_uom.factor
-            res = self.pool.get('mrp.bom')._bom_explode(cr, uid, bom_point, factor / bom_point.product_qty, properties)
+            res = bom_obj._bom_explode(cr, uid, bom_point, factor / bom_point.product_qty, properties)
             results = res[0]
             results2 = res[1]
             for line in results:
                 line['production_id'] = production.id
-                self.pool.get('mrp.production.product.line').create(cr, uid, line)
+                prod_line_obj.create(cr, uid, line)
             for line in results2:
                 line['production_id'] = production.id
-                self.pool.get('mrp.production.workcenter.line').create(cr, uid, line)
+                workcenter_line_obj.create(cr, uid, line)
         return len(results)
 
     def action_cancel(self, cr, uid, ids):
+        move_obj = self.pool.get('stock.move')
         for production in self.browse(cr, uid, ids):
             if production.move_created_ids:
-                self.pool.get('stock.move').action_cancel(cr, uid, [x.id for x in production.move_created_ids])
-            self.pool.get('stock.move').action_cancel(cr, uid, [x.id for x in production.move_lines])
+                move_obj.action_cancel(cr, uid, [x.id for x in production.move_created_ids])
+            move_obj.action_cancel(cr, uid, [x.id for x in production.move_lines])
         self.write(cr, uid, ids, {'state':'cancel'}) #,'move_lines':[(6,0,[])]})
         return True
 
     #XXX: may be a bug here; lot_lines are unreserved for a few seconds;
     #     between the end of the picking list and the call to this function
     def action_ready(self, cr, uid, ids):
+        move_obj = self.pool.get('stock.move')
         self.write(cr, uid, ids, {'state':'ready'})
         for production in self.browse(cr, uid, ids):
             if production.move_prod_id:
-                self.pool.get('stock.move').write(cr, uid, [production.move_prod_id.id],
+                move_obj.write(cr, uid, [production.move_prod_id.id],
                         {'location_id':production.location_dest_id.id})
         return True
 
@@ -579,10 +585,10 @@ class mrp_production(osv.osv):
 
     def action_produce(self, cr, uid, production_id, production_qty, production_mode, context=None):
         """ 
-             @summary: To produce final product base on production mode (consume/consume&produce).
-                       If Production mode is consume, all stock move lines of raw materials will be done/consumed.
-                       If Production mode is consume & produce, all stock move lines of raw materials will be done/consumed
-                                    and stock move lines of final product will be also done/produced.
+            To produce final product base on production mode (consume/consume&produce).
+            If Production mode is consume, all stock move lines of raw materials will be done/consumed.
+            If Production mode is consume & produce, all stock move lines of raw materials will be done/consumed
+            and stock move lines of final product will be also done/produced.
         
              @param self: The object pointer.
              @param cr: A database cursor
@@ -662,6 +668,7 @@ class mrp_production(osv.osv):
 
     def _costs_generate(self, cr, uid, production):
         amount = 0.0
+        analytic_line_obj = self.pool.get('account.analytic.line')
         for wc_line in production.workcenter_lines:
             wc = wc_line.workcenter_id
             if wc.costs_journal_id and wc.costs_general_account_id:
@@ -669,7 +676,7 @@ class mrp_production(osv.osv):
                 account = wc.costs_hour_account_id.id
                 if value and account:
                     amount += value
-                    self.pool.get('account.analytic.line').create(cr, uid, {
+                    analytic_line_obj.create(cr, uid, {
                         'name': wc_line.name+' (H)',
                         'amount': value,
                         'account_id': account,
@@ -682,7 +689,7 @@ class mrp_production(osv.osv):
                 account = wc.costs_cycle_account_id.id
                 if value and account:
                     amount += value
-                    self.pool.get('account.analytic.line').create(cr, uid, {
+                    analytic_line_obj.create(cr, uid, {
                         'name': wc_line.name+' (C)',
                         'amount': value,
                         'account_id': account,
@@ -711,6 +718,10 @@ class mrp_production(osv.osv):
     def action_confirm(self, cr, uid, ids):
         picking_id=False
         proc_ids = []
+        seq_obj = self.pool.get('ir.sequence')
+        pick_obj = self.pool.get('stock.picking')
+        move_obj = self.pool.get('stock.move')
+        proc_obj = self.pool.get('mrp.procurement')
         for production in self.browse(cr, uid, ids):
             if not production.product_lines:
                 self.action_compute(cr, uid, [production.id])
@@ -724,8 +735,8 @@ class mrp_production(osv.osv):
                     pick_type = 'out'
                 address_id = routing_loc.address_id and routing_loc.address_id.id or False
                 routing_loc = routing_loc.id
-            pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.'+pick_type)
-            picking_id = self.pool.get('stock.picking').create(cr, uid, {
+            pick_name = seq_obj.get(cr, uid, 'stock.picking.'+pick_type)
+            picking_id = pick_obj.create(cr, uid, {
                 'name': pick_name,
                 'origin': (production.origin or '').split(':')[0] +':'+production.name,
                 'type': pick_type,
@@ -751,7 +762,7 @@ class mrp_production(osv.osv):
                 'state': 'waiting',
                 'company_id': production.company_id.id,
             }
-            res_final_id = self.pool.get('stock.move').create(cr, uid, data)
+            res_final_id = move_obj.create(cr, uid, data)
 
             self.write(cr, uid, [production.id], {'move_created_ids': [(6, 0, [res_final_id])]})
             moves = []
@@ -759,7 +770,7 @@ class mrp_production(osv.osv):
                 move_id=False
                 newdate = production.date_planned
                 if line.product_id.type in ('product', 'consu'):
-                    res_dest_id = self.pool.get('stock.move').create(cr, uid, {
+                    res_dest_id = move_obj.create(cr, uid, {
                         'name':'PROD:'+production.name,
                         'date_planned': production.date_planned,
                         'product_id': line.product_id.id,
@@ -774,7 +785,7 @@ class mrp_production(osv.osv):
                         'company_id': production.company_id.id,
                     })
                     moves.append(res_dest_id)
-                    move_id = self.pool.get('stock.move').create(cr, uid, {
+                    move_id = move_obj.create(cr, uid, {
                         'name':'PROD:'+production.name,
                         'picking_id':picking_id,
                         'product_id': line.product_id.id,
@@ -789,7 +800,7 @@ class mrp_production(osv.osv):
                         'state': 'waiting',
                         'company_id': production.company_id.id,
                     })
-                proc_id = self.pool.get('mrp.procurement').create(cr, uid, {
+                proc_id = proc_obj.create(cr, uid, {
                     'name': (production.origin or '').split(':')[0] + ':' + production.name,
                     'origin': (production.origin or '').split(':')[0] + ':' + production.name,
                     'date_planned': newdate,
@@ -1039,6 +1050,7 @@ class mrp_procurement(osv.osv):
 
     def check_buy(self, cr, uid, ids):
         user = self.pool.get('res.users').browse(cr, uid, uid)
+        partner_obj = self.pool.get('res.partner')
         for procurement in self.browse(cr, uid, ids):
             if procurement.product_id.product_tmpl_id.supply_method<>'buy':
                 return False
@@ -1049,7 +1061,7 @@ class mrp_procurement(osv.osv):
             if user.company_id and user.company_id.partner_id:
                 if partner.id == user.company_id.partner_id.id:
                     return False
-            address_id = self.pool.get('res.partner').address_get(cr, uid, [partner.id], ['delivery'])['delivery']
+            address_id = partner_obj.address_get(cr, uid, [partner.id], ['delivery'])['delivery']
             if not address_id:
                 cr.execute('update mrp_procurement set message=%s where id=%s', (_('No address defined for the supplier'), procurement.id))
                 return False
@@ -1062,6 +1074,7 @@ class mrp_procurement(osv.osv):
         return False
 
     def action_confirm(self, cr, uid, ids, context={}):
+        move_obj = self.pool.get('stock.move')
         for procurement in self.browse(cr, uid, ids):
             if procurement.product_qty <= 0.00:
                 raise osv.except_osv(_('Data Insufficient !'), _('Please check the Quantity of Requisition Order(s), it should not be less than 1!'))
@@ -1070,7 +1083,7 @@ class mrp_procurement(osv.osv):
                     source = procurement.location_id.id
                     if procurement.procure_method=='make_to_order':
                         source = procurement.product_id.product_tmpl_id.property_stock_procurement.id
-                    id = self.pool.get('stock.move').create(cr, uid, {
+                    id = move_obj.create(cr, uid, {
                         'name': 'PROC:'+procurement.name,
                         'location_id': source,
                         'location_dest_id': procurement.location_id.id,
@@ -1085,7 +1098,7 @@ class mrp_procurement(osv.osv):
                 else:
                     # TODO: check this
                     if procurement.procure_method=='make_to_stock' and procurement.move_id.state in ('waiting',):
-                        id = self.pool.get('stock.move').write(cr, uid, [procurement.move_id.id], {'state':'confirmed'})
+                        id = move_obj.write(cr, uid, [procurement.move_id.id], {'state':'confirmed'})
         self.write(cr, uid, ids, {'state':'confirmed','message':''})
         return True
 
@@ -1114,7 +1127,7 @@ class mrp_procurement(osv.osv):
 
     def action_produce_assign_product(self, cr, uid, ids, context={}):
         """
-        @summary : This is action which call from workflow to assign production order to procuments
+        This is action which call from workflow to assign production order to procuments
         @return  : True
         """
         res = self.make_mo(cr, uid, ids, context=context)
@@ -1123,18 +1136,21 @@ class mrp_procurement(osv.osv):
 
     def make_mo(self, cr, uid, ids, context={}):
         """
-        @summary : Make Manufecturing(production) order from procurement
+        Make Manufecturing(production) order from procurement
         
         @return : New created Production Orders procurement wise 
         """
         res = {}
         company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
+        production_obj = self.pool.get('mrp.production')
+        move_obj = self.pool.get('stock.move')
+        wf_service = netsvc.LocalService("workflow")
         for procurement in self.browse(cr, uid, ids):
             res_id = procurement.move_id.id
             loc_id = procurement.location_id.id
             newdate = DateTime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S') - DateTime.RelativeDateTime(days=procurement.product_id.product_tmpl_id.produce_delay or 0.0)
             newdate = newdate - DateTime.RelativeDateTime(days=company.manufacturing_lead)
-            produce_id = self.pool.get('mrp.production').create(cr, uid, {
+            produce_id = production_obj.create(cr, uid, {
                 'origin': procurement.origin,
                 'product_id': procurement.product_id.id,
                 'product_qty': procurement.product_qty,
@@ -1150,17 +1166,16 @@ class mrp_procurement(osv.osv):
             })
             res[procurement.id] = produce_id
             self.write(cr, uid, [procurement.id], {'state':'running'})
-            bom_result = self.pool.get('mrp.production').action_compute(cr, uid,
+            bom_result = production_obj.action_compute(cr, uid,
                     [produce_id], properties=[x.id for x in procurement.property_ids])
-            wf_service = netsvc.LocalService("workflow")
             wf_service.trg_validate(uid, 'mrp.production', produce_id, 'button_confirm', cr)
-            self.pool.get('stock.move').write(cr, uid, [res_id],
+            move_obj.write(cr, uid, [res_id],
                     {'location_id':procurement.location_id.id})
         return res
     
     def action_po_assign(self, cr, uid, ids, context={}):
         """
-        @summary : This is action which call from workflow to assign purchase order to procuments
+        This is action which call from workflow to assign purchase order to procuments
         @return  : True
         """
         res = self.make_po(cr, uid, ids, context=context)
@@ -1169,26 +1184,32 @@ class mrp_procurement(osv.osv):
 
     def make_po(self, cr, uid, ids, context={}):
         """
-        @summary : Make purchase order from procurement
+        Make purchase order from procurement
         
         @return : New created Purchase Orders procurement wise
         """
         res = {}
         company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
+        partner_obj = self.pool.get('res.partner')
+        uom_obj = self.pool.get('product.uom')
+        pricelist_obj = self.pool.get('product.pricelist')
+        prod_obj = self.pool.get('product.product')
+        acc_pos_obj = self.pool.get('account.fiscal.position')
+        po_obj = self.pool.get('purchase.order')
         for procurement in self.browse(cr, uid, ids):
             res_id = procurement.move_id.id
             partner = procurement.product_id.seller_ids[0].name
             partner_id = partner.id
-            address_id = self.pool.get('res.partner').address_get(cr, uid, [partner_id], ['delivery'])['delivery']
+            address_id = partner_obj.address_get(cr, uid, [partner_id], ['delivery'])['delivery']
             pricelist_id = partner.property_product_pricelist_purchase.id
 
             uom_id = procurement.product_id.uom_po_id.id
 
-            qty = self.pool.get('product.uom')._compute_qty(cr, uid, procurement.product_uom.id, procurement.product_qty, uom_id)
+            qty = uom_obj._compute_qty(cr, uid, procurement.product_uom.id, procurement.product_qty, uom_id)
             if procurement.product_id.seller_ids[0].qty:
                 qty=max(qty,procurement.product_id.seller_ids[0].qty)
 
-            price = self.pool.get('product.pricelist').price_get(cr, uid, [pricelist_id], procurement.product_id.id, qty, False, {'uom': uom_id})[pricelist_id]
+            price = pricelist_obj.price_get(cr, uid, [pricelist_id], procurement.product_id.id, qty, False, {'uom': uom_id})[pricelist_id]
 
             newdate = DateTime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S')
             newdate = newdate - DateTime.RelativeDateTime(days=company.po_lead)
@@ -1197,7 +1218,7 @@ class mrp_procurement(osv.osv):
             #Passing partner_id to context for purchase order line integrity of Line name
             context.update({'lang':partner.lang, 'partner_id':partner_id})
 
-            product=self.pool.get('product.product').browse(cr,uid,procurement.product_id.id,context=context)
+            product = prod_obj.browse(cr,uid,procurement.product_id.id,context=context)
 
             line = {
                 'name': product.partner_ref,
@@ -1211,11 +1232,11 @@ class mrp_procurement(osv.osv):
             }
 
             taxes_ids = procurement.product_id.product_tmpl_id.supplier_taxes_id
-            taxes = self.pool.get('account.fiscal.position').map_tax(cr, uid, partner.property_account_position, taxes_ids)
+            taxes = acc_pos_obj.map_tax(cr, uid, partner.property_account_position, taxes_ids)
             line.update({
                 'taxes_id':[(6,0,taxes)]
             })
-            purchase_id = self.pool.get('purchase.order').create(cr, uid, {
+            purchase_id = po_obj.create(cr, uid, {
                 'origin': procurement.origin,
                 'partner_id': partner_id,
                 'partner_address_id': address_id,
@@ -1232,6 +1253,7 @@ class mrp_procurement(osv.osv):
     def action_cancel(self, cr, uid, ids):
         todo = []
         todo2 = []
+        move_obj = self.pool.get('stock.move')
         for proc in self.browse(cr, uid, ids):
             if proc.close_move:
                 if proc.move_id.state not in ('done','cancel'):
@@ -1240,9 +1262,9 @@ class mrp_procurement(osv.osv):
                 if proc.move_id and proc.move_id.state=='waiting':
                     todo.append(proc.move_id.id)
         if len(todo2):
-            self.pool.get('stock.move').action_cancel(cr, uid, todo2)
+            move_obj.action_cancel(cr, uid, todo2)
         if len(todo):
-            self.pool.get('stock.move').write(cr, uid, todo, {'state':'assigned'})
+            move_obj.write(cr, uid, todo, {'state':'assigned'})
         self.write(cr, uid, ids, {'state':'cancel'})
         wf_service = netsvc.LocalService("workflow")
         for id in ids:
@@ -1265,10 +1287,11 @@ class mrp_procurement(osv.osv):
         return res
 
     def action_done(self, cr, uid, ids):
+        move_obj = self.pool.get('stock.move')
         for procurement in self.browse(cr, uid, ids):
             if procurement.move_id:
                 if procurement.close_move and (procurement.move_id.state <> 'done'):
-                    self.pool.get('stock.move').action_done(cr, uid, [procurement.move_id.id])
+                    move_obj.action_done(cr, uid, [procurement.move_id.id])
         res = self.write(cr, uid, ids, {'state':'done', 'date_close':time.strftime('%Y-%m-%d')})
         wf_service = netsvc.LocalService("workflow")
         for id in ids:

From 99a905c1afe7669f4511834b673695fe8d390f53 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Mon, 22 Mar 2010 17:46:37 +0530
Subject: [PATCH 193/251] [IMP]: stock: fields_list variable has been changed
 to fields

bzr revid: mso@mso-20100322121637-lz6jnln149vn9vf9
---
 addons/stock/wizard/stock_move.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index 9eccd579f46..2c0cbff7565 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -66,17 +66,17 @@ class stock_move_consume(osv.osv_memory):
         'location_id': fields.many2one('stock.location', 'Location', required=True)
     }
 
-    def default_get(self, cr, uid, fields_list, context=None):
+    def default_get(self, cr, uid, fields, context=None):
         """ 
              Get default values
             
              @param self: The object pointer.
              @param cr: A database cursor
              @param uid: ID of the user currently logged in
-             @param fields_list: List of fields for default value 
+             @param fields: List of fields for default value 
              @param context: A standard dictionary 
              
-             @return: default values of fields_list
+             @return: default values of fields
         
         """
         res = super(stock_move_consume, self).default_get(cr, uid, fields, context=context)        
@@ -152,17 +152,17 @@ class split_in_production_lot(osv.osv_memory):
     _name = "stock.move.split"
     _description = "Split in Production lots"
     
-    def default_get(self, cr, uid, fields_list, context=None):
+    def default_get(self, cr, uid, fields, context=None):
         """ 
              Get default values
             
              @param self: The object pointer.
              @param cr: A database cursor
              @param uid: ID of the user currently logged in
-             @param fields_list: List of fields for default value 
+             @param fields: List of fields for default value 
              @param context: A standard dictionary 
              
-             @return: default values of fields_list
+             @return: default values of fields
         
         """
         

From 6f4bf9dd9fae51d05f06486312abef5e194fca85 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Mon, 22 Mar 2010 18:30:58 +0530
Subject: [PATCH 194/251] [IMP]: auction,delivery: fields_list variable has
 been changed to fields

bzr revid: mso@mso-20100322130058-3ya7mwxa858cbvfi
---
 addons/auction/wizard/auction_catalog_flagey_report.py | 2 +-
 addons/delivery/wizard/delivery_sale_order.py          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/auction/wizard/auction_catalog_flagey_report.py b/addons/auction/wizard/auction_catalog_flagey_report.py
index 117389770da..119c3273ee0 100644
--- a/addons/auction/wizard/auction_catalog_flagey_report.py
+++ b/addons/auction/wizard/auction_catalog_flagey_report.py
@@ -39,7 +39,7 @@ class auction_catalog_flagey(osv.osv_memory):
         res = super(auction_catalog_flagey, self).default_get(cr, uid, fields, context=context)
         return res
     
-    def view_init(self, cr, uid, fields_list, context):
+    def view_init(self, cr, uid, fields, context):
         current_auction = self.pool.get('auction.dates').browse(cr,uid,context.get('active_ids', []))
         v_lots = self.pool.get('auction.lots').search(cr,uid,[('auction_id','=',current_auction.id)])
         v_ids = self.pool.get('auction.lots').browse(cr,uid,v_lots)
diff --git a/addons/delivery/wizard/delivery_sale_order.py b/addons/delivery/wizard/delivery_sale_order.py
index 5cbc5ea692f..efc82ae4141 100644
--- a/addons/delivery/wizard/delivery_sale_order.py
+++ b/addons/delivery/wizard/delivery_sale_order.py
@@ -53,7 +53,7 @@ class make_delivery(osv.osv_memory):
              res.update({'carrier_id': order.partner_id.property_delivery_carrier.id})
         return res
     
-    def view_init(self, cr , uid , fields_list, context=None):
+    def view_init(self, cr , uid , fields, context=None):
          order_obj = self.pool.get('sale.order')
          for order in order_obj.browse(cr, uid, context.get('active_ids', [])):     
              if not order.state in ('draft'):

From 5de7f081e97b3e0d5fa17c40a87dc0a037f650c8 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 22 Mar 2010 19:42:24 +0530
Subject: [PATCH 195/251] [IMP] stock: modify the wizard of partial_picking

bzr revid: sbh@tinyerp.com-20100322141224-hqz76rz2j2qrgqt3
---
 addons/stock/wizard/wizard_partial_picking.py | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/addons/stock/wizard/wizard_partial_picking.py b/addons/stock/wizard/wizard_partial_picking.py
index 68655f72d0d..e920a95d291 100644
--- a/addons/stock/wizard/wizard_partial_picking.py
+++ b/addons/stock/wizard/wizard_partial_picking.py
@@ -57,7 +57,20 @@ def _get_moves(self, cr, uid, data, context):
 
     _moves_fields.clear()
     _moves_arch_lst = ['<?xml version="1.0"?>', '<form string="Make picking">']
-
+    _moves_arch_lst.append('<field name="partner_id%d"/>' % (pick.id,))
+    _moves_fields['partner_id%s' % pick.id] ={'string':'Partner', 
+            'type':'many2one', 'relation':'res.partner', 'required' : '1','default': make_default(pick.address_id.partner_id.id)}
+    _moves_arch_lst.append('<newline/>')
+    _moves_arch_lst.append('<field name="address_id%d"/>' % (pick.id))
+    
+    _moves_fields['address_id%s' % pick.id] ={'string':'Delivery Address', 
+                                                'type':'many2one', 'relation':'res.partner.address', 'required' : '1','default': make_default(pick.address_id.id)}
+    
+    _moves_arch_lst.append('<field name="date%d"/>' % (pick.id))
+    
+    _moves_fields['date%s' % pick.id] ={'string':'Date', 
+                                                'type':'date', 'required' : '1','default': make_default(pick.date)}
+    
     for m in pick.move_lines:
         if m.state in ('done', 'cancel'):
             continue
@@ -102,14 +115,6 @@ def _get_moves(self, cr, uid, data, context):
         _moves_arch_lst.append('<newline/>')
         res.setdefault('moves', []).append(m.id)
     
-    _moves_arch_lst.append('<field name="partner_id%d"/>' % (m.id,))
-    _moves_fields['partner_id%s' % m.id] ={'string':'Partner', 
-            'type':'many2one', 'relation':'res.partner', 'required' : '1'}
-    _moves_arch_lst.append('<newline/>')
-    _moves_arch_lst.append('<field name="address_id%d"/>' % (m.id,))
-    
-    _moves_fields['address_id%s' % m.id] ={'string':'Delivery Address', 
-                                                'type':'many2one', 'relation':'res.partner.address', 'required' : '1'}
     _moves_arch_lst.append('</form>')
     _moves_arch.string = '\n'.join(_moves_arch_lst)
     return res
@@ -177,7 +182,7 @@ def _do_split(self, cr, uid, data, context):
                         'state':'draft',
                     })
         if data['form']['move%s' % move.id] != 0:
-
+            
             new_obj = move_obj.copy(cr, uid, move.id,
                 {
                     'product_qty' : data['form']['move%s' % move.id],
@@ -185,18 +190,15 @@ def _do_split(self, cr, uid, data, context):
                     'picking_id' : new_picking,
                     'state': 'assigned',
                     'move_dest_id': False,
-                    'partner_id': data['form']['partner_id%s' % move.id],
-                    'address_id': data['form']['address_id%s' % move.id],
+                    'partner_id': data['form']['partner_id%s' % pick.id],
+                    'address_id': data['form']['address_id%s' % pick.id],
                     'price_unit': move.price_unit,
                 })
-            partner_id = False
-            if move.picking_id:
-                    partner_id = move.picking_id.address_id and (move.picking_id.address_id.partner_id and move.picking_id.address_id.partner_id.id or False) or False
             delivery_id = delivery_obj.search(cr,uid, [('name','=',pick.name)]) 
             if  not  delivery_id :
                 delivery_id = delivery_obj.create(cr, uid, {
                         'name':  pick.name,                                 
-                        'partner_id': partner_id,
+                        'partner_id': data['form']['partner_id%s' % pick.id],
                         'date': move.date,
                         'product_delivered':[(6,0, [new_obj])],
                         'picking_id':move.picking_id.id

From 57cfa6d154104339aa23508762884b26dd79fe60 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 23 Mar 2010 10:51:30 +0530
Subject: [PATCH 196/251] [IMP] point_of_sale:Removed @summary from docstring

bzr revid: sbh@tinyerp.com-20100323052130-49zeyij8z7c7kzt0
---
 addons/auction/wizard/auction_lots_make_invoice.py           | 2 +-
 addons/auction/wizard/auction_lots_make_invoice_buyer.py     | 2 +-
 addons/auction/wizard/auction_pay_buy.py                     | 2 +-
 addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py | 3 ++-
 addons/point_of_sale/wizard/pos_payment_report_date.py       | 2 +-
 addons/point_of_sale/wizard/pos_receipt.py                   | 2 +-
 addons/product_margin/wizard/product_margin.py               | 2 +-
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/auction/wizard/auction_lots_make_invoice.py b/addons/auction/wizard/auction_lots_make_invoice.py
index 11d177e45f7..6be49f7336a 100644
--- a/addons/auction/wizard/auction_lots_make_invoice.py
+++ b/addons/auction/wizard/auction_lots_make_invoice.py
@@ -31,7 +31,7 @@ class auction_lots_make_invoice(osv.osv_memory):
     
     def default_get(self, cr, uid, fields, context):
         """ 
-             @summary: To get default values for the object.
+              To get default values for the object.
             
              @param self: The object pointer.
              @param cr: A database cursor
diff --git a/addons/auction/wizard/auction_lots_make_invoice_buyer.py b/addons/auction/wizard/auction_lots_make_invoice_buyer.py
index 6173c7d8b77..53c3519d225 100644
--- a/addons/auction/wizard/auction_lots_make_invoice_buyer.py
+++ b/addons/auction/wizard/auction_lots_make_invoice_buyer.py
@@ -30,7 +30,7 @@ class auction_lots_make_invoice_buyer(osv.osv_memory):
     
     def default_get(self, cr, uid, fields, context):
         """ 
-             @summary: To get default values for the object.
+             To get default values for the object.
             
              @param self: The object pointer.
              @param cr: A database cursor
diff --git a/addons/auction/wizard/auction_pay_buy.py b/addons/auction/wizard/auction_pay_buy.py
index bd0a026d2ba..8f16ea9e7de 100644
--- a/addons/auction/wizard/auction_pay_buy.py
+++ b/addons/auction/wizard/auction_pay_buy.py
@@ -31,7 +31,7 @@ class auction_pay_buy(osv.osv_memory):
     
     def default_get(self, cr, uid, fields, context):
         """ 
-             @summary: To get default values for the object.
+             To get default values for the object.
             
              @param self: The object pointer.
              @param cr: A database cursor
diff --git a/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py b/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py
index 4e148f6cf45..0968c6c71d4 100644
--- a/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py
+++ b/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py
@@ -37,7 +37,8 @@ class all_closed_cashbox_of_the_day(osv.osv_memory):
     def print_report(self, cr, uid, ids, context=None):
 
         """ 
-             @summary: To get the date and print the report           
+             To get the date and print the report 
+                       
              @param self: The object pointer.
              @param cr: A database cursor
              @param uid: ID of the user currently logged in
diff --git a/addons/point_of_sale/wizard/pos_payment_report_date.py b/addons/point_of_sale/wizard/pos_payment_report_date.py
index 8f6471cdaa6..9e24fb76505 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_date.py
+++ b/addons/point_of_sale/wizard/pos_payment_report_date.py
@@ -32,7 +32,7 @@ class pos_payment_report_date(osv.osv_memory):
         def print_report(self, cr, uid, ids, context=None):
 
             """ 
-                 @summary: To get the date and print the report           
+                 To get the date and print the report           
                  @param self: The object pointer.
                  @param cr: A database cursor
                  @param uid: ID of the user currently logged in
diff --git a/addons/point_of_sale/wizard/pos_receipt.py b/addons/point_of_sale/wizard/pos_receipt.py
index e41deb14c32..27cdfd19ad0 100644
--- a/addons/point_of_sale/wizard/pos_receipt.py
+++ b/addons/point_of_sale/wizard/pos_receipt.py
@@ -41,7 +41,7 @@ class pos_receipt(osv.osv_memory):
     def print_report(self, cr, uid, ids, context=None):
 
         """ 
-             @summary: To get the date and print the report           
+              To get the date and print the report           
              @param self: The object pointer.
              @param cr: A database cursor
              @param uid: ID of the user currently logged in
diff --git a/addons/product_margin/wizard/product_margin.py b/addons/product_margin/wizard/product_margin.py
index dcde53571cd..1907c6695c2 100644
--- a/addons/product_margin/wizard/product_margin.py
+++ b/addons/product_margin/wizard/product_margin.py
@@ -67,7 +67,7 @@ class product_margin(osv.osv_memory):
 
     def action_cancel(self, cr, uid, ids, context=None):
         """
-            @summary:
+           
 
             @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,

From 3ec4eb5484efa29674475dbebc19880c38ebd023 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Tue, 23 Mar 2010 11:34:00 +0530
Subject: [PATCH 197/251] [IMP] stock: improved stock view

bzr revid: hmo@tinyerp.com-20100323060400-dy213r45b8e2iqw9
---
 addons/stock/stock_view.xml | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 809d6a6fbb8..fa3df94594b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -617,11 +617,11 @@
                                         string="Split in production lots"
                                            type="action" icon="gtk-justify-fill"
                                            states="draft,waiting,confirmed,assigned" />
-                                       <button
-                                           name="%(stock.move_scrap)d"
-                                           string="D" type="action"
-                                           icon="gtk-convert"
-                                           states="draft,waiting,confirmed,assigned" />
+
+                                    <button name="%(stock.move_scrap)d"
+				                    	string="Scrap Products" type="action"
+				                    	icon="gtk-convert" context="{'scrap': True}"
+				                    	states="draft,waiting,confirmed,assigned" />                                       
                                 </tree>
                                 <form string="Stock Moves">
                                     <notebook colspan="4">
@@ -784,11 +784,10 @@
                                            string="Split in production lots"
                                            type="action" icon="gtk-justify-fill"
                                            states="draft,waiting,confirmed,assigned" />
-                                       <button
-                                           name="%(stock.move_scrap)d"
-                                           string="D" type="action"
-                                           icon="gtk-convert"
-                                           states="draft,waiting,confirmed,assigned" />
+                                       <button name="%(stock.move_scrap)d"
+				                    	string="Scrap Products" type="action"
+				                    	icon="gtk-convert" context="{'scrap': True}"
+				                    	states="draft,waiting,confirmed,assigned" />
                                 </tree>
                                 <form string="Stock Moves">
                                     <notebook colspan="4">
@@ -1167,11 +1166,10 @@
                                            string="Split in production lots"
                                            type="action" icon="gtk-justify-fill"
                                            states="draft,waiting,confirmed,assigned" />
-                                       <button
-                                           name="%(stock.move_scrap)d"
-                                           string="D" type="action"
-                                           icon="gtk-convert"
-                                           states="done,cancel" />
+                                       <button name="%(stock.move_scrap)d"
+				                    	string="Scrap Products" type="action"
+				                    	icon="gtk-convert" context="{'scrap': True}"
+				                    	states="draft,waiting,confirmed,assigned" />
                                 </tree>
                                 <form string="Stock Moves">
                                     <notebook colspan="4">

From c5f3a4c94137645f9a6ad3bda19348334af27727 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Tue, 23 Mar 2010 11:40:45 +0530
Subject: [PATCH 198/251] [FIX]:stock:set the proper name of the field

bzr revid: mso@mso-20100323061045-32tm1yhe4g88ye6r
---
 addons/stock/wizard/stock_move.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index 2c0cbff7565..500b0bdc372 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -86,7 +86,7 @@ class stock_move_consume(osv.osv_memory):
         if 'product_uom' in fields:
             res.update({'product_uom': move.product_uom.id})    
         if 'product_qty' in fields:
-            res.update({'product_qty': move.product_qty.id})    
+            res.update({'product_qty': move.product_qty})    
         if 'location_id' in fields:
             res.update({'location_id': move.location_id.id})
         return res   

From 43c66f1ce51b1b29dd14b1566c97c2da066612b3 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 23 Mar 2010 12:15:14 +0530
Subject: [PATCH 199/251] [Fix] stock:Fix the sequence object for back_order

bzr revid: sbh@tinyerp.com-20100323064514-2nq98ocljgp4pk2p
---
 addons/stock/wizard/wizard_partial_picking.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/wizard/wizard_partial_picking.py b/addons/stock/wizard/wizard_partial_picking.py
index e920a95d291..2689527e82c 100644
--- a/addons/stock/wizard/wizard_partial_picking.py
+++ b/addons/stock/wizard/wizard_partial_picking.py
@@ -177,7 +177,7 @@ def _do_split(self, cr, uid, data, context):
 
             new_picking = pick_obj.copy(cr, uid, pick.id,
                     {
-                        'name': pool.get('ir.sequence').get(cr, uid, 'stock.picking'),
+                        'name': pool.get('ir.sequence').get(cr, uid, 'stock.picking.in'),
                         'move_lines' : [],
                         'state':'draft',
                     })

From 3150f2b0f588ac1bcbaebaf987fdd7effb4cdb8f Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 23 Mar 2010 12:21:50 +0530
Subject: [PATCH 200/251] [IMP]stock: add the address_id in
 wizard_partial_picking

bzr revid: sbh@tinyerp.com-20100323065150-pad7u4aq0kqndgji
---
 addons/stock/stock.py                         | 2 ++
 addons/stock/stock_view.xml                   | 1 +
 addons/stock/wizard/wizard_partial_picking.py | 1 +
 3 files changed, 4 insertions(+)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index f0492c7dd77..7a400b23138 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1769,8 +1769,10 @@ class stock_delivery(osv.osv):
         'name': fields.char('Name', size=60, required=True),  
         'date': fields.datetime('Date'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
+        'address_id': fields.many2one('res.partner.address', 'Address'),
         'product_delivered':fields.one2many('stock.move', 'delivered_id', 'Product Delivered', domain=[('picking_id.type','=','in')]),
         'picking_id': fields.many2one('stock.picking', 'Picking list'),
+        
     }
 
     
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index fa3df94594b..67fefcd0304 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1757,6 +1757,7 @@
                 		<field name="name"/>
 	                    <field name="date"/>
 	                    <field name="partner_id"/>
+	                    <field name="address_id"/>
 	                    <field name="picking_id"/>
 	                    <separator string="Product Delivered Information" colspan="4" />
 	                    <field name="product_delivered" colspan="4" nolabel="1" widget="one2many" mode="tree,form">
diff --git a/addons/stock/wizard/wizard_partial_picking.py b/addons/stock/wizard/wizard_partial_picking.py
index 2689527e82c..fde789a5a1b 100644
--- a/addons/stock/wizard/wizard_partial_picking.py
+++ b/addons/stock/wizard/wizard_partial_picking.py
@@ -199,6 +199,7 @@ def _do_split(self, cr, uid, data, context):
                 delivery_id = delivery_obj.create(cr, uid, {
                         'name':  pick.name,                                 
                         'partner_id': data['form']['partner_id%s' % pick.id],
+                        'address_id': data['form']['address_id%s' % pick.id],
                         'date': move.date,
                         'product_delivered':[(6,0, [new_obj])],
                         'picking_id':move.picking_id.id

From 361c80a2943fac3244e8e13ef5ea6f1e8561668f Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 23 Mar 2010 12:52:52 +0530
Subject: [PATCH 201/251] [IMP]: stock: Imporve the view of
 wizard_partial_picking

bzr revid: sbh@tinyerp.com-20100323072252-ephu05smjs7usr3m
---
 addons/stock/wizard/wizard_partial_picking.py | 31 ++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/addons/stock/wizard/wizard_partial_picking.py b/addons/stock/wizard/wizard_partial_picking.py
index fde789a5a1b..766ebc9513b 100644
--- a/addons/stock/wizard/wizard_partial_picking.py
+++ b/addons/stock/wizard/wizard_partial_picking.py
@@ -56,21 +56,26 @@ def _get_moves(self, cr, uid, data, context):
     res = {}
 
     _moves_fields.clear()
+    #TODO: cleanup and  this code..
+    
     _moves_arch_lst = ['<?xml version="1.0"?>', '<form string="Make picking">']
     _moves_arch_lst.append('<field name="partner_id%d"/>' % (pick.id,))
     _moves_fields['partner_id%s' % pick.id] ={'string':'Partner', 
             'type':'many2one', 'relation':'res.partner', 'required' : '1','default': make_default(pick.address_id.partner_id.id)}
-    _moves_arch_lst.append('<newline/>')
     _moves_arch_lst.append('<field name="address_id%d"/>' % (pick.id))
     
     _moves_fields['address_id%s' % pick.id] ={'string':'Delivery Address', 
                                                 'type':'many2one', 'relation':'res.partner.address', 'required' : '1','default': make_default(pick.address_id.id)}
-    
+    _moves_arch_lst.append('<newline/>')
     _moves_arch_lst.append('<field name="date%d"/>' % (pick.id))
     
     _moves_fields['date%s' % pick.id] ={'string':'Date', 
                                                 'type':'date', 'required' : '1','default': make_default(pick.date)}
-    
+    _moves_arch_lst.append('<newline/>')
+    _moves_arch_lst.append('<separator string="Product Detail" colspan="4"/>')
+    _moves_arch_lst.append('<label string="Product" align="0.0" />')
+    _moves_arch_lst.append('<label string="Quantity" align="10.0" />')
+    _moves_arch_lst.append('<label string="UOM" align="10.0" />')
     for m in pick.move_lines:
         if m.state in ('done', 'cancel'):
             continue
@@ -78,12 +83,24 @@ def _get_moves(self, cr, uid, data, context):
         if m.state!='assigned':
             quantity = 0
             _moves_fields
-            
-        _moves_arch_lst.append('<field name="move%s" />' % (m.id,))
+    
+        _moves_arch_lst.append('<group colspan="6" col="3">')    
+        _moves_arch_lst.append('<field name="name%s"  nolabel="1" />' % (m.id,))
+        _moves_fields['name%s' % m.id] = {
+                'string': 'Product',
+                'type' : 'char', 'required' : True, 'default' : make_default(m.name)}
+        _moves_arch_lst.append('<field name="move%s" nolabel="1" />' % (m.id,))
         _moves_fields['move%s' % m.id] = {
-                'string': _to_xml(m.name),
+                'string': 'Quantity',
                 'type' : 'float', 'required' : True, 'default' : make_default(quantity)}
-
+        
+        _moves_arch_lst.append('<field name="uom%s" nolabel="1"/>'% (m.id,))
+        
+        _moves_fields['uom%s' % m.id] = {'string': 'UOM', 'type': 'many2one',
+                    'relation': 'product.uom', 'required': True,
+                    'default': make_default(m.product_uom.id)}        
+        
+        _moves_arch_lst.append('</group>')            
         if (pick.type == 'in') and (m.product_id.cost_method == 'average'):
             price=0
             if hasattr(m, 'purchase_line_id') and m.purchase_line_id:

From c42e730babad0a91c3ad996ba04a7068cd5dc199 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Tue, 23 Mar 2010 13:11:42 +0530
Subject: [PATCH 202/251] [REVIEW] stock: change standard price in product

bzr revid: hmo@tinyerp.com-20100323074142-1x7pehjbloet022o
---
 .../wizard/stock_change_standard_price.py     | 127 ++++++++++--------
 1 file changed, 68 insertions(+), 59 deletions(-)

diff --git a/addons/stock/wizard/stock_change_standard_price.py b/addons/stock/wizard/stock_change_standard_price.py
index 4ee34c3294f..576c82f224e 100644
--- a/addons/stock/wizard/stock_change_standard_price.py
+++ b/addons/stock/wizard/stock_change_standard_price.py
@@ -64,6 +64,7 @@ class change_standard_price(osv.osv_memory):
         
         """
         rec_id = context and context.get('active_id', False)
+        assert rec_id, _('Active ID is not set in Context')
         prod_obj = self.pool.get('product.product')
         location_obj = self.pool.get('stock.location')
         lot_obj = self.pool.get('stock.report.prodlots')
@@ -71,64 +72,72 @@ class change_standard_price(osv.osv_memory):
         move_line_obj = self.pool.get('account.move.line')
         data_obj = self.pool.get('ir.model.data')
         
-        res = self.read(cr, uid, ids[0], ['new_price'])
-        new_price = res.get('new_price',[])
-        data = prod_obj.browse(cr, uid, rec_id)
-        diff = data.standard_price - new_price
-        prod_obj.write(cr, uid, rec_id, {'standard_price': new_price})
-        
+        res = self.browse(cr, uid, ids)
+        new_price = res[0].new_price
         loc_ids = location_obj.search(cr, uid, [('account_id','<>',False),('usage','=','internal')])
-        qty = 0
-        amount_diff = 0.0
-        amount_diff = 0.0
-        stock_input_acc = data.property_stock_account_input.id or data.categ_id.property_stock_account_input_categ.id
-        stock_output_acc = data.property_stock_account_output.id or data.categ_id.property_stock_account_output_categ.id
-        
-        company_id = False
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        if user.company_id:
-            company_id = user.company_id.id
-           
-        if stock_input_acc and stock_output_acc:
-            move_id = move_obj.create(cr, uid, {'journal_id': data.categ_id.property_stock_journal.id, 'company_id': company_id})
-            for location_id in location_obj.browse(cr, uid, loc_ids):
-                product = prod_obj.browse(cr, uid, rec_id, context.update({'location':location_id}))
-                qty = product.qty_available
-                if qty:
-                    if diff > 0:                
-                        amount_diff = qty * diff        
-                        move_line_obj.create(cr, uid, {
-                                    'name': data.name,
-                                    'account_id': stock_input_acc,
-                                    'debit': amount_diff,
-                                    'move_id': move_id,
-                                    })
-                        move_line_obj.create(cr, uid, {
-                                    'name': 'Expense',
-                                    'account_id': location_id.account_id.id,
-                                    'credit': amount_diff,
-                                    'move_id': move_id,
-                                    })
-                    elif diff < 0:               
-                        amount_diff = qty * -diff
-                        move_line_obj.create(cr, uid, {
-                                    'name': data.name,
-                                    'account_id': stock_output_acc,
-                                    'credit': amount_diff,
-                                    'move_id': move_id,
-                                    })
-                        move_line_obj.create(cr, uid, {
-                                    'name': 'Income',
-                                    'account_id': location_id.account_id.id,
-                                    'debit': amount_diff,
-                                    'move_id': move_id,
-                                    })
-                    else:
-                        raise osv.except_osv(_('Warning!'),_('No Change in Price.'))
-        else:
-            raise osv.except_osv(_('Warning!'),_('No Accounts are defined for ' 
-                        'this product on its location.\nCan\'t create Move.'))
-        
+        move_ids = []
+        for location in location_obj.browse(cr, uid, loc_ids):
+            c = context.copy()
+            c.update({'location':location.id})
+            product = prod_obj.browse(cr, uid, rec_id, context=c)
+            qty = product.qty_available
+            diff = product.standard_price - new_price                        
+            assert diff, _("Do not found any different between standard price and new price")
+            if qty:
+                location_account = location.account_id and location.account_id.id or False
+                stock_input_acc = product.property_stock_account_input and product.property_stock_account_input.id or False 
+                if not stock_input_acc:
+                    stock_input_acc = product.categ_id.property_stock_account_input_categ and product.categ_id.property_stock_account_input_categ.id or False
+                stock_output_acc = product.property_stock_account_output and product.property_stock_account_output.id or False
+                if not stock_output_acc:
+                    stock_output_acc = product.categ_id.property_stock_account_output_categ and product.categ_id.property_stock_account_output_categ.id or False
+            
+            
+                journal_id = product.categ_id.property_stock_journal and product.categ_id.property_stock_journal.id or False
+                company_id = location.company_id and location.company_id.id or False                
+                assert location_account, _('Inventory Account is not specified for Location: %s' % (location.name))
+                assert journal_id, _('Stock Journal is not specified in Product Category')
+                assert company_id, _('Company is not specified in Location')
+                move_id = move_obj.create(cr, uid, {
+                            'journal_id': journal_id, 
+                            'company_id': company_id
+                            }) 
+                move_ids.append(move_id)    
+                if diff > 0:    
+                    assert stock_input_acc, _('Stock Input Account is not specified for Product: %s' %(product.name))
+                           
+                    amount_diff = qty * diff        
+                    move_line_obj.create(cr, uid, {
+                                'name': product.name,
+                                'account_id': stock_input_acc,
+                                'debit': amount_diff,
+                                'move_id': move_id,
+                                })
+                    move_line_obj.create(cr, uid, {
+                                'name': location.name,
+                                'account_id': location_account,
+                                'credit': amount_diff,
+                                'move_id': move_id,
+                                })
+                elif diff < 0: 
+                    assert stock_output_acc, _('Stock Output Account is not specified for Product: %s' %(product.name))
+                               
+                    amount_diff = qty * -diff
+                    move_line_obj.create(cr, uid, {
+                                'name': product.name,
+                                'account_id': stock_output_acc,
+                                'credit': amount_diff,
+                                'move_id': move_id,
+                                })
+                    move_line_obj.create(cr, uid, {
+                                'name': location.name,
+                                'account_id': location_account,
+                                'debit': amount_diff,
+                                'move_id': move_id,
+                                })                   
+            
+        prod_obj.write(cr, uid, rec_id, {'standard_price': new_price})
+
         id2 = data_obj._get_id(cr, uid, 'account', 'view_move_tree')
         id3 = data_obj._get_id(cr, uid, 'account', 'view_move_form')
         
@@ -141,8 +150,8 @@ class change_standard_price(osv.osv_memory):
                 'view_type': 'form',
                 'view_mode': 'tree,form',
                 'res_model': 'account.move',
-                'res_id' : move_id,
-                'views': [(id3,'form'),(id2,'tree')],
+                'res_id' : move_ids,
+                'views': [(id2,'tree'),(id3,'form')],
                 'type': 'ir.actions.act_window',
         }
 

From b473ba6e15c475aa69cf8e918ae423dda7dce623 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 23 Mar 2010 14:01:34 +0530
Subject: [PATCH 203/251] [IMP] stock: set the field in wizard_partial_picking

bzr revid: sbh@tinyerp.com-20100323083134-t8fc4bi9orbpzy6x
---
 addons/point_of_sale/report/pos_receipt.rml   | 2 +-
 addons/stock/wizard/wizard_partial_picking.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/point_of_sale/report/pos_receipt.rml b/addons/point_of_sale/report/pos_receipt.rml
index ecf1aa8c52a..1d2e6edc9d0 100644
--- a/addons/point_of_sale/report/pos_receipt.rml
+++ b/addons/point_of_sale/report/pos_receipt.rml
@@ -104,7 +104,7 @@
         <para style="terp_default_Centre_9">E-mail : [[ address and address.email ]]</para>
         <para style="terp_default_Centre_9">Shop : [[ o.shop_id.name ]]</para>
         <para style="terp_default_Centre_9">Vendeur : [[ o.user_id1.name ]]</para>
-        <para style="terp_default_Centre_9">Date : [[ o.date_order ]]</para>
+        <para style="terp_default_Centre_9">Date : [[ formatLang(o.date_order,date = True) ]]</para>
         <para style="P4">
             <font color="white"> </font>
         </para>
diff --git a/addons/stock/wizard/wizard_partial_picking.py b/addons/stock/wizard/wizard_partial_picking.py
index 766ebc9513b..f602553d140 100644
--- a/addons/stock/wizard/wizard_partial_picking.py
+++ b/addons/stock/wizard/wizard_partial_picking.py
@@ -72,7 +72,7 @@ def _get_moves(self, cr, uid, data, context):
     _moves_fields['date%s' % pick.id] ={'string':'Date', 
                                                 'type':'date', 'required' : '1','default': make_default(pick.date)}
     _moves_arch_lst.append('<newline/>')
-    _moves_arch_lst.append('<separator string="Product Detail" colspan="4"/>')
+    _moves_arch_lst.append('<separator string="Delivery Detail" colspan="4"/>')
     _moves_arch_lst.append('<label string="Product" align="0.0" />')
     _moves_arch_lst.append('<label string="Quantity" align="10.0" />')
     _moves_arch_lst.append('<label string="UOM" align="10.0" />')
@@ -88,7 +88,7 @@ def _get_moves(self, cr, uid, data, context):
         _moves_arch_lst.append('<field name="name%s"  nolabel="1" />' % (m.id,))
         _moves_fields['name%s' % m.id] = {
                 'string': 'Product',
-                'type' : 'char', 'required' : True, 'default' : make_default(m.name)}
+                'type' : 'many2one', 'relation': 'product.product', 'required' : True, 'default' : make_default(m.product_id.id)}
         _moves_arch_lst.append('<field name="move%s" nolabel="1" />' % (m.id,))
         _moves_fields['move%s' % m.id] = {
                 'string': 'Quantity',
@@ -97,7 +97,7 @@ def _get_moves(self, cr, uid, data, context):
         _moves_arch_lst.append('<field name="uom%s" nolabel="1"/>'% (m.id,))
         
         _moves_fields['uom%s' % m.id] = {'string': 'UOM', 'type': 'many2one',
-                    'relation': 'product.uom', 'required': True,
+                    'relation': 'product.uom', 'readonly':True,'required': True,
                     'default': make_default(m.product_uom.id)}        
         
         _moves_arch_lst.append('</group>')            

From 22d2d8400d0226ef87dfee5b30d7c3529a0c5897 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 23 Mar 2010 16:38:15 +0530
Subject: [PATCH 204/251] [IMP] board_project: rename 'Members list of project'
 in 'Project(s) Members' in board_project_form view

bzr revid: psi@tinyerp.co.in-20100323110815-upwn61leh1umsjww
---
 addons/board_project/board_project_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/board_project/board_project_view.xml b/addons/board_project/board_project_view.xml
index 19cdb3a6a1b..fc79b0f9304 100644
--- a/addons/board_project/board_project_view.xml
+++ b/addons/board_project/board_project_view.xml
@@ -93,10 +93,10 @@
                         <child1>
                             <action colspan="4" height="220" name="%(action_view_task_tree)d" string="My Open Tasks" width="510"/>
                             <action colspan="4" name="%(project_issue.project_issue_categ_act0)d" string="Issues"/>
-                            
+
                          </child1>
                         <child2>
-                             <action colspan="4" height="150" name="%(action_view_project_member_tree)d" string="Members list of project"/>
+                             <action colspan="4" height="150" name="%(action_view_project_member_tree)d" string="Project(s) Members"/>
                              <action colspan="4" name="%(action_view_project_editable_messages_tree)d" string="Messages"/>
                         </child2>
                     </hpaned>

From 48df8c6e0d11b8b56879ac9e1250e191a2e83ed9 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 23 Mar 2010 16:49:28 +0530
Subject: [PATCH 205/251] [IMP] project: Set focus on button on all wizards of
 budget, remaining_hours on task with average instead of sum, Reporting=>tasks
 now working

bzr revid: psi@tinyerp.co.in-20100323111928-t041wuy0am8csx42
---
 addons/project/project_view.xml               | 5 ++---
 addons/project/report/project_report_view.xml | 8 +++-----
 addons/project/wizard/compute_tasks_date.py   | 6 +++---
 addons/project/wizard/task_delegate.py        | 6 +++---
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 302fee6602f..b910515c950 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -207,7 +207,7 @@
                     <field name="remaining_hours" widget="float_time"/>
                     <group col="4" colspan="4">
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-refresh" name="compute_hours" string="Update" type="object"/>
+                        <button icon="gtk-refresh" name="compute_hours" string="Update" type="object" default_focus="1"/>
                     </group>
                 </form>
             </field>
@@ -334,7 +334,7 @@
                     <field name="delegated_user_id" invisible="context.get('show_delegated', True)"/>
                     <field name="planned_hours" widget="float_time" />
                     <field name="total_hours" widget="float_time"/>
-                    <field name="remaining_hours" widget="float_time" sum="Remaining Hours" invisible="context.get('set_visible',False)"/>
+                    <field name="remaining_hours" widget="float_time" avg="Remaining Hours" invisible="context.get('set_visible',False)"/>
                     <field name="date_deadline" invisible="context.get('set_visible',False)"/>
                     <field name="type" groups="base.group_extended" invisible="context.get('set_visible',False)"/>
                     <field name="date_start" invisible="1"/>
@@ -412,7 +412,6 @@
                         <field name="name" select="1"/>
                         <field name="project_id" select="1" widget="selection" default="context.get('project_id', False)">
                              <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-project"/>
-                             <filter domain="[('project_id','=',False)]" help="Tasks not assigned to a project" icon="terp-project"/>
                         </field>
                         <field name="user_id" select="1" widget="selection">
                             <filter domain="[('user_id','=',uid)]" help="My Tasks" icon="gtk-execute" default="1"/>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 948ed70ef80..dd271ee97da 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -32,7 +32,6 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
             	<search string="Tasks">
-            		<group col="10" colspan="4">
 	            		<filter icon="terp-project" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Tasks performed in this year"/>
 	            		<filter icon="terp-project" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Tasks performed in this month"/>
 	            		<separator orientation="vertical"/>
@@ -41,8 +40,8 @@
                  	    <filter string="Deadline" icon="terp-project" domain="[('date_deadline','=',time.strftime('%%Y/%%m/%%d'))]"/>
                  	    <filter string="Closed" icon="terp-project" domain="[('state','=','done')]"/>
 	            		<separator orientation="vertical"/>
-	            		<field name="project_id" select="1"/>
-	                    <field name="user_id" select="1" widget="selection">
+	            		<field name="project_id"/>
+	                    <field name="user_id" widget="selection">
 	            			<filter icon="terp-project" string="My Task" domain="[('user_id','=',uid)]" default="1"/>
                 		</field>
 	                    <newline/>
@@ -55,12 +54,11 @@
                     		<filter string="Month" icon="terp-project" context="{'group_by':'month'}"/>
                     		<filter string="Year" icon="terp-project" context="{'group_by':'name'}"/>
                 		</group>
-	                </group>
             	</search>
             </field>
         </record>
 
-        <record id="action_project_task_user_tree" model="ir.actions.act_window">
+       <record id="action_project_task_user_tree" model="ir.actions.act_window">
             <field name="name">Tasks</field>
             <field name="res_model">report.project.task.user</field>
             <field name="view_type">form</field>
diff --git a/addons/project/wizard/compute_tasks_date.py b/addons/project/wizard/compute_tasks_date.py
index 7f9965367ae..9c81aefca1e 100644
--- a/addons/project/wizard/compute_tasks_date.py
+++ b/addons/project/wizard/compute_tasks_date.py
@@ -133,15 +133,15 @@ class wizard_compute_tasks(wizard.interface):
         'init': {
             'actions': [],
             'result': {'type':'form', 'arch':compute_form, 'fields':compute_fields, 'state':[
-                ('end', 'Cancel'),
-                ('compute', 'Compute')
+                ('end', 'Cancel', 'gtk-cancel'),
+                ('compute', 'Compute', 'gtk-ok', True)
             ]},
         },
 
 
         'compute': {
             'actions': [_compute_date],
-            'result': {'type':'form','arch':success_msg,'fields':{}, 'state':[('end', 'Ok')]},
+            'result': {'type':'form','arch':success_msg,'fields':{}, 'state':[('end', 'Ok', 'gtk-ok', True)]},
         }
     }
 wizard_compute_tasks('wizard.compute.tasks')
diff --git a/addons/project/wizard/task_delegate.py b/addons/project/wizard/task_delegate.py
index 1bb6c538593..0fe662dc3cb 100644
--- a/addons/project/wizard/task_delegate.py
+++ b/addons/project/wizard/task_delegate.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.
 #
 ##############################################################################
 
@@ -96,7 +96,7 @@ class wizard_delegate(wizard.interface):
             'actions': [_ask_auto_complete],
             'result': {'type':'form', 'arch':ask_form, 'fields':ask_fields, 'state':[
                 ('end', 'Cancel'),
-                ('valid', 'Validate')
+                ('valid', 'Validate', '', True)
             ]},
         },
         'valid': {

From 1abdc8745180ceabd27d9818d27d5876448d0a5b Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 23 Mar 2010 16:52:10 +0530
Subject: [PATCH 206/251] [IMP] project_gtd: Set focus on button on wizards

bzr revid: psi@tinyerp.co.in-20100323112210-5cwl0cbg4h3su05b
---
 addons/project_gtd/wizard/project_gtd_fill.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/project_gtd/wizard/project_gtd_fill.py b/addons/project_gtd/wizard/project_gtd_fill.py
index 3bbb947c5ba..ca3964d34c5 100644
--- a/addons/project_gtd/wizard/project_gtd_fill.py
+++ b/addons/project_gtd/wizard/project_gtd_fill.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.
 #
 ##############################################################################
 
@@ -61,7 +61,7 @@ class wiz_timebox_fill(wizard.interface):
                 'arch':_gtd_arch,
                 'fields':_gtd_field,
                 'state':[
-                    ('end','Cancel'),
+                    ('end','Cancel', 'gtk-cancel'),
                     ('process','Add to Timebox')
                 ]
             }

From e2067637dc09b2ca8b3804b63472378d1aebae13 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 23 Mar 2010 16:56:25 +0530
Subject: [PATCH 207/251] [IMP] project_long_term: Set focus and add icon on
 button on wizards

bzr revid: psi@tinyerp.co.in-20100323112625-wwpzyp2oeiyce3kb
---
 addons/project_long_term/wizard/compute_phases_date.py | 4 ++--
 addons/project_long_term/wizard/compute_tasks_date.py  | 4 ++--
 addons/project_long_term/wizard/schedule_tasks.py      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/project_long_term/wizard/compute_phases_date.py b/addons/project_long_term/wizard/compute_phases_date.py
index 48409bd46c5..61f3bb42251 100644
--- a/addons/project_long_term/wizard/compute_phases_date.py
+++ b/addons/project_long_term/wizard/compute_phases_date.py
@@ -165,8 +165,8 @@ class wizard_compute_phases(wizard.interface):
         'init': {
             'actions': [],
             'result': {'type': 'form', 'arch': compute_form, 'fields': compute_fields, 'state':[
-                ('end', 'Cancel'),
-                ('compute', 'Compute')
+                ('end', 'Cancel', 'gtk-cancel'),
+                ('compute', 'Compute', 'gtk-ok', True)
 
             ]},
         },
diff --git a/addons/project_long_term/wizard/compute_tasks_date.py b/addons/project_long_term/wizard/compute_tasks_date.py
index f327328305e..6ef53a6c802 100644
--- a/addons/project_long_term/wizard/compute_tasks_date.py
+++ b/addons/project_long_term/wizard/compute_tasks_date.py
@@ -147,8 +147,8 @@ class wizard_compute_tasks(wizard.interface):
         'init': {
             'actions': [],
             'result': {'type': 'form', 'arch': compute_form, 'fields': compute_fields, 'state': [
-                ('end', 'Cancel'),
-                ('compute', 'Compute')
+                ('end', 'Cancel', 'gtk-cancel'),
+                ('compute', 'Compute', 'gtk-ok', True)
             ]},
         },
         'compute': {
diff --git a/addons/project_long_term/wizard/schedule_tasks.py b/addons/project_long_term/wizard/schedule_tasks.py
index 592f5a1dc5d..4a170859032 100644
--- a/addons/project_long_term/wizard/schedule_tasks.py
+++ b/addons/project_long_term/wizard/schedule_tasks.py
@@ -139,7 +139,7 @@ class wizard_schedule_task(wizard.interface):
     states = {
         'init': {
             'actions': [_compute_date],
-            'result': {'type':'form','arch':success_msg,'fields':{}, 'state':[('end', 'Ok')]},
+            'result': {'type':'form','arch':success_msg,'fields':{}, 'state':[('end', 'Ok', 'gtk-ok', True)]},
         }
     }
 wizard_schedule_task('phase.schedule.tasks')

From 0c896cd5353bd22d57b8746be21b1b5aff96a049 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 23 Mar 2010 17:03:05 +0530
Subject: [PATCH 208/251] [IMP] project_planning: Clean code, remove menu
 Project Management/Planning/Long Term Planning/Resources, rename the tag of
 act window form Planning Tasks to task in act_task_of_lines

bzr revid: psi@tinyerp.co.in-20100323113305-voljv2ofmbm5vnr1
---
 addons/project_planning/project_planning.py   | 43 +++++++++++--------
 .../project_planning_view.xml                 |  3 +-
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py
index 359fdd6887f..bfd2af5566c 100644
--- a/addons/project_planning/project_planning.py
+++ b/addons/project_planning/project_planning.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution    
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -70,7 +70,7 @@ class report_account_analytic_planning(osv.osv):
         return result
 
     def _check_planning_responsible(self, cr, uid, ids, context={}):
-        for obj_plan in self.browse(cr,uid,ids):
+        for obj_plan in self.browse(cr, uid, ids, context=context):
             cr.execute("""
                 SELECT id FROM report_account_analytic_planning plan
                 WHERE (   (%(date_from)s BETWEEN date_from AND date_to)
@@ -117,19 +117,19 @@ class report_account_analytic_planning(osv.osv):
     ]
 
     def action_open(self, cr, uid, id, context={}):
-        self.write(cr, uid, id, {'state' : 'open'})
+        self.write(cr, uid, id, {'state' : 'open'}, context=context)
         return True
 
     def action_cancel(self, cr, uid, id, context={}):
-        self.write(cr, uid, id, {'state' : 'cancel'})
+        self.write(cr, uid, id, {'state' : 'cancel'}, context=context)
         return True
 
     def action_draft(self, cr, uid, id, context={}):
-        self.write(cr, uid, id, {'state' : 'draft'})
+        self.write(cr, uid, id, {'state' : 'draft'}, context=context)
         return True
 
     def action_done(self, cr, uid, id, context={}):
-        self.write(cr, uid, id, {'state' : 'done'})
+        self.write(cr, uid, id, {'state' : 'done'}, context=context)
         return True
 
 report_account_analytic_planning()
@@ -156,8 +156,9 @@ class report_account_analytic_planning_line(osv.osv):
         return res
 
     def _amount_base_uom(self, cr, uid, ids, name, args, context):
+        users_obj = self.pool.get('res.users')
         result = {}
-        tm = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.planning_time_mode_id
+        tm = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
         if tm and tm.factor:
             div = tm.factor
         else:
@@ -220,13 +221,14 @@ class report_account_analytic_planning_user(osv.osv):
 
 
     def _get_tasks(self, cr, uid, ids, name, args, context):
+        users_obj = self.pool.get('res.users')
         result = {}
-        tm = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.project_time_mode_id
+        tm = users_obj.browse(cr, uid, uid, context=context).company_id.project_time_mode_id
         if tm and tm.factor:
             div = tm.factor
         else:
             div = 1.0
-        tm2 = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.planning_time_mode_id
+        tm2 = users_obj.browse(cr, uid, uid, context=context).company_id.planning_time_mode_id
         if tm2 and tm2.factor:
             div2 = tm2.factor
         else:
@@ -252,8 +254,9 @@ class report_account_analytic_planning_user(osv.osv):
         return result
 
     def _get_timesheets(self, cr, uid, ids, name, args, context):
+        users_obj = self.pool.get('res.users')
         result = {}
-        tm2 = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.planning_time_mode_id
+        tm2 = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
         if tm2 and tm2.factor:
             div2 = tm2.factor
         else:
@@ -313,8 +316,8 @@ Business Days - (Time Allocation of Tasks + Time Allocation without Tasks + Holi
                 FROM hr_holidays holidays
                 WHERE holidays.employee_id IN
                     (
-                    SELECT emp.id 
-                    FROM hr_employee emp, resource_resource res WHERE emp.resource_id = res.id and res.user_id = users.id 
+                    SELECT emp.id
+                    FROM hr_employee emp, resource_resource res WHERE emp.resource_id = res.id and res.user_id = users.id
                     )
                 AND holidays.state IN ('validate')
                 AND holidays.type = 'remove'
@@ -360,13 +363,14 @@ class report_account_analytic_planning_account(osv.osv):
     _auto = False
 
     def _get_tasks(self, cr, uid, ids, name, args, context):
+        users_obj = self.pool.get('res.users')
         result = {}
-        tm = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.project_time_mode_id
+        tm = users_obj.browse(cr, uid, uid, context).company_id.project_time_mode_id
         if tm and tm.factor:
             div = tm.factor
         else:
             div = 1.0
-        tm2 = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.planning_time_mode_id
+        tm2 = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
         if tm2 and tm2.factor:
             div2 = tm2.factor
         else:
@@ -384,8 +388,9 @@ class report_account_analytic_planning_account(osv.osv):
         return result
 
     def _get_timesheets(self, cr, uid, ids, name, args, context):
+        users_obj = self.pool.get('res.users')
         result = {}
-        tm2 = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.planning_time_mode_id
+        tm2 = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
         if tm2 and tm2.factor:
             div2 = tm2.factor
         else:
@@ -456,8 +461,9 @@ class report_account_analytic_planning_stat(osv.osv):
     _order = 'planning_id,user_id'
 
     def _sum_amount_real(self, cr, uid, ids, name, args, context):
+        users_obj = self.pool.get('res.users')
         result = {}
-        tm2 = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.planning_time_mode_id
+        tm2 = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
         if tm2 and tm2.factor:
             div2 = tm2.factor
         else:
@@ -473,13 +479,14 @@ where user_id=%s and account_id=%s and date>=%s and date<=%s''', (line.user_id.i
         return result
 
     def _sum_amount_tasks(self, cr, uid, ids, name, args, context):
+        users_obj = self.pool.get('res.users')
         result = {}
-        tm = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.project_time_mode_id
+        tm = users_obj.browse(cr, uid, uid, context).company_id.project_time_mode_id
         if tm and tm.factor:
             div = tm.factor
         else:
             div = 1.0
-        tm2 = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.planning_time_mode_id
+        tm2 = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
         if tm2 and tm2.factor:
             div2 = tm2.factor
         else:
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index c9c746fbd79..7d0031c4177 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -223,7 +223,6 @@
 
 		<menuitem action="action_account_analytic_planning_form"
 			id="menu_report_account_analytic_planning" parent="planning_main" />
-		<menuitem action="resource.action_resource_resource_tree" id="base.menu_resource_resource_tree" parent="planning_main" />
 
 		<!--
 			Planning statistics
@@ -357,7 +356,7 @@
 
 <!--Added link to open the list of all tasks planned on all lines of this planning.-->
 		<act_window context="{'planning': active_id}"
-			id="act_task_of_lines" name="Planning tasks" res_model="project.task"
+			id="act_task_of_lines" name="Tasks" res_model="project.task"
 			src_model="report_account_analytic.planning"
 		/>
 

From 4fddb6bc4b175a4477eb39cb879ea64b915be55e Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 23 Mar 2010 17:06:37 +0530
Subject: [PATCH 209/251] [IMP] resource: rename Resource Calender to Working
 Period in views

bzr revid: psi@tinyerp.co.in-20100323113637-y2hppy0en8e1qsfl
---
 addons/resource/resource_view.xml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index aacac7cef42..f08b03600f8 100755
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -35,9 +35,10 @@
             <field name="model">resource.calendar</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Resource Calendar">
+                <search string="Search Working Period">
                    <group col='15' colspan='4'>
-                       <field name="name" string="Working Calendar"/>
+                   	   <field name="name" string="Name"/>
+               <!--     <field name="name" string="Working Calendar"/> -->
                        <field name="manager" string="Workgroup Manager" widget="selection"/>
                        <field name="company_id" string="Company" widget="selection"/>
                    </group>
@@ -50,7 +51,7 @@
             <field name="model">resource.calendar.leaves</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Resource Calendar Leaves">
+                <search string="Search Working Period Leaves">
                    <group col='15' colspan='4'>
                        <field name="name" string="Name"/>
                        <field name="company_id" string="Company" widget="selection"/>
@@ -70,7 +71,7 @@
             <field name="model">resource.calendar</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Resource Calendar">
+            	<form string="Working Period">
                     <field name="name" select="1"/>
                     <field name="manager" select="1"/>
                     <field name="company_id" select="1"/>
@@ -85,7 +86,7 @@
             <field name="model">resource.calendar</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Resource Calendar">
+            	<tree string="Working Period">
                     <field name="name"/>
                     <field name="manager" select="1"/>
                     <field name="company_id" select="1"/>
@@ -94,7 +95,7 @@
         </record>
 
         <record id="action_resource_calendar_form" model="ir.actions.act_window">
-            <field name="name">Resource Calendar</field>
+            <field name="name">Working Period</field>
             <field name="res_model">resource.calendar</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -181,10 +182,10 @@
                 <tree string="Resources">
                     <field name="name" />
                     <field name="company_id" />
-                    <field name="calendar_id" />
                     <field name="resource_type" />
-                    <field name="user_id" />
+                    <field name="calendar_id" />
                     <field name="time_efficiency" />
+                    <field name="user_id" />
                 </tree>
             </field>
         </record>

From 1d98e10bc21a987c1e8b072d0684885b79b93436 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Tue, 23 Mar 2010 19:15:03 +0530
Subject: [PATCH 210/251] [ADD] auction: Added osv_memory wizard for 'Map buyer
 username to Partners'.

bzr revid: uco@tinyerp.co.in-20100323134503-gfumtlx8yui2pnd4
---
 addons/auction/__terp__.py                    |   2 +
 addons/auction/wizard/__init__.py             |   3 +
 .../auction/wizard/auction_lots_buyer_map.py  | 128 ++++++++++++++++++
 .../wizard/auction_lots_buyer_map_view.xml    |  36 +++++
 .../auction/wizard/wizard_lots_buyer_map.py   | 107 ---------------
 5 files changed, 169 insertions(+), 107 deletions(-)
 create mode 100644 addons/auction/wizard/auction_lots_buyer_map.py
 create mode 100644 addons/auction/wizard/auction_lots_buyer_map_view.xml
 delete mode 100644 addons/auction/wizard/wizard_lots_buyer_map.py

diff --git a/addons/auction/__terp__.py b/addons/auction/__terp__.py
index 41c4a6f1a8d..96cbc34cb5e 100644
--- a/addons/auction/__terp__.py
+++ b/addons/auction/__terp__.py
@@ -44,6 +44,8 @@
         'wizard/auction_payer_sel_view.xml',
         'wizard/auction_lots_sms_send_view.xml',
         'wizard/auction_catalog_flagey_view.xml',
+#        'wizard/auction_aie_send_result_view.xml',
+        'wizard/auction_lots_buyer_map_view.xml',
         
         'auction_view.xml',
         'auction_report.xml',
diff --git a/addons/auction/wizard/__init__.py b/addons/auction/wizard/__init__.py
index e6748e31172..bcd2de8b301 100644
--- a/addons/auction/wizard/__init__.py
+++ b/addons/auction/wizard/__init__.py
@@ -30,5 +30,8 @@ import auction_payer_sel
 import auction_lots_sms_send
 import auction_catalog_flagey_report
 
+#import auction_aie_send_result
+import auction_lots_buyer_map
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/auction/wizard/auction_lots_buyer_map.py b/addons/auction/wizard/auction_lots_buyer_map.py
new file mode 100644
index 00000000000..2725a59d55b
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_buyer_map.py
@@ -0,0 +1,128 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import netsvc
+import sql_db
+from osv import osv,fields 
+
+class wiz_auc_lots_buyer_map(osv.osv_memory):
+    _name = 'auction.lots.buyer_map'
+    _description = 'Map Buyer'
+    
+    _columns = {
+        'ach_login': fields.char('Buyer Username', size=64, required=True),
+        'ach_uid': fields.many2one('res.partner','Buyer', required=True),
+    }
+
+    def default_get(self, cr, uid, fields, context):
+        """ 
+         To get default values for the object.
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param fields: List of fields for which we want default values 
+         @param context: A standard dictionary 
+         @return: A dictionary which of fields with values. 
+        """
+        ids = context and context.get('active_ids',False) or False
+        assert ids, _('Active IDs not Found')
+        res = super(wiz_auc_lots_buyer_map,self).default_get(cr, uid, fields, context)
+        cr.execute('select id from auction_lots where (ach_uid is null and ach_login is not null)  ')
+        v_ids = [x[0] for x in cr.fetchall()]
+        for rec in self.pool.get('auction.lots').browse(cr, uid, v_ids, context):
+            if (not rec.ach_uid or not rec.ach_login):
+                res.update(self._start(cr, uid, ids, context))
+                return res
+        res.update(self._start(cr, uid, ids, context))
+        return res
+    
+    def _start(self, cr, uid, ids, context):
+        """ 
+         Returns login if already there in the selected record.
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param ids: List of ids 
+         @param context: A standard dictionary 
+         @return: login field from current record. 
+        """
+        lots_obj = self.pool.get('auction.lots')
+        for rec in lots_obj.browse(cr, uid, ids, context):
+            if (len(ids)==1) and (not rec.ach_uid and not rec.ach_login):
+                raise osv.except_osv('Error', 'No buyer is set for this lot.')
+            if not rec.ach_uid and rec.ach_login:
+                return {'ach_login': rec.ach_login}
+        return {}
+    
+    def buyer_map_set(self, cr, uid, ids, context):
+        """ 
+         To map the buyer and login name.
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param ids: List of ids 
+         @param context: A standard dictionary 
+         @return: 
+        """
+        rec_ids = context and context.get('active_ids',False) or False
+        assert rec_ids, _('Active IDs not Found')
+        datas = self.read(cr, uid, ids[0],['ach_login','ach_uid'])
+        lots_obj = self.pool.get('auction.lots')
+        recs = lots_obj.browse(cr, uid, rec_ids, context)
+        for rec in recs:
+            if rec.ach_login==datas['ach_login']:
+                lots_obj.write(cr, uid, [rec.id], {'ach_uid': datas['ach_uid']}, context=context)
+                cr.commit()
+        return {}
+    
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', 
+                        context=None, toolbar=False, submenu=False):
+        """ 
+         Changes the view dynamically
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param context: A standard dictionary 
+         @return: New arch of view.
+        """
+        record_ids = context and context.get('active_ids', False) or False
+        res = super(wiz_auc_lots_buyer_map, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
+        lots_obj = self.pool.get('auction.lots')
+        if record_ids:
+            for lots in lots_obj.browse(cr, uid, record_ids):
+                print "lotslotslotslots",lots
+                if lots.ach_uid:
+                    res['arch'] = """
+                            <form title="Mapping Result">
+                                <group col="2" colspan="2">
+                                    <label string="All objects are assigned to buyers !"/>
+                                    <newline/>
+                                    <button icon='gtk-cancel' special="cancel"
+                                        string="Done" />
+                                </group>
+                            </form>
+                    """
+        return res
+    
+wiz_auc_lots_buyer_map()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/auction_lots_buyer_map_view.xml b/addons/auction/wizard/auction_lots_buyer_map_view.xml
new file mode 100644
index 00000000000..c76c74983d2
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_buyer_map_view.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Auction lots send result -->
+        
+		<record id="view_auction_buyer_map" model="ir.ui.view">
+            <field name="name">Map buyer username to Partners</field>
+            <field name="model">auction.lots.buyer_map</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+				<form string="Buyer Map" >
+				    <field name="ach_login" colspan="4"/>
+				    <newline/>
+				    <field name="ach_uid" colspan="4"/>
+				    <separator colspan="4"/>
+				    <group col="4" colspan="4">
+				    	<button icon='gtk-cancel' special="cancel"
+                			string="Exit" />
+                		<button name="buyer_map_set" string="Update"
+                			colspan="2" type="object" icon="gtk-go-forward" />
+				    </group>
+				</form>
+			</field>
+		</record>
+		
+		<act_window name="Map buyer username to Partners"
+            res_model="auction.lots.buyer_map"
+            src_model="auction.lots"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_view_auction_buyer_map"/>
+
+	</data>
+</openerp>
diff --git a/addons/auction/wizard/wizard_lots_buyer_map.py b/addons/auction/wizard/wizard_lots_buyer_map.py
deleted file mode 100644
index 42c5f80a530..00000000000
--- a/addons/auction/wizard/wizard_lots_buyer_map.py
+++ /dev/null
@@ -1,107 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-import sql_db
-
-buyer_map = '''<?xml version="1.0"?>
-<form title="Buyer Map">
-    <field name="ach_login"/>
-    <newline/>
-    <field name="ach_uid"/>
-</form>'''
-
-buyer_map_fields = {
-    'ach_login': {'string':'Buyer Username', 'type':'char', 'size':64, 'required':True},
-    'ach_uid': {'string':'Buyer', 'type':'many2one', 'required':True, 'relation':'res.partner'},
-}
-
-
-#
-# Try to find an object not mapped
-#
-def _state_check(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    cr.execute('select id from auction_lots where (ach_uid is null and ach_login is not null)  ')
-    v_ids=[x[0] for x in cr.fetchall()]
-    #ids_not_mapped=pool.get('auction.lots').search(cr,uid,[('rec.ach_uid','=',False)])
-    for rec in pool.get('auction.lots').browse(cr,uid,v_ids,context):
-    #   if not rec.ach_uid and not rec.ach_login:
-    #       raise wizard.except_wizard ('Error','No username is associated to this lot!')
-        if (not rec.ach_uid or not rec.ach_login):
-            return 'check'
-    return 'done'
-
-def _start(self,cr,uid,datas,context):
-    pool = pooler.get_pool(cr.dbname)
-    for rec in pool.get('auction.lots').browse(cr,uid,datas['ids'],context):
-        if (len(datas['ids'])==1) and (not rec.ach_uid and not rec.ach_login):
-            raise wizard.except_wizard('Error', 'No buyer setted for this lot')
-        if not rec.ach_uid and rec.ach_login:
-            return {'ach_login': rec.ach_login}
-
-    for rec in pool.get('auction.lots').browse(cr,uid,datas['ids'],context):
-        if (not rec.ach_uid and rec.ach_login):
-            return {'ach_login': rec.ach_login}
-    return {}
-
-def _buyer_map_set(self,cr, uid, datas,context):
-    pool = pooler.get_pool(cr.dbname)
-    recs=pool.get('auction.lots').browse(cr,uid,datas['ids'],context)
-    for rec in recs:
-        if rec.ach_login==datas['form']['ach_login']:
-            pool.get('auction.lots').write(cr, uid, [rec.id], {'ach_uid':  datas['form']['ach_uid']}, context=context)
-            cr.commit()
-    return {'ach_login':False, 'ach_uid':False}
-
-class wiz_auc_lots_buyer_map(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'choice', 'next_state':_state_check}
-        },
-        'check': {
-            'actions': [_start],
-            'result': {'type': 'form', 'arch':buyer_map, 'fields': buyer_map_fields, 'state':[('end','Exit'),('set_buyer', 'Update')]}
-        },
-        'set_buyer': {
-            'actions': [_buyer_map_set],
-            'result': {'type': 'state', 'state':'init'}
-        },
-        'done': {
-            'actions': [_start],
-            'result': {
-                'type': 'form',
-                'arch':'''<?xml version="1.0"?>
-                <form title="Mapping result">
-                    <label string="All objects are assigned to buyers !"/>
-                </form>''',
-                'fields': {},
-                'state':[('end','Close')]}
-        }
-    }
-
-wiz_auc_lots_buyer_map('auction.lots.buyer_map')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From 63449811c20e8e1e09bee64bba5672b51c514d01 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Tue, 23 Mar 2010 19:18:24 +0530
Subject: [PATCH 211/251] [REF] auction: Removed print statement

bzr revid: uco@tinyerp.co.in-20100323134824-uzkqvbl6qwcj3rl3
---
 addons/auction/wizard/auction_lots_buyer_map.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/auction/wizard/auction_lots_buyer_map.py b/addons/auction/wizard/auction_lots_buyer_map.py
index 2725a59d55b..db80a2ab3f3 100644
--- a/addons/auction/wizard/auction_lots_buyer_map.py
+++ b/addons/auction/wizard/auction_lots_buyer_map.py
@@ -108,7 +108,6 @@ class wiz_auc_lots_buyer_map(osv.osv_memory):
         lots_obj = self.pool.get('auction.lots')
         if record_ids:
             for lots in lots_obj.browse(cr, uid, record_ids):
-                print "lotslotslotslots",lots
                 if lots.ach_uid:
                     res['arch'] = """
                             <form title="Mapping Result">

From d91fa1c56eb25cd2a9afde75186428effd9a08ed Mon Sep 17 00:00:00 2001
From: "kum (Open ERP)" <kum@tinyerp.co.in>
Date: Tue, 23 Mar 2010 19:31:06 +0530
Subject: [PATCH 212/251] [FIX] document: changes made in create method

bzr revid: kum@tinyerp.co.in-20100323140106-z2qld0a827n2olqr
---
 addons/document/document.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/document/document.py b/addons/document/document.py
index f3ffd2f6f6c..af2517c7cbb 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -165,7 +165,7 @@ class document_file(osv.osv):
             vals['res_model'] = context.get('default_res_model', False)
         if vals.get('res_id', False) and vals.get('res_model', False):
             obj_model = self.pool.get(vals['res_model'])
-            result = obj_model.read(cr, uid, [vals['res_id']], context=context)
+            result = obj_model.read(cr, uid, [vals['res_id']], ['name', 'partner_id', 'address_id'], context=context)
             if len(result):
                 obj = result[0]
                 if obj.get('name', False):

From 3c61bb73b8593630114ec9d1e656342f29ba5f24 Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Thu, 25 Mar 2010 12:23:08 +0530
Subject: [PATCH 213/251] [IMP] l10n_BE: Clean the code

bzr revid: mra@tinyerp.com-20100325065308-o5smw265l26nu0y1
---
 addons/l10n_be/__terp__.py                    | 26 +++++------
 addons/l10n_be/company.py                     |  8 ++--
 .../l10n_be/wizard/account_vat_declaration.py | 45 ++++++++++---------
 3 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/addons/l10n_be/__terp__.py b/addons/l10n_be/__terp__.py
index 43d5a189247..c6580e79563 100644
--- a/addons/l10n_be/__terp__.py
+++ b/addons/l10n_be/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.
 #
 ##############################################################################
 
@@ -39,20 +39,20 @@
 
     """,
     'author': 'Tiny',
-    'depends': [ 
-                    'account', 
-                    'account_report', 
-                    'base_vat', 
-                    'base_iban', 
-                    'account_chart'
+    'depends': [
+                'account',
+                'account_report',
+                'base_vat',
+                'base_iban',
+                'account_chart'
                 ],
     'init_xml': [],
     'update_xml': [
-                    'account_pcmn_belgium.xml', 
-                    'l10n_be_wizard.xml',
-                    'l10n_be_sequence.xml', 
-                    'fiscal_templates.xml',
-                    'security/ir.model.access.csv'
+                'account_pcmn_belgium.xml',
+                'l10n_be_wizard.xml',
+                'l10n_be_sequence.xml',
+                'fiscal_templates.xml',
+                'security/ir.model.access.csv'
                    ],
     'demo_xml': [
                     'account.report.report.csv'
diff --git a/addons/l10n_be/company.py b/addons/l10n_be/company.py
index 8d6633b0d88..4395f13380e 100644
--- a/addons/l10n_be/company.py
+++ b/addons/l10n_be/company.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,17 +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/>.
 #
 ##############################################################################
-
 from osv import osv
 
 class res_company(osv.osv):
     _inherit = "res.company"
     _description = 'res.company'
 
-
     def _get_default_ad(self, addresses):
         city = post_code = address = ""
         for ads in addresses:
@@ -39,4 +37,4 @@ class res_company(osv.osv):
         return city, post_code, address
 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/l10n_be/wizard/account_vat_declaration.py b/addons/l10n_be/wizard/account_vat_declaration.py
index 6533493ce23..404b9406c69 100644
--- a/addons/l10n_be/wizard/account_vat_declaration.py
+++ b/addons/l10n_be/wizard/account_vat_declaration.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,16 +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 wizard
 import time
 import datetime
-import pooler
 import base64
 
+import wizard
+import pooler
 from tools.translate import _
 
 form_fyear = """<?xml version="1.0"?>
@@ -54,30 +53,32 @@ fields = {
 class wizard_vat_declaration(wizard.interface):
 
     def _create_xml(self, cr, uid, data, context):
-        list_of_tags=['00','01','02','03','45','46','47','48','49','54','55','56','57','59','61','62','63','64','71','81','82','83','84','85','86','87','91']
         pool_obj = pooler.get_pool(cr.dbname)
-        #obj_company = pool_obj.get('res.company').browse(cr,uid,1)
-        obj_company = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid).company_id
+        obj_fyear = pool_obj.get('account.fiscalyear')
+        obj_tax_code = pool_obj.get('account.tax.code')
+        obj_user = pool_obj.get('res.users')
+        list_of_tags=['00','01','02','03','45','46','47','48','49','54','55','56','57','59','61','62','63','64','71','81','82','83','84','85','86','87','91']
+        obj_company = obj_user.browse(cr, uid, uid, context=context).company_id
         user_cmpny = obj_company.name
         vat_no=obj_company.partner_id.vat
         if not vat_no:
             raise wizard.except_wizard(_('Data Insufficient'),_('No VAT Number Associated with Main Company!'))
 
-        tax_ids = pool_obj.get('account.tax.code').search(cr,uid,[])
+        tax_code_ids = obj_tax_code.search(cr, uid, [], context=context)
         ctx = context.copy()
         ctx['period_id'] = data['form']['period'] #added context here
-        tax_info = pool_obj.get('account.tax.code').read(cr,uid,tax_ids,['code','sum_period'],context=ctx)
+        tax_info = obj_tax_code.read(cr, uid, tax_code_ids, ['code','sum_period'], context=ctx)
 
-        address=post_code=city=''
+        address = post_code = city = ''
         if not obj_company.partner_id.address:
-                address=post_code=city=''
+            address = post_code = city = ''
+
+        city, post_code, address = pool_obj.get('res.company')._get_default_ad(obj_company.partner_id.address)
 
-        city, post_code, address = pooler.get_pool(cr.dbname).get('res.company')._get_default_ad(obj_company.partner_id.address)
 
-        obj_fyear = pool_obj.get('account.fiscalyear')
         year_id = obj_fyear.find(cr, uid)
-        
-        account_period=pool_obj.get('account.period').browse(cr, uid, data['form']['period'])
+
+        account_period = pool_obj.get('account.period').browse(cr, uid, data['form']['period'], context=context)
         current_year = account_period.fiscalyear_id.name
         period_code = account_period.code
 
@@ -93,7 +94,7 @@ class wizard_vat_declaration(wizard.interface):
         starting_month = account_period.date_start[5:7]
         ending_month = account_period.date_stop[5:7]
         if starting_month != ending_month:
-            #starting month and ending month of selected period are not the same 
+            #starting month and ending month of selected period are not the same
             #it means that the accounting isn't based on periods of 1 month but on quarters
             quarter = str(((int(starting_month) - 1) / 3) + 1)
             data_of_file += '<QUARTER>'+quarter+'</QUARTER>\n\t\t\t'
@@ -111,20 +112,20 @@ class wizard_vat_declaration(wizard.interface):
 
         data_of_file +='\n\t\t\t</DATA_ELEM>\n\t\t</DATA>\n\t</VATRECORD>\n</VATSENDING>'
         data['form']['msg']='Save the File with '".xml"' extension.'
-        data['form']['file_save']=base64.encodestring(data_of_file)
+        data['form']['file_save'] = base64.encodestring(data_of_file)
         return data['form']
 
-
     states = {
         'init': {
             'actions': [],
-            'result': {'type':'form', 'arch':form_fyear, 'fields':fields_fyear, 'state':[('end','Cancel'),('go','Create XML')]},
+            'result': {'type': 'form', 'arch': form_fyear, 'fields':fields_fyear, 'state':[('end', 'Cancel'),('go', 'Create XML')]},
         },
         'go': {
             'actions': [_create_xml],
-            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Ok')]},
+            'result': {'type':'form', 'arch': form, 'fields': fields, 'state': [('end', 'Ok')]},
         }
     }
 
 wizard_vat_declaration('wizard.account.xml.vat.declaration')
-# 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 58bbc777266b3712fc5dddb3c97cd5db246a1b0f Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Thu, 25 Mar 2010 13:14:05 +0530
Subject: [PATCH 214/251] [REF] purchase: search view of purchase order and
 form view of merge order wizard

bzr revid: hmo@tinyerp.com-20100325074405-4rwf5u5ys8le07m3
---
 addons/purchase/purchase_view.xml             |  1 +
 .../wizard/purchase_order_group_view.xml      | 29 ++++++++-----------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 70942eacdcf..653238748b9 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -160,6 +160,7 @@
                         <filter icon="terp-partner" domain="[('create_uid','=',uid)]" help="My Purchase Orders"/>                        
                     </field>
                 </group>
+                <newline/>
                   <group expand="1" string="Group By..." colspan="4" col="10">
                     <filter string="Supplier" icon="terp-purchase" domain="[]" context="{'group_by':'partner_id'}"/>    
                     <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>                
diff --git a/addons/purchase/wizard/purchase_order_group_view.xml b/addons/purchase/wizard/purchase_order_group_view.xml
index b943c64520d..aa835b36f0b 100644
--- a/addons/purchase/wizard/purchase_order_group_view.xml
+++ b/addons/purchase/wizard/purchase_order_group_view.xml
@@ -9,24 +9,19 @@
                <form string="Merge orders">
         			<separator string="Are you sure you want to merge these orders ?" colspan="4"/>
        				<newline/>
-    				<label string="Please note that:" colspan="4"/>
-				<newline/>
-      				<label string="-orders will only be merged if:" colspan="4"/>
-        			<newline/>
-    				<label string="* their status is draft" colspan="4"/>
-				<newline/>
-    				<label string="* they belong to the same partner" colspan="4"/>
-				<newline/>
-    				<label string="* are going to the same location" colspan="4"/>
-				<newline/>
-    				<label string="* have the same pricelist" colspan="4"/>
-				<newline/>
-    				<label string="- lines will only be merged if:" colspan="4"/>
-				<newline/>
-    				<label string="* they are exactly the same except for the quantity and unit" colspan="4"/>
+    				<label string="
+Please note that: &#13; &#13;  
+Orders will only be merged if: &#13;  
+* Purchase Orders are in draft &#13;  
+* Purchase Orders belong to the same partner &#13;  
+* Purchase Orders are have same stock location, same pricelist &#13; &#13;   
+Lines will only be merged if: &#13;  
+* Order lines are exactly the same except for the quantity and unit &#13;
+" colspan="4"/>				
+				    <newline/>    				
         			<separator string="" colspan="4" />
-					<button special="cancel" string="Cancel" />
-            	    <button name="merge_orders" string="Merge orders" type="object" />
+					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+            	    <button name="merge_orders" string="Merge orders" type="object" icon="gtk-convert"/>
     			</form>
             </field>
 		</record>

From c5b08dc354bb982a14832dbd1aa9f506b109aa7c Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Thu, 25 Mar 2010 13:55:11 +0530
Subject: [PATCH 215/251] [REF] puchase: merge order wizard

bzr revid: hmo@tinyerp.com-20100325082511-k3ri4500pjd7kwsz
---
 addons/purchase/purchase.py                   | 110 +++++++++++-
 .../purchase/wizard/purchase_order_group.py   | 160 ++++--------------
 2 files changed, 143 insertions(+), 127 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 7077d688beb..0dc7926f428 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -32,7 +32,7 @@ from tools import config
 from tools.translate import _
 
 import decimal_precision as dp
-
+from osv.orm import browse_record, browse_null
 
 #
 # Model definition
@@ -446,6 +446,114 @@ class purchase_order(osv.osv):
         })
         return super(purchase_order, self).copy(cr, uid, id, default, context)
 
+
+    def do_merge(self, cr, uid, ids, context):
+        """ 
+        To merge similar type of purchase orders.        
+        Orders will only be merged if: 
+        * Purchase Orders are in draft  
+        * Purchase Orders belong to the same partner   
+        * Purchase Orders are have same stock location, same pricelist
+        Lines will only be merged if: 
+        * Order lines are exactly the same except for the quantity and unit 
+
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param ids: the ID or list of IDs 
+         @param context: A standard dictionary 
+         
+         @return: new purchase order id
+            
+        """          
+        wf_service = netsvc.LocalService("workflow")    
+        def make_key(br, fields):                    
+            list_key = []
+            for field in fields:
+                field_val = getattr(br, field)
+                if field in ('product_id', 'move_dest_id', 'account_analytic_id'):
+                    if not field_val:
+                        field_val = False
+                if isinstance(field_val, browse_record):
+                    field_val = field_val.id
+                elif isinstance(field_val, browse_null):
+                    field_val = False
+                elif isinstance(field_val, list):
+                    field_val = ((6, 0, tuple([v.id for v in field_val])),)
+                list_key.append((field, field_val))
+            list_key.sort()
+            return tuple(list_key)
+
+    # compute what the new orders should contain
+  
+        new_orders = {}
+    
+        for porder in [order for order in self.browse(cr, uid, ids) if order.state == 'draft']:
+            order_key = make_key(porder, ('partner_id', 'location_id', 'pricelist_id'))
+            new_order = new_orders.setdefault(order_key, ({}, []))
+            new_order[1].append(porder.id)
+            order_infos = new_order[0]
+            if not order_infos:
+                order_infos.update({
+                'origin': porder.origin,
+                'date_order': time.strftime('%Y-%m-%d'),
+                'partner_id': porder.partner_id.id,
+                'partner_address_id': porder.partner_address_id.id,
+                'dest_address_id': porder.dest_address_id.id,
+                'warehouse_id': porder.warehouse_id.id,
+                'location_id': porder.location_id.id,
+                'pricelist_id': porder.pricelist_id.id,
+                'state': 'draft',
+                'order_line': {},
+                'notes': '%s' % (porder.notes or '',),
+                })
+            else:
+                #order_infos['name'] += ', %s' % porder.name
+                if porder.notes:
+                    order_infos['notes'] = (order_infos['notes'] or '') + ('\n%s' % (porder.notes,))
+                if porder.origin:
+                    order_infos['origin'] = (order_infos['origin'] or '') + ' ' + porder.origin
+
+            for order_line in porder.order_line:
+                line_key = make_key(order_line, ('name', 'date_planned', 'taxes_id', 'price_unit', 'notes', 'product_id', 'move_dest_id', 'account_analytic_id'))
+                o_line = order_infos['order_line'].setdefault(line_key, {})
+                if o_line:
+                    # merge the line with an existing line
+                    o_line['product_qty'] += order_line.product_qty * order_line.product_uom.factor / o_line['uom_factor']
+                else:
+                    # append a new "standalone" line
+                    for field in ('product_qty', 'product_uom'):
+                        field_val = getattr(order_line, field)
+                        if isinstance(field_val, browse_record):
+                            field_val = field_val.id
+                        o_line[field] = field_val
+                    o_line['uom_factor'] = order_line.product_uom and order_line.product_uom.factor or 1.0
+
+        
+
+        allorders = []
+        for order_key, (order_data, old_ids) in new_orders.iteritems():
+            # skip merges with only one order
+            if len(old_ids) < 2:
+                allorders += (old_ids or [])
+                continue
+
+            # cleanup order line data
+            for key, value in order_data['order_line'].iteritems():
+                del value['uom_factor']
+                value.update(dict(key))
+            order_data['order_line'] = [(0, 0, value) for value in order_data['order_line'].itervalues()]
+
+            # create the new order
+            neworder_id = self.create(cr, uid, order_data)
+            allorders.append(neworder_id)
+
+            # make triggers pointing to the old orders point to the new order
+            for old_id in old_ids:
+                wf_service.trg_redirect(uid, 'purchase.order', old_id, neworder_id, cr)
+                wf_service.trg_validate(uid, 'purchase.order', old_id, 'purchase_cancel', cr)
+        return allorders
+
 purchase_order()
 
 class purchase_order_line(osv.osv):
diff --git a/addons/purchase/wizard/purchase_order_group.py b/addons/purchase/wizard/purchase_order_group.py
index c34b610f26b..8c4e0784a7b 100644
--- a/addons/purchase/wizard/purchase_order_group.py
+++ b/addons/purchase/wizard/purchase_order_group.py
@@ -28,135 +28,43 @@ import wizard
 from osv.orm import browse_record, browse_null
 
 class purchase_order_group(osv.osv_memory):
-	_name = "purchase.order.group"
-	_description = "Purchase Wizard"
-	_columns = {
-		  
-		} 
+    _name = "purchase.order.group"
+    _description = "Purchase Wizard"
+    _columns = {
+          
+        } 
 
-	def merge_orders(self, cr, uid, ids, context):
-		""" 
-		     To merge similar type of purchase orders.
-		    
-		     @param self: The object pointer.
-		     @param cr: A database cursor
-		     @param uid: ID of the user currently logged in
-		     @param ids: the ID or list of IDs 
-		     @param context: A standard dictionary 
-		     
-		     @return: purchase order view
-			
-		"""      		
-	        order_obj = self.pool.get('purchase.order')
-		mod_obj =self.pool.get('ir.model.data')
-		result = mod_obj._get_id(cr, uid, 'purchase', 'view_purchase_order_filter')
-		id = mod_obj.read(cr, uid, result, ['res_id'])
+    def merge_orders(self, cr, uid, ids, context):
+        """ 
+             To merge similar type of purchase orders.
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID or list of IDs 
+             @param context: A standard dictionary 
+             
+             @return: purchase order view
+            
+        """              
+        order_obj = self.pool.get('purchase.order')
+        mod_obj =self.pool.get('ir.model.data')
+        result = mod_obj._get_id(cr, uid, 'purchase', 'view_purchase_order_filter')
+        id = mod_obj.read(cr, uid, result, ['res_id'])
       
 
- 	
-		def make_key(br, fields):
-			""" 
-			     Returns tuple indicating the value corresponding to fields
-			    
-			     @param br: record object
-			     @param fields: name of fields
-			     @return: Returns tuple indicating the value corresponding to fields
-				
-			"""      			
-			list_key = []
-			for field in fields:
-			    field_val = getattr(br, field)
-			    if field in ('product_id', 'move_dest_id', 'account_analytic_id'):
-				if not field_val:
-				    field_val = False
-			    if isinstance(field_val, browse_record):
-				field_val = field_val.id
-			    elif isinstance(field_val, browse_null):
-				field_val = False
-			    elif isinstance(field_val, list):
-				field_val = ((6, 0, tuple([v.id for v in field_val])),)
-			    list_key.append((field, field_val))
-			list_key.sort()
-			return tuple(list_key)
+        allorders = order_obj.do_merge(cr, uid, context.get('active_ids',[]), context)
+        
 
-    # compute what the new orders should contain
-  
-		new_orders = {}
-    
-		for porder in [order for order in order_obj.browse(cr, uid, context['active_ids']) if order.state == 'draft']:
-			order_key = make_key(porder, ('partner_id', 'location_id', 'pricelist_id'))
-			new_order = new_orders.setdefault(order_key, ({}, []))
-			new_order[1].append(porder.id)
-			order_infos = new_order[0]
-			if not order_infos:
-			    order_infos.update({
-				'origin': porder.origin,
-				'date_order': time.strftime('%Y-%m-%d'),
-				'partner_id': porder.partner_id.id,
-				'partner_address_id': porder.partner_address_id.id,
-				'dest_address_id': porder.dest_address_id.id,
-				'warehouse_id': porder.warehouse_id.id,
-				'location_id': porder.location_id.id,
-				'pricelist_id': porder.pricelist_id.id,
-				'state': 'draft',
-				'order_line': {},
-				'notes': '%s' % (porder.notes or '',),
-			    })
-			else:
-			    #order_infos['name'] += ', %s' % porder.name
-			    if porder.notes:
-				order_infos['notes'] = (order_infos['notes'] or '') + ('\n%s' % (porder.notes,))
-			    if porder.origin:
-				order_infos['origin'] = (order_infos['origin'] or '') + ' ' + porder.origin
-
-			for order_line in porder.order_line:
-			    line_key = make_key(order_line, ('name', 'date_planned', 'taxes_id', 'price_unit', 'notes', 'product_id', 'move_dest_id', 'account_analytic_id'))
-			    o_line = order_infos['order_line'].setdefault(line_key, {})
-			    if o_line:
-				# merge the line with an existing line
-				o_line['product_qty'] += order_line.product_qty * order_line.product_uom.factor / o_line['uom_factor']
-			    else:
-				# append a new "standalone" line
-				for field in ('product_qty', 'product_uom'):
-				    field_val = getattr(order_line, field)
-				    if isinstance(field_val, browse_record):
-					field_val = field_val.id
-				    o_line[field] = field_val
-				o_line['uom_factor'] = order_line.product_uom and order_line.product_uom.factor or 1.0
-
-		wf_service = netsvc.LocalService("workflow")
-
-		allorders = []
-		for order_key, (order_data, old_ids) in new_orders.iteritems():
-			# skip merges with only one order
-			if len(old_ids) < 2:
-			    allorders += (old_ids or [])
-			    continue
-
-			# cleanup order line data
-			for key, value in order_data['order_line'].iteritems():
-				del value['uom_factor']
-				value.update(dict(key))
-			order_data['order_line'] = [(0, 0, value) for value in order_data['order_line'].itervalues()]
-
-			# create the new order
-			neworder_id = order_obj.create(cr, uid, order_data)
-			allorders.append(neworder_id)
-
-			# make triggers pointing to the old orders point to the new order
-			for old_id in old_ids:
-			    wf_service.trg_redirect(uid, 'purchase.order', old_id, neworder_id, cr)
-			    wf_service.trg_validate(uid, 'purchase.order', old_id, 'purchase_cancel', cr)
-
-		return {
-		'domain': "[('id','in', [" + ','.join(map(str, allorders)) + "])]",
-		'name': 'Purchase Orders',
-		'view_type': 'form',
-		'view_mode': 'tree,form',
-		'res_model': 'purchase.order',
-		'view_id': False,
-		'type': 'ir.actions.act_window',
-		'search_view_id': id['res_id']
-		}
+        return {
+        'domain': "[('id','in', [" + ','.join(map(str, allorders)) + "])]",
+        'name': 'Purchase Orders',
+        'view_type': 'form',
+        'view_mode': 'tree,form',
+        'res_model': 'purchase.order',
+        'view_id': False,
+        'type': 'ir.actions.act_window',
+        'search_view_id': id['res_id']
+        }
 purchase_order_group()
 

From 269134531b6380361fa82be0d7e003f218765e4e Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Thu, 25 Mar 2010 13:58:43 +0530
Subject: [PATCH 216/251] [IMP] auction, stock: Changes in auction, modified
 change_standard_price wizard

bzr revid: mso@mso-20100325082843-3epa7l1pngez55zf
---
 addons/auction/auction.py                     |   6 +-
 .../wizard/stock_change_standard_price.py     | 112 ++++++++++++------
 .../stock_change_standard_price_view.xml      |   8 +-
 3 files changed, 88 insertions(+), 38 deletions(-)

diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index 979f2c6cf42..1687980c029 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -481,10 +481,8 @@ class auction_lots(osv.osv):
     def name_search(self, cr, user, name, args=None, operator='ilike', context={}):
         if not args:
             args = []
-        try:
-            ids = self.search(cr, user, [('obj_num','=',int(name))] + args)
-        except:
-            ids = []
+
+        ids = self.search(cr, user, [('obj_num','=',int(name))] + args)
         if not ids:
             ids = self.search(cr, user, [('name',operator,name)] + args)
         return self.name_get(cr, user, ids)
diff --git a/addons/stock/wizard/stock_change_standard_price.py b/addons/stock/wizard/stock_change_standard_price.py
index 576c82f224e..50892c6fdc6 100644
--- a/addons/stock/wizard/stock_change_standard_price.py
+++ b/addons/stock/wizard/stock_change_standard_price.py
@@ -27,28 +27,79 @@ class change_standard_price(osv.osv_memory):
     _description = "Change Standard Price"
     _columns = {
             'new_price': fields.float('Price', required=True),
+            
+            'property_stock_account_input':fields.many2one('account.account', 'Stock Input Account', required=True),
+            'property_stock_account_output':fields.many2one('account.account', 'Stock Output Account', required=True),
+            'property_stock_journal':fields.many2one('account.journal', 'Stock journal', required=True),
+            
+#            'property_stock_account_input': fields.property('account.account',
+#                type='many2one', relation='account.account',
+#                string='Stock Input Account', method=True, view_load=True,
+#                help='This account will be used, instead of the default one, to value input stock'),
+#            'property_stock_account_output': fields.property('account.account',
+#                type='many2one', relation='account.account',
+#                string='Stock Output Account', method=True, view_load=True,
+#                help='This account will be used, instead of the default one, to value output stock'),
+#           
+#            'property_stock_journal': fields.property('account.journal',
+#            relation='account.journal', type='many2one',
+#            string='Stock journal', method=True, view_load=True,
+#            required = True,
+#            help="This journal will be used for the accounting move generated by stock move"),
+            
+            'enable_acc':fields.boolean('Enable Related Account',),
     }
     
     def default_get(self, cr, uid, fields, context):
         """ 
-             To get default values for the object.
-            
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param fields: List of fields for which we want default values 
-             @param context: A standard dictionary 
-             
-             @return: A dictionary which of fields with values. 
+         To get default values for the object.
+        
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param fields: List of fields for which we want default values 
+         @param context: A standard dictionary 
+         
+         @return: A dictionary which of fields with values. 
         
         """ 
-
+        product_obj = self.pool.get('product.product').browse(cr, uid, context.get('active_id', False))
         res = super(change_standard_price, self).default_get(cr, uid, fields, context=context)   
-        price = self.pool.get('product.product').browse(cr, uid, context.get('active_id', False))
+        
+        stock_input_acc = product_obj.property_stock_account_input and product_obj.property_stock_account_input.id or False 
+        if not stock_input_acc:
+            stock_input_acc = product_obj.categ_id.property_stock_account_input_categ and product_obj.categ_id.property_stock_account_input_categ.id or False
+        
+        stock_output_acc = product_obj.property_stock_account_output and product_obj.property_stock_account_output.id or False
+        if not stock_output_acc:
+            stock_output_acc = product_obj.categ_id.property_stock_account_output_categ and product_obj.categ_id.property_stock_account_output_categ.id or False
+
+        price = product_obj.standard_price
+        journal_id = product_obj.categ_id.property_stock_journal and product_obj.categ_id.property_stock_journal.id or False
+        
         if 'new_price' in fields:
-            res.update({'new_price':price.standard_price})         
+            res.update({'new_price': price})
+        if 'property_stock_account_input' in fields:
+            res.update({'property_stock_account_input': stock_input_acc})         
+        if 'property_stock_account_output' in fields:
+            res.update({'property_stock_account_output': stock_output_acc})         
+        if 'property_stock_journal' in fields:
+            res.update({'property_stock_journal': journal_id})  
+        if 'enable_acc' in fields:
+            res.update({'enable_acc': True})              
+                 
+                     
         return res
     
+    def onchange_price(self, cr, uid, ids, new_price, context = {}):
+        product_obj = self.pool.get('product.product').browse(cr, uid, context.get('active_id', False))
+        price = product_obj.standard_price
+        diff = price - new_price
+        if diff > 0 : 
+            return {'value' : {'enable_acc':False}}
+        else :
+            return {'value' : {'enable_acc':True}}
+        
     def change_price(self, cr, uid, ids, context):
         """ 
              Changes the Standard Price of Product. 
@@ -73,39 +124,36 @@ class change_standard_price(osv.osv_memory):
         data_obj = self.pool.get('ir.model.data')
         
         res = self.browse(cr, uid, ids)
-        new_price = res[0].new_price
+        
         loc_ids = location_obj.search(cr, uid, [('account_id','<>',False),('usage','=','internal')])
+        
+        new_price = res[0].new_price
+        stock_output_acc = res[0].property_stock_account_output.id
+        stock_input_acc = res[0].property_stock_account_input.id
+        journal_id = res[0].property_stock_journal.id
+
         move_ids = []
         for location in location_obj.browse(cr, uid, loc_ids):
             c = context.copy()
-            c.update({'location':location.id})
+            c.update({'location': location.id})
+            c.update({'compute_child': False})
+            
             product = prod_obj.browse(cr, uid, rec_id, context=c)
             qty = product.qty_available
             diff = product.standard_price - new_price                        
-            assert diff, _("Do not found any different between standard price and new price")
+            assert diff, _("Could not find any difference between standard price and new price!")
             if qty:
                 location_account = location.account_id and location.account_id.id or False
-                stock_input_acc = product.property_stock_account_input and product.property_stock_account_input.id or False 
-                if not stock_input_acc:
-                    stock_input_acc = product.categ_id.property_stock_account_input_categ and product.categ_id.property_stock_account_input_categ.id or False
-                stock_output_acc = product.property_stock_account_output and product.property_stock_account_output.id or False
-                if not stock_output_acc:
-                    stock_output_acc = product.categ_id.property_stock_account_output_categ and product.categ_id.property_stock_account_output_categ.id or False
-            
-            
-                journal_id = product.categ_id.property_stock_journal and product.categ_id.property_stock_journal.id or False
                 company_id = location.company_id and location.company_id.id or False                
                 assert location_account, _('Inventory Account is not specified for Location: %s' % (location.name))
-                assert journal_id, _('Stock Journal is not specified in Product Category')
                 assert company_id, _('Company is not specified in Location')
                 move_id = move_obj.create(cr, uid, {
                             'journal_id': journal_id, 
                             'company_id': company_id
                             }) 
-                move_ids.append(move_id)    
+                
+                move_ids.append(move_id)
                 if diff > 0:    
-                    assert stock_input_acc, _('Stock Input Account is not specified for Product: %s' %(product.name))
-                           
                     amount_diff = qty * diff        
                     move_line_obj.create(cr, uid, {
                                 'name': product.name,
@@ -117,23 +165,21 @@ class change_standard_price(osv.osv_memory):
                                 'name': location.name,
                                 'account_id': location_account,
                                 'credit': amount_diff,
-                                'move_id': move_id,
+                                'move_id': move_id
                                 })
                 elif diff < 0: 
-                    assert stock_output_acc, _('Stock Output Account is not specified for Product: %s' %(product.name))
-                               
                     amount_diff = qty * -diff
                     move_line_obj.create(cr, uid, {
                                 'name': product.name,
                                 'account_id': stock_output_acc,
                                 'credit': amount_diff,
-                                'move_id': move_id,
+                                'move_id': move_id
                                 })
                     move_line_obj.create(cr, uid, {
                                 'name': location.name,
                                 'account_id': location_account,
                                 'debit': amount_diff,
-                                'move_id': move_id,
+                                'move_id': move_id
                                 })                   
             
         prod_obj.write(cr, uid, rec_id, {'standard_price': new_price})
diff --git a/addons/stock/wizard/stock_change_standard_price_view.xml b/addons/stock/wizard/stock_change_standard_price_view.xml
index 38ba579848d..8c418cef0ea 100644
--- a/addons/stock/wizard/stock_change_standard_price_view.xml
+++ b/addons/stock/wizard/stock_change_standard_price_view.xml
@@ -7,8 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Change Standard Price">
-              		<field name="new_price"/>
+             		<field name="new_price" on_change="onchange_price(new_price, context)" context="{'active_id': active_id}"/>
               		<newline/>
+                    <field name="property_stock_account_input" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('enable_acc','=',False)]}"/>
+              		<newline/>
+                    <field name="property_stock_account_output" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('enable_acc','=',True)]}"/>
+              		<newline/>
+              		<field name="property_stock_journal"/>
+              		<field name="enable_acc" invisible="1"/>
               		<group col="2" colspan="4">
 	              		<button special="cancel" string="Cancel" icon="gtk-cancel"/>
 	              		<button name="change_price" string="Change" type="object" icon="gtk-ok"/>

From b2c2c367918898db650f2c10eb590c995f020309 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Thu, 25 Mar 2010 14:21:35 +0530
Subject: [PATCH 217/251] [IMP] stock: modifications in  change_standard_price
 wizard

bzr revid: mso@mso-20100325085135-m9z641h4o0urvyi6
---
 .../stock/wizard/stock_change_standard_price.py | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/addons/stock/wizard/stock_change_standard_price.py b/addons/stock/wizard/stock_change_standard_price.py
index 50892c6fdc6..7420e69a9d7 100644
--- a/addons/stock/wizard/stock_change_standard_price.py
+++ b/addons/stock/wizard/stock_change_standard_price.py
@@ -184,22 +184,7 @@ class change_standard_price(osv.osv_memory):
             
         prod_obj.write(cr, uid, rec_id, {'standard_price': new_price})
 
-        id2 = data_obj._get_id(cr, uid, 'account', 'view_move_tree')
-        id3 = data_obj._get_id(cr, uid, 'account', 'view_move_form')
-        
-        if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-        if id3:
-            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-        
-        return {
-                'view_type': 'form',
-                'view_mode': 'tree,form',
-                'res_model': 'account.move',
-                'res_id' : move_ids,
-                'views': [(id2,'tree'),(id3,'form')],
-                'type': 'ir.actions.act_window',
-        }
+        return {  }
 
 change_standard_price()
 

From 8c323b03d18b6435e47c253485a2d21c1cc3e86d Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Thu, 25 Mar 2010 14:27:49 +0530
Subject: [PATCH 218/251] [IMP] stock: Removed unnecessary code in 
 change_standard_price wizard and name of an variable has been changed

bzr revid: mso@mso-20100325085749-7v012mfw2s5ppot8
---
 .../wizard/stock_change_standard_price.py     | 28 ++++---------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/addons/stock/wizard/stock_change_standard_price.py b/addons/stock/wizard/stock_change_standard_price.py
index 7420e69a9d7..f9444c1dfa9 100644
--- a/addons/stock/wizard/stock_change_standard_price.py
+++ b/addons/stock/wizard/stock_change_standard_price.py
@@ -30,24 +30,8 @@ class change_standard_price(osv.osv_memory):
             
             'property_stock_account_input':fields.many2one('account.account', 'Stock Input Account', required=True),
             'property_stock_account_output':fields.many2one('account.account', 'Stock Output Account', required=True),
-            'property_stock_journal':fields.many2one('account.journal', 'Stock journal', required=True),
-            
-#            'property_stock_account_input': fields.property('account.account',
-#                type='many2one', relation='account.account',
-#                string='Stock Input Account', method=True, view_load=True,
-#                help='This account will be used, instead of the default one, to value input stock'),
-#            'property_stock_account_output': fields.property('account.account',
-#                type='many2one', relation='account.account',
-#                string='Stock Output Account', method=True, view_load=True,
-#                help='This account will be used, instead of the default one, to value output stock'),
-#           
-#            'property_stock_journal': fields.property('account.journal',
-#            relation='account.journal', type='many2one',
-#            string='Stock journal', method=True, view_load=True,
-#            required = True,
-#            help="This journal will be used for the accounting move generated by stock move"),
-            
-            'enable_acc':fields.boolean('Enable Related Account',),
+            'property_stock_journal':fields.many2one('account.journal', 'Stock journal', required=True),            
+            'enable_stock_in_out_acc':fields.boolean('Enable Related Account',),
     }
     
     def default_get(self, cr, uid, fields, context):
@@ -85,8 +69,8 @@ class change_standard_price(osv.osv_memory):
             res.update({'property_stock_account_output': stock_output_acc})         
         if 'property_stock_journal' in fields:
             res.update({'property_stock_journal': journal_id})  
-        if 'enable_acc' in fields:
-            res.update({'enable_acc': True})              
+        if 'enable_stock_in_out_acc' in fields:
+            res.update({'enable_stock_in_out_acc': True})              
                  
                      
         return res
@@ -96,9 +80,9 @@ class change_standard_price(osv.osv_memory):
         price = product_obj.standard_price
         diff = price - new_price
         if diff > 0 : 
-            return {'value' : {'enable_acc':False}}
+            return {'value' : {'enable_stock_in_out_acc':False}}
         else :
-            return {'value' : {'enable_acc':True}}
+            return {'value' : {'enable_stock_in_out_acc':True}}
         
     def change_price(self, cr, uid, ids, context):
         """ 

From a500c187cc237c10628338281055a93f1333fac5 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Thu, 25 Mar 2010 15:37:14 +0530
Subject: [PATCH 219/251] [IMP] product: Added view or normal category on
 product

bzr revid: mso@mso-20100325100714-40rh2prsz0gwxks0
---
 addons/product/product.py       | 2 +-
 addons/product/product_demo.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index 6b7bdefcb67..f682e782a09 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -262,7 +262,7 @@ class product_template(osv.osv):
         'produce_delay': fields.float('Manufacturing Lead Time', help="Average time to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different lead times will be summed for all levels and purchase orders."),
         'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Requisition Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the requisition request."),
         'rental': fields.boolean('Can be Rent'),
-        'categ_id': fields.many2one('product.category','Category', required=True, change_default=True),
+        'categ_id': fields.many2one('product.category','Category', required=True, change_default=True, domain="[('type','=','normal')]"),
         'list_price': fields.float('Sale Price', digits_compute=dp.get_precision('Sale Price'), help="Base price for computing the customer price. Sometimes called the catalog price."),
         'standard_price': fields.float('Cost Price', required=True, digits_compute=dp.get_precision('Account'), help="Product's cost for accounting stock valuation. It is the base price for the supplier price."),
         'volume': fields.float('Volume', help="The volume in m3."),
diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index 68054cec0f1..19761704e88 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -8,6 +8,7 @@
         <record id="cat0" model="product.category">
             <field name="parent_id" ref="null"/>
             <field name="name">All products</field>
+            <field name="type">view</field>
         </record>
         <record id="cat1" model="product.category">
             <field name="parent_id" ref="cat0"/>

From 942ac8de0bdf91cd528bd4524e57cb6261ecf713 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=ABl=20Grand-Guillaume?=
 <joel.grandguillaume@camptocamp.com>
Date: Thu, 25 Mar 2010 11:59:36 +0100
Subject: [PATCH 220/251] [IMP] Add the multi-currency support on product
 costs. You can now have different costs price for each company, but in the
 same currency even if your company are in different one

bzr revid: joel.grandguillaume@camptocamp.com-20100325105936-btwdqg96jt723l2r
---
 addons/account/account_analytic_line.py       |  3 ++-
 addons/hr_expense/hr_expense.py               |  1 +
 addons/product/company.py                     | 10 ----------
 addons/product/product.py                     | 11 ++++++++++-
 addons/stock/stock.py                         | 16 ++++++++++++----
 addons/stock/wizard/wizard_partial_picking.py |  3 ++-
 6 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index 08f36f65e53..036a8fa3ce2 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -146,8 +146,9 @@ class account_analytic_line(osv.osv):
       
             # Compute based on pricetype
             pricetype=self.pool.get('product.price.type').browse(cr,uid,company_obj.browse(cr,uid,company_id).property_valuation_price_type.id)
+            # Take the company currency as the reference one
+            context['currency_id']=company_obj.browse(cr,uid,company_id).currency_id.id
             amount_unit=prod.price_get(pricetype.field, context)[prod.id]
-
             amount=amount_unit*unit_amount or 1.0
             return {'value': {
                 'amount': - round(amount, 2),
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 5e71e4614df..62988a94edb 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -218,6 +218,7 @@ class hr_expense_line(osv.osv):
             
             # Compute based on pricetype of employee company
             pricetype_id = self.pool.get('hr.employee').browse(cr,uid,employee_id).user_id.company_id.property_valuation_price_type.id
+            context['currency_id']=self.pool.get('hr.employee').browse(cr,uid,employee_id).user_id.company_id.currency_id.id
             pricetype=self.pool.get('product.price.type').browse(cr,uid,pricetype_id)
             amount_unit=product.price_get(pricetype.field, context)[product.id]
             
diff --git a/addons/product/company.py b/addons/product/company.py
index f23d010b600..0f248dba309 100644
--- a/addons/product/company.py
+++ b/addons/product/company.py
@@ -36,16 +36,6 @@ class res_company(osv.osv):
             help="The price type field in the selected price type will be used, instead of the default one, \
                   for valuation of product in the current company"),
     }
-    
-    def _check_currency(self, cr, uid, ids):
-        for rec in self.browse(cr, uid, ids):
-            if rec.currency_id.id <> rec.property_valuation_price_type.currency_id.id:
-                return False
-        return True
-        
-    _constraints = [
-        (_check_currency, 'Error! You can not chooes a pricetype in a different currency than your company (Not supported now).', ['property_valuation_price_type'])
-    ]
 
 res_company()
 
diff --git a/addons/product/product.py b/addons/product/product.py
index a4a30cba863..8d6b08b69df 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -522,7 +522,6 @@ class product_product(osv.osv):
     def price_get(self, cr, uid, ids, ptype='list_price', context={}):
         res = {}
         product_uom_obj = self.pool.get('product.uom')
-
         for product in self.browse(cr, uid, ids, context=context):
             res[product.id] = product[ptype] or 0.0
             if ptype == 'list_price':
@@ -532,6 +531,16 @@ class product_product(osv.osv):
                 uom = product.uos_id or product.uom_id
                 res[product.id] = product_uom_obj._compute_price(cr, uid,
                         uom.id, res[product.id], context['uom'])
+            # Convert from price_type currency to asked one
+            if 'currency_id' in context:
+                pricetype_obj = self.pool.get('product.price.type')
+                # Take the price_type currency from the product field
+                # This is right cause a field cannot be in more than one currency
+                price_type_id = pricetype_obj.search(cr,ui,['field','=',ptype])[0]
+                price_type_currency_id = pricetype_obj.browse(cr,uid,price_type_id).currency_id.id
+                res[product.id] = self.pool.get('res.currency').compute(cr, uid, price_type_currency_id,
+                    context['currency_id'], res[product.id],context=context)
+                
         return res
 
     def copy(self, cr, uid, id, default=None, context=None):
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 310e993146d..579b637769d 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -117,8 +117,13 @@ class stock_location(osv.osv):
             for r in result:
                 c = (context or {}).copy()
                 c['location'] = id
-                product = self.pool.get('product.product').read(cr, uid, r['product_id'], [field_to_read, pricetype.field], context=c)
-                final_value += (product[field_to_read] * product[pricetype.field])
+                product = self.pool.get('product.product').read(cr, uid, r['product_id'], [field_to_read], context=c)
+                # Compute the amount_unit in right currency
+                
+                context['currency_id']=self.pool.get('res.users').browse(cr,uid,uid).company_id.currency_id.id
+                amount_unit=self.pool.get('product.product').browse(cr,uid,r['product_id']).price_get(pricetype.field, context)[r['product_id']]
+                
+                final_value += (product[field_to_read] * amount_unit)
         return final_value
 
     def _product_value(self, cr, uid, ids, field_names, arg, context={}):
@@ -218,6 +223,7 @@ class stock_location(osv.osv):
         # Take the user company and pricetype
         price_type_id=self.pool.get('res.users').browse(cr,uid,uid).company_id.property_valuation_price_type.id
         pricetype=self.pool.get('product.price.type').browse(cr,uid,price_type_id)
+        context['currency_id']=self.pool.get('res.users').browse(cr,uid,uid).company_id.currency_id.id
         
         if not product_ids:
             product_ids = product_obj.search(cr, uid, [])
@@ -661,7 +667,9 @@ class stock_picking(osv.osv):
         if type in ('in_invoice', 'in_refund'):
             # Take the user company and pricetype
             price_type_id=self.pool.get('res.users').browse(cr,users,users).company_id.property_valuation_price_type.id
-            pricetype=self.pool.get('product.price.type').browse(cr,uid,price_type_id)            
+            pricetype=self.pool.get('product.price.type').browse(cr,uid,price_type_id)    
+            context['currency_id']=move_line.company_id.currency_id.id        
+            
             amount_unit=move_line.product_id.price_get(pricetype.field, context)[move_line.product_id.id] 
             return amount_unit
         else:
@@ -1433,7 +1441,7 @@ class stock_move(osv.osv):
                     # Base computation on valuation price type
                     else:
                         company_id=move.company_id.id
-                        
+                        context['currency_id']=move.company_id.currency_id.id
                         pricetype=self.pool.get('product.price.type').browse(cr,uid,move.company_id.property_valuation_price_type.id)
                         amount_unit=move.product_id.price_get(pricetype.field, context)[move.product_id.id]
                         amount=amount_unit * q or 1.0
diff --git a/addons/stock/wizard/wizard_partial_picking.py b/addons/stock/wizard/wizard_partial_picking.py
index 389d6b8f5b6..a0cd1c78711 100644
--- a/addons/stock/wizard/wizard_partial_picking.py
+++ b/addons/stock/wizard/wizard_partial_picking.py
@@ -126,7 +126,8 @@ def _do_split(self, cr, uid, data, context):
 
             product = product_obj.browse(cr, uid, [move.product_id.id])[0]
             user = users_obj.browse(cr, uid, [uid])[0]
-
+            context['currency_id']=move.company_id.currency_id.id
+            
             qty = data['form']['move%s' % move.id]
             uom = data['form']['uom%s' % move.id]
             price = data['form']['price%s' % move.id]

From a57878a9c0db1bc5a63cd7d576676e0171c33fb9 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Thu, 25 Mar 2010 16:30:02 +0530
Subject: [PATCH 221/251] [IMP] stock: changes in
 change_standard_prize_view.xml and refactored name of variables

bzr revid: mso@mso-20100325110002-zt7uu5x1glclaj45
---
 .../wizard/stock_change_standard_price.py     | 25 +++++++++----------
 .../stock_change_standard_price_view.xml      |  8 +++---
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/addons/stock/wizard/stock_change_standard_price.py b/addons/stock/wizard/stock_change_standard_price.py
index f9444c1dfa9..8454d1e32ff 100644
--- a/addons/stock/wizard/stock_change_standard_price.py
+++ b/addons/stock/wizard/stock_change_standard_price.py
@@ -27,10 +27,9 @@ class change_standard_price(osv.osv_memory):
     _description = "Change Standard Price"
     _columns = {
             'new_price': fields.float('Price', required=True),
-            
-            'property_stock_account_input':fields.many2one('account.account', 'Stock Input Account', required=True),
-            'property_stock_account_output':fields.many2one('account.account', 'Stock Output Account', required=True),
-            'property_stock_journal':fields.many2one('account.journal', 'Stock journal', required=True),            
+            'stock_account_input':fields.many2one('account.account', 'Stock Input Account'),
+            'stock_account_output':fields.many2one('account.account', 'Stock Output Account'),
+            'stock_journal':fields.many2one('account.journal', 'Stock journal', required=True),            
             'enable_stock_in_out_acc':fields.boolean('Enable Related Account',),
     }
     
@@ -63,12 +62,12 @@ class change_standard_price(osv.osv_memory):
         
         if 'new_price' in fields:
             res.update({'new_price': price})
-        if 'property_stock_account_input' in fields:
-            res.update({'property_stock_account_input': stock_input_acc})         
-        if 'property_stock_account_output' in fields:
-            res.update({'property_stock_account_output': stock_output_acc})         
-        if 'property_stock_journal' in fields:
-            res.update({'property_stock_journal': journal_id})  
+        if 'stock_account_input' in fields:
+            res.update({'stock_account_input': stock_input_acc})         
+        if 'stock_account_output' in fields:
+            res.update({'stock_account_output': stock_output_acc})         
+        if 'stock_journal' in fields:
+            res.update({'stock_journal': journal_id})  
         if 'enable_stock_in_out_acc' in fields:
             res.update({'enable_stock_in_out_acc': True})              
                  
@@ -112,9 +111,9 @@ class change_standard_price(osv.osv_memory):
         loc_ids = location_obj.search(cr, uid, [('account_id','<>',False),('usage','=','internal')])
         
         new_price = res[0].new_price
-        stock_output_acc = res[0].property_stock_account_output.id
-        stock_input_acc = res[0].property_stock_account_input.id
-        journal_id = res[0].property_stock_journal.id
+        stock_output_acc = res[0].stock_account_output.id
+        stock_input_acc = res[0].stock_account_input.id
+        journal_id = res[0].stock_journal.id
 
         move_ids = []
         for location in location_obj.browse(cr, uid, loc_ids):
diff --git a/addons/stock/wizard/stock_change_standard_price_view.xml b/addons/stock/wizard/stock_change_standard_price_view.xml
index 8c418cef0ea..4382a35558e 100644
--- a/addons/stock/wizard/stock_change_standard_price_view.xml
+++ b/addons/stock/wizard/stock_change_standard_price_view.xml
@@ -9,12 +9,12 @@
               <form string="Change Standard Price">
              		<field name="new_price" on_change="onchange_price(new_price, context)" context="{'active_id': active_id}"/>
               		<newline/>
-                    <field name="property_stock_account_input" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('enable_acc','=',False)]}"/>
+                    <field name="stock_account_input" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"  attrs="{'readonly':[('enable_stock_in_out_acc','=',False)],'required': [('enable_stock_in_out_acc','=',True)]}"/>
               		<newline/>
-                    <field name="property_stock_account_output" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('enable_acc','=',True)]}"/>
+                    <field name="stock_account_output" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('enable_stock_in_out_acc','=',True)],'required': [('enable_stock_in_out_acc','=',False)]}"/>
               		<newline/>
-              		<field name="property_stock_journal"/>
-              		<field name="enable_acc" invisible="1"/>
+              		<field name="stock_journal"/>
+              		<field name="enable_stock_in_out_acc" invisible="1"/>
               		<group col="2" colspan="4">
 	              		<button special="cancel" string="Cancel" icon="gtk-cancel"/>
 	              		<button name="change_price" string="Change" type="object" icon="gtk-ok"/>

From 18e85709760b5241971bcdd4c71035fc1b9fc52f Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Thu, 25 Mar 2010 17:38:31 +0530
Subject: [PATCH 222/251] [REF] stock

bzr revid: hmo@tinyerp.com-20100325120831-jsnj6d63v1q0pmv6
---
 addons/stock/product.py                       |  84 +++++++++++
 addons/stock/stock.py                         | 135 ++++++++++++++++++
 .../wizard/stock_change_standard_price.py     |  77 ++--------
 3 files changed, 228 insertions(+), 68 deletions(-)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index 3e789fa7ecd..cf7c5605b8f 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -25,6 +25,90 @@ from tools.translate import _
 
 class product_product(osv.osv):
     _inherit = "product.product"
+
+    def do_change_standard_price(self, cr, uid, ids, datas, context={}):
+        """ 
+             Changes the Standard Price of Product. 
+             And creates an account move accordingly.
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: List of IDs selected 
+             @param datas : dict. contain default datas like new_price, stock_output_account, stock_input_account, stock_journal
+             @param context: A standard dictionary 
+             
+             @return:  
+        
+        """        
+        location_obj = self.pool.get('stock.location')
+        lot_obj = self.pool.get('stock.report.prodlots')
+        move_obj = self.pool.get('account.move')
+        move_line_obj = self.pool.get('account.move.line')        
+        loc_ids = location_obj.search(cr, uid, [('account_id','<>',False),('usage','=','internal')])
+        
+        new_price = datas.get('new_price', 0.0)
+        stock_output_acc = datas.get('stock_output_account', False)
+        stock_input_acc = datas.get('stock_input_account', False)
+        journal_id = datas.get('stock_journal', False)
+
+        move_ids = []
+        for rec_id in ids:
+            for location in location_obj.browse(cr, uid, loc_ids):
+                c = context.copy()
+                c.update({
+                    'location': location.id,
+                    'compute_child': False
+                })           
+                
+                product = self.browse(cr, uid, rec_id, context=c)
+                qty = product.qty_available
+                diff = product.standard_price - new_price                        
+                assert diff, _("Could not find any difference between standard price and new price!")
+                if qty:
+                    location_account = location.account_id and location.account_id.id or False
+                    company_id = location.company_id and location.company_id.id or False                
+                    assert location_account, _('Inventory Account is not specified for Location: %s' % (location.name))
+                    assert company_id, _('Company is not specified in Location')
+                    move_id = move_obj.create(cr, uid, {
+                                'journal_id': journal_id, 
+                                'company_id': company_id
+                                }) 
+                    
+                    move_ids.append(move_id)
+                    if diff > 0:    
+                        amount_diff = qty * diff        
+                        move_line_obj.create(cr, uid, {
+                                    'name': product.name,
+                                    'account_id': stock_input_acc,
+                                    'debit': amount_diff,
+                                    'move_id': move_id,
+                                    })
+                        move_line_obj.create(cr, uid, {
+                                    'name': location.name,
+                                    'account_id': location_account,
+                                    'credit': amount_diff,
+                                    'move_id': move_id
+                                    })
+                    elif diff < 0: 
+                        amount_diff = qty * -diff
+                        move_line_obj.create(cr, uid, {
+                                    'name': product.name,
+                                    'account_id': stock_output_acc,
+                                    'credit': amount_diff,
+                                    'move_id': move_id
+                                    })
+                        move_line_obj.create(cr, uid, {
+                                    'name': location.name,
+                                    'account_id': location_account,
+                                    'debit': amount_diff,
+                                    'move_id': move_id
+                                    })                   
+                
+            self.write(cr, uid, rec_id, {'standard_price': new_price})
+
+        return True
+
     def view_header_get(self, cr, user, view_id, view_type, context):
         res = super(product_product, self).view_header_get(cr, user, view_id, view_type, context)
         if res: return res
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 7a400b23138..5e684d90752 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -856,6 +856,141 @@ class stock_picking(osv.osv):
                 continue
         return super(stock_picking, self).unlink(cr, uid, ids, context=context)
 
+    def do_partial(self, cr, uid, ids, partial_datas, context):
+        """
+        @ partial_datas : dict. contain details of partial picking 
+                          like partner_id, address_id, delivery_date, delivery moves with product_id, product_qty, uom
+        """
+        res = {}
+        move_obj = self.pool.get('stock.move')
+        delivery_obj = self.pool.get('stock.delivery')
+        product_obj = self.pool.get('product.product')
+        currency_obj = self.pool.get('res.currency')
+        users_obj = self.pool.get('res.users')
+        uom_obj = self.pool.get('product.uom')
+        price_type_obj = self.pool.get('product.price.type')
+        wf_service = netsvc.LocalService("workflow")
+        partner_id = partial_datas.get('partner_id', False)
+        address_id = partial_datas.get('address_id', False)
+        delivery_date = partial_datas.get('delivery_date', False)
+        for pick in self.browse(cr, uid, ids, context=context):
+            new_picking = None
+            new_moves = []
+
+            complete, too_many, too_few = [], [], []        
+            for move in pick.move_lines:
+                partial_data = partial_datas.get('move%s'%(move.id), False)
+                assert partial_data, _('Do not Found Partial data of Stock Move Line :%s' %(move.id))
+                product_qty = partial_data.get('product_qty',0.0)
+                product_uom = partial_data.get('product_uom',False)
+                product_price = partial_data.get('product_price',0.0)
+                product_currency = partial_data.get('product_currency',False)
+                if move.product_qty == product_qty:
+                    complete.append(move)
+                elif move.product_qty > product_qty:
+                    too_few.append(move)
+                else:
+                    too_many.append(move)
+
+                # Average price computation
+                if (pick.type == 'in') and (move.product_id.cost_method == 'average'):
+                    product = product_obj.browse(cr, uid, move.product_id.id)
+                    user = users_obj.browse(cr, uid, uid)                   
+
+                    qty = uom_obj._compute_qty(cr, uid, product_uom, product_qty, product.uom_id.id)
+                    pricetype = False
+                    if user.company_id.property_valuation_price_type:
+                        pricetype = price_type_obj.browse(cr, uid, user.company_id.property_valuation_price_type.id)
+                    if pricetype and qty > 0:
+                        new_price = currency_obj.compute(cr, uid, currency,
+                                user.company_id.currency_id.id, product_price)
+                        new_price = uom_obj._compute_price(cr, uid, product_uom, new_price,
+                                product.uom_id.id)
+                        if product.qty_available <= 0:
+                            new_std_price = new_price
+                        else:
+                            # Get the standard price
+                            amount_unit = product.price_get(pricetype.field, context)[product.id]
+                            new_std_price = ((amount_unit * product.qty_available)\
+                                + (new_price * qty))/(product.qty_available + qty)
+                                
+                        # Write the field according to price type field
+                        product_obj.write(cr, uid, [product.id],
+                                {pricetype.field: new_std_price})
+                        move_obj.write(cr, uid, [move.id], {'price_unit': new_price})
+
+            delivery_id = delivery_obj.create(cr, uid, {
+                'name':  pick.name,                                 
+                'partner_id': partner_id,
+                'address_id': address_id,
+                'date': delivery_date,                
+                'picking_id':pick.id
+            }, context=context)
+
+            for move in too_few:
+                if not new_picking:
+
+                    new_picking = self.copy(cr, uid, pick.id,
+                            {
+                                'name': pool.get('ir.sequence').get(cr, uid, 'stock.picking.%s'%(pick.type)),
+                                'move_lines' : [],
+                                'state':'draft',
+                            })
+                if product_qty != 0:
+                    
+                    new_obj = move_obj.copy(cr, uid, move.id,
+                        {
+                            'product_qty' : product_qty,
+                            'product_uos_qty': product_qty, #TODO: put correct uos_qty
+                            'picking_id' : new_picking,
+                            'delivery_id' : delivery_id,
+                            'state': 'assigned',
+                            'move_dest_id': False,                            
+                            'price_unit': move.price_unit,
+                        })
+                                
+                move_obj.write(cr, uid, [move.id],
+                        {
+                            'product_qty' : move.product_qty - product_qty,
+                            'product_uos_qty':move.product_qty - product_qty, #TODO: put correct uos_qty
+                          
+                        })
+
+            if new_picking:
+                move_obj.write(cr, uid, [c.id for c in complete], {'picking_id': new_picking})
+                for move in too_many:
+                    move_obj.write(cr, uid, [move.id],
+                            {
+                                'product_qty' : product_qty,
+                                'product_uos_qty': product_qty, #TODO: put correct uos_qty
+                                'picking_id': new_picking,
+                            })
+            else:
+                for move in too_many:
+                    move_obj.write(cr, uid, [move.id],
+                            {
+                                'product_qty': product_qty,
+                                'product_uos_qty': product_qty
+                            })
+
+            # At first we confirm the new picking (if necessary)            
+            if new_picking:
+                wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_confirm', cr)
+            # Then we finish the good picking
+            if new_picking:
+                self.write(cr, uid, [pick.id], {'backorder_id': new_picking})
+                self.action_move(cr, uid, [new_picking])
+                wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_done', cr)
+                wf_service.trg_write(uid, 'stock.picking', pick.id, cr)
+            else:
+                self.action_move(cr, uid, [pick.id])
+                wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_done', cr)
+            bo_name = ''
+            if new_picking:
+                bo_name = pick_obj.read(cr, uid, [new_picking], ['name'])[0]['name']
+            res[pick.id] = {'new_picking': new_picking or False, 'back_order':bo_name}
+        return res
+
 stock_picking()
 
 
diff --git a/addons/stock/wizard/stock_change_standard_price.py b/addons/stock/wizard/stock_change_standard_price.py
index 8454d1e32ff..337a59f1624 100644
--- a/addons/stock/wizard/stock_change_standard_price.py
+++ b/addons/stock/wizard/stock_change_standard_price.py
@@ -100,74 +100,15 @@ class change_standard_price(osv.osv_memory):
         rec_id = context and context.get('active_id', False)
         assert rec_id, _('Active ID is not set in Context')
         prod_obj = self.pool.get('product.product')
-        location_obj = self.pool.get('stock.location')
-        lot_obj = self.pool.get('stock.report.prodlots')
-        move_obj = self.pool.get('account.move')
-        move_line_obj = self.pool.get('account.move.line')
-        data_obj = self.pool.get('ir.model.data')
-        
-        res = self.browse(cr, uid, ids)
-        
-        loc_ids = location_obj.search(cr, uid, [('account_id','<>',False),('usage','=','internal')])
-        
-        new_price = res[0].new_price
-        stock_output_acc = res[0].stock_account_output.id
-        stock_input_acc = res[0].stock_account_input.id
-        journal_id = res[0].stock_journal.id
-
-        move_ids = []
-        for location in location_obj.browse(cr, uid, loc_ids):
-            c = context.copy()
-            c.update({'location': location.id})
-            c.update({'compute_child': False})
-            
-            product = prod_obj.browse(cr, uid, rec_id, context=c)
-            qty = product.qty_available
-            diff = product.standard_price - new_price                        
-            assert diff, _("Could not find any difference between standard price and new price!")
-            if qty:
-                location_account = location.account_id and location.account_id.id or False
-                company_id = location.company_id and location.company_id.id or False                
-                assert location_account, _('Inventory Account is not specified for Location: %s' % (location.name))
-                assert company_id, _('Company is not specified in Location')
-                move_id = move_obj.create(cr, uid, {
-                            'journal_id': journal_id, 
-                            'company_id': company_id
-                            }) 
-                
-                move_ids.append(move_id)
-                if diff > 0:    
-                    amount_diff = qty * diff        
-                    move_line_obj.create(cr, uid, {
-                                'name': product.name,
-                                'account_id': stock_input_acc,
-                                'debit': amount_diff,
-                                'move_id': move_id,
-                                })
-                    move_line_obj.create(cr, uid, {
-                                'name': location.name,
-                                'account_id': location_account,
-                                'credit': amount_diff,
-                                'move_id': move_id
-                                })
-                elif diff < 0: 
-                    amount_diff = qty * -diff
-                    move_line_obj.create(cr, uid, {
-                                'name': product.name,
-                                'account_id': stock_output_acc,
-                                'credit': amount_diff,
-                                'move_id': move_id
-                                })
-                    move_line_obj.create(cr, uid, {
-                                'name': location.name,
-                                'account_id': location_account,
-                                'debit': amount_diff,
-                                'move_id': move_id
-                                })                   
-            
-        prod_obj.write(cr, uid, rec_id, {'standard_price': new_price})
-
-        return {  }
+        res = self.browse(cr, uid, ids)        
+        datas = {
+            'new_price' : res[0].new_price,
+            'stock_output_account' : res[0].stock_account_output.id,
+            'stock_input_account' : res[0].stock_account_input.id,
+            'stock_journal' : res[0].stock_journal.id
+        }
+        prod_obj.do_change_standard_price(cr, uid, [rec_id], datas, context)
+        return {}        
 
 change_standard_price()
 

From 137c640c50f0e70cf514379fdb7b986b750e0df2 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Thu, 25 Mar 2010 18:04:53 +0530
Subject: [PATCH 223/251] [IMP] stock: changes in do_change_standard_price
 method

bzr revid: mso@mso-20100325123453-7igqzvauuqm403tm
---
 addons/stock/product.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index cf7c5605b8f..ef7bfb14ea2 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -42,7 +42,6 @@ class product_product(osv.osv):
         
         """        
         location_obj = self.pool.get('stock.location')
-        lot_obj = self.pool.get('stock.report.prodlots')
         move_obj = self.pool.get('account.move')
         move_line_obj = self.pool.get('account.move.line')        
         loc_ids = location_obj.search(cr, uid, [('account_id','<>',False),('usage','=','internal')])

From ac581eb57115cdbc772c02b9eb69bdc7fb2788ad Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Thu, 25 Mar 2010 19:14:10 +0530
Subject: [PATCH 224/251] [FIX] hr_evaluation: Removed demo file from update
 tag (Already available with demo tag)

bzr revid: mra@tinyerp.com-20100325134410-hdscyuetlrsavkm6
---
 addons/hr_evaluation/__terp__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/hr_evaluation/__terp__.py b/addons/hr_evaluation/__terp__.py
index 780ddd290df..be1ce233718 100644
--- a/addons/hr_evaluation/__terp__.py
+++ b/addons/hr_evaluation/__terp__.py
@@ -40,7 +40,6 @@
                     "security/ir.model.access.csv",
                     "wizard/hr_evaluation_mail_view.xml",
                     "hr_evaluation_view.xml",
-                    "hr_evaluation_demo.xml",
                     "report/hr_evaluation_report_view.xml"],
     "active": False,
     "installable": True

From b170ef94fccb34765bc4acec66e4659a24ce1753 Mon Sep 17 00:00:00 2001
From: "RVO(OpenERP)" <>
Date: Thu, 25 Mar 2010 19:47:36 +0530
Subject: [PATCH 225/251] FIX converted private methods called from views to
 public

bzr revid: hda@tinyerp.com-20100325141736-itdnr9bfe7iox4to
---
 addons/account/account_move_line.py                         | 4 ++--
 addons/account/account_view.xml                             | 4 ++--
 addons/account_invoice_layout/account_invoice_layout.py     | 6 +++---
 .../account_invoice_layout/account_invoice_layout_view.xml  | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 0adc85a942e..07d8e1a02ac 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -278,7 +278,7 @@ class account_move_line(osv.osv):
             data['amount_currency'] = v
         return data
 
-    def _on_create_write(self, cr, uid, id, context={}):
+    def on_create_write(self, cr, uid, id, context={}):
         ml = self.browse(cr, uid, id, context)
         return map(lambda x: x.id, ml.move_id.line_id)
 
@@ -733,7 +733,7 @@ class account_move_line(osv.osv):
                     state = ' colors="red:state==\'draft\'"'
 
             #xml = '''<?xml version="1.0"?>\n<tree string="%s" editable="top" refresh="5"%s>\n\t''' % (title, state)
-            xml = '''<?xml version="1.0"?>\n<tree string="%s" editable="top" refresh="5" on_write="_on_create_write"%s>\n\t''' % (title, state)
+            xml = '''<?xml version="1.0"?>\n<tree string="%s" editable="top" refresh="5" on_write="on_create_write"%s>\n\t''' % (title, state)
             fields = []
 
             widths = {
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index d865823e9cd..88205521b1c 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -159,7 +159,7 @@
                 </search>
             </field>
         </record>
-        
+
         <record id="action_account_form" model="ir.actions.act_window">
             <field name="name">List of Accounts</field>
             <field name="res_model">account.account</field>
@@ -681,7 +681,7 @@
             <field name="type">tree</field>
             <field eval="4" name="priority"/>
             <field name="arch" type="xml">
-                <tree string="Account Entry Line" editable="top" on_write="_on_create_write">
+                <tree string="Account Entry Line" editable="top" on_write="on_create_write">
                     <field name="date"/>
                     <field name="period_id"/>
                     <field name="move_id"/>
diff --git a/addons/account_invoice_layout/account_invoice_layout.py b/addons/account_invoice_layout/account_invoice_layout.py
index 58f7721d253..2317e0c65a9 100644
--- a/addons/account_invoice_layout/account_invoice_layout.py
+++ b/addons/account_invoice_layout/account_invoice_layout.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.
 #
 ##############################################################################
 
@@ -70,7 +70,7 @@ class account_invoice_line(osv.osv):
                     res[field]['states'][key] = value
         return res
 
-    def _onchange_invoice_line_view(self, cr, uid, id, type, context={}, *args):
+    def onchange_invoice_line_view(self, cr, uid, id, type, context={}, *args):
 
         if (not type):
             return {}
diff --git a/addons/account_invoice_layout/account_invoice_layout_view.xml b/addons/account_invoice_layout/account_invoice_layout_view.xml
index 18e7996a7cd..fe11e407bf3 100644
--- a/addons/account_invoice_layout/account_invoice_layout_view.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_view.xml
@@ -9,7 +9,7 @@
 			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<xpath expr="/form/notebook/page/field[@name='name']" position="before">
-					<field name="state" select="1" on_change="_onchange_invoice_line_view(state)" />
+					<field name="state" select="1" on_change="onchange_invoice_line_view(state)" />
 					<field name="sequence"/>
 				</xpath>
 			</field>

From f688de89c1c168261798934354c14f25d08dd57c Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Fri, 26 Mar 2010 14:55:02 +0530
Subject: [PATCH 226/251] [IMP] stock: change cost price and partial wizard

bzr revid: hmo@tinyerp.com-20100326092502-3f4jfnr6wjjrbayf
---
 addons/stock/__terp__.py                      |   1 +
 addons/stock/product.py                       |  55 +++-
 addons/stock/stock.py                         |  82 ++---
 addons/stock/stock_sequence.xml               |  12 +
 addons/stock/stock_view.xml                   |  31 +-
 addons/stock/stock_wizard.xml                 |  11 +-
 addons/stock/wizard/__init__.py               |   2 +-
 .../wizard/stock_change_standard_price.py     |   4 +-
 .../stock_change_standard_price_view.xml      |  17 +-
 addons/stock/wizard/stock_partial_picking.py  | 237 ++++++++++++++
 .../wizard/stock_partial_picking_view.xml     |  13 +
 addons/stock/wizard/wizard_partial_picking.py | 306 ------------------
 12 files changed, 381 insertions(+), 390 deletions(-)
 create mode 100644 addons/stock/wizard/stock_partial_picking.py
 create mode 100644 addons/stock/wizard/stock_partial_picking_view.xml
 delete mode 100644 addons/stock/wizard/wizard_partial_picking.py

diff --git a/addons/stock/__terp__.py b/addons/stock/__terp__.py
index 52c27c76d01..07cfeccf0b5 100644
--- a/addons/stock/__terp__.py
+++ b/addons/stock/__terp__.py
@@ -43,6 +43,7 @@ Thanks to the double entry management, the inventory controlling is powerful and
     "update_xml" : [
         "stock_data.xml",
         "wizard/stock_move_view.xml",
+        "wizard/stock_partial_picking_view.xml",
         "wizard/stock_inventory_set_stock_zero_view.xml",
         "wizard/stock_fill_inventory_view.xml",
         "wizard/stock_invoice_onshipping_view.xml",
diff --git a/addons/stock/product.py b/addons/stock/product.py
index ef7bfb14ea2..d771815a4d4 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -24,7 +24,7 @@ from tools.translate import _
 
 
 class product_product(osv.osv):
-    _inherit = "product.product"
+    _inherit = "product.product"    
 
     def do_change_standard_price(self, cr, uid, ids, datas, context={}):
         """ 
@@ -43,16 +43,16 @@ class product_product(osv.osv):
         """        
         location_obj = self.pool.get('stock.location')
         move_obj = self.pool.get('account.move')
-        move_line_obj = self.pool.get('account.move.line')        
-        loc_ids = location_obj.search(cr, uid, [('account_id','<>',False),('usage','=','internal')])
-        
+        move_line_obj = self.pool.get('account.move.line')                        
+
         new_price = datas.get('new_price', 0.0)
         stock_output_acc = datas.get('stock_output_account', False)
         stock_input_acc = datas.get('stock_input_account', False)
         journal_id = datas.get('stock_journal', False)
 
-        move_ids = []
+        move_ids = []        
         for rec_id in ids:
+            loc_ids = location_obj.search(cr, uid, [('account_id','<>',False),('usage','=','internal')])
             for location in location_obj.browse(cr, uid, loc_ids):
                 c = context.copy()
                 c.update({
@@ -62,20 +62,45 @@ class product_product(osv.osv):
                 
                 product = self.browse(cr, uid, rec_id, context=c)
                 qty = product.qty_available
-                diff = product.standard_price - new_price                        
+                diff = product.standard_price - new_price 
                 assert diff, _("Could not find any difference between standard price and new price!")
                 if qty:
                     location_account = location.account_id and location.account_id.id or False
-                    company_id = location.company_id and location.company_id.id or False                
+                    company_id = location.company_id and location.company_id.id or False                    
                     assert location_account, _('Inventory Account is not specified for Location: %s' % (location.name))
                     assert company_id, _('Company is not specified in Location')
+                    #
+                    # Accounting Entries
+                    #
+                    if not journal_id:
+                        journal_id = product.categ_id.property_stock_journal and product.categ_id.property_stock_journal.id or False
+                    if not journal_id:
+                        raise osv.except_osv(_('Error!'),
+                            _('There is no journal defined '\
+                                'on the product category: "%s" (id: %d)') % \
+                                (product.categ_id.name,
+                                    product.categ_id.id,))
                     move_id = move_obj.create(cr, uid, {
                                 'journal_id': journal_id, 
                                 'company_id': company_id
                                 }) 
                     
                     move_ids.append(move_id)
-                    if diff > 0:    
+
+
+                    if diff > 0:
+                        if not stock_input_acc:
+                            stock_input_acc = product.product_tmpl_id.\
+                                property_stock_account_input.id
+                        if not stock_input_acc:
+                            stock_input_acc = product.categ_id.\
+                                    property_stock_account_input_categ.id
+                        if not stock_input_acc:
+                            raise osv.except_osv(_('Error!'),
+                                    _('There is no stock input account defined ' \
+                                            'for this product: "%s" (id: %d)') % \
+                                            (product.name,
+                                                product.id,))
                         amount_diff = qty * diff        
                         move_line_obj.create(cr, uid, {
                                     'name': product.name,
@@ -90,6 +115,18 @@ class product_product(osv.osv):
                                     'move_id': move_id
                                     })
                     elif diff < 0: 
+                        if not stock_output_acc:
+                            stock_output_acc = product.product_tmpl_id.\
+                                property_stock_account_output.id
+                        if not stock_output_acc:
+                            stock_output_acc = product.categ_id.\
+                                    property_stock_account_output_categ.id
+                        if not stock_output_acc:
+                            raise osv.except_osv(_('Error!'),
+                                    _('There is no stock output account defined ' \
+                                            'for this product: "%s" (id: %d)') % \
+                                            (product.name,
+                                                product.id,))
                         amount_diff = qty * -diff
                         move_line_obj.create(cr, uid, {
                                     'name': product.name,
@@ -106,7 +143,7 @@ class product_product(osv.osv):
                 
             self.write(cr, uid, rec_id, {'standard_price': new_price})
 
-        return True
+        return move_ids
 
     def view_header_get(self, cr, user, view_id, view_type, context):
         res = super(product_product, self).view_header_get(cr, user, view_id, view_type, context)
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 5e684d90752..229ea2081cd 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -486,6 +486,7 @@ class stock_picking(osv.osv):
         'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date",
                  method=True, store=True, type='datetime', string='Max. Expected Date', select=2),
         'move_lines': fields.one2many('stock.move', 'picking_id', 'Entry lines', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
+        'delivery_line':fields.one2many('stock.delivery', 'picking_id', 'Delivery lines', readonly=True),
         'auto_picking': fields.boolean('Auto-Picking'),
         'address_id': fields.many2one('res.partner.address', 'Partner', help="Address of partner"),
         'invoice_state': fields.selection([
@@ -856,7 +857,7 @@ class stock_picking(osv.osv):
                 continue
         return super(stock_picking, self).unlink(cr, uid, ids, context=context)
 
-    def do_partial(self, cr, uid, ids, partial_datas, context):
+    def do_partial(self, cr, uid, ids, partial_datas, context={}):
         """
         @ partial_datas : dict. contain details of partial picking 
                           like partner_id, address_id, delivery_date, delivery moves with product_id, product_qty, uom
@@ -869,6 +870,7 @@ class stock_picking(osv.osv):
         users_obj = self.pool.get('res.users')
         uom_obj = self.pool.get('product.uom')
         price_type_obj = self.pool.get('product.price.type')
+        sequence_obj = self.pool.get('ir.sequence')
         wf_service = netsvc.LocalService("workflow")
         partner_id = partial_datas.get('partner_id', False)
         address_id = partial_datas.get('address_id', False)
@@ -877,11 +879,13 @@ class stock_picking(osv.osv):
             new_picking = None
             new_moves = []
 
-            complete, too_many, too_few = [], [], []        
+            complete, too_many, too_few = [], [], []
+            move_product_qty = {}
             for move in pick.move_lines:
-                partial_data = partial_datas.get('move%s'%(move.id), False)
+                partial_data = partial_datas.get('move%s'%(move.id), False)                
                 assert partial_data, _('Do not Found Partial data of Stock Move Line :%s' %(move.id))
                 product_qty = partial_data.get('product_qty',0.0)
+                move_product_qty[move.id] = product_qty
                 product_uom = partial_data.get('product_uom',False)
                 product_price = partial_data.get('product_price',0.0)
                 product_currency = partial_data.get('product_currency',False)
@@ -919,20 +923,14 @@ class stock_picking(osv.osv):
                                 {pricetype.field: new_std_price})
                         move_obj.write(cr, uid, [move.id], {'price_unit': new_price})
 
-            delivery_id = delivery_obj.create(cr, uid, {
-                'name':  pick.name,                                 
-                'partner_id': partner_id,
-                'address_id': address_id,
-                'date': delivery_date,                
-                'picking_id':pick.id
-            }, context=context)
-
+            
             for move in too_few:
+                product_qty = move_product_qty[move.id]
                 if not new_picking:
 
                     new_picking = self.copy(cr, uid, pick.id,
                             {
-                                'name': pool.get('ir.sequence').get(cr, uid, 'stock.picking.%s'%(pick.type)),
+                                'name': sequence_obj.get(cr, uid, 'stock.picking.%s'%(pick.type)),
                                 'move_lines' : [],
                                 'state':'draft',
                             })
@@ -942,8 +940,7 @@ class stock_picking(osv.osv):
                         {
                             'product_qty' : product_qty,
                             'product_uos_qty': product_qty, #TODO: put correct uos_qty
-                            'picking_id' : new_picking,
-                            'delivery_id' : delivery_id,
+                            'picking_id' : new_picking,                            
                             'state': 'assigned',
                             'move_dest_id': False,                            
                             'price_unit': move.price_unit,
@@ -959,6 +956,7 @@ class stock_picking(osv.osv):
             if new_picking:
                 move_obj.write(cr, uid, [c.id for c in complete], {'picking_id': new_picking})
                 for move in too_many:
+                    product_qty = move_product_qty[move.id]
                     move_obj.write(cr, uid, [move.id],
                             {
                                 'product_qty' : product_qty,
@@ -967,10 +965,11 @@ class stock_picking(osv.osv):
                             })
             else:
                 for move in too_many:
+                    product_qty = move_product_qty[move.id]
                     move_obj.write(cr, uid, [move.id],
                             {
                                 'product_qty': product_qty,
-                                'product_uos_qty': product_qty
+                                'product_uos_qty': product_qty #TODO: put correct uos_qty
                             })
 
             # At first we confirm the new picking (if necessary)            
@@ -982,13 +981,22 @@ class stock_picking(osv.osv):
                 self.action_move(cr, uid, [new_picking])
                 wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_done', cr)
                 wf_service.trg_write(uid, 'stock.picking', pick.id, cr)
+                delivered_pack_id = new_picking
             else:
                 self.action_move(cr, uid, [pick.id])
-                wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_done', cr)
-            bo_name = ''
-            if new_picking:
-                bo_name = pick_obj.read(cr, uid, [new_picking], ['name'])[0]['name']
-            res[pick.id] = {'new_picking': new_picking or False, 'back_order':bo_name}
+                wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_done', cr) 
+                delivered_pack_id = pick.id
+
+            delivered_pack = self.browse(cr, uid, delivered_pack_id, context=context) 
+            delivery_id = delivery_obj.create(cr, uid, {
+                'name':  delivered_pack.name,                                 
+                'partner_id': partner_id,
+                'address_id': address_id,
+                'date': delivery_date,
+                'picking_id' :  pick.id,                  
+                'move_delivered' : [(6,0, map(lambda x:x.id, delivered_pack.move_lines))]             
+            }, context=context)            
+            res[pick.id] = {'delivered_picking': delivered_pack.id or False}
         return res
 
 stock_picking()
@@ -1090,7 +1098,21 @@ class stock_production_lot_revision(osv.osv):
 stock_production_lot_revision()
     
 class stock_delivery(osv.osv):
+    
+    """ Tracability of partialdeliveries """
+    
     _name = "stock.delivery"
+    _description = "Delivery"
+    _columns = {
+        'name': fields.char('Name', size=60, required=True),  
+        'date': fields.datetime('Date', required=True),
+        'partner_id': fields.many2one('res.partner', 'Partner', required=True),
+        'address_id': fields.many2one('res.partner.address', 'Address', required=True),
+        'move_delivered':fields.one2many('stock.move', 'delivered_id', 'Move Delivered'),
+        'picking_id': fields.many2one('stock.picking', 'Picking list', required=True),
+        
+    }
+    
 stock_delivery()
 # ----------------------------------------------------
 # Move
@@ -1892,26 +1914,8 @@ class stock_warehouse(osv.osv):
     _defaults = {
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.inventory', context=c),
     }
-stock_warehouse()
-    
-class stock_delivery(osv.osv):
-    
-    """ Tracability of partialdeliveries """
-    
-    _name = "stock.delivery"
-    _description = "Delivery"
-    _columns = {
-        'name': fields.char('Name', size=60, required=True),  
-        'date': fields.datetime('Date'),
-        'partner_id': fields.many2one('res.partner', 'Partner'),
-        'address_id': fields.many2one('res.partner.address', 'Address'),
-        'product_delivered':fields.one2many('stock.move', 'delivered_id', 'Product Delivered', domain=[('picking_id.type','=','in')]),
-        'picking_id': fields.many2one('stock.picking', 'Picking list'),
-        
-    }
+stock_warehouse()   
 
-    
-stock_delivery()
 
 # Move wizard :
 #    get confirm or assign stock move lines of partner and put in current picking.
diff --git a/addons/stock/stock_sequence.xml b/addons/stock/stock_sequence.xml
index d65c3df8fcb..9c5083d13b4 100644
--- a/addons/stock/stock_sequence.xml
+++ b/addons/stock/stock_sequence.xml
@@ -20,6 +20,11 @@
             <field name="code">stock.picking.internal</field>
         </record>
 
+        <record id="seq_type_picking_delivery" model="ir.sequence.type">
+            <field name="name">Picking Delivery</field>
+            <field name="code">stock.picking.delivery</field>
+        </record>
+
 		<!--
     		Sequences for pickings
     	-->
@@ -45,6 +50,13 @@
             <field name="padding">5</field>
         </record>
 
+        <record id="seq_picking_delivery" model="ir.sequence">
+            <field name="name">Picking DLV</field>
+            <field name="code">stock.picking.delivery</field>
+            <field name="prefix">DLV/</field>
+            <field name="padding">5</field>
+        </record>
+
         <!--
     Sequences from tracking numbers
     -->
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 67fefcd0304..ec07a2f9845 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -565,7 +565,7 @@
                     <field name="date"/>
                     <field name="min_date"/>
                     <field name="state"/>
-                    <button name="%(partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-go-forward" help="Validate Picking"/>
+                    <button name="%(action_partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-go-forward" help="Validate Picking"/>
                     <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the picking.   Do you want to continue?"/>
                 </tree>
             </field>
@@ -672,7 +672,7 @@
                                 <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"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                                <button name="%(partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-apply"/>
+                                <button name="%(action_partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-apply"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
@@ -732,7 +732,7 @@
                     <field name="date" select="1"/>
                     <field name="min_date" select="1"/>
                     <field name="state" select="1"/>
-                    <button name="%(partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-go-forward" help="Validate Delivery"/>
+                    <button name="%(action_partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-go-forward" help="Validate Delivery"/>
                     <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the delivery.    Do you want to continue?"/>
                 </tree>
             </field>
@@ -833,7 +833,7 @@
                                 <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"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                                <button name="%(partial_picking)d" states="assigned" string="Products Sent" type="action" icon="gtk-go-forward"/>
+                                <button name="%(action_partial_picking)d" states="assigned" string="Products Sent" type="action" icon="gtk-go-forward"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
@@ -926,7 +926,7 @@
                     <field name="min_date"/>
                     <field name="invoice_state"/>
                     <field name="state"/>
-                    <button name="%(partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-go-forward" help="Validate Picking"/>
+                    <button name="%(action_partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-go-forward" help="Validate Picking"/>
                     <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the picking.    Do you want to continue?"/>
                 </tree>
             </field>
@@ -1030,10 +1030,13 @@
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-yes"/>
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" groups="base.group_extended" icon="gtk-apply"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                                <button name="%(partial_picking)d" states="assigned" string="Picking Done" type="action" icon="gtk-execute"/>
+                                <button name="%(action_partial_picking)d" states="assigned" string="Picking Done" type="action" icon="gtk-execute"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
+                        <page string="Delivery Info">
+                            <field colspan="4" name="delivery_line" nolabel="1"/>
+                        </page>
                         <page string="Notes">
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
@@ -1101,7 +1104,7 @@
             <field name="view_mode">calendar</field>
             <field name="act_window_id" ref="action_picking_tree"/>
         </record>
-<!--        <menuitem action="action_picking_tree" id="menu_action_picking_tree" parent="menu_stock_root" sequence="19"/>-->
+        <menuitem action="action_picking_tree" id="menu_action_picking_tree" parent="menu_stock_warehouse_mgmt" sequence="5"/>
 
         <record id="view_picking_in_tree" model="ir.ui.view">
             <field name="name">stock.picking.in.tree</field>
@@ -1117,7 +1120,7 @@
                     <field name="min_date"/>
                     <field name="invoice_state"/>
                     <field name="state"/>
-                    <button name="%(partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-ok" help="Receive products"/>
+                    <button name="%(action_partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-ok" help="Receive products"/>
                     <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the shipment. Do you want to continue?" />
                 </tree>
             </field>
@@ -1220,10 +1223,13 @@
                                 <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"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" groups="base.group_extended" icon="gtk-jump-to"/>
-                                <button name="%(partial_picking)d" states="assigned" string="Products Received" type="action" icon="gtk-ok"/>
+                                <button name="%(action_partial_picking)d" states="assigned" string="Products Received" type="action" icon="gtk-ok"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
+                        <page string="Delivery Info">
+                            <field colspan="4" name="delivery_line" nolabel="1"/>
+                        </page>
                         <page string="Notes">
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
@@ -1760,7 +1766,7 @@
 	                    <field name="address_id"/>
 	                    <field name="picking_id"/>
 	                    <separator string="Product Delivered Information" colspan="4" />
-	                    <field name="product_delivered" colspan="4" nolabel="1" widget="one2many" mode="tree,form">
+	                    <field name="move_delivered" colspan="4" nolabel="1" widget="one2many" mode="tree,form">
 	                       <tree string="Stock Moves" editable="top">
 			                    <field name="picking_id" string="Reference"/>
 			                    <field name="origin" string="Latest Requisition"/>
@@ -1783,7 +1789,7 @@
                 	<field name="name"/>
                     <field name="date"/>
                     <field name="partner_id"/>
-                    <field name="product_delivered"/>
+                    <field name="address_id"/>
                 </tree>
             </field>
         </record>
@@ -1792,8 +1798,7 @@
             <field name="name">Delivered Products</field>
             <field name="res_model">stock.delivery</field>
             <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-           <!-- <field name="target">new</field>      -->      
+            <field name="view_type">form</field>            
             <field name="view_mode">form,tree</field>
             <field name="view_id" ref="view_stock_delivery_tree"/>
         </record>        
diff --git a/addons/stock/stock_wizard.xml b/addons/stock/stock_wizard.xml
index 86b91e462d8..7e727eb20f7 100644
--- a/addons/stock/stock_wizard.xml
+++ b/addons/stock/stock_wizard.xml
@@ -13,14 +13,7 @@
             multi="True"
             name="stock.move.split"
             string="Split move line"/>
-
-        <wizard
-            id="partial_picking"
-            model="stock.picking"
-            menu="False"
-			keyword="client_action_multi"
-            name="stock.partial_picking"
-            string="Partial picking"/>
+        
 
 		<wizard 
 			id="make_picking" 
@@ -61,4 +54,4 @@
         id="wizard_merge_inventory"/>
 
    </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py
index fabee37650c..2d085edcef5 100644
--- a/addons/stock/wizard/__init__.py
+++ b/addons/stock/wizard/__init__.py
@@ -21,7 +21,7 @@
 
 import stock_traceability
 import stock_move   
-import wizard_partial_picking
+import stock_partial_picking
 import wizard_partial_move
 import wizard_picking_make
 import wizard_replacement
diff --git a/addons/stock/wizard/stock_change_standard_price.py b/addons/stock/wizard/stock_change_standard_price.py
index 337a59f1624..8e2ec5f555e 100644
--- a/addons/stock/wizard/stock_change_standard_price.py
+++ b/addons/stock/wizard/stock_change_standard_price.py
@@ -79,9 +79,9 @@ class change_standard_price(osv.osv_memory):
         price = product_obj.standard_price
         diff = price - new_price
         if diff > 0 : 
-            return {'value' : {'enable_stock_in_out_acc':False}}
-        else :
             return {'value' : {'enable_stock_in_out_acc':True}}
+        else :
+            return {'value' : {'enable_stock_in_out_acc':False}}
         
     def change_price(self, cr, uid, ids, context):
         """ 
diff --git a/addons/stock/wizard/stock_change_standard_price_view.xml b/addons/stock/wizard/stock_change_standard_price_view.xml
index 4382a35558e..ffca108390d 100644
--- a/addons/stock/wizard/stock_change_standard_price_view.xml
+++ b/addons/stock/wizard/stock_change_standard_price_view.xml
@@ -7,17 +7,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Change Standard Price">
-             		<field name="new_price" on_change="onchange_price(new_price, context)" context="{'active_id': active_id}"/>
-              		<newline/>
-                    <field name="stock_account_input" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"  attrs="{'readonly':[('enable_stock_in_out_acc','=',False)],'required': [('enable_stock_in_out_acc','=',True)]}"/>
-              		<newline/>
-                    <field name="stock_account_output" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('enable_stock_in_out_acc','=',True)],'required': [('enable_stock_in_out_acc','=',False)]}"/>
-              		<newline/>
-              		<field name="stock_journal"/>
-              		<field name="enable_stock_in_out_acc" invisible="1"/>
-              		<group col="2" colspan="4">
-	              		<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-	              		<button name="change_price" string="Change" type="object" icon="gtk-ok"/>
+             		<field name="new_price"/>              		
+                    <separator string="" colspan="4" />
+                    <label string="" colspan="2"/>
+              		<group col="2" colspan="2">                        
+	              		<button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+	              		<button name="change_price" string="_Apply" type="object" icon="gtk-apply"/>
               		</group>
               </form>
             </field>
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
new file mode 100644
index 00000000000..bc23d0371d0
--- /dev/null
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -0,0 +1,237 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields, osv
+from service import web_services
+from tools.translate import _
+import netsvc
+import pooler
+import time
+
+class stock_partial_picking(osv.osv_memory):
+    _name = "stock.partial.picking"
+    _description = "Partial Picking"
+    _columns = {
+                'date': fields.datetime('Date', required=True),
+                'partner_id': fields.many2one('res.partner',string="Partner", required=True),
+                'address_id': fields.many2one('res.partner.address', 'Delivery Address', help="Address where goods are to be delivered", required=True),
+                               
+     }
+
+    def view_init(self, cr, uid, fields_list, context=None):
+        res = super(stock_partial_picking, self).view_init(cr, uid, fields_list, context=context)
+        pick_obj = self.pool.get('stock.picking')        
+        if not context:
+            context={}
+        moveids = []
+        for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):            
+            for m in pick.move_lines:
+                if m.state in ('done', 'cancel'):
+                    continue
+                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:
+                    self._columns['move%s_product_qty'%(m.id)] = fields.float("Quantity")
+                if 'move%s_product_uom'%(m.id) not in self._columns:
+                    self._columns['move%s_product_uom'%(m.id)] = fields.many2one('product.uom',string="Product UOM")
+
+                if (pick.type == 'in') and (m.product_id.cost_method == 'average'):
+                    if 'move%s_product_price'%(m.id) not in self._columns:
+                        self._columns['move%s_product_price'%(m.id)] = fields.float("Price")
+                    if 'move%s_product_currency'%(m.id) not in self._columns:
+                        self._columns['move%s_product_currency'%(m.id)] = fields.many2one('res.currency',string="Currency")
+        return res   
+
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
+        result = super(stock_partial_picking, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)        
+        pick_obj = self.pool.get('stock.picking')
+        picking_ids = context.get('active_ids', False)        
+        if not picking_ids:
+            return result
+        if view_type in ['form']:
+            _moves_arch_lst = """<form string="Deliver Products">
+                        <separator colspan="4" string="Delivery Information"/>
+                    	<field name="date" colspan="4" />
+                    	<field name="partner_id"/>
+                    	<field name="address_id"/>
+                    	<newline/>
+                        <separator colspan="4" string="Move Detail"/>
+                    	"""
+            _moves_fields = result['fields']
+            for pick in pick_obj.browse(cr, uid, picking_ids, context):
+                for m in pick.move_lines:
+                    if m.state in ('done', 'cancel'):
+                        continue
+                    _moves_fields.update({
+                        'move%s_product_id'%(m.id)  : {
+                                    'string': _('Product'),
+                                    'type' : 'many2one', 
+                                    'relation': 'product.product', 
+                                    'required' : True, 
+                                    'readonly' : True,                                    
+                                    },
+                        'move%s_product_qty'%(m.id) : {
+                                    'string': _('Quantity'),
+                                    'type' : 'float',
+                                    'required': True,                                    
+                                    },
+                        'move%s_product_uom'%(m.id) : {
+                                    'string': _('Product UOM'),
+                                    'type' : 'many2one', 
+                                    'relation': 'product.uom', 
+                                    'required' : True, 
+                                    'readonly' : True,                                    
+                                    }
+                    })                
+                    
+                    _moves_arch_lst += """
+                        <group colspan="4" col="10">
+                        <field name="move%s_product_id" />
+                        <field name="move%s_product_qty" />
+                        <field name="move%s_product_uom" />
+                    """%(m.id, m.id, m.id)
+                    if (pick.type == 'in') and (m.product_id.cost_method == 'average'):                        
+                        _moves_fields.update({
+                            'move%s_product_price'%(m.id) : {
+                                    'string': _('Price'),
+                                    'type' : 'float',
+                                    },
+                            'move%s_product_currency'%(m.id): {
+                                    'string': _('Currency'),
+                                    'type' : 'float',      
+                                    'type' : 'many2one', 
+                                    'relation': 'res.currency',                                    
+                                    }
+                        })
+                        _moves_arch_lst += """
+                            <field name="move%s_product_price" />
+                            <field name="move%s_product_currency" />
+                        """%(m.id, m.id)
+                    _moves_arch_lst += """
+                        </group>
+                        """
+                _moves_arch_lst += """
+                        <separator string="" colspan="4" />
+                        <label string="" colspan="2"/>
+                        <group col="2" colspan="2">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="_Cancel" />
+                		<button name="do_partial" string="_Deliver"
+                			colspan="1" type="object" icon="gtk-apply" />
+                	</group>                	
+                </form>"""
+            result['arch'] = _moves_arch_lst
+            result['fields'] = _moves_fields           
+        return result
+
+    def default_get(self, cr, uid, fields, context=None):
+        """ 
+             To get default values for the object.
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param fields: List of fields for which we want default values 
+             @param context: A standard dictionary 
+             
+             @return: A dictionary which of fields with values. 
+        
+        """ 
+
+        res = super(stock_partial_picking, self).default_get(cr, uid, fields, context=context)
+        pick_obj = self.pool.get('stock.picking')        
+        if not context:
+            context={}
+        moveids = []
+        for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):
+            if 'partner_id' in fields:
+                res.update({'partner_id': pick.address_id.partner_id.id})                
+            if 'address_id' in fields:
+                res.update({'address_id': pick.address_id.id})                        
+            if 'date' in fields:
+                res.update({'date': pick.date})
+            for m in pick.move_lines:
+                if m.state in ('done', 'cancel'):
+                    continue
+                if 'move%s_product_id'%(m.id) in fields:
+                    res['move%s_product_id'%(m.id)] = m.product_id.id
+                if 'move%s_product_qty'%(m.id) in fields:
+                    res['move%s_product_qty'%(m.id)] = m.product_qty
+                if 'move%s_product_uom'%(m.id) in fields:
+                    res['move%s_product_uom'%(m.id)] = m.product_uom.id
+
+                if (pick.type == 'in') and (m.product_id.cost_method == 'average'):
+                    price = 0
+                    if hasattr(m, 'purchase_line_id') and m.purchase_line_id:
+                        price = m.purchase_line_id.price_unit
+
+                    currency = False
+                    if hasattr(pick, 'purchase_id') and pick.purchase_id:
+                        currency = pick.purchase_id.pricelist_id.currency_id.id
+        
+                    if 'move%s_product_price'%(m.id) in fields:
+                        res['move%s_product_price'%(m.id)] = price
+                    if 'move%s_product_currency'%(m.id) in fields:
+                        res['move%s_product_currency'%(m.id)] = currency
+        return res   
+
+    def do_partial(self, cr, uid, ids, context):    
+        pick_obj = self.pool.get('stock.picking')    
+        picking_ids = context.get('active_ids', False)
+        partial = self.browse(cr, uid, ids[0], context)
+        partial_datas = {
+            'partner_id' : partial.partner_id and partial.partner_id.id or False,
+            'address_id' : partial.address_id and partial.address_id.id or False,
+            'delivery_date' : partial.date         
+        }
+        for pick in pick_obj.browse(cr, uid, picking_ids):
+            for m in pick.move_lines:
+                if m.state in ('done', 'cancel'):
+                    continue
+                partial_datas['move%s'%(m.id)] = {
+                    'product_id' : getattr(partial, 'move%s_product_id'%(m.id)),
+                    'product_qty' : getattr(partial, 'move%s_product_qty'%(m.id)),
+                    'product_uom' : getattr(partial, 'move%s_product_uom'%(m.id))
+                }
+
+                if (pick.type == 'in') and (m.product_id.cost_method == 'average'):   
+                    partial_datas['move%s'%(m.id)].update({             
+                        'product_price' : getattr(partial, 'move%s_product_price'%(m.id)),
+                        'product_currency': getattr(partial, 'move%s_product_currency'%(m.id))
+                    })  
+        
+        res = pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)
+        return {}
+ 
+stock_partial_picking()    
+
+
+
+#_moves_arch_end = '''<?xml version="1.0"?>
+#<form string="Picking result">
+#    <label string="The picking has been successfully made !" colspan="4"/>
+#    <field name="back_order_notification" colspan="4" nolabel="1"/>
+#</form>'''
+
+#_moves_fields_end = {
+#    'back_order_notification': {'string':'Back Order' ,'type':'text', 'readonly':True}
+#                     }
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml
new file mode 100644
index 00000000000..2f901b9884d
--- /dev/null
+++ b/addons/stock/wizard/stock_partial_picking_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>		    	
+  		<record id="action_partial_picking" model="ir.actions.act_window">
+            <field name="name">Making Picking</field>
+  			<field name="res_model">stock.partial.picking</field>                        
+            <field name="view_type">form</field>            
+           	<field name="view_mode">form</field>            
+            <field name="target">new</field>
+        </record>	
+
+    </data>
+</openerp>
diff --git a/addons/stock/wizard/wizard_partial_picking.py b/addons/stock/wizard/wizard_partial_picking.py
deleted file mode 100644
index f602553d140..00000000000
--- a/addons/stock/wizard/wizard_partial_picking.py
+++ /dev/null
@@ -1,306 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-import netsvc
-from tools.misc import UpdateableStr, UpdateableDict
-import pooler
-
-import wizard
-from osv import osv
-import tools
-from tools.translate import _
-
-_moves_arch = UpdateableStr()
-_moves_fields = UpdateableDict()
-
-_moves_arch_end = '''<?xml version="1.0"?>
-<form string="Picking result">
-    <label string="The picking has been successfully made !" colspan="4"/>
-    <field name="back_order_notification" colspan="4" nolabel="1"/>
-</form>'''
-
-_moves_fields_end = {
-    'back_order_notification': {'string':'Back Order' ,'type':'text', 'readonly':True}
-                     }
-
-def make_default(val):
-    def fct(uid, data, state):
-        return val
-    return fct
-
-def _to_xml(s):
-    return (s or '').replace('&','&amp;').replace('<','&lt;').replace('>','&gt;')
-
-def _get_moves(self, cr, uid, data, context):
-    pick_obj = pooler.get_pool(cr.dbname).get('stock.picking')
-    pick = pick_obj.browse(cr, uid, [data['id']], context)[0]
-    res = {}
-
-    _moves_fields.clear()
-    #TODO: cleanup and  this code..
-    
-    _moves_arch_lst = ['<?xml version="1.0"?>', '<form string="Make picking">']
-    _moves_arch_lst.append('<field name="partner_id%d"/>' % (pick.id,))
-    _moves_fields['partner_id%s' % pick.id] ={'string':'Partner', 
-            'type':'many2one', 'relation':'res.partner', 'required' : '1','default': make_default(pick.address_id.partner_id.id)}
-    _moves_arch_lst.append('<field name="address_id%d"/>' % (pick.id))
-    
-    _moves_fields['address_id%s' % pick.id] ={'string':'Delivery Address', 
-                                                'type':'many2one', 'relation':'res.partner.address', 'required' : '1','default': make_default(pick.address_id.id)}
-    _moves_arch_lst.append('<newline/>')
-    _moves_arch_lst.append('<field name="date%d"/>' % (pick.id))
-    
-    _moves_fields['date%s' % pick.id] ={'string':'Date', 
-                                                'type':'date', 'required' : '1','default': make_default(pick.date)}
-    _moves_arch_lst.append('<newline/>')
-    _moves_arch_lst.append('<separator string="Delivery Detail" colspan="4"/>')
-    _moves_arch_lst.append('<label string="Product" align="0.0" />')
-    _moves_arch_lst.append('<label string="Quantity" align="10.0" />')
-    _moves_arch_lst.append('<label string="UOM" align="10.0" />')
-    for m in pick.move_lines:
-        if m.state in ('done', 'cancel'):
-            continue
-        quantity = m.product_qty
-        if m.state!='assigned':
-            quantity = 0
-            _moves_fields
-    
-        _moves_arch_lst.append('<group colspan="6" col="3">')    
-        _moves_arch_lst.append('<field name="name%s"  nolabel="1" />' % (m.id,))
-        _moves_fields['name%s' % m.id] = {
-                'string': 'Product',
-                'type' : 'many2one', 'relation': 'product.product', 'required' : True, 'default' : make_default(m.product_id.id)}
-        _moves_arch_lst.append('<field name="move%s" nolabel="1" />' % (m.id,))
-        _moves_fields['move%s' % m.id] = {
-                'string': 'Quantity',
-                'type' : 'float', 'required' : True, 'default' : make_default(quantity)}
-        
-        _moves_arch_lst.append('<field name="uom%s" nolabel="1"/>'% (m.id,))
-        
-        _moves_fields['uom%s' % m.id] = {'string': 'UOM', 'type': 'many2one',
-                    'relation': 'product.uom', 'readonly':True,'required': True,
-                    'default': make_default(m.product_uom.id)}        
-        
-        _moves_arch_lst.append('</group>')            
-        if (pick.type == 'in') and (m.product_id.cost_method == 'average'):
-            price=0
-            if hasattr(m, 'purchase_line_id') and m.purchase_line_id:
-                price=m.purchase_line_id.price_unit
-
-            currency=0
-            if hasattr(pick, 'purchase_id') and pick.purchase_id:
-                currency=pick.purchase_id.pricelist_id.currency_id.id
-
-            _moves_arch_lst.append('<group col="6"><field name="uom%s" nolabel="1"/>\
-                    <field name="price%s"/>' % (m.id,m.id,))
-
-            _moves_fields['price%s' % m.id] = {'string': 'Unit Price',
-                    'type': 'float', 'required': True, 'default': make_default(price)}
-
-            _moves_fields['uom%s' % m.id] = {'string': 'UOM', 'type': 'many2one',
-                    'relation': 'product.uom', 'required': True,
-                    'default': make_default(m.product_uom.id)}
-
-            _moves_arch_lst.append('<field name="currency%d" nolabel="1"/></group>' % (m.id,))
-            _moves_fields['currency%s' % m.id] = {'string': 'Currency',
-                    'type': 'many2one', 'relation': 'res.currency',
-                    'required': True, 'default': make_default(currency)}
-        
-                    
-        _moves_arch_lst.append('<newline/>')
-
-                
-        _moves_arch_lst.append('<newline/>')
-        res.setdefault('moves', []).append(m.id)
-    
-    _moves_arch_lst.append('</form>')
-    _moves_arch.string = '\n'.join(_moves_arch_lst)
-    return res
-
-def _do_split(self, cr, uid, data, context):
-    move_obj = pooler.get_pool(cr.dbname).get('stock.move')
-    pick_obj = pooler.get_pool(cr.dbname).get('stock.picking')
-    delivery_obj = pooler.get_pool(cr.dbname).get('stock.delivery')
-    pick = pick_obj.browse(cr, uid, [data['id']])[0]
-    new_picking = None
-    new_moves = []
-
-    complete, too_many, too_few = [], [], []
-    pool = pooler.get_pool(cr.dbname)
-    for move in move_obj.browse(cr, uid, data['form'].get('moves',[])):
-        if move.product_qty == data['form']['move%s' % move.id]:
-            complete.append(move)
-        elif move.product_qty > data['form']['move%s' % move.id]:
-            too_few.append(move)
-        else:
-            too_many.append(move)
-
-        # Average price computation
-        if (pick.type == 'in') and (move.product_id.cost_method == 'average'):
-            product_obj = pool.get('product.product')
-            currency_obj = pool.get('res.currency')
-            users_obj = pool.get('res.users')
-            uom_obj = pool.get('product.uom')
-
-            product = product_obj.browse(cr, uid, [move.product_id.id])[0]
-            user = users_obj.browse(cr, uid, [uid])[0]
-
-            qty = data['form']['move%s' % move.id]
-            uom = data['form']['uom%s' % move.id]
-            price = data['form']['price%s' % move.id]
-            currency = data['form']['currency%s' % move.id]
-
-            qty = uom_obj._compute_qty(cr, uid, uom, qty, product.uom_id.id)
-            pricetype=pool.get('product.price.type').browse(cr,uid,user.company_id.property_valuation_price_type.id)
-            if (qty > 0):
-                new_price = currency_obj.compute(cr, uid, currency,
-                        user.company_id.currency_id.id, price)
-                new_price = uom_obj._compute_price(cr, uid, uom, new_price,
-                        product.uom_id.id)
-                if product.qty_available<=0:
-                    new_std_price = new_price
-                else:
-                    # Get the standard price
-                    amount_unit=product.price_get(pricetype.field, context)[product.id]
-                    new_std_price = ((amount_unit * product.qty_available)\
-                        + (new_price * qty))/(product.qty_available + qty)
-                        
-                # Write the field according to price type field
-                product_obj.write(cr, uid, [product.id],
-                        {pricetype.field: new_std_price})
-                move_obj.write(cr, uid, [move.id], {'price_unit': new_price})
-
-    for move in too_few:
-        if not new_picking:
-
-            new_picking = pick_obj.copy(cr, uid, pick.id,
-                    {
-                        'name': pool.get('ir.sequence').get(cr, uid, 'stock.picking.in'),
-                        'move_lines' : [],
-                        'state':'draft',
-                    })
-        if data['form']['move%s' % move.id] != 0:
-            
-            new_obj = move_obj.copy(cr, uid, move.id,
-                {
-                    'product_qty' : data['form']['move%s' % move.id],
-                    'product_uos_qty':data['form']['move%s' % move.id],
-                    'picking_id' : new_picking,
-                    'state': 'assigned',
-                    'move_dest_id': False,
-                    'partner_id': data['form']['partner_id%s' % pick.id],
-                    'address_id': data['form']['address_id%s' % pick.id],
-                    'price_unit': move.price_unit,
-                })
-            delivery_id = delivery_obj.search(cr,uid, [('name','=',pick.name)]) 
-            if  not  delivery_id :
-                delivery_id = delivery_obj.create(cr, uid, {
-                        'name':  pick.name,                                 
-                        'partner_id': data['form']['partner_id%s' % pick.id],
-                        'address_id': data['form']['address_id%s' % pick.id],
-                        'date': move.date,
-                        'product_delivered':[(6,0, [new_obj])],
-                        'picking_id':move.picking_id.id
-                    }, context=context)   
-            if not isinstance(delivery_id, (int, long)): 
-               delivery_id=delivery_id[0]
-               delivery_obj.write(cr, uid, [delivery_id], {'product_delivered': [(4, new_obj)]})
-                        
-        move_obj.write(cr, uid, [move.id],
-                {
-                    'product_qty' : move.product_qty - data['form']['move%s' % move.id],
-                    'product_uos_qty':move.product_qty - data['form']['move%s' % move.id],
-                  #  'delivered_id':delivery_id
-                })
-
-    if new_picking:
-        move_obj.write(cr, uid, [c.id for c in complete], {'picking_id': new_picking})
-        for move in too_many:
-            move_obj.write(cr, uid, [move.id],
-                    {
-                        'product_qty' : data['form']['move%s' % move.id],
-                        'product_uos_qty': data['form']['move%s' % move.id],
-                        'picking_id': new_picking,
-                    })
-    else:
-        for move in too_many:
-            move_obj.write(cr, uid, [move.id],
-                    {
-                        'product_qty': data['form']['move%s' % move.id],
-                        'product_uos_qty': data['form']['move%s' % move.id]
-                    })
-
-    # At first we confirm the new picking (if necessary)
-    wf_service = netsvc.LocalService("workflow")
-    if new_picking:
-        wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_confirm', cr)
-    # Then we finish the good picking
-    if new_picking:
-        pick_obj.write(cr, uid, [pick.id], {'backorder_id': new_picking})
-        pick_obj.action_move(cr, uid, [new_picking])
-        wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_done', cr)
-        wf_service.trg_write(uid, 'stock.picking', pick.id, cr)
-    else:
-        pick_obj.action_move(cr, uid, [pick.id])
-        wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_done', cr)
-    bo_name = ''
-    if new_picking:
-        bo_name = pick_obj.read(cr, uid, [new_picking], ['name'])[0]['name']
-    return {'new_picking':new_picking or False, 'back_order':bo_name}
-
-def _get_default(self, cr, uid, data, context):
-    if data['form']['back_order']:
-        data['form']['back_order_notification'] = _('Back Order %s Assigned to this Picking.') % (tools.ustr(data['form']['back_order']),)
-    return data['form']
-
-class partial_picking(wizard.interface):
-
-    states = {
-        'init': {
-            'actions': [ _get_moves ],
-            'result': {'type': 'form', 'arch': _moves_arch, 'fields': _moves_fields,
-                'state' : (
-                    ('end', 'Cancel', 'gtk-cancel'),
-                    ('split', 'Make Picking', 'gtk-apply', True)
-                )
-            },
-        },
-        'split': {
-            'actions': [ _do_split ],
-            'result': {'type': 'state', 'state': 'end2'},
-        },
-        'end2': {
-            'actions': [ _get_default ],
-            'result': {'type': 'form', 'arch': _moves_arch_end,
-                'fields': _moves_fields_end,
-                'state': (
-                    ('end', 'Close'),
-                )
-            },
-        },
-    }
-
-partial_picking('stock.partial_picking')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From 5653f51a43724eaacc1fff4464501803d6b4d59f Mon Sep 17 00:00:00 2001
From: "kum (Open ERP)" <kum@tinyerp.co.in>
Date: Fri, 26 Mar 2010 15:34:20 +0530
Subject: [PATCH 227/251] [FIX] project_long_term: If resource has no
 calendar_id leaves not be considered for that resource now

bzr revid: kum@tinyerp.co.in-20100326100420-d8gfh5kib18y78t0
---
 addons/project_long_term/wizard/compute_tasks_date.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/project_long_term/wizard/compute_tasks_date.py b/addons/project_long_term/wizard/compute_tasks_date.py
index 6ef53a6c802..77e7bbd6512 100644
--- a/addons/project_long_term/wizard/compute_tasks_date.py
+++ b/addons/project_long_term/wizard/compute_tasks_date.py
@@ -76,7 +76,8 @@ class wizard_compute_tasks(wizard.interface):
                 if resource_id:
 #                    resource = resource_obj.browse(cr, uid, resource_id, context=context)[0]
                     resource = resource_obj.read(cr, uid, resource_id, ['calendar_id','time_efficiency'], context=context)[0]
-                    leaves = wkcal.compute_leaves(cr, uid, calendar_id , resource_id[0], resource.get('calendar_id')[0])
+                    if resource.get('calendar_id', False):
+                       leaves = wkcal.compute_leaves(cr, uid, calendar_id , resource_id[0], resource['calendar_id'] and resource['calendar_id'][0] or False)
                     time_efficiency = resource.get('time_efficiency')
                 resources.append(classobj((user.name.encode('utf8')), (Resource,), {'__doc__': user.name,
                                                                         '__name__': user.name,

From 17968f108d4b7acb5bc8301023fc93f63f364047 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Fri, 26 Mar 2010 15:45:01 +0530
Subject: [PATCH 228/251] [IMP] mrp: if cost price of component is changed,
 also change cost price of main product

bzr revid: hmo@tinyerp.com-20100326101501-vlreabb9h6ishpqf
---
 addons/mrp/__init__.py |  1 +
 addons/mrp/product.py  | 70 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 addons/mrp/product.py

diff --git a/addons/mrp/__init__.py b/addons/mrp/__init__.py
index 11d210e791e..39d97d0ba11 100644
--- a/addons/mrp/__init__.py
+++ b/addons/mrp/__init__.py
@@ -21,6 +21,7 @@
 
 import mrp
 import stock
+import product
 import installer
 import wizard
 import report
diff --git a/addons/mrp/product.py b/addons/mrp/product.py
new file mode 100644
index 00000000000..375bd0c9f46
--- /dev/null
+++ b/addons/mrp/product.py
@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+
+
+class product_product(osv.osv):
+    _inherit = "product.product"    
+
+    def do_change_standard_price(self, cr, uid, ids, datas, context={}):
+        #TODO : TO Check 
+        res = super(product_product, self).do_change_standard_price(cr, uid, ids, datas, context=context)
+        bom_obj = self.pool.get('mrp.bom')
+        product_uom_obj = self.pool.get('product.uom')
+
+        def _compute_price(bom):            
+            price = 0
+            if bom.bom_lines:
+                for sbom in bom.bom_lines:
+                    price += _compute_price(sbom) * sbom.product_qty                    
+            else:
+                
+                no_child_bom = bom_obj.search(cr, uid, [('product_id', '=', bom.product_id.id), ('bom_id', '=', False)])
+                if no_child_bom and bom.id not in no_child_bom:
+                    other_bom = bom_obj.browse(cr, uid, no_child_bom)[0]
+                    if not other_bom.product_id.calculate_price:
+                        price += _compute_price(other_bom) * other_bom.product_qty
+                    else:
+                        price += other_bom.product_id.standard_price
+                else:
+                    price += bom.product_id.standard_price
+
+            if bom.routing_id:
+                for wline in bom.routing_id.workcenter_lines:
+                    wc = wline.workcenter_id
+                    cycle = wline.cycle_nbr
+                    hour = (wc.time_start + wc.time_stop + cycle * wc.time_cycle) *  (wc.time_efficiency or 1.0)
+                    price += wc.costs_cycle * cycle + wc.costs_hour * hour
+                    price = product_uom_obj._compute_price(cr, uid, bom.product_uom.id, price, bom.product_id.uom_id.id)
+            if bom.bom_lines:
+                self.write(cr, uid, [bom.product_id.id], {'standard_price' : price/bom.product_qty})
+            if bom.product_uom.id != bom.product_id.uom_id.id:
+                price = product_uom_obj._compute_price(cr, uid, bom.product_uom.id, price, bom.product_id.uom_id.id)
+            return price
+
+        
+        bom_ids = bom_obj.search(cr, uid, [('product_id', 'in', ids)])
+        for bom in bom_obj.browse(cr, uid, bom_ids):
+            _compute_price(bom)
+        return res    
+product_product()

From 67480b3904b84c82cc6cbaf2b229ceaa3fb237a2 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Fri, 26 Mar 2010 16:57:31 +0530
Subject: [PATCH 229/251] [FIX] stock: fix small problmes

bzr revid: hmo@tinyerp.com-20100326112731-3z57rtooizu7uhxt
---
 addons/product/product.py                    |  2 +-
 addons/stock/stock.py                        |  8 ++++----
 addons/stock/wizard/stock_partial_picking.py | 14 +++++++-------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index 6ea0c73fe10..d51d0733e81 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -547,7 +547,7 @@ class product_product(osv.osv):
                 pricetype_obj = self.pool.get('product.price.type')
                 # Take the price_type currency from the product field
                 # This is right cause a field cannot be in more than one currency
-                price_type_id = pricetype_obj.search(cr,ui,['field','=',ptype])[0]
+                price_type_id = pricetype_obj.search(cr, uid, [('field','=',ptype)])[0]
                 price_type_currency_id = pricetype_obj.browse(cr,uid,price_type_id).currency_id.id
                 res[product.id] = self.pool.get('res.currency').compute(cr, uid, price_type_currency_id,
                     context['currency_id'], res[product.id],context=context)
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 869b2503903..a801fe4fcd9 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -894,7 +894,7 @@ class stock_picking(osv.osv):
                 assert partial_data, _('Do not Found Partial data of Stock Move Line :%s' %(move.id))
                 product_qty = partial_data.get('product_qty',0.0)
                 move_product_qty[move.id] = product_qty
-                product_uom = partial_data.get('product_uom',False)
+                product_uom = partial_data.get('product_uom',False)                
                 product_price = partial_data.get('product_price',0.0)
                 product_currency = partial_data.get('product_currency',False)
                 if move.product_qty == product_qty:
@@ -908,16 +908,16 @@ class stock_picking(osv.osv):
                 if (pick.type == 'in') and (move.product_id.cost_method == 'average'):
                     product = product_obj.browse(cr, uid, move.product_id.id)
                     user = users_obj.browse(cr, uid, uid)                   
-                    context['currency_id'] = move.company_id.currency_id.id
+                    context['currency_id'] = move.company_id.currency_id.id                    
                     qty = uom_obj._compute_qty(cr, uid, product_uom, product_qty, product.uom_id.id)
                     pricetype = False
                     if user.company_id.property_valuation_price_type:
                         pricetype = price_type_obj.browse(cr, uid, user.company_id.property_valuation_price_type.id)
                     if pricetype and qty > 0:
-                        new_price = currency_obj.compute(cr, uid, currency,
+                        new_price = currency_obj.compute(cr, uid, product_currency,
                                 user.company_id.currency_id.id, product_price)
                         new_price = uom_obj._compute_price(cr, uid, product_uom, new_price,
-                                product.uom_id.id)
+                                product.uom_id.id)                        
                         if product.qty_available <= 0:
                             new_std_price = new_price
                         else:
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index bc23d0371d0..494fb3b1231 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -103,9 +103,9 @@ class stock_partial_picking(osv.osv_memory):
                     
                     _moves_arch_lst += """
                         <group colspan="4" col="10">
-                        <field name="move%s_product_id" />
-                        <field name="move%s_product_qty" />
-                        <field name="move%s_product_uom" />
+                        <field name="move%s_product_id" nolabel="1"/>
+                        <field name="move%s_product_qty" string="Qty" />
+                        <field name="move%s_product_uom" nolabel="1" />
                     """%(m.id, m.id, m.id)
                     if (pick.type == 'in') and (m.product_id.cost_method == 'average'):                        
                         _moves_fields.update({
@@ -122,7 +122,7 @@ class stock_partial_picking(osv.osv_memory):
                         })
                         _moves_arch_lst += """
                             <field name="move%s_product_price" />
-                            <field name="move%s_product_currency" />
+                            <field name="move%s_product_currency" nolabel="1"/>
                         """%(m.id, m.id)
                     _moves_arch_lst += """
                         </group>
@@ -206,15 +206,15 @@ class stock_partial_picking(osv.osv_memory):
                 if m.state in ('done', 'cancel'):
                     continue
                 partial_datas['move%s'%(m.id)] = {
-                    'product_id' : getattr(partial, 'move%s_product_id'%(m.id)),
+                    'product_id' : getattr(partial, 'move%s_product_id'%(m.id)).id,
                     'product_qty' : getattr(partial, 'move%s_product_qty'%(m.id)),
-                    'product_uom' : getattr(partial, 'move%s_product_uom'%(m.id))
+                    'product_uom' : getattr(partial, 'move%s_product_uom'%(m.id)).id
                 }
 
                 if (pick.type == 'in') and (m.product_id.cost_method == 'average'):   
                     partial_datas['move%s'%(m.id)].update({             
                         'product_price' : getattr(partial, 'move%s_product_price'%(m.id)),
-                        'product_currency': getattr(partial, 'move%s_product_currency'%(m.id))
+                        'product_currency': getattr(partial, 'move%s_product_currency'%(m.id)).id
                     })  
         
         res = pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)

From b65b70bb0743cbfee3d2435c9eaa548196337791 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 26 Mar 2010 17:02:53 +0530
Subject: [PATCH 230/251] [IMP] point_of_sale: convert pos_payment wizard in
 osv_memory

bzr revid: sbh@tinyerp.com-20100326113253-su4gskwkkg8gq66c
---
 addons/point_of_sale/__terp__.py              |   1 +
 addons/point_of_sale/pos_view.xml             |   2 +-
 addons/point_of_sale/pos_wizard.xml           |   4 +-
 addons/point_of_sale/wizard/__init__.py       |   3 +-
 addons/point_of_sale/wizard/pos_payment.py    | 204 +++++++++++++++
 addons/point_of_sale/wizard/pos_payment.xml   |  45 ++++
 .../wizard/wizard_pos_payment.py              | 233 ------------------
 7 files changed, 255 insertions(+), 237 deletions(-)
 create mode 100644 addons/point_of_sale/wizard/pos_payment.py
 create mode 100644 addons/point_of_sale/wizard/pos_payment.xml
 delete mode 100644 addons/point_of_sale/wizard/wizard_pos_payment.py

diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__terp__.py
index e2fcdffd1e3..153584f6a26 100644
--- a/addons/point_of_sale/__terp__.py
+++ b/addons/point_of_sale/__terp__.py
@@ -61,6 +61,7 @@ Main features :
         'wizard/pos_receipt_view.xml',  
         'wizard/pos_payment_report_user.xml',  
         'wizard/pos_payment_report.xml',
+        'wizard/pos_payment.xml',
         'pos_report.xml',
         'pos_wizard.xml',
         'pos_view.xml',
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 9c15b5a2824..f5ce8368bbe 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -68,7 +68,7 @@
                                 <button name="%(pos_add_product)d" string="_Add product" type="action" states="draft"/>
                                 -->
 
-                                <button name="%(pos_payment)d" string="Ma_ke Payment" icon="gtk-ok" type="action" states="draft,advance"/>
+                                <button name="%(action_pos_payment)d" string="Ma_ke Payment" icon="gtk-ok" type="action" states="draft,advance" context="{'record_id':'active_id'}" />
                                 <button name="%(action_report_pos_receipt)d" string="_Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
 
 
diff --git a/addons/point_of_sale/pos_wizard.xml b/addons/point_of_sale/pos_wizard.xml
index 50746c7ac85..50e3630c4d7 100644
--- a/addons/point_of_sale/pos_wizard.xml
+++ b/addons/point_of_sale/pos_wizard.xml
@@ -13,8 +13,8 @@
 <!--		<wizard string="Box Entries" model="account.bank.statement"
 				name="pos.entry" id="pos_entry" menu="False"/>-->
 
-		<wizard string="Payment" model="pos.order"
-				name="pos.payment" id="pos_payment" menu="False"/>
+<!--		<wizard string="Payment" model="pos.order"
+				name="pos.payment" id="pos_payment" menu="False"/>-->
 
 			<!--<wizard string="Create Invoices" model="pos.order"
 				name="pos.create_invoice" id="pos_invoice" multi="True"/>-->
diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index d4f826423ee..82d9ea9409a 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -20,7 +20,7 @@
 #
 ##############################################################################
 
-import wizard_pos_payment
+#import wizard_pos_payment
 import wizard_default_journal
 import wizard_scan_product
 
@@ -49,6 +49,7 @@ import pos_receipt
 import pos_payment_report_user
 import pos_payment_report_date
 import pos_payment_report
+import pos_payment
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
new file mode 100644
index 00000000000..585e5426d67
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -0,0 +1,204 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import netsvc
+from osv import osv,fields
+from tools.translate import _
+import pos_box_entries
+import time
+from decimal import Decimal
+from tools.translate import _
+import pos_receipt
+
+class pos_make_payment(osv.osv_memory):
+    _name = 'pos.make.payment'
+    _description = 'Point of Sale Payment'
+    
+    def default_get(self, cr, uid, fields, context):
+        """ 
+         To get default values for the object.
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param fields: List of fields for which we want default values 
+         @param context: A standard dictionary 
+         @return: A dictionary which of fields with values. 
+        """
+        res = super(pos_make_payment, self).default_get(cr, uid, fields, context=context)
+        record_id = context and context.get('active_id',False)  
+        j_obj = self.pool.get('account.journal')
+        c = self.pool.get('res.users').browse(cr,uid,uid).company_id.id
+        journal = j_obj.search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', c)])
+        if journal:
+            journal = journal[0]
+        else:
+            journal = None
+        wf_service = netsvc.LocalService("workflow")
+
+    
+        order = self.pool.get('pos.order').browse(cr, uid, record_id, context)
+        #get amount to pay
+        amount = order.amount_total - order.amount_paid
+        
+        if amount<=0.0:
+            context.update({'flag':True})
+            self.pool.get('pos.order').action_paid(cr,uid,[record_id],context)
+        elif order.amount_paid > 0.0:
+            self.pool.get('pos.order').write(cr, uid, [record_id],{'state':'advance'})
+    
+        invoice_wanted_checked = False
+    
+        current_date = time.strftime('%Y-%m-%d')
+            
+        if 'journal' in fields:
+            res.update({'journal':journal})         
+        if 'amount' in fields:
+            res.update({'amount':amount})   
+        if 'invoice_wanted' in fields:
+            res.update({'invoice_wanted':invoice_wanted_checked})               
+        if 'payment_date' in fields:
+            res.update({'payment_date':current_date})
+        if 'payment_name'  in fields: 
+            res.update({'payment_name':'Payment'})    
+        return res
+    def view_init(self, cr, uid, fields_list, context=None):
+        res = super(pos_make_payment, self).view_init(cr, uid, fields_list, context=context)
+        record_id = context and context.get('active_id', False) or False        
+        order = self.pool.get('pos.order').browse(cr, uid, record_id)
+        if not order.lines:
+                raise osv.except_osv('Error!','No Order Lines ')
+        True
+    
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        """ 
+             Changes the view dynamically
+        
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary 
+             
+             @return: New arch of view.
+        
+        """
+        record_id = context and context.get('record_id', False) or False        
+        res = super(pos_make_payment, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
+        print "::::::::record_idrecord_id:::::::",context
+        if record_id:
+            order = self.pool.get('pos.order').browse(cr, uid, record_id)
+            amount = order.amount_total - order.amount_paid
+            if amount==0.0:
+                res['arch'] = """ <form string="Make Payment" colspan="4">
+                                <group col="2" colspan="2">
+                                    <label string="Do you want to print the Receipt?" colspan="4"/>
+                                    <separator colspan="4"/>
+                                    <button icon="gtk-cancel" special="cancel" string="No" readonly="0"/>
+                                    <button name="print_report" string="Print Receipt" type="object" icon="gtk-ok"/>
+                                </group>
+                            </form>                             
+                        """
+        return res
+
+    def check(self, cr, uid, ids, context=None):
+        
+        """Check the order:
+        if the order is not paid: continue payment,
+        if the order is paid print invoice (if wanted) or ticket.
+        """
+        record_id = context and context.get('active_id',False)      
+        order_obj = self.pool.get('pos.order')
+        jrnl_obj = self.pool.get('account.journal')        
+        order = order_obj.browse(cr, uid, record_id, context)
+        amount = order.amount_total - order.amount_paid
+        data =  self.read(cr, uid, ids)[0]
+        print "::::::::",data
+        # Todo need to check ...
+        if amount !=0.0:
+            invoice_wanted = data['invoice_wanted']
+            jrnl_used=False
+            if data.get('journal',False):
+                jrnl_used=jrnl_obj.browse(cr,uid,data['journal'])
+            order_obj.write(cr, uid, [record_id], {'invoice_wanted': invoice_wanted})
+            order_obj.add_payment(cr, uid, record_id, data, context=context)            
+        
+        if amount<=0.0:
+            context.update({'flag':True})
+            order_obj.action_paid(cr,uid,[record_id],context)
+        if order_obj.test_paid(cr, uid, [record_id]):
+            if order.partner_id and order.invoice_wanted:
+                return self.create_invoice(cr,uid,ids,context)
+            else:
+                return self.print_report(cr, uid, ids, context) 
+        return {}
+
+    
+    def create_invoice(self, cr, uid, ids, context):
+        wf_service = netsvc.LocalService("workflow")
+        record_ids = context and context.get('active_ids',False)      
+        for i in record_ids:
+            wf_service.trg_validate(uid, 'pos.order', i, 'invoice', cr)
+        datas = {'ids' : context.get('active_ids', [])}        
+        return { 
+                'type' : 'ir.actions.report.xml',
+                'report_name':'pos.invoice',
+                'datas' : datas,               
+        }            
+                    
+    def print_report(self, cr, uid, ids, context=None):
+        if not context:
+            context={}
+        """ 
+             @summary: To get the date and print the report           
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary 
+             @return : retrun report
+        """        
+        datas = {'ids' : context.get('active_ids',[])}
+        res =  {}        
+        datas['form'] = res
+        return { 
+                'type' : 'ir.actions.report.xml',
+                'report_name':'pos.receipt',
+                'datas' : datas,               
+       }        
+    
+    def trigger_wkf(self, cr, uid, data, context):
+        record_id = context and context.get('active_id',False)              
+        wf_service = netsvc.LocalService("workflow")
+        wf_service.trg_validate(uid, 'pos.order', record_id, 'payment', cr)
+        return {}
+        
+    _columns = {
+                'journal':fields.selection(pos_box_entries.get_journal, "Journal",required=True),
+                'product_id': fields.many2one('product.product', "Acompte"),
+                'amount':fields.float('Amount', digits=(16,2) ,required= True),
+                'payment_name': fields.char('Payment name', size=32, required=True),
+                'payment_date': fields.date('Payment date', required=True),
+                'is_acc': fields.boolean('Accompte'),
+                'invoice_wanted': fields.boolean('Invoice'),
+                'num_sale':fields.char('Num.File', size=32),
+    }  
+    
+pos_make_payment()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/wizard/pos_payment.xml b/addons/point_of_sale/wizard/pos_payment.xml
new file mode 100644
index 00000000000..771ec3c72e3
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_payment.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+
+"""        
+        <!--  Select an Open Sale Order -->
+        
+		<record id="view_pos_payment" model="ir.ui.view">
+            <field name="name">Add payment :</field>
+            <field name="model">pos.make.payment</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+			<form string="Add payment :">
+				<group colspan="4" >
+				    <field name="amount" />
+				    <field name="journal"/>
+				    <field name="payment_date" />
+				    <field name="payment_name" />
+				    <field name="invoice_wanted" />
+				    <field name="num_sale" />
+				    <field name="is_acc" />
+				    <group attrs="{'readonly':[('is_acc','=',False)]}" colspan="4" col="2">
+				    	<field name="product_id" attrs="{'required':[('is_acc', '=', True)]}" domain="[('type','=','service')]"/>
+				    </group>
+				    <newline/>
+				    <separator orientation="vertical"/>
+            		<button icon='gtk-cancel' special="cancel" string="Cancel" />
+					<button name="trigger_wkf" string="Finish" colspan="1" type="object" icon="gtk-ok"/>	
+					<button name="check" string="Make Payment" colspan="1" type="object" icon="gtk-ok"/>	
+				 </group>
+				</form>
+            </field>
+        </record>
+        <record id="action_pos_payment" model="ir.actions.act_window">
+            <field name="name">Add payment</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.make.payment</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+	</data>
+</openerp>	
+        
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/wizard_pos_payment.py b/addons/point_of_sale/wizard/wizard_pos_payment.py
deleted file mode 100644
index 580b0b308dd..00000000000
--- a/addons/point_of_sale/wizard/wizard_pos_payment.py
+++ /dev/null
@@ -1,233 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import pooler
-import netsvc
-import wizard
-import time
-from decimal import Decimal
-from tools.translate import _
-
-
-def _get_journal(self, cr, uid, context):
-    pool = pooler.get_pool(cr.dbname)
-    obj = pool.get('account.journal')
-    c=pool.get('res.users').browse(cr,uid,uid).company_id.id
-    ids = obj.search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', c)])
-    res = obj.read(cr, uid, ids, ['id', 'name'], context)
-    res = [(r['id'], r['name']) for r in res]
-    return res
-
-
-payment_form = """<?xml version="1.0"?>
-<form string="Add payment :">
-<group colspan="4" label="Payment">
-    <field name="amount" />
-    <field name="journal"/>
-    <field name="payment_date" />
-    <field name="payment_name" />
-    <field name="invoice_wanted" />
-    <field name="num_sale" />
-    <field name="is_acc" />
-    <group attrs="{'readonly':[('is_acc','=',False)]}" colspan="4" cols="2">
-    <field name="product_id" attrs="{'required':[('is_acc', '=', True)]}" domain="[('type','=','service')]"/>
-    </group>
-    </group>
-</form>
-"""
-
-payment_fields = {
-    'amount': {'string': 'Amount', 'type': 'float', 'required': True},
-    'is_acc': {'string': 'Accompte', 'type': 'boolean'},
-    'invoice_wanted': {'string': 'Invoice', 'type': 'boolean'},
-    'journal': {'string': 'Journal',
-                'type': 'selection',
-                'selection': _get_journal,
-                'required': True,
-               },
-    'payment_date': {'string': 'Payment date', 'type': 'date', 'required': True},
-    'payment_name': {'string': 'Payment name', 'type': 'char', 'size': '32', 'required':True, 'default':'Payment'},
-    'num_sale': {'string': 'Num.File', 'type': 'char', 'size': '32'},
-    'product_id': {'string':'Acompte','type': 'many2one', 'relation': 'product.product'},
-    }
-
-
-def _pre_init(self, cr, uid, data, context):
-    def _get_journal(pool, order):
-        j_obj = pool.get('account.journal')
-        c = pool.get('res.users').browse(cr,uid,uid).company_id.id
-        journal = j_obj.search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', c)])
-        if journal:
-            journal = journal[0]
-        else:
-            journal = None
-        return journal
-
-    wf_service = netsvc.LocalService("workflow")
-   # wf_service.trg_validate(uid, 'pos.order', data['id'], 'start_payment', cr)
-
-    pool = pooler.get_pool(cr.dbname)
-    order = pool.get('pos.order').browse(cr, uid, data['id'], context)
-    #get amount to pay
-    #amount = Decimal(str(order.amount_total)) - Decimal(str(order.amount_paid))
-    amount = order.amount_total - order.amount_paid
-
-    if amount<=0:
-        context.update({'flag':True})
-        pool.get('pos.order').action_paid(cr,uid,data['ids'],context)
-    elif order.amount_paid > 0:
-        pool.get('pos.order').write(cr, uid, data['id'],{'state':'advance'})
-
-
-    # get journal:
-    journal = _get_journal(pool, order)
-
-    # check if an invoice is wanted:
-    #invoice_wanted_checked = not not order.partner_id # not not -> boolean
-    invoice_wanted_checked = False
-
-    # select the current date
-    current_date = time.strftime('%Y-%m-%d')
-
-    return {'journal': journal, 'amount': amount, 'invoice_wanted': invoice_wanted_checked, 'payment_date': current_date}
-
-
-def _add_pay(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    order_obj = pool.get('pos.order')
-    jrnl_obj = pool.get('account.journal')
-    result = data['form']
-    invoice_wanted = data['form']['invoice_wanted']
-    jrnl_used=False
-    if data['form'] and data['form'].get('journal',False):
-        jrnl_used=jrnl_obj.browse(cr,uid,data['form']['journal'])
-
-    # add 'invoice_wanted' in 'pos.order'
-    order_obj.write(cr, uid, [data['id']], {'invoice_wanted': invoice_wanted})
-
-    order_obj.add_payment(cr, uid, data['id'], result, context=context)
-    return {}
-
-
-def _check(self, cr, uid, data, context):
-    """Check the order:
-    if the order is not paid: continue payment,
-    if the order is paid print invoice (if wanted) or ticket.
-    """
-    pool = pooler.get_pool(cr.dbname)
-    order_obj = pool.get('pos.order')
-    order = order_obj.browse(cr, uid, data['id'], context)
-    amount = order.amount_total - order.amount_paid
-    if amount<=0:
-        context.update({'flag':True})
-        pool.get('pos.order').action_paid(cr,uid,data['ids'],context)
-
-    action = 'ask_pay'
-    if order_obj.test_paid(cr, uid, [data['id']]):
-        if order.partner_id:
-            if order.invoice_wanted:
-                action = 'invoice'
-            else:
-                action = 'paid'
-        elif order.date_payment:
-            action = 'receipt'
-        else:
-            action = 'paid'
-    return action
-
-
-def create_invoice(self, cr, uid, data, context):
-    wf_service = netsvc.LocalService("workflow")
-    for i in data['ids']:
-        wf_service.trg_validate(uid, 'pos.order', i, 'invoice', cr)
-    return {}
-
-def _trigger_wkf(self, cr, uid, data, context):
-    wf_service = netsvc.LocalService("workflow")
-    wf_service.trg_validate(uid, 'pos.order', data['id'], 'payment', cr)
-    return {}
-
-
-
-class pos_payment(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {
-                'type': 'choice',
-                'next_state': _check,
-            }
-        },
-        'ask_pay': {
-            'actions': [_pre_init],
-            'result': {
-                'type': 'form',
-                'arch': payment_form,
-                'fields': payment_fields,
-                'state': (('end', 'Cancel'), ('finish', 'Finish'), ('add_pay', 'Ma_ke payment', 'gtk-ok', True))
-            }
-        },
-        'add_pay': {
-            'actions': [_add_pay],
-            'result': {
-                'type': 'state',
-                'state': "init",
-            }
-        },
-        'invoice': {
-            'actions': [create_invoice],
-            'result': {
-                'type': 'print',
-                'report': 'pos.invoice',
-                'state': 'finish'
-            }
-        },
-        'receipt': {
-            'actions': [],
-            'result': {
-                'type': 'print',
-                'report': 'pos.receipt',
-                'state': 'finish'
-            }
-        },
-        'paid': {
-            'actions': [],
-            'result': {
-                'type': 'print',
-                'report': 'pos.receipt',
-                'state': 'finish'
-            }
-        },
-        'finish': {
-            'actions': [_trigger_wkf],
-            'result': {
-                'type': 'state',
-                'state': 'end'
-            }
-        },
-
-    }
-
-pos_payment('pos.payment')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From 748bb6481b796eb27e89a4cb6541ce88dc3272ae Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 26 Mar 2010 17:38:00 +0530
Subject: [PATCH 231/251] [IMP] point_of_sale:remove the print statement

bzr revid: sbh@tinyerp.com-20100326120800-ztuvfhmz4qcltmc1
---
 addons/point_of_sale/wizard/pos_payment.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index 585e5426d67..a86ac38278d 100644
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -101,7 +101,7 @@ class pos_make_payment(osv.osv_memory):
         """
         record_id = context and context.get('record_id', False) or False        
         res = super(pos_make_payment, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
-        print "::::::::record_idrecord_id:::::::",context
+        
         if record_id:
             order = self.pool.get('pos.order').browse(cr, uid, record_id)
             amount = order.amount_total - order.amount_paid
@@ -129,7 +129,7 @@ class pos_make_payment(osv.osv_memory):
         order = order_obj.browse(cr, uid, record_id, context)
         amount = order.amount_total - order.amount_paid
         data =  self.read(cr, uid, ids)[0]
-        print "::::::::",data
+        
         # Todo need to check ...
         if amount !=0.0:
             invoice_wanted = data['invoice_wanted']

From f1ca4fb2a4b4aa31eafda96d7338882d92595eed Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Fri, 26 Mar 2010 18:34:16 +0530
Subject: [PATCH 232/251] [ADD] stock: Added osv_memory wizard for 'Upstream
 Traceability' and 'Downstream Traceability' wizards.

bzr revid: mtr@mtr-20100326130416-e245kw4dr7eutedo
---
 addons/stock/__terp__.py                      |   2 +
 addons/stock/stock_view.xml                   |  20 +--
 addons/stock/wizard/__init__.py               |   2 -
 addons/stock/wizard/stock_traceability.py     | 112 ++++++++++-------
 .../stock/wizard/stock_traceability_view.xml  | 114 ++++++++++++++++++
 5 files changed, 196 insertions(+), 54 deletions(-)
 create mode 100644 addons/stock/wizard/stock_traceability_view.xml

diff --git a/addons/stock/__terp__.py b/addons/stock/__terp__.py
index 07cfeccf0b5..1248794fe50 100644
--- a/addons/stock/__terp__.py
+++ b/addons/stock/__terp__.py
@@ -50,6 +50,8 @@ Thanks to the double entry management, the inventory controlling is powerful and
         "wizard/stock_location_product_view.xml",
         "wizard/stock_inventory_line_split_view.xml",
         "wizard/stock_change_standard_price_view.xml",
+        "wizard/stock_inventory_merge_view.xml",
+        "wizard/stock_traceability_view.xml",
         "stock_workflow.xml",
         "stock_incoterms.xml",
         "stock_wizard.xml",        
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index ec07a2f9845..c32eddfbf4d 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -338,31 +338,31 @@
             </field>
         </record>
 
-        <wizard
+        <!--wizard
             id="action_lot2"
             model="stock.production.lot"
             name="stock.traceability.lot.upstream"
-            string="Upstream traceability"/>
+            string="Upstream traceability"/-->
 
-        <wizard
+        <!--wizard
             id="action_lot4"
             model="stock.production.lot"
             name="stock.traceability.lot.downstream"
-            string="Downstream traceability"/>
+            string="Downstream traceability"/-->
 
-        <wizard
+        <!--wizard
             id="action4"
             model="stock.tracking"
             name="stock.traceability.upstream"
-            string="Upstream traceability"/>
+            string="Upstream traceability"/-->
 
-        <wizard
+        <!--wizard
             id="action2"
             model="stock.tracking"
             name="stock.traceability.downstream"
-            string="Downstream traceability"/>
+            string="Downstream traceability"/-->
 
-        <record id="action3" model="ir.actions.act_window">
+        <!--record id="action3" model="ir.actions.act_window">
             <field name="name">Downstream traceability</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">stock.move</field>
@@ -391,7 +391,7 @@
             <field name="name">Upstream traceability</field>
             <field eval="'ir.actions.act_window,'+str(action5)" name="value"/>
             <field eval="True" name="object"/>
-        </record>
+        </record-->
 
         <record id="view_location_form" model="ir.ui.view">
             <field name="name">stock.location.form</field>
diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py
index 2d085edcef5..9088e95ca1d 100644
--- a/addons/stock/wizard/__init__.py
+++ b/addons/stock/wizard/__init__.py
@@ -29,13 +29,11 @@ import wizard_return
 import wizard_split_lot_line
 import wizard_ups
 import inventory_merge
-
 import stock_inventory_set_stock_zero
 import stock_fill_inventory
 import stock_inventory_line_split
 import stock_invoice_onshipping
 import stock_location_product
-
 import stock_change_standard_price
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/stock_traceability.py b/addons/stock/wizard/stock_traceability.py
index 58cc26a3224..120fa658b1c 100644
--- a/addons/stock/wizard/stock_traceability.py
+++ b/addons/stock/wizard/stock_traceability.py
@@ -23,63 +23,91 @@ import wizard
 import netsvc
 import time
 import pooler
-
 from osv import osv
 
-def action_traceability(type='move_history_ids', field='tracking_id'):
-    def open_tab(self, cr, uid, data, context):
-        obj = pooler.get_pool(cr.dbname).get('stock.move')
-        ids = obj.search(cr, uid, [(field, 'in', data['ids'])])
-        cr.execute('select id from ir_ui_view where model=%s and field_parent=%s and type=%s', ('stock.move', type, 'tree'))
+class action_traceability(osv.osv_memory):
+    """ 
+    This class defines a function action_traceability for wizard
+
+    """
+    _name = "action.traceability"
+    _description = "Action traceability "
+     
+    def action_traceability(self, cr, uid, ids, context={}):
+        """ 
+             It traces the information of a product
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: List of IDs selected 
+             @param context: A standard dictionary 
+             
+             @return: A dictionary of values
+        
+        """
+        type1 = context['type'] or 'move_history_ids'
+        field = context['field'] or 'tracking_id'
+        obj = self.pool.get('stock.move')
+        ids = obj.search(cr, uid, [(field, 'in',context['active_ids'])])
+        cr.execute('select id from ir_ui_view where model=%s and field_parent=%s and type=%s', ('stock.move', type1, 'tree'))
         view_id = cr.fetchone()[0]
         value = {
             'domain': "[('id','in',["+','.join(map(str, ids))+"])]",
-            'name': ((type=='move_history_ids') and 'Upstream Traceability') or 'Downstream Traceability',
+            'name': ((type1=='move_history_ids') and 'Upstream Traceability') or 'Downstream Traceability',
             'view_type': 'tree',
             'res_model': 'stock.move',
-            'field_parent': type,
+            'field_parent': type1,
             'view_id': (view_id,'View'),
             'type': 'ir.actions.act_window'
-        }
+            }
         return value
-    return open_tab
+   
+action_traceability()
 
-class wiz_journal(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'action', 'action': action_traceability('move_history_ids2'), 'state':'end'}
-        }
-    }
-wiz_journal('stock.traceability.downstream')
+class stock_traceability_downstream(osv.osv_memory):
+    """
+    This class is defined for Stock traceability downstream wizard
 
-class wiz_journal2(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'action', 'action': action_traceability(), 'state':'end'}
-        }
-    }
-wiz_journal2('stock.traceability.upstream')
+    """
+    _name = "stock.traceability.downstream"
+    _inherit = "action.traceability"
+    _description = "Stock traceability downstream"
+   
+stock_traceability_downstream()
 
-class wiz_journal3(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'action', 'action': action_traceability(field='prodlot_id'), 'state':'end'}
-        }
-    }
-wiz_journal3('stock.traceability.lot.upstream')
+class stock_traceability_upstream(osv.osv_memory):
+    """
+    This class is defined for Stock traceability upstream wizard
 
-class wiz_journal4(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'action', 'action': action_traceability('move_history_ids2', 'prodlot_id'), 'state':'end'}
-        }
-    }
-wiz_journal4('stock.traceability.lot.downstream')
+    """
+    _name = "stock.traceability.upstream"
+    _inherit = "action.traceability"
+    _description = "Stock traceability upstream"
+   
+stock_traceability_upstream()
 
+class stock_traceability_lot_upstream(osv.osv_memory):
+    """
+    This class is defined for Stock traceability lot upstream wizard
+
+    """
+    _name = "stock.traceability.lot.upstream"
+    _inherit = "action.traceability"
+    _description = "Stock traceability lot upstream"
+
+stock_traceability_lot_upstream()
+
+class stock_traceability_lot_downstream(osv.osv_memory):
+    """
+    This class is defined for Stock traceability lot downstream wizard
+
+    """
+    _name = "stock.traceability.lot.downstream"
+    _inherit = "action.traceability"
+    _description = "Stock traceability lot downstream"
+
+stock_traceability_lot_downstream()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/stock/wizard/stock_traceability_view.xml b/addons/stock/wizard/stock_traceability_view.xml
new file mode 100644
index 00000000000..4a1f6b11b25
--- /dev/null
+++ b/addons/stock/wizard/stock_traceability_view.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+<!-- =========stock.traceability.downstream================= -->
+
+            <record id="view_stock_traceability_downstream" model="ir.ui.view">
+                <field name="name">Stock traceability downstream</field>
+                <field name="model">stock.traceability.downstream</field>
+                <field name="type">form</field>
+                <field name="arch" type="xml">
+	                <form string="Downstream traceability">
+	                	
+	                	<label string="It will give information about the stock of a product as per the Tracking Lot" colspan="2" />
+				<separator string="" colspan="4" />
+	                	<button icon='gtk-cancel' special="cancel"
+	                		string="Cancel" />
+	                	<button name="action_traceability" string="Downstream traceability" type="object" context="{'type': 'move_history_ids2','field': ''}"/>
+	                	
+	                </form>
+	            </field>
+	        </record>	        
+     	
+	<act_window name="Downstream traceability"		    
+		res_model="stock.traceability.downstream"
+		src_model="stock.tracking"
+		view_mode="form"
+		target="new"        
+		key2="client_action_multi"    
+		id="action_view_stock_traceability_downstream"/>
+
+<!-- =========stock.traceability.upstream================= -->
+
+  <record id="view_stock_traceability_upstream" model="ir.ui.view">
+                <field name="name">Stock traceability upstream</field>
+                <field name="model">stock.traceability.upstream</field>
+                <field name="type">form</field>
+                <field name="arch" type="xml">
+	                <form string="Upstream traceability">
+	                	
+	                	<label string="It will give information about the stock of a product as per the Tracking Lot" colspan="2" />
+				<separator string="" colspan="4" />
+	                	<button icon='gtk-cancel' special="cancel"
+	                		string="Cancel" />
+	                	<button name="action_traceability" string="Upstream traceability" type="object" context="{'type': '','field': ''}"/>
+	                	
+	                </form>
+	            </field>
+	        </record>	        
+     	
+	<act_window name="Upstream traceability"		    
+		res_model="stock.traceability.upstream"
+		src_model="stock.tracking"
+		view_mode="form"
+		target="new"        
+		key2="client_action_multi"    
+		id="action_view_stock_traceability_upstream"/>
+
+<!-- =========stock.traceability.lot.upstream================= -->
+
+<record id="view_stock_traceability_lot_upstream" model="ir.ui.view">
+                <field name="name">Stock traceability lot upstream</field>
+                <field name="model">stock.traceability.lot.upstream</field>
+                <field name="type">form</field>
+                <field name="arch" type="xml">
+	                <form string="Stock traceability lot upstream">
+	                	
+	                	<label string="It will give information about the stock of a product as per the Production Lot" colspan="2" />
+				<separator string="" colspan="4" />
+	                	<button icon='gtk-cancel' special="cancel"
+	                		string="Cancel" />
+	                	<button name="action_traceability" string="Upstream traceability" type="object" context="{'type': '', 'field': 'prodlot_id'}"/>
+	                	
+	                </form>
+	            </field>
+	        </record>	        
+     	
+	<act_window name="Upstream traceability"		    
+		res_model="stock.traceability.lot.upstream"
+		src_model="stock.production.lot"
+		view_mode="form"
+		target="new"        
+		key2="client_action_multi"    
+		id="action_view_stock_traceability_lot_upstream"/>
+
+<!-- =========stock.traceability.lot.downstream================= -->
+
+<record id="view_stock_traceability_lot_downstream" model="ir.ui.view">
+                <field name="name">Stock traceability lot downstream</field>
+                <field name="model">stock.traceability.lot.downstream</field>
+                <field name="type">form</field>
+                <field name="arch" type="xml">
+	                <form string="Stock traceability lot downstream">
+	                	
+	                	<label string="It will give information about the stock of a product as per the Production Lot" colspan="2" />
+				<separator string="" colspan="4" />
+	                	<button icon='gtk-cancel' special="cancel"
+	                		string="Cancel" />
+	                	<button name="action_traceability" string="Downstream traceability" type="object" context="{'type': 'move_history_ids2', 'field': 'prodlot_id'}"/>
+	                	
+	                </form>
+	            </field>
+	        </record>	        
+     	
+	<act_window name="Downstream traceability"		    
+		res_model="stock.traceability.lot.downstream"
+		src_model="stock.production.lot"
+		view_mode="form"
+		target="new"        
+		key2="client_action_multi"    
+		id="action_view_stock_traceability_lot_downstream"/>
+
+	</data>
+</openerp>
+

From 6dec1538a066d8cf6872cb8a8484db65f4b22461 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 26 Mar 2010 18:50:28 +0530
Subject: [PATCH 233/251] [IMP]: point_of_sale: change the name of variable

bzr revid: sbh@tinyerp.com-20100326132028-63mm3ddrk4y5s3xv
---
 addons/point_of_sale/wizard/pos_payment.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index a86ac38278d..b29a6a43b7f 100644
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -45,8 +45,8 @@ class pos_make_payment(osv.osv_memory):
         res = super(pos_make_payment, self).default_get(cr, uid, fields, context=context)
         record_id = context and context.get('active_id',False)  
         j_obj = self.pool.get('account.journal')
-        c = self.pool.get('res.users').browse(cr,uid,uid).company_id.id
-        journal = j_obj.search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', c)])
+        company_id = self.pool.get('res.users').browse(cr,uid,uid).company_id.id
+        journal = j_obj.search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', company_id)])
         if journal:
             journal = journal[0]
         else:

From d9dc66b9942aa4c76b6a3e8872649cca51f0e477 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Fri, 26 Mar 2010 19:13:11 +0530
Subject: [PATCH 234/251] [Fix] stock:remove the file name from terp

bzr revid: mtr@mtr-20100326134311-qbazgm07gjjbjwfx
---
 addons/mrp/mrp.py                             | 15 +++
 addons/point_of_sale/__terp__.py              |  4 +-
 addons/point_of_sale/pos_wizard.xml           |  5 +-
 .../report/all_closed_cashbox_of_the_day.py   |  2 +
 addons/point_of_sale/report/pos_receipt.rml   |  2 +
 addons/point_of_sale/statement_report.xml     |  9 +-
 addons/point_of_sale/statement_view.xml       |  5 +-
 addons/point_of_sale/statement_wizard.xml     | 15 ++-
 addons/point_of_sale/wizard/__init__.py       |  7 --
 .../wizard/all_closed_cashbox_of_the_day.py   | 60 ------------
 addons/point_of_sale/wizard/pos_receipt.py    |  2 +
 .../{wizard_return.py => pos_return.py}       | 64 ++++++++++--
 addons/stock/__terp__.py                      |  2 +-
 addons/stock/stock_wizard.xml                 |  4 +-
 addons/stock/wizard/inventory_merge.py        | 98 -------------------
 addons/stock/wizard/stock_inventory_merge.py  | 83 ++++++++++++++++
 ..._picking_make.py => stock_picking_make.py} | 17 +++-
 17 files changed, 208 insertions(+), 186 deletions(-)
 delete mode 100644 addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py
 rename addons/point_of_sale/wizard/{wizard_return.py => pos_return.py} (93%)
 delete mode 100644 addons/stock/wizard/inventory_merge.py
 create mode 100644 addons/stock/wizard/stock_inventory_merge.py
 rename addons/stock/wizard/{wizard_picking_make.py => stock_picking_make.py} (87%)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index b2817d052e3..6864b542396 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -134,6 +134,18 @@ class mrp_bom(osv.osv):
     _name = 'mrp.bom'
     _description = 'Bills of Material'
     def _child_compute(self, cr, uid, ids, name, arg, context={}):
+        """ 
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID of mrp.production object
+             @param name: 
+             @param arg: 
+
+             @return:  True
+        
+        """ 
+             
         result = {}
         for bom in self.browse(cr, uid, ids, context=context):
             result[bom.id] = map(lambda x: x.id, bom.bom_lines)
@@ -145,6 +157,9 @@ class mrp_bom(osv.osv):
                 if sids:
                     bom2 = self.pool.get('mrp.bom').browse(cr, uid, sids[0], context=context)
                     result[bom.id] += map(lambda x: x.id, bom2.bom_lines)
+        print "name",name
+        print "arg",arg   
+        print "result",result            
         return result
     def _compute_type(self, cr, uid, ids, field_name, arg, context):
         res = dict(map(lambda x: (x,''), ids))
diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__terp__.py
index 153584f6a26..b1838a28fc1 100644
--- a/addons/point_of_sale/__terp__.py
+++ b/addons/point_of_sale/__terp__.py
@@ -41,7 +41,7 @@ Main features :
     'init_xml': [],
 
     'update_xml': [
-        'security/point_of_sale_security.xml',
+      'security/point_of_sale_security.xml',
         'security/ir.model.access.csv',
         'wizard/pos_details.xml',  
         'wizard/pos_add_product.xml',
@@ -72,7 +72,7 @@ Main features :
         'statement_view.xml',
         'statement_report.xml',
         'statement_data.xml',
-        'statement_wizard.xml',    
+        'statement_wizard.xml',   
     ],
     'demo_xml': ['pos_demo.xml','singer_statement_demo.xml','multi_company_stock_data.xml'],
     'installable': True,
diff --git a/addons/point_of_sale/pos_wizard.xml b/addons/point_of_sale/pos_wizard.xml
index 50e3630c4d7..2e09b5cc9df 100644
--- a/addons/point_of_sale/pos_wizard.xml
+++ b/addons/point_of_sale/pos_wizard.xml
@@ -10,6 +10,7 @@
 
 
 
+
 <!--		<wizard string="Box Entries" model="account.bank.statement"
 				name="pos.entry" id="pos_entry" menu="False"/>-->
 
@@ -62,12 +63,12 @@
         	string="Close Statements"/>-->
 
 
-       <wizard
+       <!--wizard
         	id="wizard_all_closed_cashbox_of_the_day"
         	model="account.bank.statement"
         	menu="False"
         	name="all.closed.cashbox.of.the.day"
-        	string="All Cashboxes Of the day"/>
+        	string="All Cashboxes Of the day"/-->
 
 
 	</data>
diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
index 2490d5719cd..f3c21da2dcb 100644
--- a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
+++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
@@ -138,4 +138,6 @@ class all_closed_cashbox_of_the_day(report_sxw.rml_parse):
         res = self.cr.dictfetchall()
         return res[0]['net_total'] or 0.0
 
+
 report_sxw.report_sxw('report.all.closed.cashbox.of.the.day', 'account.bank.statement', 'addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml', parser=all_closed_cashbox_of_the_day)
+
diff --git a/addons/point_of_sale/report/pos_receipt.rml b/addons/point_of_sale/report/pos_receipt.rml
index 1d2e6edc9d0..1d5e70241c7 100644
--- a/addons/point_of_sale/report/pos_receipt.rml
+++ b/addons/point_of_sale/report/pos_receipt.rml
@@ -104,7 +104,9 @@
         <para style="terp_default_Centre_9">E-mail : [[ address and address.email ]]</para>
         <para style="terp_default_Centre_9">Shop : [[ o.shop_id.name ]]</para>
         <para style="terp_default_Centre_9">Vendeur : [[ o.user_id1.name ]]</para>
+
         <para style="terp_default_Centre_9">Date : [[ formatLang(o.date_order,date = True) ]]</para>
+
         <para style="P4">
             <font color="white"> </font>
         </para>
diff --git a/addons/point_of_sale/statement_report.xml b/addons/point_of_sale/statement_report.xml
index 8118d2e834d..7bdece39a77 100644
--- a/addons/point_of_sale/statement_report.xml
+++ b/addons/point_of_sale/statement_report.xml
@@ -22,7 +22,7 @@
 			rml="point_of_sale/report/account_statement.rml"
 			 />
 
-		<report
+		<!--report
 			id="all_closed_cashbox_of_the_day"
 			string="All Cloded CashBOx"
 			model="account.bank.statement"
@@ -30,8 +30,13 @@
 			auto="False"
 			multi="True"
 			menu = 'False'
+<<<<<<< TREE
+			rml="point_of_sale/report/all_closed_cashbox_of_the_day.rml"
+			 /-->
+=======
 			rml="point_of_sale/report/all_closed_cashbox_of_the_day.rml"
 			 />
+>>>>>>> MERGE-SOURCE
 		<report
 			id="pos_users_product_re"
 			string="User's Product"
@@ -54,7 +59,7 @@
 
 		<report
 			id="all_closed_cashbox_of_the_day"
-			string="All Cloded CashBOx"
+			string="All Closed CashBOx"
 			model="account.bank.statement"
 			name="all.closed.cashbox.of.the.day"
 			auto="False"
diff --git a/addons/point_of_sale/statement_view.xml b/addons/point_of_sale/statement_view.xml
index 19e7bdc13e3..7f241e5bfa8 100644
--- a/addons/point_of_sale/statement_view.xml
+++ b/addons/point_of_sale/statement_view.xml
@@ -427,7 +427,10 @@
        <menuitem icon="STOCK_PRINT"
        			 action="action_report_all_closed_cashbox_of_the_day"
 				 id="menu_all_closed_cashbox_of_the_day"
-				 parent="menu_statement_tree_all"/>
+
+				 parent="menu_statement_tree_all"
+				/>
+
 
 		<menuitem
             name="Close Register" parent="point_of_sale.menu_point_config"
diff --git a/addons/point_of_sale/statement_wizard.xml b/addons/point_of_sale/statement_wizard.xml
index dd9715db628..c4f4ddf9072 100644
--- a/addons/point_of_sale/statement_wizard.xml
+++ b/addons/point_of_sale/statement_wizard.xml
@@ -16,10 +16,21 @@
 -->
 
 
-       
+
+     <!--  <wizard
+        	id="action_report_all_closed_cashbox_of_the_day2"
+        	model="account.bank.statement"
+        	menu="False"
+        	name="all.closed.cashbox.of.the.day"
+        	string="All Cashboxes Of the day"/>-->
+
+
        <menuitem icon="STOCK_PRINT"
        			 action="action_report_all_closed_cashbox_of_the_day"
 				 id="menu_all_closed_cashbox_of_the_day"
-				 parent="menu_point_report_register"/>
+
+				 parent="menu_point_report_register"
+				/>
+
     </data>
 </openerp>
diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index 82d9ea9409a..1384fb8329a 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -23,15 +23,8 @@
 #import wizard_pos_payment
 import wizard_default_journal
 import wizard_scan_product
-
 import wizard_return
-
-
-
-
-
 #import wizard_open_statement
-
 import pos_add_product
 import pos_confirm
 import pos_discount
diff --git a/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py b/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py
deleted file mode 100644
index 0968c6c71d4..00000000000
--- a/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import netsvc
-from osv import osv,fields
-from tools.translate import _
-from mx import DateTime
-import time
-
-class all_closed_cashbox_of_the_day(osv.osv_memory):
-    _name = 'all.closed.cashbox.of.the.day'
-    _description = 'All closed cashbox of the day'
-
-    _columns = {
-                
-    }
-    
-    def print_report(self, cr, uid, ids, context=None):
-
-        """ 
-             To get the date and print the report 
-                       
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param context: A standard dictionary 
-             @return : retrun report
-        """        
-        datas = {'ids' : context.get('active_ids',[])}
-        res =  {}        
-        datas['form'] = res
-        
-        return { 
-                'type' : 'ir.actions.report.xml',
-                'report_name':'all.closed.cashbox.of.the.day',
-                'datas' : datas,               
-       }
-
-all_closed_cashbox_of_the_day()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/pos_receipt.py b/addons/point_of_sale/wizard/pos_receipt.py
index 27cdfd19ad0..a812ad342a4 100644
--- a/addons/point_of_sale/wizard/pos_receipt.py
+++ b/addons/point_of_sale/wizard/pos_receipt.py
@@ -22,6 +22,7 @@
 import netsvc
 from osv import osv,fields
 from tools.translate import _
+
 from mx import DateTime
 import time
 
@@ -62,3 +63,4 @@ pos_receipt()
 
 
 
+
diff --git a/addons/point_of_sale/wizard/wizard_return.py b/addons/point_of_sale/wizard/pos_return.py
similarity index 93%
rename from addons/point_of_sale/wizard/wizard_return.py
rename to addons/point_of_sale/wizard/pos_return.py
index 591fd00b18a..1b5860cef1c 100644
--- a/addons/point_of_sale/wizard/wizard_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -20,19 +20,69 @@
 #
 ##############################################################################
 
-import wizard
-import pooler
-from tools.misc import UpdateableStr
+#import wizard
+#import pooler
+#from tools.misc import UpdateableStr
+#
+#import netsvc
+#import time
+#
+#from tools.translate import _
+#from decimal import Decimal
+
+#arch=UpdateableStr()
+#fields={}
 
 import netsvc
+from osv import osv,fields
+from tools.translate import _
+from mx import DateTime
 import time
 
-from tools.translate import _
-from decimal import Decimal
 
+class pos_return(osv.osv_memory):
+    _name = 'pos.return'
+    _description = 'Point of sale return'
 
-arch=UpdateableStr()
-fields={}
+    _columns = {
+                
+    }
+pos_return()
+
+class pos_add_payment(osv.osv_memory):
+    _name = 'pos.add.payment'
+    _description = 'Add Payment'
+
+    _columns = {
+        'amount': fields.float('Amount', digits=(16,2),required=True),
+        'journal': fields.function(_get_journal, 'Journal', method=True, required=True),
+        'payment_date': fields.date('Payment date',required=True),
+        'payment_name': fields.char('Payment name', size=32,required=True),
+        'invoice_wanted': fields.boolean('Invoice'),
+        'num_sale': fields.char('Num.Cof', size=32)        
+    }
+    _defaults = {
+          'payment_name': lambda *a: 'Payment'
+        }
+
+pos_add_payment()
+
+class pos_add_product(osv.osv_memory):
+    _name = 'pos.add.product'
+    _description = 'Add Product'
+
+    _columns = {
+        'product': fields.many2one('product.product','Product', required=True),
+        'quantity': fields.integer( 'Quantity',required=True),
+             
+    }
+
+    _defaults = {
+          'product': lambda *a: 'False',
+          'quantity': lambda *a: 1
+        }
+
+pos_add_product()
 
 
 def _get_journal(self, cr, uid, context):
diff --git a/addons/stock/__terp__.py b/addons/stock/__terp__.py
index 1248794fe50..4c379ccc371 100644
--- a/addons/stock/__terp__.py
+++ b/addons/stock/__terp__.py
@@ -50,7 +50,7 @@ Thanks to the double entry management, the inventory controlling is powerful and
         "wizard/stock_location_product_view.xml",
         "wizard/stock_inventory_line_split_view.xml",
         "wizard/stock_change_standard_price_view.xml",
-        "wizard/stock_inventory_merge_view.xml",
+       
         "wizard/stock_traceability_view.xml",
         "stock_workflow.xml",
         "stock_incoterms.xml",
diff --git a/addons/stock/stock_wizard.xml b/addons/stock/stock_wizard.xml
index 7e727eb20f7..e966c27a6c1 100644
--- a/addons/stock/stock_wizard.xml
+++ b/addons/stock/stock_wizard.xml
@@ -45,13 +45,13 @@
         name="stock.inventory.line.split"
         string="Split inventory lines"/>
 
-    <wizard
+    <!--wizard
         string="Merge inventories"
         model="stock.inventory"
         name="inventory.merge"
         keyword="client_action_multi"
         multi="True"
-        id="wizard_merge_inventory"/>
+        id="wizard_merge_inventory"/-->
 
    </data>
 </openerp>
diff --git a/addons/stock/wizard/inventory_merge.py b/addons/stock/wizard/inventory_merge.py
deleted file mode 100644
index 7be8eb2b3e3..00000000000
--- a/addons/stock/wizard/inventory_merge.py
+++ /dev/null
@@ -1,98 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-
-import wizard
-import pooler
-from tools.translate import _
-
-
-_form = """<?xml version="1.0"?>
-<form string="Merge inventories">
-    <separator colspan="4" string="Merge inventories" />
-    <label string="Do you want to merge theses inventories ?"/>
-</form>
-"""
-
-
-def do_merge(self, cr, uid, data, context):
-
-    invent_obj = pooler.get_pool(cr.dbname).get('stock.inventory')
-    invent_line_obj = pooler.get_pool(cr.dbname).get('stock.inventory.line')
-
-    invent_lines = {}
-
-    if len(data['ids']) < 2:
-        raise wizard.except_wizard(_('Warning'),
-            _('Please select at least two inventories.'))
-
-
-
-    for inventory in invent_obj.browse(cr, uid, data['ids'], context=context):
-        if inventory.state == "done":
-            raise wizard.except_wizard(_('Warning'),
-                _('Merging is only allowed on draft inventories.'))
-
-        for line in inventory.inventory_line_id:
-            key = (line.location_id.id, line.product_id.id, line.product_uom.id)
-            if key in invent_lines:
-                invent_lines[key] += line.product_qty
-            else:
-                invent_lines[key] = line.product_qty
-
-
-    new_invent = invent_obj.create(cr, uid, {
-        'name': 'Merged inventory'
-        }, context=context)
-
-    for key, quantity in invent_lines.items():
-        invent_line_obj.create(cr, uid, {
-            'inventory_id': new_invent,
-            'location_id': key[0],
-            'product_id': key[1],
-            'product_uom': key[2],
-            'product_qty': quantity,
-            })
-
-    return {}
-
-
-class merge_inventory(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'form',
-                    'arch' : _form,
-                    'fields' : {},
-                    'state' : [('end', 'Cancel', 'gtk-cancel'),
-                               ('merge', 'Yes', 'gtk-apply', True) ]}
-        },
-        'merge' : {
-            'actions' : [],
-            'result' : {'type' : 'action',
-                        'action': do_merge,
-                        'state' : 'end'}
-        },
-    }
-merge_inventory("inventory.merge")
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/stock/wizard/stock_inventory_merge.py b/addons/stock/wizard/stock_inventory_merge.py
new file mode 100644
index 00000000000..64620054ff8
--- /dev/null
+++ b/addons/stock/wizard/stock_inventory_merge.py
@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+from service import web_services
+from tools.misc import UpdateableStr, UpdateableDict
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import wizard
+
+class stock_inventory_merge(osv.osv_memory):
+    _name = "stock.inventory.merge"
+    _description = "Merge Inventory"
+    _columns = {
+           
+            }
+
+    def do_merge(self, cr, uid, ids, context):
+
+        invent_obj = self.pool.get('stock.inventory')
+        invent_line_obj = self.pool.get('stock.inventory.line')
+
+        invent_lines = {}
+
+        if len(context['active_ids']) < 2:
+            raise osv.except_osv(_('Warning'),
+            _('Please select at least two inventories.'))
+
+
+
+        for inventory in invent_obj.browse(cr, uid, context['active_ids'], context=context):
+            print"-------active-ids----",context['active_ids']
+            if inventory.state == "done":
+                raise osv.except_osv(_('Warning'),
+                _('Merging is only allowed on draft inventories.'))
+
+            for line in inventory.inventory_line_id:
+                key = (line.location_id.id, line.product_id.id, line.product_uom.id)
+                if key in invent_lines:
+                    invent_lines[key] += line.product_qty
+                else:
+                    invent_lines[key] = line.product_qty
+
+
+        new_invent = invent_obj.create(cr, uid, {
+            'name': 'Merged inventory'
+            }, context=context)
+
+        for key, quantity in invent_lines.items():
+            invent_line_obj.create(cr, uid, {
+                'inventory_id': new_invent,
+                'location_id': key[0],
+                'product_id': key[1],
+                'product_uom': key[2],
+                'product_qty': quantity,
+                })
+
+        return {}
+
+stock_inventory_merge()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/stock/wizard/wizard_picking_make.py b/addons/stock/wizard/stock_picking_make.py
similarity index 87%
rename from addons/stock/wizard/wizard_picking_make.py
rename to addons/stock/wizard/stock_picking_make.py
index 287fb066f7c..6ac54ee3bc1 100644
--- a/addons/stock/wizard/wizard_picking_make.py
+++ b/addons/stock/wizard/stock_picking_make.py
@@ -19,9 +19,21 @@
 #
 ##############################################################################
 
-import wizard
-import pooler
+from osv import fields, osv
+from service import web_services
+from tools.misc import UpdateableStr, UpdateableDict
+from tools.translate import _
 import netsvc
+import pooler
+import time
+import wizard
+
+class stock_picking_make(osv.osv_memory):
+    _name = "stock.picking.make"
+    _description = "Make picking"
+    _columns = {
+            'pickings': fields.many2many('stock.picking', 'Picking', required=True),
+            }
 
 ARCH = '''<?xml version="1.0"?>
 <form string="Make picking">
@@ -53,6 +65,7 @@ def _make_packing(obj, cursor, user, data, context):
     pool = pooler.get_pool(cursor.dbname)
     picking_obj = pool.get('stock.picking')
     ids = data['form']['pickings'][0][2]
+    print"-------ids--------",ids
     picking_obj.force_assign(cursor, user, ids)
     picking_obj.action_move(cursor, user, ids)
     for picking_id in ids:

From 9593ee3015ef8f06bd901e676456c22fc4045ffc Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Fri, 26 Mar 2010 19:43:52 +0530
Subject: [PATCH 235/251] [ADD] l10n_be: convert account_vat_declaration wizard
 to osv_memory wizard

bzr revid: psi@tinyerp.co.in-20100326141352-bolnvlc15ky0um3p
---
 addons/l10n_be/__terp__.py                    |  1 +
 addons/l10n_be/l10n_be_wizard.xml             |  4 +-
 addons/l10n_be/wizard/__init__.py             |  5 +-
 ....py => l10n_be_account_vat_declaration.py} | 75 +++++++------------
 .../l10n_be_account_vat_declaration_view.xml  | 47 ++++++++++++
 5 files changed, 81 insertions(+), 51 deletions(-)
 rename addons/l10n_be/wizard/{account_vat_declaration.py => l10n_be_account_vat_declaration.py} (68%)
 create mode 100644 addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml

diff --git a/addons/l10n_be/__terp__.py b/addons/l10n_be/__terp__.py
index c6580e79563..618367dfef7 100644
--- a/addons/l10n_be/__terp__.py
+++ b/addons/l10n_be/__terp__.py
@@ -50,6 +50,7 @@
     'update_xml': [
                 'account_pcmn_belgium.xml',
                 'l10n_be_wizard.xml',
+                'wizard/l10n_be_account_vat_declaration_view.xml',
                 'l10n_be_sequence.xml',
                 'fiscal_templates.xml',
                 'security/ir.model.access.csv'
diff --git a/addons/l10n_be/l10n_be_wizard.xml b/addons/l10n_be/l10n_be_wizard.xml
index c20f1c62420..86c4d828b70 100644
--- a/addons/l10n_be/l10n_be_wizard.xml
+++ b/addons/l10n_be/l10n_be_wizard.xml
@@ -21,7 +21,7 @@
         type="wizard"
         id="partner_wizard_vat_menu"/>
 
-    <wizard
+<!--    <wizard
         string="Periodical VAT Declaration"
         name="wizard.account.xml.vat.declaration"
         menu="False"
@@ -32,7 +32,7 @@
         parent="menu_finance_belgian_statement"
         action="wizard_xml_vat_declaration"
         type="wizard"
-        id="account_wizard_vat_declaration"/>
+        id="account_wizard_vat_declaration"/> -->
 
    	<wizard
         string="Partner VAT intra"
diff --git a/addons/l10n_be/wizard/__init__.py b/addons/l10n_be/wizard/__init__.py
index 1050e8e2ee9..b811c54a6e4 100644
--- a/addons/l10n_be/wizard/__init__.py
+++ b/addons/l10n_be/wizard/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,13 +15,14 @@
 #    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 account_vat_declaration
 import partner_vat_listing
 import wizard_vat_intra
+import l10n_be_account_vat_declaration
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_be/wizard/account_vat_declaration.py b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
similarity index 68%
rename from addons/l10n_be/wizard/account_vat_declaration.py
rename to addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
index 404b9406c69..490709b15ec 100644
--- a/addons/l10n_be/wizard/account_vat_declaration.py
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
@@ -18,45 +18,36 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import time
 import datetime
 import base64
-
-import wizard
-import pooler
+from osv import osv, fields
 from tools.translate import _
 
-form_fyear = """<?xml version="1.0"?>
-<form string="Select Period">
-    <field name="period" />
-</form>"""
+class l10n_be_vat_declaration(osv.osv_memory):
+    """ Vat Declaration """
+    _name = "l1on_be.vat.declaration"
+    _description = "Vat Declaration"
 
-fields_fyear = {
-    'period': {'string': 'Period', 'type': 'many2one', 'relation': 'account.period', 'required': True,},
-}
+    _columns = {
+        'period_id': fields.many2one('account.period','Period', required=True),
+        'msg': fields.text('File created', size=64, readonly=True),
+        'file_save' : fields.binary('Save File'),
+    }
 
-form = """<?xml version="1.0"?>
-<form string="Notification">
-     <separator string="XML Flie has been Created."  colspan="4"/>
-     <field name="msg" colspan="4" nolabel="1"/>
-     <field name="file_save" />
-</form>"""
+    _defaults = {
+        'msg': lambda *a:'''Save the File with '".xml"' extension.''',
+    }
 
-fields = {
-    'msg': {'string':'File created', 'type':'text', 'size':'100','readonly':True},
-    'file_save':{'string': 'Save File',
-        'type': 'binary',
-        'readonly': True,},
-}
+    def create_xml(self, cr, uid, ids, context={}):
+        obj_fyear = self.pool.get('account.fiscalyear')
+        obj_tax_code = self.pool.get('account.tax.code')
+        obj_acc_period = self.pool.get('account.period')
+        obj_user = self.pool.get('res.users')
+        obj_comp = self.pool.get('res.company')
+        obj_data = self.pool.get('ir.model.data')
 
-
-class wizard_vat_declaration(wizard.interface):
-
-    def _create_xml(self, cr, uid, data, context):
-        pool_obj = pooler.get_pool(cr.dbname)
-        obj_fyear = pool_obj.get('account.fiscalyear')
-        obj_tax_code = pool_obj.get('account.tax.code')
-        obj_user = pool_obj.get('res.users')
         list_of_tags=['00','01','02','03','45','46','47','48','49','54','55','56','57','59','61','62','63','64','71','81','82','83','84','85','86','87','91']
         obj_company = obj_user.browse(cr, uid, uid, context=context).company_id
         user_cmpny = obj_company.name
@@ -66,19 +57,20 @@ class wizard_vat_declaration(wizard.interface):
 
         tax_code_ids = obj_tax_code.search(cr, uid, [], context=context)
         ctx = context.copy()
-        ctx['period_id'] = data['form']['period'] #added context here
+        data  = self.read(cr, uid, ids)[0]
+        ctx['period_id'] = data['period_id'] #added context here
         tax_info = obj_tax_code.read(cr, uid, tax_code_ids, ['code','sum_period'], context=ctx)
 
         address = post_code = city = ''
         if not obj_company.partner_id.address:
             address = post_code = city = ''
 
-        city, post_code, address = pool_obj.get('res.company')._get_default_ad(obj_company.partner_id.address)
+        city, post_code, address = obj_comp._get_default_ad(obj_company.partner_id.address)
 
 
         year_id = obj_fyear.find(cr, uid)
 
-        account_period = pool_obj.get('account.period').browse(cr, uid, data['form']['period'], context=context)
+        account_period = obj_acc_period.browse(cr, uid, data['period_id'], context=context)
         current_year = account_period.fiscalyear_id.name
         period_code = account_period.code
 
@@ -111,21 +103,10 @@ class wizard_vat_declaration(wizard.interface):
                     data_of_file +='\n\t\t\t\t<D'+str(int(item['code'])) +'>' + str(int(item['sum_period']*100)) +  '</D'+str(int(item['code'])) +'>'
 
         data_of_file +='\n\t\t\t</DATA_ELEM>\n\t\t</DATA>\n\t</VATRECORD>\n</VATSENDING>'
-        data['form']['msg']='Save the File with '".xml"' extension.'
-        data['form']['file_save'] = base64.encodestring(data_of_file)
-        return data['form']
+        data['file_save'] = base64.encodestring(data_of_file)
+        self.write(cr, uid, ids, {'file_save':data['file_save']}, context=context)
 
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch': form_fyear, 'fields':fields_fyear, 'state':[('end', 'Cancel'),('go', 'Create XML')]},
-        },
-        'go': {
-            'actions': [_create_xml],
-            'result': {'type':'form', 'arch': form, 'fields': fields, 'state': [('end', 'Ok')]},
-        }
-    }
 
-wizard_vat_declaration('wizard.account.xml.vat.declaration')
+l10n_be_vat_declaration()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
new file mode 100644
index 00000000000..f0c19198bf3
--- /dev/null
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    	<menuitem
+        id="menu_finance_belgian_statement"
+        name="Belgium Statements"
+        parent="account.menu_finance_legal_statement"/>
+
+    	<record id="view_vat_declaration" model="ir.ui.view">
+            <field name="name">Select Period</field>
+            <field name="model">l1on_be.vat.declaration</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+			<form string="Select Period">
+               	<group  colspan="4" >
+					<field name="period_id" select="1"/>
+              		<button colspan="1" name="create_xml" string="Create XML" type="object" default_focus="1"/>
+              	 </group>
+              	 <separator string="XML Flie has been Created." colspan="4"/>
+              	 <group colspan="4" >
+					<field name="msg" nolabel="1" colspan="4"/>
+			    	<field name="file_save" readonly="True"/>
+			     </group>
+              		<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+			</form>
+            </field>
+		</record>
+
+		<record id="action_vat_declaration" model="ir.actions.act_window">
+            <field name="name">Vat Declaraion</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">l1on_be.vat.declaration</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_vat_declaration"/>
+            <field name="target">new</field>
+    	</record>
+
+	    <menuitem
+	        name="Periodical VAT Declaration"
+	        parent="menu_finance_belgian_statement"
+	        action="action_vat_declaration"
+	        id="l10_be_vat_declaration"/>
+
+    </data>
+</openerp>
\ No newline at end of file

From 373b2701c5ea118dcd5ffdb336baadc4d510a5b6 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Fri, 26 Mar 2010 20:22:01 +0530
Subject: [PATCH 236/251] [IMP] stock: stock partial move wizard

bzr revid: hmo@tinyerp.com-20100326145201-3viwi4gcsujnvfhd
---
 addons/stock/__terp__.py                      |   1 +
 addons/stock/stock.py                         | 134 ++++++++++-
 addons/stock/stock_view.xml                   |   4 +-
 addons/stock/stock_wizard.xml                 |   9 +-
 addons/stock/wizard/__init__.py               |   2 +-
 addons/stock/wizard/stock_partial_move.py     | 217 +++++++++++++++++
 .../stock/wizard/stock_partial_move_view.xml  |  25 ++
 addons/stock/wizard/stock_partial_picking.py  |  44 ++--
 addons/stock/wizard/wizard_partial_move.py    | 220 ------------------
 9 files changed, 399 insertions(+), 257 deletions(-)
 create mode 100644 addons/stock/wizard/stock_partial_move.py
 create mode 100644 addons/stock/wizard/stock_partial_move_view.xml
 delete mode 100644 addons/stock/wizard/wizard_partial_move.py

diff --git a/addons/stock/__terp__.py b/addons/stock/__terp__.py
index 4c379ccc371..5fa272238d5 100644
--- a/addons/stock/__terp__.py
+++ b/addons/stock/__terp__.py
@@ -44,6 +44,7 @@ Thanks to the double entry management, the inventory controlling is powerful and
         "stock_data.xml",
         "wizard/stock_move_view.xml",
         "wizard/stock_partial_picking_view.xml",
+        "wizard/stock_partial_move_view.xml",
         "wizard/stock_inventory_set_stock_zero_view.xml",
         "wizard/stock_fill_inventory_view.xml",
         "wizard/stock_invoice_onshipping_view.xml",
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index a801fe4fcd9..68450edd6d0 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -890,6 +890,8 @@ class stock_picking(osv.osv):
             complete, too_many, too_few = [], [], []
             move_product_qty = {}
             for move in pick.move_lines:
+                if move.state in ('done', 'cancel'):
+                    continue
                 partial_data = partial_datas.get('move%s'%(move.id), False)                
                 assert partial_data, _('Do not Found Partial data of Stock Move Line :%s' %(move.id))
                 product_qty = partial_data.get('product_qty',0.0)
@@ -1117,10 +1119,9 @@ class stock_delivery(osv.osv):
         'partner_id': fields.many2one('res.partner', 'Partner', required=True),
         'address_id': fields.many2one('res.partner.address', 'Address', required=True),
         'move_delivered':fields.one2many('stock.move', 'delivered_id', 'Move Delivered'),
-        'picking_id': fields.many2one('stock.picking', 'Picking list', required=True),
+        'picking_id': fields.many2one('stock.picking', 'Picking list'),
         
     }
-    
 stock_delivery()
 # ----------------------------------------------------
 # Move
@@ -1788,7 +1789,134 @@ class stock_move(osv.osv):
                     self.write(cr, uid, [move.id], update_val)
 
         self.action_done(cr, uid, res)          
-        return res    
+        return res   
+    
+    def do_partial(self, cr, uid, ids, partial_datas, context={}):
+        """
+        @ partial_datas : dict. contain details of partial picking 
+                          like partner_id, address_id, delivery_date, delivery moves with product_id, product_qty, uom
+        """
+        res = {}
+        picking_obj = self.pool.get('stock.picking')
+        delivery_obj = self.pool.get('stock.delivery')
+        product_obj = self.pool.get('product.product')
+        currency_obj = self.pool.get('res.currency')
+        users_obj = self.pool.get('res.users')
+        uom_obj = self.pool.get('product.uom')
+        price_type_obj = self.pool.get('product.price.type')
+        sequence_obj = self.pool.get('ir.sequence')
+        wf_service = netsvc.LocalService("workflow")
+        partner_id = partial_datas.get('partner_id', False)
+        address_id = partial_datas.get('address_id', False)
+        delivery_date = partial_datas.get('delivery_date', False)
+        
+        new_moves = []
+
+        complete, too_many, too_few = [], [], []
+        move_product_qty = {}
+        for move in self.browse(cr, uid, ids, context=context):
+            if move.state in ('done', 'cancel'):
+                continue
+            partial_data = partial_datas.get('move%s'%(move.id), False)                
+            assert partial_data, _('Do not Found Partial data of Stock Move Line :%s' %(move.id))
+            product_qty = partial_data.get('product_qty',0.0)
+            move_product_qty[move.id] = product_qty
+            product_uom = partial_data.get('product_uom',False)                
+            product_price = partial_data.get('product_price',0.0)
+            product_currency = partial_data.get('product_currency',False)
+            if move.product_qty == product_qty:
+                complete.append(move)
+            elif move.product_qty > product_qty:
+                too_few.append(move)
+            else:
+                too_many.append(move)
+
+            # Average price computation
+            if (move.picking_id.type == 'in') and (move.product_id.cost_method == 'average'):
+                product = product_obj.browse(cr, uid, move.product_id.id)
+                user = users_obj.browse(cr, uid, uid)                   
+                context['currency_id'] = move.company_id.currency_id.id                    
+                qty = uom_obj._compute_qty(cr, uid, product_uom, product_qty, product.uom_id.id)
+                pricetype = False
+                if user.company_id.property_valuation_price_type:
+                    pricetype = price_type_obj.browse(cr, uid, user.company_id.property_valuation_price_type.id)
+                if pricetype and qty > 0:
+                    new_price = currency_obj.compute(cr, uid, product_currency,
+                            user.company_id.currency_id.id, product_price)
+                    new_price = uom_obj._compute_price(cr, uid, product_uom, new_price,
+                            product.uom_id.id)                        
+                    if product.qty_available <= 0:
+                        new_std_price = new_price
+                    else:
+                        # Get the standard price
+                        amount_unit = product.price_get(pricetype.field, context)[product.id]
+                        new_std_price = ((amount_unit * product.qty_available)\
+                            + (new_price * qty))/(product.qty_available + qty)
+                            
+                    # Write the field according to price type field
+                    product_obj.write(cr, uid, [product.id],
+                            {pricetype.field: new_std_price})
+                    self.write(cr, uid, [move.id], {'price_unit': new_price})
+
+        for move in too_few:  
+            product_qty = move_product_qty[move.id]      
+            if product_qty != 0:
+                new_move = self.copy(cr, uid, move.id,
+                    {
+                        'product_qty' : product_qty,
+                        'product_uos_qty': product_qty,
+                        'picking_id' : move.picking_id.id,
+                        'state': 'assigned',
+                        'move_dest_id': False,
+                        'price_unit': move.price_unit,
+                    })
+                complete.append(self.browse(cr, uid, new_move))
+            self.write(cr, uid, move.id,
+                    {
+                        'product_qty' : move.product_qty - product_qty,
+                        'product_uos_qty':move.product_qty - product_qty,
+                    })
+
+        
+        for move in too_many:
+            self.write(cr, uid, move.id,
+                    {
+                        'product_qty': product_qty,
+                        'product_uos_qty': product_qty
+                    })
+            complete.append(move) 
+
+        for move in complete:
+            self.action_done(cr, uid, [move.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 = []
+        for move in complete: 
+            done_move_ids.append(move.id)              
+            if move.picking_id.id not in ref:                   
+                delivery_id = delivery_obj.create(cr, uid, {            
+                    'partner_id': partner_id,
+                    'address_id': address_id,
+                    'date': delivery_date,
+                    'name' : move.picking_id.name,
+                    'picking_id':  move.picking_id.id
+                }, context=context)
+                ref[move.picking_id.id] = delivery_id
+            delivery_obj.write(cr, uid, ref[move.picking_id.id], {
+                'move_delivered' : [(4,move.id)]
+            })
+        return done_move_ids
 
 stock_move()
 
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index c32eddfbf4d..877ea313d1b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1488,7 +1488,7 @@
                     <field name="date_planned"/>
                     <field name="backorder_id"/>
                     <field name="state"/>
-                    <button name="%(partial_move)d" string="Partial" type="action" states="assigned" icon="gtk-justify-fill"/>
+                    <button name="%(action_partial_move)d" string="Partial" type="action" states="assigned" icon="gtk-justify-fill"/>
                     <button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>
                 </tree>
             </field>
@@ -1534,7 +1534,7 @@
                                 <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                                 <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
                                 <button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>
-                                <button name="%(partial_move)d" states="assigned" string="Partial" type="action" icon="gtk-justify-fill"/>
+                                <button name="%(action_partial_move)d" states="assigned" string="Partial" type="action" icon="gtk-justify-fill"/>
                                 <button name="action_done" states="assigned" string="Done" type="object" icon="gtk-jump-to"/>
                             </group>
                         </page>
diff --git a/addons/stock/stock_wizard.xml b/addons/stock/stock_wizard.xml
index e966c27a6c1..f9a2dfc93b0 100644
--- a/addons/stock/stock_wizard.xml
+++ b/addons/stock/stock_wizard.xml
@@ -29,14 +29,7 @@
 	        menu="False"
 			keyword="client_action_multi"
 	        name="stock.return.picking"
-	        string="Return picking"/>
-
-	<wizard
-            id="partial_move"
-            model="stock.move"
-            multi="True"
-            name="stock.partial_move"
-            string="Partial Move"/>
+	        string="Return picking"/>	
 
     <wizard
         id="split_inventory_lots"
diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py
index 9088e95ca1d..6f5a83a07b3 100644
--- a/addons/stock/wizard/__init__.py
+++ b/addons/stock/wizard/__init__.py
@@ -22,7 +22,7 @@
 import stock_traceability
 import stock_move   
 import stock_partial_picking
-import wizard_partial_move
+import stock_partial_move
 import wizard_picking_make
 import wizard_replacement
 import wizard_return
diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
new file mode 100644
index 00000000000..bf8d1058aa2
--- /dev/null
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -0,0 +1,217 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from service import web_services
+from tools.translate import _
+import netsvc
+import pooler
+import time
+
+class stock_partial_move(osv.osv_memory):
+    _name = "stock.partial.move"    
+    _description = "Partial Move"    
+    _columns = {
+                'date': fields.datetime('Date', required=True),
+                'partner_id': fields.many2one('res.partner',string="Partner", required=True),
+                'address_id': fields.many2one('res.partner.address', 'Delivery Address', help="Address where goods are to be delivered", required=True),
+                               
+     }
+
+    def view_init(self, cr, uid, fields_list, context=None):
+        res = super(stock_partial_move, self).view_init(cr, uid, fields_list, context=context)
+        move_obj = self.pool.get('stock.move')        
+        if not context:
+            context={}
+        moveids = []
+        for m in move_obj.browse(cr, uid, context.get('active_ids', [])):            
+            if m.state in ('done', 'cancel'):
+                continue
+            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:
+                self._columns['move%s_product_qty'%(m.id)] = fields.float("Quantity")
+            if 'move%s_product_uom'%(m.id) not in self._columns:
+                self._columns['move%s_product_uom'%(m.id)] = fields.many2one('product.uom',string="Product UOM")
+
+            if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
+                if 'move%s_product_price'%(m.id) not in self._columns:
+                    self._columns['move%s_product_price'%(m.id)] = fields.float("Price")
+                if 'move%s_product_currency'%(m.id) not in self._columns:
+                    self._columns['move%s_product_currency'%(m.id)] = fields.many2one('res.currency',string="Currency")
+        return res   
+
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
+        result = super(stock_partial_move, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)        
+        move_obj = self.pool.get('stock.move')
+        move_ids = context.get('active_ids', False)                
+        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="partner_id"/>
+                    	<field name="address_id"/>
+                    	<newline/>
+                        <separator colspan="4" string="Move Detail"/>
+                    	"""
+        _moves_fields = result['fields']
+        if move_ids and view_type in ['form']:            
+            for m in move_obj.browse(cr, uid, move_ids, context):                
+                if m.state in ('done', 'cancel'):
+                    continue
+                _moves_fields.update({
+                    'move%s_product_id'%(m.id)  : {
+                                'string': _('Product'),
+                                'type' : 'many2one', 
+                                'relation': 'product.product', 
+                                'required' : True, 
+                                'readonly' : True,                                    
+                                },
+                    'move%s_product_qty'%(m.id) : {
+                                'string': _('Quantity'),
+                                'type' : 'float',
+                                'required': True,                                    
+                                },
+                    'move%s_product_uom'%(m.id) : {
+                                'string': _('Product UOM'),
+                                'type' : 'many2one', 
+                                'relation': 'product.uom', 
+                                'required' : True, 
+                                'readonly' : True,                                    
+                                }
+                })                
+                
+                _moves_arch_lst += """
+                    <group colspan="4" col="10">
+                    <field name="move%s_product_id" nolabel="1"/>
+                    <field name="move%s_product_qty" string="Qty" />
+                    <field name="move%s_product_uom" nolabel="1" />
+                """%(m.id, m.id, m.id)
+                if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):                        
+                    _moves_fields.update({
+                        'move%s_product_price'%(m.id) : {
+                                'string': _('Price'),
+                                'type' : 'float',
+                                },
+                        'move%s_product_currency'%(m.id): {
+                                'string': _('Currency'),
+                                'type' : 'float',      
+                                'type' : 'many2one', 
+                                'relation': 'res.currency',                                    
+                                }
+                    })
+                    _moves_arch_lst += """
+                        <field name="move%s_product_price" />
+                        <field name="move%s_product_currency" nolabel="1"/>
+                    """%(m.id, m.id)
+                _moves_arch_lst += """
+                    </group>
+                    """
+        _moves_arch_lst += """
+                <separator string="" colspan="4" />
+                <label string="" colspan="2"/>
+                <group col="2" colspan="2">
+        		<button icon='gtk-cancel' special="cancel"
+        			string="_Cancel" />
+        		<button name="do_partial" string="_Deliver"
+        			colspan="1" type="object" icon="gtk-apply" />
+        	</group>                	
+        </form>"""
+        result['arch'] = _moves_arch_lst
+        result['fields'] = _moves_fields           
+        return result
+
+    def default_get(self, cr, uid, fields, context=None):
+        """ 
+             To get default values for the object.
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param fields: List of fields for which we want default values 
+             @param context: A standard dictionary 
+             
+             @return: A dictionary which of fields with values. 
+        
+        """ 
+
+        res = super(stock_partial_move, self).default_get(cr, uid, fields, context=context)
+        move_obj = self.pool.get('stock.move')        
+        if not context:
+            context={}
+        moveids = []
+        if 'date' in fields:
+            res.update({'date': time.strftime('%Y-%m-%d %H:%M:%S')})
+        for m in move_obj.browse(cr, uid, context.get('active_ids', [])):            
+            if m.state in ('done', 'cancel'):
+                continue
+            if 'move%s_product_id'%(m.id) in fields:
+                res['move%s_product_id'%(m.id)] = m.product_id.id
+            if 'move%s_product_qty'%(m.id) in fields:
+                res['move%s_product_qty'%(m.id)] = m.product_qty
+            if 'move%s_product_uom'%(m.id) in fields:
+                res['move%s_product_uom'%(m.id)] = m.product_uom.id
+
+            if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
+                price = 0
+                if hasattr(m, 'purchase_line_id') and m.purchase_line_id:
+                    price = m.purchase_line_id.price_unit
+
+                currency = False
+                if hasattr(m.picking_id, 'purchase_id') and m.picking_id.purchase_id:
+                    currency = m.picking_id.purchase_id.pricelist_id.currency_id.id
+    
+                if 'move%s_product_price'%(m.id) in fields:
+                    res['move%s_product_price'%(m.id)] = price
+                if 'move%s_product_currency'%(m.id) in fields:
+                    res['move%s_product_currency'%(m.id)] = currency
+        return res   
+
+    def do_partial(self, cr, uid, ids, context):    
+        move_obj = self.pool.get('stock.move')    
+        move_ids = context.get('active_ids', False)
+        partial = self.browse(cr, uid, ids[0], context)
+        partial_datas = {
+            'partner_id' : partial.partner_id and partial.partner_id.id or False,
+            'address_id' : partial.address_id and partial.address_id.id or False,
+            'delivery_date' : partial.date         
+        }
+        for m in move_obj.browse(cr, uid, move_ids):            
+            if m.state in ('done', 'cancel'):
+                continue
+            partial_datas['move%s'%(m.id)] = {
+                'product_id' : getattr(partial, 'move%s_product_id'%(m.id)).id,
+                'product_qty' : getattr(partial, 'move%s_product_qty'%(m.id)),
+                'product_uom' : getattr(partial, 'move%s_product_uom'%(m.id)).id
+            }
+
+            if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):   
+                partial_datas['move%s'%(m.id)].update({             
+                    'product_price' : getattr(partial, 'move%s_product_price'%(m.id)),
+                    'product_currency': getattr(partial, 'move%s_product_currency'%(m.id)).id
+                })  
+        
+        res = move_obj.do_partial(cr, uid, move_ids, partial_datas, context=context)
+        return {}
+ 
+stock_partial_move()    
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/stock/wizard/stock_partial_move_view.xml b/addons/stock/wizard/stock_partial_move_view.xml
new file mode 100644
index 00000000000..30b7f3fca0e
--- /dev/null
+++ b/addons/stock/wizard/stock_partial_move_view.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>	
+
+        <record id="view_stock_partial_move" model="ir.ui.view">
+            <field name="name">Delivery Product</field>
+            <field name="model">stock.partial.move</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Delivery Product">
+             		
+             </form>
+            </field>
+		</record>
+
+        <act_window name="Delivery Product"		    
+		    res_model="stock.partial.move"
+		    src_model="stock.move"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_partial_move"/>		    	  		
+
+    </data>
+</openerp>
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 494fb3b1231..eba095718cd 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -62,11 +62,9 @@ class stock_partial_picking(osv.osv_memory):
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
         result = super(stock_partial_picking, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)        
         pick_obj = self.pool.get('stock.picking')
-        picking_ids = context.get('active_ids', False)        
-        if not picking_ids:
-            return result
-        if view_type in ['form']:
-            _moves_arch_lst = """<form string="Deliver Products">
+        picking_ids = context.get('active_ids', False) 
+        picking_ids = pick_obj.search(cr, uid, [('id', 'in', picking_ids)])               
+        _moves_arch_lst = """<form string="Deliver Products">
                         <separator colspan="4" string="Delivery Information"/>
                     	<field name="date" colspan="4" />
                     	<field name="partner_id"/>
@@ -74,7 +72,8 @@ class stock_partial_picking(osv.osv_memory):
                     	<newline/>
                         <separator colspan="4" string="Move Detail"/>
                     	"""
-            _moves_fields = result['fields']
+        _moves_fields = result['fields']
+        if picking_ids and view_type in ['form']:
             for pick in pick_obj.browse(cr, uid, picking_ids, context):
                 for m in pick.move_lines:
                     if m.state in ('done', 'cancel'):
@@ -127,18 +126,18 @@ class stock_partial_picking(osv.osv_memory):
                     _moves_arch_lst += """
                         </group>
                         """
-                _moves_arch_lst += """
-                        <separator string="" colspan="4" />
-                        <label string="" colspan="2"/>
-                        <group col="2" colspan="2">
-                		<button icon='gtk-cancel' special="cancel"
-                			string="_Cancel" />
-                		<button name="do_partial" string="_Deliver"
-                			colspan="1" type="object" icon="gtk-apply" />
-                	</group>                	
-                </form>"""
-            result['arch'] = _moves_arch_lst
-            result['fields'] = _moves_fields           
+        _moves_arch_lst += """
+                <separator string="" colspan="4" />
+                <label string="" colspan="2"/>
+                <group col="2" colspan="2">
+        		<button icon='gtk-cancel' special="cancel"
+        			string="_Cancel" />
+        		<button name="do_partial" string="_Deliver"
+        			colspan="1" type="object" icon="gtk-apply" />
+        	</group>                	
+        </form>"""
+        result['arch'] = _moves_arch_lst
+        result['fields'] = _moves_fields           
         return result
 
     def default_get(self, cr, uid, fields, context=None):
@@ -160,13 +159,13 @@ class stock_partial_picking(osv.osv_memory):
         if not context:
             context={}
         moveids = []
+        if 'date' in fields:
+            res.update({'date': time.strftime('%Y-%m-%d %H:%M:%S')})
         for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):
             if 'partner_id' in fields:
                 res.update({'partner_id': pick.address_id.partner_id.id})                
             if 'address_id' in fields:
-                res.update({'address_id': pick.address_id.id})                        
-            if 'date' in fields:
-                res.update({'date': pick.date})
+                res.update({'address_id': pick.address_id.id})            
             for m in pick.move_lines:
                 if m.state in ('done', 'cancel'):
                     continue
@@ -215,8 +214,7 @@ class stock_partial_picking(osv.osv_memory):
                     partial_datas['move%s'%(m.id)].update({             
                         'product_price' : getattr(partial, 'move%s_product_price'%(m.id)),
                         'product_currency': getattr(partial, 'move%s_product_currency'%(m.id)).id
-                    })  
-        
+                    })          
         res = pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)
         return {}
  
diff --git a/addons/stock/wizard/wizard_partial_move.py b/addons/stock/wizard/wizard_partial_move.py
deleted file mode 100644
index 928d96461c8..00000000000
--- a/addons/stock/wizard/wizard_partial_move.py
+++ /dev/null
@@ -1,220 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-import netsvc
-from tools.misc import UpdateableStr, UpdateableDict
-import pooler
-
-import wizard
-from osv import osv
-import tools
-from tools.translate import _
-
-_moves_arch = UpdateableStr()
-_moves_fields = UpdateableDict()
-
-_moves_arch_end = '''<?xml version="1.0"?>
-<form string="Picking result">
-    <label string="Move(s) have been successfully Done !" colspan="4"/>    
-</form>'''
-
-def make_default(val):
-    def fct(uid, data, state):
-        return val
-    return fct
-
-def _to_xml(s):
-    return (s or '').replace('&','&amp;').replace('<','&lt;').replace('>','&gt;')
-
-def _get_moves(self, cr, uid, data, context):
-    move_obj = pooler.get_pool(cr.dbname).get('stock.move')
-    move_lines = move_obj.browse(cr, uid, data['ids'], context)
-    res = {}
-
-    _moves_fields.clear()
-    _moves_arch_lst = ['<?xml version="1.0"?>', '<form string="Partial Stock Moves">']
-
-    for move in move_lines:
-        quantity = move.product_qty
-        if move.state != 'assigned':
-            quantity = 0
-
-        _moves_arch_lst.append('<field name="move%s" />' % (move.id,))
-        _moves_fields['move%s' % move.id] = {
-                'string': _to_xml(move.name),
-                'type' : 'float', 'required' : True, 'default' : make_default(quantity)}
-
-        if (move.picking_id.type == 'in') and (move.product_id.cost_method == 'average'):
-            price = 0
-            if hasattr(move, 'purchase_line_id') and move.purchase_line_id:
-                price = move.purchase_line_id.price_unit
-
-            currency = 0
-            if hasattr(move.picking_id, 'purchase_id') and move.picking_id.purchase_id:
-                currency = move.picking_id.purchase_id.pricelist_id.currency_id.id
-
-            _moves_arch_lst.append('<group col="6"><field name="uom%s" nolabel="1"/>\
-                    <field name="price%s"/>' % (move.id, move.id,))
-
-            _moves_fields['price%s' % move.id] = {'string': 'Unit Price',
-                    'type': 'float', 'required': True, 'default': make_default(price)}
-
-            _moves_fields['uom%s' % move.id] = {'string': 'UOM', 'type': 'many2one',
-                    'relation': 'product.uom', 'required': True,
-                    'default': make_default(move.product_uom.id)}
-
-            _moves_arch_lst.append('<field name="currency%d" nolabel="1"/></group>' % (move.id,))
-            _moves_fields['currency%s' % m.id] = {'string': 'Currency',
-                    'type': 'many2one', 'relation': 'res.currency',
-                    'required': True, 'default': make_default(currency)}
-
-        _moves_arch_lst.append('<newline/>')
-        res.setdefault('moves', []).append(move.id)
-
-    _moves_arch_lst.append('</form>')
-    _moves_arch.string = '\n'.join(_moves_arch_lst)
-    return res
-
-def _do_split(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    move_obj = pool.get('stock.move')
-    pick_obj = pool.get('stock.picking')
-    product_obj = pool.get('product.product')
-    currency_obj = pool.get('res.currency')
-    users_obj = pool.get('res.users')
-    uom_obj = pool.get('product.uom')
-    move_lines = move_obj.browse(cr, uid, data['ids'])
-    wf_service = netsvc.LocalService("workflow")
-    complete, too_few, too_many = [], [], []
-    for move in move_lines:        
-        states = []
-    
-        if move.product_qty == data['form']['move%s' % move.id]:
-            complete.append(move)
-        elif move.product_qty > data['form']['move%s' % move.id]:
-            too_few.append(move)
-        else:
-            too_many.append(move)        
-        # Average price computation
-        if (move.picking_id.type == 'in') and (move.product_id.cost_method == 'average'):
-            product = move.product_id
-            user = users_obj.browse(cr, uid, uid)
-            qty = data['form']['move%s' % move.id]
-            uom = data['form']['uom%s' % move.id]
-            price = data['form']['price%s' % move.id]
-            currency = data['form']['currency%s' % move.id]
-
-            qty = uom_obj._compute_qty(cr, uid, uom, qty, product.uom_id.id)
-            pricetype=pool.get('product.price.type').browse(cr,uid,user.company_id.property_valuation_price_type.id)
-            
-            if (qty > 0):
-                new_price = currency_obj.compute(cr, uid, currency,
-                        user.company_id.currency_id.id, price)
-                new_price = uom_obj._compute_price(cr, uid, uom, new_price,
-                        product.uom_id.id)
-                if product.qty_available<=0:
-                    new_std_price = new_price
-                else:
-                    # Get the standard price
-                    amount_unit=product.price_get(pricetype.field, context)[product.id]
-                    new_std_price = ((amount_unit * product.qty_available)\
-                        + (new_price * qty))/(product.qty_available + qty)
-
-                product_obj.write(cr, uid, [product.id],
-                        {pricetype.field: new_std_price})
-                move_obj.write(cr, uid, move.id, {'price_unit': new_price})        
-
-    for move in too_few:        
-        if data['form']['move%s' % move.id] != 0:
-            new_move = move_obj.copy(cr, uid, move.id,
-                {
-                    'product_qty' : data['form']['move%s' % move.id],
-                    'product_uos_qty':data['form']['move%s' % move.id],
-                    'picking_id' : move.picking_id.id,
-                    'state': 'assigned',
-                    'move_dest_id': False,
-                    'price_unit': move.price_unit,
-                })
-            complete.append(move_obj.browse(cr, uid, new_move))
-        move_obj.write(cr, uid, move.id,
-                {
-                    'product_qty' : move.product_qty - data['form']['move%s' % move.id],
-                    'product_uos_qty':move.product_qty - data['form']['move%s' % move.id],
-                })
-        
-    
-    for move in too_many:
-        move_obj.write(cr, uid, move.id,
-                {
-                    'product_qty': data['form']['move%s' % move.id],
-                    'product_uos_qty': data['form']['move%s' % move.id]
-                })
-        complete.append(move) 
-
-    for move in complete:
-        move_obj.action_done(cr, uid, [move.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):                       
-            pick_obj.action_move(cr, uid, [move.picking_id.id])            
-            wf_service.trg_validate(uid, 'stock.picking', move.picking_id.id, 'button_done', cr)
-
-    return {}
-
-
-
-class partial_move(wizard.interface):
-
-    states = {
-        'init': {
-            'actions': [ _get_moves ],
-            'result': {'type': 'form', 'arch': _moves_arch, 'fields': _moves_fields,
-                'state' : (
-                    ('end', 'Cancel', 'gtk-cancel'),
-                    ('split', 'Partial', 'gtk-apply', True)
-                )
-            },
-        },
-        'split': {
-            'actions': [ _do_split ],
-            'result': {'type': 'state', 'state': 'end2'},
-        },
-        'end2': {
-            'actions': [],
-            'result': {'type': 'form', 'arch': _moves_arch_end,
-                'fields': {},
-                'state': (
-                    ('end', 'Close'),
-                )
-            },
-        },
-    }
-
-partial_move('stock.partial_move')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From c69cc8bb6c10de10cd7735e71779ef9389a1ffcf Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Sat, 27 Mar 2010 05:00:17 +0000
Subject: [PATCH 237/251] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100327050017-sv5pl78of0rm7rrv
---
 addons/account/i18n/pt_BR.po                |   2 +-
 addons/account/i18n/sv.po                   |  50 +--
 addons/account_analytic_plans/i18n/oc.po    | 376 ++++++++++++++++++++
 addons/account_anglo_saxon/i18n/es.po       |  66 ++++
 addons/account_chart/i18n/pt_BR.po          |   2 +-
 addons/account_date_check/i18n/pt_BR.po     |   2 +-
 addons/account_payment/i18n/pt_BR.po        |   2 +-
 addons/analytic_user_function/i18n/hr.po    |  30 +-
 addons/base_contact/i18n/hr.po              | 136 +++----
 addons/base_contact/i18n/it.po              |  20 +-
 addons/base_iban/i18n/hr.po                 |  31 +-
 addons/base_module_merge/i18n/hr.po         |  66 ++--
 addons/base_module_quality/i18n/hr.po       |  72 ++--
 addons/base_module_record/i18n/hr.po        | 117 +++---
 addons/base_report_designer/i18n/hr.po      |  57 +--
 addons/base_setup/i18n/hr.po                |  90 +++--
 addons/board_project/i18n/sv.po             |  50 +--
 addons/board_sale/i18n/sv.po                |  28 +-
 addons/crm/i18n/fr.po                       |   6 +-
 addons/crm_profiling/i18n/pt_BR.po          |   2 +-
 addons/delivery/i18n/hr.po                  |  64 ++--
 addons/delivery/i18n/pt_BR.po               |   2 +-
 addons/document/i18n/hr.po                  |  31 +-
 addons/document_webdav/i18n/pt_BR.po        |   2 +-
 addons/idea/i18n/hr.po                      | 143 ++++----
 addons/olap_crm/i18n/pt_BR.po               |   2 +-
 addons/olap_extract/i18n/pt_BR.po           |   2 +-
 addons/olap_sale/i18n/pt_BR.po              |   2 +-
 addons/profile_crm/i18n/pt_BR.po            |   2 +-
 addons/report_account/i18n/hr.po            |  81 ++---
 addons/report_analytic/i18n/hr.po           |  32 +-
 addons/report_analytic_line/i18n/hr.po      |  17 +-
 addons/report_analytic_planning/i18n/hr.po  | 126 +++----
 addons/report_document/i18n/hr.po           |  92 ++---
 addons/report_intrastat/i18n/hr.po          | 108 +++---
 addons/report_mrp/i18n/hr.po                |  42 +--
 addons/sale/i18n/hr.po                      |   2 +-
 addons/sale_analytic_plans/i18n/hr.po       |   2 +-
 addons/sale_delivery_report/i18n/sv.po      |  22 +-
 addons/sale_journal/i18n/hr.po              |   2 +-
 addons/stock/i18n/fr.po                     |  26 +-
 addons/stock_invoice_directly/i18n/pt_BR.po |   2 +-
 42 files changed, 1265 insertions(+), 744 deletions(-)
 create mode 100644 addons/account_analytic_plans/i18n/oc.po
 create mode 100644 addons/account_anglo_saxon/i18n/es.po

diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index 117d5f3975a..11692706164 100644
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.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-03-24 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po
index 6dfa3106b60..74c60176c3a 100644
--- a/addons/account/i18n/sv.po
+++ b/addons/account/i18n/sv.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-03-23 16:02+0000\n"
-"Last-Translator: djn (Xclude) <Unknown>\n"
+"PO-Revision-Date: 2010-03-24 14:33+0000\n"
+"Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\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-03-24 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -24,7 +24,7 @@ msgstr "Internt namn"
 #. module: account
 #: view:account.tax.code:0
 msgid "Account Tax Code"
-msgstr "Skattekontokod"
+msgstr "Konto, skattekod"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree9
@@ -45,7 +45,7 @@ msgstr "Ange meddelande till rapporten försenade betalningar."
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement from draft"
-msgstr "Bekräfta verifikat från utkast"
+msgstr "Bekräfta preliminära verifikat"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_asset
@@ -55,7 +55,7 @@ msgstr "Tillgång"
 #. module: account
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "Ogiltigt modellnamn i åtgärdsdefinitionen."
+msgstr "Felaktigt namn för modell i händelsedefinitionen."
 
 #. module: account
 #: help:account.journal,currency:0
@@ -112,7 +112,7 @@ msgstr "Skriv ut momsrapport"
 #. module: account
 #: field:account.account,parent_id:0
 msgid "Parent"
-msgstr "Ovanliggande"
+msgstr "Överliggande"
 
 #. module: account
 #: selection:account.move,type:0
@@ -141,7 +141,7 @@ msgstr "Ej avstämda transaktioner"
 #. module: account
 #: constraint:account.period:0
 msgid "Error ! The duration of the Period(s) is/are invalid. "
-msgstr "Fel ! Varaktigheten i perioden/erna är felaktig "
+msgstr "Fel! Fel periodintervall. "
 
 #. module: account
 #: view:account.bank.statement.reconcile:0
@@ -262,7 +262,7 @@ msgstr "Summa Debet"
 #. module: account
 #: rml:account.tax.code.entries:0
 msgid "Accounting Entries-"
-msgstr "Bokföringstransaktioner"
+msgstr "Bokföringstransaktioner-"
 
 #. module: account
 #: help:account.journal,view_id:0
@@ -272,8 +272,8 @@ msgid ""
 "in which order. You can create your own view for a faster encoding in each "
 "journal."
 msgstr ""
-"Ger vyn som används när du skriver eller surfar poster i journalen. Vyn "
-"berättar för Open ERP vilka fält som ska synas, krävs eller skrivskyddas och "
+"Ger vyn som används när du skriver eller bläddrar poster i journalen. Vyn "
+"berättar för OpenERP vilka fält som ska synas, krävs eller skrivskyddas och "
 "i vilken ordning. Du kan skapa din egen vy  för en snabbare kodning i varje "
 "journal."
 
@@ -287,8 +287,8 @@ msgid ""
 "due dates, for example 50% now, 50% in one month."
 msgstr ""
 "Om du använder betalningsvillkor, förfallodagen kommer att beräknas "
-"automatiskt vid generering av bokföringsposter. Om du håller "
-"betalningsvillkor och förfallodagen tom betyder det direkt betalning. "
+"automatiskt vid generering av bokföringsposter. Om du lämnar "
+"betalningsvillkor och förfallodagen tomma betyder det direkt betalning. "
 "Betalningsvillkor kan beräkna flera förfallodatum, till exempel 50% nu, 50% "
 "efter en månad."
 
@@ -319,7 +319,7 @@ msgstr "Välj period"
 #: field:account.invoice,origin:0
 #: field:account.invoice.line,origin:0
 msgid "Origin"
-msgstr "Ursprung"
+msgstr "Orginal"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -364,7 +364,7 @@ msgstr "Debettransaktion"
 #: field:account.move.line,analytic_account_id:0
 #: field:report.hr.timesheet.invoice.journal,account_id:0
 msgid "Analytic Account"
-msgstr "Objektkonto"
+msgstr "Objekt"
 
 #. module: account
 #: field:account.tax,child_depend:0
@@ -382,7 +382,7 @@ msgstr "Journalnamn"
 #. module: account
 #: view:account.payment.term:0
 msgid "Description on invoices"
-msgstr "Beskrivning på faktura"
+msgstr "Beskrivning på fakturor"
 
 #. module: account
 #: constraint:account.analytic.account:0
@@ -434,7 +434,7 @@ msgstr "Negativ"
 #. module: account
 #: rml:account.partner.balance:0
 msgid "(Account/Partner) Name"
-msgstr "(Konto/Företag) namn"
+msgstr "(Konto/Partner) namn"
 
 #. module: account
 #: selection:account.move,type:0
@@ -509,7 +509,7 @@ msgstr ""
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Analytic Entries Stats"
-msgstr "Objektposter"
+msgstr "Objektposter statistikKredit ber"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
@@ -526,7 +526,7 @@ msgstr "Leverantörsfaktura"
 #: model:process.transition,name:account.process_transition_reconcilepaid0
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "Reconcile Paid"
-msgstr ""
+msgstr "Kreditering betald"
 
 #. module: account
 #: wizard_field:account.chart,init,target_move:0
@@ -542,7 +542,7 @@ msgstr "Momsmallar"
 #. module: account
 #: field:account.invoice,reconciled:0
 msgid "Paid/Reconciled"
-msgstr ""
+msgstr "Betald/Återbetald"
 
 #. module: account
 #: field:account.account.type,close_method:0
@@ -552,7 +552,7 @@ msgstr ""
 #. module: account
 #: field:account.tax.template,include_base_amount:0
 msgid "Include in Base Amount"
-msgstr ""
+msgstr "Inkluder i basbeloppet"
 
 #. module: account
 #: field:account.tax,ref_base_code_id:0
@@ -2071,7 +2071,7 @@ msgstr "Preliminär faktura"
 #. module: account
 #: model:account.account.type,name:account.account_type_expense
 msgid "Expense"
-msgstr "Kostnad"
+msgstr "Utgift"
 
 #. module: account
 #: field:account.journal,invoice_sequence_id:0
@@ -3268,7 +3268,7 @@ msgstr "Kod"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance
 msgid "Financial Management"
-msgstr "Bokföring"
+msgstr "Redovisning"
 
 #. module: account
 #: selection:account.account.type,close_method:0
@@ -3664,7 +3664,7 @@ msgstr ""
 #: field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
-msgstr "Nummerserie"
+msgstr "Sekvens"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
@@ -4140,7 +4140,7 @@ msgstr "Valuta för boken"
 #: view:account.journal.column:0
 #: model:ir.model,name:account.model_account_journal_column
 msgid "Journal Column"
-msgstr ""
+msgstr "Journalkolumn"
 
 #. module: account
 #: selection:account.fiscalyear,state:0
diff --git a/addons/account_analytic_plans/i18n/oc.po b/addons/account_analytic_plans/i18n/oc.po
new file mode 100644
index 00000000000..c697c75a25c
--- /dev/null
+++ b/addons/account_analytic_plans/i18n/oc.po
@@ -0,0 +1,376 @@
+# Occitan (post 1500) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-03-25 12:58+0000\n"
+"Last-Translator: Cédric VALMARY (Per Tot en òc) <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@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-03-27 05:00+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account4_ids:0
+msgid "Account4 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs "
+"especials !"
+
+#. module: account_analytic_plans
+#: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic
+#: model:ir.actions.wizard,name:account_analytic_plans.account_analytic_account_inverted_balance_report
+msgid "Crossovered Analytic"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account5_ids:0
+msgid "Account5 Id"
+msgstr "Identificant del Compte5"
+
+#. module: account_analytic_plans
+#: wizard_field:wizard.crossovered.analytic,init,date2:0
+msgid "End Date"
+msgstr "Data de fin"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,rate:0
+msgid "Rate (%)"
+msgstr "Taus (%)"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan:0
+#: field:account.analytic.plan,name:0
+#: field:account.analytic.plan.line,plan_id:0
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action
+msgid "Analytic Plan"
+msgstr "Plan Analitic"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
+msgid "Analytic Instance Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: wizard_button:wizard.crossovered.analytic,init,print:0
+msgid "Print"
+msgstr "Estampar"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "To Date"
+msgstr "Data de Fin"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,plan_id:0
+msgid "Plan Id"
+msgstr "Identificant del Plan"
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
+msgid "Analytic Distribution's Models"
+msgstr ""
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Account Name"
+msgstr "Nom del compte"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,code:0
+msgid "Distribution Code"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,name:0
+msgid "Plan Name"
+msgstr "Nom del Plan"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Printing date"
+msgstr "Data d'estampatge"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Percentage"
+msgstr "Percentatge"
+
+#. module: account_analytic_plans
+#: wizard_field:wizard.crossovered.analytic,init,empty_line:0
+msgid "Dont show empty lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: wizard_view:wizard.crossovered.analytic,init:0
+msgid "Select Information"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account3_ids:0
+msgid "Account3 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,journal_id:0
+#: wizard_field:wizard.crossovered.analytic,init,journal_ids:0
+msgid "Analytic Journal"
+msgstr "Jornal analitic"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "100.00%"
+msgstr "100.00%"
+
+#. module: account_analytic_plans
+#: wizard_field:wizard.crossovered.analytic,init,ref:0
+msgid "Analytic Account Ref."
+msgstr ""
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account :"
+msgstr "Compte Analitic :"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.line:0
+msgid "Analytic Plan Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account Reference:"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.wizard,name:account_analytic_plans.create_model
+msgid "Create Model"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan,default_instance_id:0
+msgid "Default Entries"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan:0
+#: field:account.analytic.plan,plan_ids:0
+#: field:account.journal,plan_id:0
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan
+msgid "Analytic Plans"
+msgstr "Plans Analitics"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,min_required:0
+msgid "Minimum Allowed (%)"
+msgstr "Minimum Permés (%)"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account1_ids:0
+msgid "Account1 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,max_required:0
+msgid "Maximum Allowed (%)"
+msgstr "Maximum Permés (%)"
+
+#. module: account_analytic_plans
+#: wizard_view:create.model,info:0
+msgid "Distribution Model Saved"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
+msgid "Analytic Plan Instance"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
+msgid "Distribution Models"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.module.module,description:account_analytic_plans.module_meta_information
+msgid ""
+"This module allows to use several analytic plans, according to the general "
+"journal,\n"
+"so that multiple analytic lines are created when the invoice or the entries\n"
+"are confirmed.\n"
+"\n"
+"For example, you can define the following analytic structure:\n"
+"  Projects\n"
+"      Project 1\n"
+"          SubProj 1.1\n"
+"          SubProj 1.2\n"
+"      Project 2\n"
+"  Salesman\n"
+"      Eric\n"
+"      Fabien\n"
+"\n"
+"Here, we have two plans: Projects and Salesman. An invoice line must\n"
+"be able to write analytic entries in the 2 plans: SubProj 1.1 and\n"
+"Fabien. The amount can also be split. The following example is for\n"
+"an invoice that touches the two subproject and assigned to one salesman:\n"
+"\n"
+"Plan1:\n"
+"    SubProject 1.1 : 50%\n"
+"    SubProject 1.2 : 50%\n"
+"Plan2:\n"
+"    Eric: 100%\n"
+"\n"
+"So when this line of invoice will be confirmed, it will generate 3 analytic "
+"lines,\n"
+"for one account entry.\n"
+"        "
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
+msgid "Multiple-plans management in Analytic Accounting"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.line:0
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
+msgid "Analytic Plan Lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Crossovered Analytic -"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,plan_id:0
+msgid "Model's Plan"
+msgstr "Plan del Modèl"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account2_ids:0
+msgid "Account2 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Amount"
+msgstr "Montant"
+
+#. module: account_analytic_plans
+#: help:account.analytic.plan.line,root_analytic_id:0
+msgid "Root account of this plan."
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account6_ids:0
+msgid "Account6 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Quantity"
+msgstr "Quantitat"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account_ids:0
+msgid "Account Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Code"
+msgstr "Còde"
+
+#. module: account_analytic_plans
+#: wizard_button:create.model,info,end:0
+msgid "OK"
+msgstr "D'acòrdi"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,root_analytic_id:0
+msgid "Root Account"
+msgstr ""
+
+#. module: account_analytic_plans
+#: wizard_view:create.model,info:0
+msgid ""
+"This distribution model has been saved. You will be able to reuse it later."
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,sequence:0
+msgid "Sequence"
+msgstr "Sequéncia"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Compte Analitic"
+
+#. module: account_analytic_plans
+#: field:account.analytic.default,analytics_id:0
+#: view:account.analytic.plan.instance:0
+#: field:account.analytic.plan.instance,name:0
+#: field:account.invoice.line,analytics_id:0
+#: field:account.move.line,analytics_id:0
+msgid "Analytic Distribution"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_instance_action
+msgid "Analytic Distribution's models"
+msgstr ""
+
+#. module: account_analytic_plans
+#: wizard_button:wizard.crossovered.analytic,init,end:0
+msgid "Cancel"
+msgstr "Anullar"
+
+#. module: account_analytic_plans
+#: wizard_field:wizard.crossovered.analytic,init,date1:0
+msgid "Start Date"
+msgstr "Data de començament"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "at"
+msgstr "a"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "From Date"
+msgstr ""
diff --git a/addons/account_anglo_saxon/i18n/es.po b/addons/account_anglo_saxon/i18n/es.po
new file mode 100644
index 00000000000..68e7618ac56
--- /dev/null
+++ b/addons/account_anglo_saxon/i18n/es.po
@@ -0,0 +1,66 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-24 12:50+0000\n"
+"PO-Revision-Date: 2010-03-24 17:25+0000\n"
+"Last-Translator: relojero <relojero28@gmail.com>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr " Contabilidad de la propiedad"
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
+msgid ""
+"This module will support the Anglo-Saxons accounting methodology by \n"
+"    changing the accounting logic with stock transactions. The difference "
+"between the Anglo-Saxon accounting countries \n"
+"    and the Rhine or also called Continental accounting countries is the "
+"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
+"    Anglo-Saxons accounting does take the cost when sales invoice is "
+"created, Continental accounting will take the cost at he moment the goods "
+"are shipped.\n"
+"    This module will add this functionality by using a interim account, to "
+"store the value of shipped goods and will contra book this interim account \n"
+"    when the invoice is created to transfer this amount to the debtor or "
+"creditor account."
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
+msgid "Stock Account"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: field:product.category,property_account_creditor_price_difference_categ:0
+#: field:product.template,property_account_creditor_price_difference:0
+msgid "Price Difference Account"
+msgstr "Precio de la cuenta diferencia"
+
+#. module: account_anglo_saxon
+#: help:product.category,property_account_creditor_price_difference_categ:0
+#: help:product.template,property_account_creditor_price_difference:0
+msgid ""
+"This account will be used to value price difference between purchase price "
+"and cost price."
+msgstr ""
+"Esta cuenta se utilizará para valorar la diferencia de precios entre el "
+"precio de compra y precio de coste"
diff --git a/addons/account_chart/i18n/pt_BR.po b/addons/account_chart/i18n/pt_BR.po
index 5ca91351ef7..48873002c79 100644
--- a/addons/account_chart/i18n/pt_BR.po
+++ b/addons/account_chart/i18n/pt_BR.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-03-24 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_date_check/i18n/pt_BR.po b/addons/account_date_check/i18n/pt_BR.po
index 01484e7d6de..46b422bf9ed 100644
--- a/addons/account_date_check/i18n/pt_BR.po
+++ b/addons/account_date_check/i18n/pt_BR.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-03-24 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_payment/i18n/pt_BR.po b/addons/account_payment/i18n/pt_BR.po
index 3292a090a89..0ea750cd530 100644
--- a/addons/account_payment/i18n/pt_BR.po
+++ b/addons/account_payment/i18n/pt_BR.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-03-24 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/analytic_user_function/i18n/hr.po b/addons/analytic_user_function/i18n/hr.po
index d458ac939a6..05b08aca798 100644
--- a/addons/analytic_user_function/i18n/hr.po
+++ b/addons/analytic_user_function/i18n/hr.po
@@ -1,64 +1,66 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* analytic_user_function
-#
+# * analytic_user_function
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 15:12+0000\n"
-"Last-Translator: Ivica Perić <ivica.peric@ipsoft-tg.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-25 00:56+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\n"
+"Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: analytic_user_function
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nepravilan XML format za View Architecture!"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
-msgstr ""
+msgstr "Vza između korisnika i proizvoda kod Analitičkog konta."
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Proizvod"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analitički Konto"
 
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
-msgstr ""
+msgstr "veza Korisnici/Proizvodi"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Korisnik"
 
 #. module: analytic_user_function
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Naziv Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !"
 
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
-msgstr ""
+msgstr "Funkcija Analitičkog Korisnika"
 
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
-msgstr ""
+msgstr "Korisnikov Proizvod za ovaj Analitički konto."
diff --git a/addons/base_contact/i18n/hr.po b/addons/base_contact/i18n/hr.po
index 3d11dd37b3e..0d890821c0d 100644
--- a/addons/base_contact/i18n/hr.po
+++ b/addons/base_contact/i18n/hr.po
@@ -1,41 +1,43 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* base_contact
-#
+# * base_contact
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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: 2009-11-09 16:40+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-25 10:49+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\n"
+"Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_contact:0
 msgid "Contact Seq."
-msgstr ""
+msgstr "Seq. Osobe"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_contact
 msgid "res.partner.contact"
-msgstr ""
+msgstr "res.partner.contact"
 
 #. module: base_contact
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Naziv Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !"
 
 #. module: base_contact
 #: field:res.partner.job,function_id:0
 msgid "Partner Function"
-msgstr ""
+msgstr "Funkcija Partnera"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
@@ -45,62 +47,62 @@ msgstr ""
 #: view:res.partner.address:0
 #: field:res.partner.address,job_ids:0
 msgid "Contacts"
-msgstr ""
+msgstr "Kontakti"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_partner:0
 msgid "Partner Seq."
-msgstr ""
+msgstr "Partner Seq."
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
 msgid "Current"
-msgstr ""
+msgstr "Tekući"
 
 #. module: base_contact
 #: field:res.partner.contact,first_name:0
 msgid "First Name"
-msgstr ""
+msgstr "Ime osobe"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_job
 msgid "Contact Partner Function"
-msgstr ""
+msgstr "Funkcija Osobe Partnera - Contact Partner Function"
 
 #. module: base_contact
 #: field:res.partner.job,other:0
 msgid "Other"
-msgstr ""
+msgstr "Drugi"
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_contacttofunction0
 msgid "Contact to function"
-msgstr ""
+msgstr "Osoba na Funkciju - Contact to Function"
 
 #. module: base_contact
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nepravilno ime modela u definiciji radnje."
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_partnertoaddress0
 msgid "Partner to address"
-msgstr ""
+msgstr "Partner na Adresu"
 
 #. module: base_contact
 #: view:res.partner.address:0
 msgid "# of Contacts"
-msgstr ""
+msgstr "# Osoba"
 
 #. module: base_contact
 #: help:res.partner.job,other:0
 msgid "Additional phone field"
-msgstr ""
+msgstr "Dodatno polje za tel. broj"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_function0
 msgid "Function"
-msgstr ""
+msgstr "Funkcija"
 
 #. module: base_contact
 #: field:res.partner.job,fax:0
@@ -110,7 +112,7 @@ msgstr "Fax"
 #. module: base_contact
 #: field:res.partner.contact,lang_id:0
 msgid "Language"
-msgstr ""
+msgstr "Jezik"
 
 #. module: base_contact
 #: field:res.partner.job,phone:0
@@ -120,22 +122,22 @@ msgstr ""
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_contacttofunction0
 msgid "Defines contacts and functions."
-msgstr ""
+msgstr "Određuje Osobe i Funkcije"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
 msgid "Title"
-msgstr ""
+msgstr "Naslov"
 
 #. module: base_contact
 #: view:res.partner.job:0
 msgid "Contact Functions"
-msgstr ""
+msgstr "Funkcije Osoba"
 
 #. module: base_contact
 #: model:ir.module.module,shortdesc:base_contact.module_meta_information
 msgid "Base Contact"
-msgstr ""
+msgstr "Osnovna Osoba"
 
 #. module: base_contact
 #: help:res.partner.job,sequence_partner:0
@@ -143,212 +145,214 @@ msgid ""
 "Order of importance of this job title in the list of job title of the linked "
 "partner"
 msgstr ""
+"redoslijed važnosti ovog naziva Posla-Radnog mjesta u listi naziva Poslova-"
+"Radnih mjesta povezanog Partnera"
 
 #. module: base_contact
 #: field:res.partner.contact,email:0
 #: field:res.partner.job,email:0
 msgid "E-Mail"
-msgstr ""
+msgstr "E-Mail"
 
 #. module: base_contact
 #: field:res.partner.job,date_stop:0
 msgid "Date Stop"
-msgstr ""
+msgstr "Datum Završetka"
 
 #. module: base_contact
 #: view:res.partner:0
 #: field:res.partner.job,address_id:0
 msgid "Address"
-msgstr ""
+msgstr "Adresa"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_res_partner_job
 #: model:ir.ui.menu,name:base_contact.menu_action_res_partner_job
 msgid "Contact's Jobs"
-msgstr ""
+msgstr "Poslovi Osobe"
 
 #. module: base_contact
 #: field:res.partner.contact,country_id:0
 msgid "Nationality"
-msgstr ""
+msgstr "Državljanstvo"
 
 #. module: base_contact
 #: help:res.partner.job,sequence_contact:0
 msgid ""
 "Order of importance of this address in the list of addresses of the linked "
 "contact"
-msgstr ""
+msgstr "redoslijed važnosti ove Adrese u listi Adresa povezanog Partnera"
 
 #. module: base_contact
 #: field:res.partner.address,job_id:0
 #: field:res.partner.contact,job_id:0
 msgid "Main Job"
-msgstr ""
+msgstr "Glavni Posao"
 
 #. module: base_contact
 #: view:res.partner:0
 msgid "Categories"
-msgstr ""
+msgstr "Kategorije"
 
 #. module: base_contact
 #: field:res.partner.contact,function_id:0
 msgid "Main Function"
-msgstr ""
+msgstr "Glavna funkcija"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_partnertoaddress0
 msgid "Define partners and their addresses."
-msgstr ""
+msgstr "Definiraj Partnere i njihove Adrese"
 
 #. module: base_contact
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nepravilan XML format za Arhitekturu Prikaza!"
 
 #. module: base_contact
 #: model:process.process,name:base_contact.process_process_basecontactprocess0
 msgid "Base Contact Process"
-msgstr ""
+msgstr "Proces Osnovne Osobe za kontakt"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Seq."
-msgstr ""
+msgstr "Seq."
 
 #. module: base_contact
 #: field:res.partner.job,extension:0
 msgid "Extension"
-msgstr ""
+msgstr "Ekstenzija"
 
 #. module: base_contact
 #: field:res.partner.contact,mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "Mobitel"
 
 #. module: base_contact
 #: help:res.partner.job,extension:0
 msgid "Internal/External extension phone number"
-msgstr ""
+msgstr "Unutarnja/Vanjska Ekstenzija Tel. broja"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_contacts0
 msgid "People you work with."
-msgstr ""
+msgstr "Ljudi s kojima radite."
 
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Extra Information"
-msgstr ""
+msgstr "Dodatni Podaci"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 #: field:res.partner.contact,job_ids:0
 msgid "Functions and Addresses"
-msgstr ""
+msgstr "Funkcije i Adrese"
 
 #. module: base_contact
 #: field:res.partner.contact,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktivan"
 
 #. module: base_contact
 #: field:res.partner.job,contact_id:0
 msgid "Contact"
-msgstr ""
+msgstr "Osoba"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_partners0
 msgid "Companies you work with."
-msgstr ""
+msgstr "Tvrtke s kojima radite."
 
 #. module: base_contact
 #: field:res.partner.contact,partner_id:0
 msgid "Main Employer"
-msgstr ""
+msgstr "Glavni Poslodavac."
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_functiontoaddress0
 msgid "Function to address"
-msgstr ""
+msgstr "Funkcija na Adresu - Function to address"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
 msgid "Partner Contacts"
-msgstr ""
+msgstr "Osobe kod Partnera"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "Osoba kod Partnera"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_partners0
 msgid "Partners"
-msgstr ""
+msgstr "Partneri"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_addresses0
 #: view:res.partner:0
 msgid "Addresses"
-msgstr ""
+msgstr "Adrese"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_addresses0
 msgid "Working and private addresses."
-msgstr ""
+msgstr "Poslovne i Privatne Adrese"
 
 #. module: base_contact
 #: field:res.partner.contact,name:0
 msgid "Last Name"
-msgstr ""
+msgstr "Prezime osobe"
 
 #. module: base_contact
 #: field:res.partner.job,state:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 #: view:res.partner.job:0
 msgid "General"
-msgstr ""
+msgstr "Općenit"
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
 msgid "Past"
-msgstr ""
+msgstr "Prošli"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "General Information"
-msgstr ""
+msgstr "Opća Informacija"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_function0
 msgid "Jobs at a same partner address."
-msgstr ""
+msgstr "Poslovi na istoj Adresi Partnera"
 
 #. module: base_contact
 #: field:res.partner.job,name:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: base_contact
 #: field:res.partner.job,date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "Datum Početka"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_functiontoaddress0
 msgid "Define functions and address."
-msgstr ""
+msgstr "Definiraj Funkcije i Adrese"
 
 #. module: base_contact
 #: field:res.partner.contact,website:0
 msgid "Website"
-msgstr ""
+msgstr "Web stranica"
 
 #. module: base_contact
 #: field:res.partner.contact,birthdate:0
 msgid "Birth Date"
-msgstr ""
+msgstr "Datum rođenja"
diff --git a/addons/base_contact/i18n/it.po b/addons/base_contact/i18n/it.po
index 487a73f2c3f..8fd01ee5ac3 100644
--- a/addons/base_contact/i18n/it.po
+++ b/addons/base_contact/i18n/it.po
@@ -7,19 +7,19 @@ 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: 2009-11-17 06:48+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-26 16:08+0000\n"
+"Last-Translator: Carlo Vettore <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-03-11 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_contact:0
 msgid "Contact Seq."
-msgstr ""
+msgstr "Seq. Contatto"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_contact
@@ -52,7 +52,7 @@ msgstr "Contatti"
 #. module: base_contact
 #: field:res.partner.job,sequence_partner:0
 msgid "Partner Seq."
-msgstr ""
+msgstr "Seq. Partner"
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
@@ -82,7 +82,7 @@ msgstr "Contatto di funzione"
 #. module: base_contact
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome del modulo non valido nella definizione dell'azione."
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_partnertoaddress0
@@ -92,12 +92,12 @@ msgstr "Partner da contattare"
 #. module: base_contact
 #: view:res.partner.address:0
 msgid "# of Contacts"
-msgstr ""
+msgstr "Numero Contatti"
 
 #. module: base_contact
 #: help:res.partner.job,other:0
 msgid "Additional phone field"
-msgstr ""
+msgstr "Numero di telefono aggiuntivo"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_function0
@@ -189,7 +189,7 @@ msgstr ""
 #: field:res.partner.address,job_id:0
 #: field:res.partner.contact,job_id:0
 msgid "Main Job"
-msgstr ""
+msgstr "Lavoro principale"
 
 #. module: base_contact
 #: view:res.partner:0
@@ -224,7 +224,7 @@ msgstr "Seq."
 #. module: base_contact
 #: field:res.partner.job,extension:0
 msgid "Extension"
-msgstr ""
+msgstr "Interno"
 
 #. module: base_contact
 #: field:res.partner.contact,mobile:0
diff --git a/addons/base_iban/i18n/hr.po b/addons/base_iban/i18n/hr.po
index 0e2702c5b7a..b58483799a1 100644
--- a/addons/base_iban/i18n/hr.po
+++ b/addons/base_iban/i18n/hr.po
@@ -1,63 +1,64 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* base_iban
-#
+# * base_iban
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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: 2009-09-08 13:34+0000\n"
-"Last-Translator: Ivica Perić <ivica.peric@ipsoft-tg.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-25 10:49+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\n"
+"Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: base_iban
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nepravilan XML format za Arhitekturu Prikaza!"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
 msgid "zip"
-msgstr ""
+msgstr "Pošt. Broj"
 
 #. module: base_iban
 #: help:res.partner.bank,iban:0
 msgid "International Bank Account Number"
-msgstr ""
+msgstr "Međunarodni broj Bankovnog računa"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_country_field
 msgid "country_id"
-msgstr ""
+msgstr "country_id"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
 msgid "bic"
-msgstr ""
+msgstr "bic"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_iban_field
 msgid "iban"
-msgstr ""
+msgstr "iban"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
 #: field:res.partner.bank,iban:0
 msgid "IBAN"
-msgstr ""
+msgstr "IBAN"
 
 #. module: base_iban
 #: model:res.partner.bank.type,name:base_iban.bank_iban
 msgid "IBAN Account"
-msgstr ""
+msgstr "IBAN konto"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field
 msgid "acc_number"
-msgstr ""
+msgstr "Broj konta"
diff --git a/addons/base_module_merge/i18n/hr.po b/addons/base_module_merge/i18n/hr.po
index 86da56d3753..21f6ec6abd1 100644
--- a/addons/base_module_merge/i18n/hr.po
+++ b/addons/base_module_merge/i18n/hr.po
@@ -1,123 +1,124 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* base_module_merge
-#
+# * base_module_merge
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 13:34+0000\n"
-"Last-Translator: Ivica Perić <ivica.peric@ipsoft-tg.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-25 10:51+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\n"
+"Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,category:0
 msgid "Category"
-msgstr ""
+msgstr "Kategorija"
 
 #. module: base_module_merge
 #: wizard_view:base_module_merge.module_merge,save:0
 msgid "Information"
-msgstr ""
+msgstr "Informacija"
 
 #. module: base_module_merge
 #: wizard_view:base_module_merge.module_merge,init:0
 msgid "Module Merging"
-msgstr ""
+msgstr "Spajanje Modula"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,author:0
 msgid "Author"
-msgstr ""
+msgstr "Autor"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,directory_name:0
 msgid "Directory Name"
-msgstr ""
+msgstr "Ime Direktorija"
 
 #. module: base_module_merge
 #: selection:base_module_merge.module_merge,info,data_kind:0
 msgid "Demo Data"
-msgstr ""
+msgstr "Demo Podaciž"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,save,module_filename:0
 msgid "Filename"
-msgstr ""
+msgstr "Ime datoteke"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,version:0
 msgid "Version"
-msgstr ""
+msgstr "Verzija"
 
 #. module: base_module_merge
 #: wizard_view:base_module_merge.module_merge,info:0
 #: wizard_view:base_module_merge.module_merge,save:0
 msgid "Module Recording"
-msgstr ""
+msgstr "Snimanje Modula"
 
 #. module: base_module_merge
 #: wizard_view:base_module_merge.module_merge,save:0
 msgid "Thanks in advance for your contribution."
-msgstr ""
+msgstr "naprijed Hvala na doprinosu!"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,description:0
 msgid "Full Description"
-msgstr ""
+msgstr "Puni opis"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,name:0
 msgid "Module Name"
-msgstr ""
+msgstr "Ime Modula"
 
 #. module: base_module_merge
 #: model:ir.actions.wizard,name:base_module_merge.wizard_base_module_merger
 #: model:ir.ui.menu,name:base_module_merge.menu_wizard_base_module_merger
 msgid "Merge module"
-msgstr ""
+msgstr "Spoji Modul"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,save,module_file:0
 msgid "Module .zip File"
-msgstr ""
+msgstr ".zip datoteka Modula"
 
 #. module: base_module_merge
 #: model:ir.module.module,shortdesc:base_module_merge.module_meta_information
 msgid "Module Merger"
-msgstr ""
+msgstr "Spoj Modula"
 
 #. module: base_module_merge
 #: wizard_view:base_module_merge.module_merge,save:0
 msgid "Module successfully created !"
-msgstr ""
+msgstr "Modul uspješno kreiran !"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,website:0
 msgid "Documentation URL"
-msgstr ""
+msgstr "URL Dokumentacije"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,init,modules_list:0
 msgid "Modules"
-msgstr ""
+msgstr "Moduli"
 
 #. module: base_module_merge
 #: wizard_button:base_module_merge.module_merge,info,save:0
 #: wizard_button:base_module_merge.module_merge,init,info:0
 msgid "Continue"
-msgstr ""
+msgstr "Nastavi"
 
 #. module: base_module_merge
 #: selection:base_module_merge.module_merge,info,data_kind:0
 msgid "Normal Data"
-msgstr ""
+msgstr "Obični podaci"
 
 #. module: base_module_merge
 #: wizard_view:base_module_merge.module_merge,save:0
@@ -126,29 +127,32 @@ msgid ""
 "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
 "the website or using features of the 'base_module_publish' module."
 msgstr ""
+"Ako mislite da bi Vaš Modul mogao nekog zanimati, voljeli bismo da ga "
+"publicirate na OpenERP.com u sekciji \"Modules\". To možete putem weba ili "
+"korištenjem mogućnosti Modula: 'base_module_publish'"
 
 #. module: base_module_merge
 #: help:base_module_merge.module_merge,init,modules_list:0
 msgid "Select Modules which you want to merge in single module"
-msgstr ""
+msgstr "Odaberite Module koje želite spojiti u jedan Modul"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,data_kind:0
 msgid "Type of Data"
-msgstr ""
+msgstr "Tip Podataka"
 
 #. module: base_module_merge
 #: wizard_view:base_module_merge.module_merge,info:0
 msgid "Module Information"
-msgstr ""
+msgstr "Informacije o Modulu"
 
 #. module: base_module_merge
 #: wizard_button:base_module_merge.module_merge,info,end:0
 #: wizard_button:base_module_merge.module_merge,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: base_module_merge
 #: wizard_button:base_module_merge.module_merge,save,end:0
 msgid "Close"
-msgstr ""
+msgstr "Zatvori"
diff --git a/addons/base_module_quality/i18n/hr.po b/addons/base_module_quality/i18n/hr.po
index 6daae728fe3..d9adbe54358 100644
--- a/addons/base_module_quality/i18n/hr.po
+++ b/addons/base_module_quality/i18n/hr.po
@@ -2,66 +2,68 @@
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the openobject-addons package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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: 2009-09-18 12:31+0000\n"
-"Last-Translator: Ivica Perić <ivica.peric@ipsoft-tg.com>\n"
-"Language-Team: Croatian <hr@li.org>\n"
+"PO-Revision-Date: 2010-03-25 21:09+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\n"
+"Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: base_module_quality
 #: field:module.quality.check,final_score:0
 msgid "Final Score (%)"
-msgstr ""
+msgstr "Konačni Rezultat (%)"
 
 #. module: base_module_quality
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Naziv Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !"
 
 #. module: base_module_quality
 #: model:ir.module.module,shortdesc:base_module_quality.module_meta_information
 msgid "Base module quality"
-msgstr ""
+msgstr "Kvalitet osnovnog Modula"
 
 #. module: base_module_quality
 #: field:module.quality.check,name:0
 msgid "Rated Module"
-msgstr ""
+msgstr "Ocijenjen Modul"
 
 #. module: base_module_quality
 #: view:module.quality.detail:0
 msgid "Detail"
-msgstr ""
+msgstr "Detalj"
 
 #. module: base_module_quality
 #: field:module.quality.detail,note:0
 msgid "Note"
-msgstr ""
+msgstr "Bilješka"
 
 #. module: base_module_quality
 #: field:module.quality.detail,state:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: base_module_quality
 #: field:module.quality.detail,detail:0
 msgid "Details"
-msgstr ""
+msgstr "Detalji"
 
 #. module: base_module_quality
 #: field:module.quality.detail,ponderation:0
 msgid "Ponderation"
-msgstr ""
+msgstr "Ponderacija"
 
 #. module: base_module_quality
 #: help:module.quality.detail,ponderation:0
@@ -69,17 +71,19 @@ msgid ""
 "Some tests are more critical than others, so they have a bigger weight in "
 "the computation of final rating"
 msgstr ""
+"Neki su testovi od većeg kritičnog značaja od drugih, tako da imaju veću "
+"\"težinu\" u izračunu konačne procjene."
 
 #. module: base_module_quality
 #: view:module.quality.check:0
 #: field:module.quality.check,check_detail_ids:0
 msgid "Tests"
-msgstr ""
+msgstr "Testovi"
 
 #. module: base_module_quality
 #: selection:module.quality.detail,state:0
 msgid "Skipped"
-msgstr ""
+msgstr "Preskočen"
 
 #. module: base_module_quality
 #: help:module.quality.detail,state:0
@@ -87,95 +91,97 @@ msgid ""
 "The test will be completed only if the module is installed or if the test "
 "may be processed on uninstalled module."
 msgstr ""
+"test će biti dovršen jedino ako je modul instaliran ili ako test može biti "
+"procesiran an neinstaliranom modulu."
 
 #. module: base_module_quality
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nepravilan XML format za View Architecture!"
 
 #. module: base_module_quality
 #: model:ir.model,name:base_module_quality.model_module_quality_check
 msgid "module.quality.check"
-msgstr ""
+msgstr "module.quality.check"
 
 #. module: base_module_quality
 #: field:module.quality.detail,name:0
 msgid "Name"
-msgstr ""
+msgstr "Ime"
 
 #. module: base_module_quality
 #: wizard_field:quality_detail_save,init,module_file:0
 msgid "Save report"
-msgstr ""
+msgstr "Spremi Izvještaj"
 
 #. module: base_module_quality
 #: wizard_field:quality_detail_save,init,name:0
 msgid "File name"
-msgstr ""
+msgstr "Ime datoteke"
 
 #. module: base_module_quality
 #: field:module.quality.detail,score:0
 msgid "Score (%)"
-msgstr ""
+msgstr "Rezultat (%)"
 
 #. module: base_module_quality
 #: help:quality_detail_save,init,name:0
 msgid "Save report as .html format"
-msgstr ""
+msgstr "Spremi izvještaj u .html formatu"
 
 #. module: base_module_quality
 #: view:module.quality.detail:0
 #: field:module.quality.detail,summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Sižetak"
 
 #. module: base_module_quality
 #: model:ir.actions.wizard,name:base_module_quality.quality_detail_save
 msgid "Report Save"
-msgstr ""
+msgstr "Spremi Izvještaj"
 
 #. module: base_module_quality
 #: wizard_view:quality_detail_save,init:0
 msgid "Standard entries"
-msgstr ""
+msgstr "Standardni unosi"
 
 #. module: base_module_quality
 #: view:module.quality.detail:0
 msgid "Save Report"
-msgstr ""
+msgstr "Spremi Izvještaj"
 
 #. module: base_module_quality
 #: model:ir.actions.wizard,name:base_module_quality.create_quality_check_id
 msgid "Quality Check"
-msgstr ""
+msgstr "Provjera Kvalitete"
 
 #. module: base_module_quality
 #: model:ir.model,name:base_module_quality.model_module_quality_detail
 msgid "module.quality.detail"
-msgstr ""
+msgstr "module.quality.detail"
 
 #. module: base_module_quality
 #: selection:module.quality.detail,state:0
 msgid "Done"
-msgstr ""
+msgstr "Gotovo"
 
 #. module: base_module_quality
 #: view:module.quality.check:0
 #: view:module.quality.detail:0
 msgid "Result"
-msgstr ""
+msgstr "Rezultat"
 
 #. module: base_module_quality
 #: wizard_button:quality_detail_save,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: base_module_quality
 #: field:module.quality.detail,message:0
 msgid "Message"
-msgstr ""
+msgstr "Poruka"
 
 #. module: base_module_quality
 #: field:module.quality.detail,quality_check_id:0
 msgid "Quality"
-msgstr ""
+msgstr "Kvaliteta"
diff --git a/addons/base_module_record/i18n/hr.po b/addons/base_module_record/i18n/hr.po
index 1aacc87b906..ab8a8a4a73e 100644
--- a/addons/base_module_record/i18n/hr.po
+++ b/addons/base_module_record/i18n/hr.po
@@ -1,105 +1,107 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* base_module_record
-#
+# * base_module_record
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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: 2009-09-08 15:16+0000\n"
-"Last-Translator: Ivica Perić <ivica.peric@ipsoft-tg.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-25 21:09+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\n"
+"Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,category:0
 #: wizard_field:base_module_record.module_save,info,category:0
 msgid "Category"
-msgstr ""
+msgstr "Kategorija"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
 #: wizard_field:base_module_record.module_save,init,info_text:0
 #: wizard_view:base_module_record.module_save,save:0
 msgid "Information"
-msgstr ""
+msgstr "Informacija"
 
 #. module: base_module_record
 #: model:ir.model,name:base_module_record.model_ir_module_record
 msgid "ir.module.record"
-msgstr ""
+msgstr "ir.module.record"
 
 #. module: base_module_record
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Ime Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,init:0
 msgid "Choose objects to record"
-msgstr ""
+msgstr "Izaberite Objekte za Snimanje"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,author:0
 #: wizard_field:base_module_record.module_save,info,author:0
 msgid "Author"
-msgstr ""
+msgstr "Autor"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,directory_name:0
 #: wizard_field:base_module_record.module_save,info,directory_name:0
 msgid "Directory Name"
-msgstr ""
+msgstr "Ime Direktorija"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Records only"
-msgstr ""
+msgstr "Samo Zapisi"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,intro,data_kind:0
 #: selection:base_module_record.module_save,info,data_kind:0
 msgid "Demo Data"
-msgstr ""
+msgstr "Demo Podaci"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,save,module_filename:0
 #: wizard_field:base_module_record.module_save,save,module_filename:0
 msgid "Filename"
-msgstr ""
+msgstr "Ime datoteke"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,version:0
 #: wizard_field:base_module_record.module_save,info,version:0
 msgid "Version"
-msgstr ""
+msgstr "Verzija"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,init:0
 msgid "Objects Recording"
-msgstr ""
+msgstr "Objekti se Snimaju"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,init,check_date:0
 msgid "Record from Date"
-msgstr ""
+msgstr "Zapis od Datuma"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,stop:0
 #: wizard_view:base_module_record.module_save,init:0
 msgid "Recording Information"
-msgstr ""
+msgstr "Informacija o Snimanju"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_save,init,info_status:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,stop:0
@@ -111,111 +113,111 @@ msgstr ""
 #: wizard_view:base_module_record.module_save,init:0
 #: wizard_view:base_module_record.module_save,save:0
 msgid "Module Recording"
-msgstr ""
+msgstr "Modul se Zapisuje"
 
 #. module: base_module_record
 #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
 msgid "Export Customizations As a Module"
-msgstr ""
+msgstr "Izvezi Prilagodbe kao Modul"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
 #: wizard_view:base_module_record.module_save,save:0
 msgid "Thanks in advance for your contribution."
-msgstr ""
+msgstr "Hvala unaprijed na Vašem Doprinosu"
 
 #. module: base_module_record
 #: help:base_module_record.module_record_objects,init,objects:0
 msgid "List of objects to be recorded"
-msgstr ""
+msgstr "Lista Objekata za zapis"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record,start,start_confirm:0
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record
 msgid "Start Recording"
-msgstr ""
+msgstr "Počni Snimanje"
 
 #. module: base_module_record
 #: selection:base_module_record.module_save,init,info_status:0
 msgid "Not Recording"
-msgstr ""
+msgstr "Ne Zapisuje se"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,description:0
 #: wizard_field:base_module_record.module_save,info,description:0
 msgid "Full Description"
-msgstr ""
+msgstr "Puni Opis"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,name:0
 #: wizard_field:base_module_record.module_save,info,name:0
 msgid "Module Name"
-msgstr ""
+msgstr "Ime Modula"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,init,objects:0
 msgid "Objects"
-msgstr ""
+msgstr "Objekti"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,save,module_file:0
 #: wizard_field:base_module_record.module_save,save,module_file:0
 msgid "Module .zip File"
-msgstr ""
+msgstr ".zip datoteka Modula"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,start:0
 msgid "Recording information"
-msgstr ""
+msgstr "Informacija o Snimanju"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
 #: wizard_view:base_module_record.module_save,save:0
 msgid "Module successfully created !"
-msgstr ""
+msgstr "Modul uspješno kreiran !"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,start:0
 msgid "Recording Stopped"
-msgstr ""
+msgstr "Snimanje zaustavljeno"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Created"
-msgstr ""
+msgstr "Kreiran"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,end:0
 #: wizard_view:base_module_record.module_save,end:0
 msgid "Thanks For using Module Recorder"
-msgstr ""
+msgstr "Hvala što ste koristili Snimač  Modula"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record,start,continue:0
 msgid "Continue Previous Session"
-msgstr ""
+msgstr "Nastavi Prethodnu Sesiju"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,website:0
 #: wizard_field:base_module_record.module_save,info,website:0
 msgid "Documentation URL"
-msgstr ""
+msgstr "URL Dokumentacije"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Modified"
-msgstr ""
+msgstr "Izmijenjen"
 
 #. module: base_module_record
 #: selection:base_module_record.module_save,init,info_status:0
 msgid "Recording"
-msgstr ""
+msgstr "Snimanje"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_objects,init,record:0
 msgid "Record"
-msgstr ""
+msgstr "Zapis"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record,stop,end:0
@@ -223,25 +225,25 @@ msgstr ""
 #: wizard_button:base_module_record.module_save,info,save:0
 #: wizard_button:base_module_record.module_save,init,check:0
 msgid "Continue"
-msgstr ""
+msgstr "Nastavi"
 
 #. module: base_module_record
 #: model:ir.module.module,shortdesc:base_module_record.module_meta_information
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec_rec
 msgid "Module Recorder"
-msgstr ""
+msgstr "Snimač Modula"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,intro,data_kind:0
 #: selection:base_module_record.module_save,info,data_kind:0
 msgid "Normal Data"
-msgstr ""
+msgstr "uobičajeni Podaci"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_objects,end,end:0
 #: wizard_button:base_module_record.module_save,end,end:0
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
@@ -251,6 +253,9 @@ msgid ""
 "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
 "the website or using features of the 'base_module_publish' module."
 msgstr ""
+"Ako mislite da bi Vaš Modul mogao nekog zanimati, voljeli bismo da ga "
+"publicirate na OpenERP.com u sekciji \"Modules\". To možete putem weba ili "
+"korištenjem mogućnosti Modula: 'base_module_publish'."
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,start:0
@@ -259,16 +264,19 @@ msgid ""
 "ERP client and save them as a module. You will be able to install this "
 "module on any database to reuse and/or publish it."
 msgstr ""
+"Snimač Modula omogućuje Vam da snimite svaku operaciju izvršenu u Open ERP "
+"klijentu i izmjene spremite kao Modul. Moći ćete instalirati taj Modul na "
+"bilo kojoj Bazi Podataka za ponovnu uporabu ili publiciranje."
 
 #. module: base_module_record
 #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record
 msgid "Record module"
-msgstr ""
+msgstr "Snimi Modul"
 
 #. module: base_module_record
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
 msgid "Module Creation"
-msgstr ""
+msgstr "Kreacija Modula"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,stop:0
@@ -276,30 +284,33 @@ msgid ""
 "You can continue the recording session by relauching the 'start recording' "
 "wizard."
 msgstr ""
+"Možete nastaviti snimanje tako da ponovo pokrenete Čarobnjak \"Počni "
+"Snimanje\""
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,data_kind:0
 #: wizard_field:base_module_record.module_save,info,data_kind:0
 msgid "Type of Data"
-msgstr ""
+msgstr "Tip podataka"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,intro:0
 #: wizard_view:base_module_record.module_save,info:0
 msgid "Module Information"
-msgstr ""
+msgstr "Informacija o Modulu"
 
 #. module: base_module_record
 #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_save
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_save
 msgid "Save Recorded Module"
-msgstr ""
+msgstr "Spremi Snimljen Modul"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,stop:0
 msgid ""
 "Open ERP recording is stopped. Don't forget to save the recorded module."
 msgstr ""
+"OpenERP Snimač je zaustavljen. Ne zaboravite spremiti snimljen Modul."
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record,start,end:0
@@ -308,20 +319,20 @@ msgstr ""
 #: wizard_button:base_module_record.module_save,info,end:0
 #: wizard_button:base_module_record.module_save,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_objects,save,end:0
 #: wizard_button:base_module_record.module_save,save,end:0
 msgid "Close"
-msgstr ""
+msgstr "Zatvori"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Created & Modified"
-msgstr ""
+msgstr "Kreiran i Izmijenjen"
 
 #. module: base_module_record
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_stop
 msgid "Stop Recording"
-msgstr ""
+msgstr "Zaustavi Snimanje"
diff --git a/addons/base_report_designer/i18n/hr.po b/addons/base_report_designer/i18n/hr.po
index 4bf555fb9e5..446c310fe71 100644
--- a/addons/base_report_designer/i18n/hr.po
+++ b/addons/base_report_designer/i18n/hr.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* base_report_designer
-#
+# * base_report_designer
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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: 2009-09-30 08:28+0000\n"
-"Last-Translator: Miro Glavić <glavicmiro@gmail.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-24 09:27+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\n"
+"Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: base_report_designer
 #: wizard_field:base_report_designer.modify,init,text:0
@@ -29,67 +30,67 @@ msgstr ""
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,get_form_result,send_form:0
 msgid "Upload the modified report"
-msgstr ""
+msgstr "Pošalji promijenjen Izvještaj na Server"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,get_form_result:0
 msgid "The .SXW report"
-msgstr ""
+msgstr ".SXW Izvještaj"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,send_form_result:0
 msgid "Report modified"
-msgstr ""
+msgstr "Izvještaj je promijenjen"
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,init,get_form:0
 msgid "Modify a report"
-msgstr ""
+msgstr "Izmijeni Izvještaj"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,send_form_result:0
 msgid "Your report has been modified."
-msgstr ""
+msgstr "Vaš je Izvještaj izmijenjen"
 
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
 msgid "Report designer interface module"
-msgstr ""
+msgstr "Modul sučelja Dizajnera Izvještaja"
 
 #. module: base_report_designer
 #: wizard_field:base_report_designer.modify,get_form,report_id:0
 #: wizard_field:base_report_designer.modify,get_form_result,report_id:0
 #: wizard_field:base_report_designer.modify,send_form,report_id:0
 msgid "Report"
-msgstr ""
+msgstr "Izvještaj"
 
 #. module: base_report_designer
 #: model:ir.ui.menu,name:base_report_designer.menu_wizard_report_designer_modify
 msgid "Report Designer"
-msgstr ""
+msgstr "Dizajner Izvještaja"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,get_form:0
 #: wizard_view:base_report_designer.modify,get_form_result:0
 #: wizard_view:base_report_designer.modify,send_form:0
 msgid "Get a report"
-msgstr ""
+msgstr "Napravi Izvještaj"
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,get_form,get_form_result:0
 msgid "Continue"
-msgstr ""
+msgstr "Nastavi"
 
 #. module: base_report_designer
 #: wizard_field:base_report_designer.modify,get_form_result,file_sxw:0
 #: wizard_field:base_report_designer.modify,send_form,file_sxw:0
 msgid "Your .SXW file"
-msgstr ""
+msgstr "Vaša .SXW datoteka"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,init:0
 msgid "Report designer"
-msgstr ""
+msgstr "Dizajner Izvještaja"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,get_form_result:0
@@ -99,47 +100,51 @@ msgid ""
 "to modify it. Once it is modified, re-upload it in Open ERP using this "
 "wizard."
 msgstr ""
+"Ovo je Predložak vašeg traženog Izvještaja. Spremite ga kao .SXW datoteku i "
+"otvorite s programon OpenOffice. Ne zaboravite instalirati Tiny OpenOffice "
+"paket kako biste mogli vršiti izmjene. kad izvršite izmjene, vratite "
+"datoteku u Open ERP koristeći ovaj Čarobnjak."
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,send_form,send_form_result:0
 msgid "Update the report"
-msgstr ""
+msgstr "Ažurirajte Izvještaj"
 
 #. module: base_report_designer
 #: selection:base_report_designer.modify,init,operation:0
 msgid "Create a new report"
-msgstr ""
+msgstr "Napravi novi Izvještaj"
 
 #. module: base_report_designer
 #: selection:base_report_designer.modify,init,operation:0
 #: model:ir.actions.wizard,name:base_report_designer.wizard_report_designer_modify
 msgid "Modify an existing report"
-msgstr ""
+msgstr "Izmijeni postojeći izvještaj"
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,get_form,end:0
 #: wizard_button:base_report_designer.modify,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,get_form_result,end:0
 #: wizard_button:base_report_designer.modify,send_form,end:0
 #: wizard_button:base_report_designer.modify,send_form_result,end:0
 msgid "Close"
-msgstr ""
+msgstr "Zatvori"
 
 #. module: base_report_designer
 #: wizard_field:base_report_designer.modify,init,operation:0
 msgid "Operation"
-msgstr ""
+msgstr "Operacija"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,init:0
 msgid "Report designer introduction"
-msgstr ""
+msgstr "Uvod u Dizajner Izvještaja"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,get_form:0
 msgid "Select your report"
-msgstr ""
+msgstr "Odaberite izvještaj"
diff --git a/addons/base_setup/i18n/hr.po b/addons/base_setup/i18n/hr.po
index 038c0c73538..3423f72d4a5 100644
--- a/addons/base_setup/i18n/hr.po
+++ b/addons/base_setup/i18n/hr.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* base_setup
-#
+# * base_setup
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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: 2009-09-08 16:32+0000\n"
-"Last-Translator: Ivica Perić <ivica.peric@ipsoft-tg.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-26 01:09+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\n"
+"Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,city:0
@@ -29,34 +30,37 @@ msgid ""
 "You can start configuring the system or connect directly to the database "
 "using the default setup."
 msgstr ""
+"Možete početi s konfiguracijom sustava ili se izravno spojiti na bazu "
+"podataka koristeći predefinirane postavke."
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,zip:0
 #: wizard_field:base_setup.base_setup,init,zip:0
 #: wizard_field:base_setup.base_setup,update,zip:0
 msgid "Zip code"
-msgstr ""
+msgstr "Pošt. broj"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,init:0
 msgid "Select a Profile"
-msgstr ""
+msgstr "Odaberite Profil"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
 msgid "Report header"
-msgstr ""
+msgstr "Zaglavlje Izvještaja"
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,finish,config:0
 msgid "Start Configuration"
-msgstr ""
+msgstr "Započnite Konfiguriranje"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,init:0
 msgid ""
 "You'll be able to install more modules later through the Administration menu."
 msgstr ""
+"Moći ćete instalirati više Modula kasnije kroz izbornik Admininstracija"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,init:0
@@ -65,88 +69,91 @@ msgid ""
 "have been setup to help you discover the different aspects of OpenERP. This "
 "is just an overview, we have 300+ available modules."
 msgstr ""
+"Profil određuje pred-izbor modula za specifične potrebe. Ti su profili "
+"podešeni kako biste lakše otkrivali različite aspekte Open ERP-a. Ovo je tek "
+"osvrt, postoji 300+ raspoloživih modula."
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,company,update:0
 #: wizard_button:base_setup.base_setup,init,company:0
 msgid "Next"
-msgstr ""
+msgstr "Dalje"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,email:0
 #: wizard_field:base_setup.base_setup,init,email:0
 #: wizard_field:base_setup.base_setup,update,email:0
 msgid "E-mail"
-msgstr ""
+msgstr "E-Mail"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,state_id:0
 #: wizard_field:base_setup.base_setup,init,state_id:0
 #: wizard_field:base_setup.base_setup,update,state_id:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,finish:0
 msgid "Your new database is now fully installed."
-msgstr ""
+msgstr "Vaša nova baza podataka sada je instalirana u potpunosti."
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,profile:0
 #: wizard_field:base_setup.base_setup,init,profile:0
 #: wizard_field:base_setup.base_setup,update,profile:0
 msgid "Profile"
-msgstr ""
+msgstr "Profil"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,rml_footer1:0
 #: wizard_field:base_setup.base_setup,init,rml_footer1:0
 #: wizard_field:base_setup.base_setup,update,rml_footer1:0
 msgid "Report Footer 1"
-msgstr ""
+msgstr "Podnožje Izvještaja 1"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,rml_footer2:0
 #: wizard_field:base_setup.base_setup,init,rml_footer2:0
 #: wizard_field:base_setup.base_setup,update,rml_footer2:0
 msgid "Report Footer 2"
-msgstr ""
+msgstr "Podnožje Izvještaja 2"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
 msgid "General Information"
-msgstr ""
+msgstr "Opće Informacije"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,street2:0
 #: wizard_field:base_setup.base_setup,init,street2:0
 #: wizard_field:base_setup.base_setup,update,street2:0
 msgid "Street2"
-msgstr ""
+msgstr "Ulica2"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
 msgid "Report Information"
-msgstr ""
+msgstr "Informacija o Izvještaju"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,phone:0
 #: wizard_field:base_setup.base_setup,init,phone:0
 #: wizard_field:base_setup.base_setup,update,phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Telefon"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
 msgid "Define Main Company"
-msgstr ""
+msgstr "Odredite glavnu Tvrtku"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,name:0
 #: wizard_field:base_setup.base_setup,init,name:0
 #: wizard_field:base_setup.base_setup,update,name:0
 msgid "Company Name"
-msgstr ""
+msgstr "Ime Tvrtke"
 
 #. module: base_setup
 #: help:base_setup.base_setup,company,rml_footer2:0
@@ -157,13 +164,16 @@ msgid ""
 "We suggest you to put bank information here:\n"
 "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
 msgstr ""
+"Ova će se rečenica pojavljivati u podnožju vaših izvještaja.\n"
+"Savjetujemo vam da ovdje upišete bankovne podatke:\n"
+"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - PDV: BE0477.472.701"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,country_id:0
 #: wizard_field:base_setup.base_setup,init,country_id:0
 #: wizard_field:base_setup.base_setup,update,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "Država"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
@@ -173,7 +183,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:base_setup.action_wizard_setup
 #: model:ir.actions.wizard,name:base_setup.wizard_base_setup
 msgid "Setup"
-msgstr ""
+msgstr "Postava"
 
 #. module: base_setup
 #: help:base_setup.base_setup,company,rml_footer1:0
@@ -184,21 +194,24 @@ msgid ""
 "We suggest you to write legal sentences here:\n"
 "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
 msgstr ""
+"Ova će se rečenica pojavljivati u podnožju vaših izvještaja.\n"
+"Savjetujemo vam da ovdje upišete osnovne podatke:\n"
+"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,update:0
 msgid "Summary"
-msgstr ""
+msgstr "Sižetak"
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,update,finish:0
 msgid "Install"
-msgstr ""
+msgstr "Instaliraj"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,finish:0
 msgid "Installation Done"
-msgstr ""
+msgstr "Instalacija Završena"
 
 #. module: base_setup
 #: help:base_setup.base_setup,company,rml_header1:0
@@ -209,57 +222,60 @@ msgid ""
 "We suggest you to put a slogan here:\n"
 "\"Open Source Business Solutions\"."
 msgstr ""
+"Ova će se rečenica pojavljivati u gornjem desno kutu vaših izvještaja.\n"
+"Savjetujemo vam da ovdje upišete slogan tvrtke:\n"
+"\"Open Source Business Solutions\""
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,rml_header1:0
 #: wizard_field:base_setup.base_setup,init,rml_header1:0
 #: wizard_field:base_setup.base_setup,update,rml_header1:0
 msgid "Report Header"
-msgstr ""
+msgstr "Zaglavlje Izvještaja"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
 msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr ""
+msgstr "Vaš Logo: Koristite veličinu slike od cca. 450x150 pixela."
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,currency:0
 #: wizard_field:base_setup.base_setup,init,currency:0
 #: wizard_field:base_setup.base_setup,update,currency:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,street:0
 #: wizard_field:base_setup.base_setup,init,street:0
 #: wizard_field:base_setup.base_setup,update,street:0
 msgid "Street"
-msgstr ""
+msgstr "Ulica"
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,finish,menu:0
 msgid "Use Directly"
-msgstr ""
+msgstr "Koristi Izravno"
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,init,menu:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,logo:0
 #: wizard_field:base_setup.base_setup,init,logo:0
 #: wizard_field:base_setup.base_setup,update,logo:0
 msgid "Logo"
-msgstr ""
+msgstr "Logo"
 
 #. module: base_setup
 #: model:ir.module.module,shortdesc:base_setup.module_meta_information
 msgid "Base Setup"
-msgstr ""
+msgstr "Osnovni Postav"
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,company,init:0
 #: wizard_button:base_setup.base_setup,update,company:0
 msgid "Previous"
-msgstr ""
+msgstr "Prethodno"
diff --git a/addons/board_project/i18n/sv.po b/addons/board_project/i18n/sv.po
index 16fdd4bd9ff..9d4dfb842a3 100644
--- a/addons/board_project/i18n/sv.po
+++ b/addons/board_project/i18n/sv.po
@@ -7,100 +7,100 @@ 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-02-03 11:05+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-24 08:22+0000\n"
+"Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\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-03-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
 #: view:board.board:0
 msgid "My project's planning"
-msgstr ""
+msgstr "Mina projekts planering"
 
 #. module: board_project
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:board_project.act_hr_timesheet_sheet
 msgid "Timesheets"
-msgstr ""
+msgstr "Tidrapporter"
 
 #. module: board_project
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Felaktigt namn för modell i händelsedefinitionen."
 
 #. module: board_project
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_project.act_my_project
 msgid "My projects"
-msgstr ""
+msgstr "Mina projekt"
 
 #. module: board_project
 #: model:ir.actions.act_window,name:board_project.action_view_task_tree_deadline
 msgid "My Task's Deadlines"
-msgstr ""
+msgstr "Mina aktiviteters deadlines"
 
 #. module: board_project
 #: view:project.task:0
 msgid "My Tasks"
-msgstr ""
+msgstr "Mina aktiviteter"
 
 #. module: board_project
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_project.action_view_board_note_tree
 msgid "Public Notes"
-msgstr ""
+msgstr "Publika Inlägg"
 
 #. module: board_project
 #: model:ir.actions.act_window,name:board_project.open_board_project
 #: model:ir.ui.menu,name:board_project.menu_board_project
 msgid "Project Dashboard"
-msgstr ""
+msgstr "Projekt dashboard"
 
 #. module: board_project
 #: model:ir.module.module,shortdesc:board_project.module_meta_information
 msgid "Board for project users"
-msgstr ""
+msgstr "Dashboard för projektanvändare"
 
 #. module: board_project
 #: model:ir.actions.act_window,name:board_project.action_project_pipeline_user
 msgid "Pipeline of tasks"
-msgstr ""
+msgstr "Aktiviteter i pipeline"
 
 #. module: board_project
 #: view:board.board:0
 msgid "My Planning"
-msgstr ""
+msgstr "Min planering"
 
 #. module: board_project
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_project.act_my_account
 msgid "My accounts to invoice"
-msgstr ""
+msgstr "Mina konton som skall fakturerar"
 
 #. module: board_project
 #: model:ir.actions.act_window,name:board_project.open_board_project_manager
 #: model:ir.ui.menu,name:board_project.menu_board_project_manager
 msgid "Project Manager Dashboard"
-msgstr ""
+msgstr "Projektledare dashboard"
 
 #. module: board_project
 #: view:board.board:0
 msgid "My Deadlines"
-msgstr ""
+msgstr "Mina deadlines"
 
 #. module: board_project
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Felaktig XML för Vyarkitektur!"
 
 #. module: board_project
 #: view:board.board:0
 msgid "User's timesheets"
-msgstr ""
+msgstr "Användares tidrapporter"
 
 #. module: board_project
 #: model:ir.ui.menu,name:board_project.next_id_86
@@ -110,30 +110,30 @@ msgstr "Projekt"
 #. module: board_project
 #: view:board.board:0
 msgid "Project manager board"
-msgstr ""
+msgstr "Projektledarens dashboard"
 
 #. module: board_project
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_project.action_view_task_tree
 msgid "My Open Tasks"
-msgstr ""
+msgstr "Mina öppna aktiviteter"
 
 #. module: board_project
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "Min dashboard"
 
 #. module: board_project
 #: view:board.board:0
 msgid "My tasks board"
-msgstr ""
+msgstr "Dashboard för mina aktiviteter"
 
 #. module: board_project
 #: view:board.board:0
 msgid "My user's pipeline"
-msgstr ""
+msgstr "Mina användares pipeline"
 
 #. module: board_project
 #: view:board.board:0
 msgid "My Timesheet"
-msgstr ""
+msgstr "Min tidrapport"
diff --git a/addons/board_sale/i18n/sv.po b/addons/board_sale/i18n/sv.po
index 146ea3c73d8..bd03fc11c76 100644
--- a/addons/board_sale/i18n/sv.po
+++ b/addons/board_sale/i18n/sv.po
@@ -7,67 +7,67 @@ 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-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-24 13:56+0000\n"
+"Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\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-03-11 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
 #: model:ir.module.module,shortdesc:board_sale.module_meta_information
 msgid "Dashboard for sales"
-msgstr ""
+msgstr "Dashboard för kundorder"
 
 #. module: board_sale
 #: model:ir.actions.act_window,name:board_sale.open_board_sales_manager
 #: model:ir.ui.menu,name:board_sale.menu_board_sales_manager
 msgid "Sale Dashboard"
-msgstr ""
+msgstr "Kundorder dashboard"
 
 #. module: board_sale
 #: view:board.board:0
 msgid "Sales of the month"
-msgstr ""
+msgstr "Försäljning denna månad"
 
 #. module: board_sale
 #: view:board.board:0
 msgid "Sales manager board"
-msgstr ""
+msgstr "Dashboard för försäljningschef"
 
 #. module: board_sale
 #: view:board.board:0
 msgid "Cases of the month"
-msgstr ""
+msgstr "Ärenden denna månad"
 
 #. module: board_sale
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "Felaktig XML för Vyarkitektur!"
+msgstr "Ogiltig XML för Vy-arkitektur!"
 
 #. module: board_sale
 #: view:board.board:0
 msgid "My open quotations"
-msgstr ""
+msgstr "Mina öppna offerter"
 
 #. module: board_sale
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "Felaktigt namn för modell i händelsedefinitionen."
+msgstr "Ogiltigt modellnamn i åtgärdsdefinitionen."
 
 #. module: board_sale
 #: model:ir.ui.menu,name:board_sale.next_id_88
 msgid "Sales"
-msgstr ""
+msgstr "Kundorder"
 
 #. module: board_sale
 #: view:board.board:0
 msgid "Cases statistics"
-msgstr ""
+msgstr "Ärendestatistik"
 
 #. module: board_sale
 #: view:board.board:0
 msgid "Top ten sales of the month"
-msgstr ""
+msgstr "Top tio kundorder denna månad"
diff --git a/addons/crm/i18n/fr.po b/addons/crm/i18n/fr.po
index d3a77572ea2..fbbda785372 100644
--- a/addons/crm/i18n/fr.po
+++ b/addons/crm/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.7\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-02-09 23:36+0000\n"
+"PO-Revision-Date: 2010-03-26 21:06+0000\n"
 "Last-Translator: Sebastien LANGE - http://www.Syleam.fr <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-03-11 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -1753,7 +1753,7 @@ msgstr "Planifier un appel téléphonique"
 #. module: crm
 #: field:crm.case,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "Référence"
 
 #. module: crm
 #: field:crm.meeting,exrule:0
diff --git a/addons/crm_profiling/i18n/pt_BR.po b/addons/crm_profiling/i18n/pt_BR.po
index 16c70e45e7f..ccc9abddce2 100644
--- a/addons/crm_profiling/i18n/pt_BR.po
+++ b/addons/crm_profiling/i18n/pt_BR.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-03-24 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/delivery/i18n/hr.po b/addons/delivery/i18n/hr.po
index 0a9b6342c63..586c69fe1af 100644
--- a/addons/delivery/i18n/hr.po
+++ b/addons/delivery/i18n/hr.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* delivery
-#
+# * delivery
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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: 2009-11-26 07:23+0000\n"
-"Last-Translator: Miro Glavić <glavicmiro@gmail.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-25 21:11+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\n"
+"Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: delivery
 #: constraint:ir.model:0
@@ -47,7 +48,7 @@ msgstr "Dostava Poštom"
 #. module: delivery
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za Arhitekturu Prikaza!"
+msgstr "Nevažeći XML format za Arhitekturu Prikaza!"
 
 #. module: delivery
 #: constraint:res.partner:0
@@ -57,17 +58,18 @@ msgstr "Greška ! Ne možete kreirati rekurzivno pridružene članove."
 #. module: delivery
 #: field:delivery.grid,state_ids:0
 msgid "States"
-msgstr "Države"
+msgstr "Stanja"
 
 #. module: delivery
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "Nevažeće ime modela u definiciji akcije."
+msgstr "Nevažeće ime modela u definiciji Radnje."
 
 #. module: delivery
 #: help:res.partner,property_delivery_carrier:0
 msgid "This delivery method will be used when invoicing from packing."
 msgstr ""
+"Ovaj će način isporuke biti korišten kada se Račun radi kod Pakiranja."
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
@@ -77,7 +79,7 @@ msgstr "Dostavna Mreža"
 #. module: delivery
 #: field:delivery.grid,zip_from:0
 msgid "Start Zip"
-msgstr ""
+msgstr "?Start Zip"
 
 #. module: delivery
 #: selection:delivery.grid.line,price_type:0
@@ -87,24 +89,24 @@ msgstr "Fiksno"
 #. module: delivery
 #: field:delivery.grid,line_ids:0
 msgid "Grid Line"
-msgstr ""
+msgstr "?Grid line"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
 #: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
 msgid "Delivery Pricelist"
-msgstr "Cijenik Dostave"
+msgstr "Cjenik Dostave"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_picking_tree5
 #: model:ir.ui.menu,name:delivery.menu_action_picking_tree5
 msgid "Generate Draft Invoices On Receptions"
-msgstr ""
+msgstr "Generiraj Nacrte Računa kod Zaprimanja"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid_line
 msgid "Delivery line of grid"
-msgstr ""
+msgstr "? Delivery line of grid"
 
 #. module: delivery
 #: model:ir.ui.menu,name:delivery.menu_delivery
@@ -114,7 +116,7 @@ msgstr "Dostava"
 #. module: delivery
 #: view:delivery.grid.line:0
 msgid "Grid Lines"
-msgstr ""
+msgstr "?Grid line"
 
 #. module: delivery
 #: field:delivery.grid.line,grid_id:0
@@ -141,7 +143,7 @@ msgstr "Definicija mreže"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 msgid "Weight * Volume"
-msgstr ""
+msgstr "Težina * Volumen"
 
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
@@ -151,7 +153,7 @@ msgstr "="
 #. module: delivery
 #: field:delivery.carrier,product_id:0
 msgid "Delivery Product"
-msgstr ""
+msgstr "Proizvod za Isporuku"
 
 #. module: delivery
 #: view:delivery.grid.line:0
@@ -161,7 +163,7 @@ msgstr "Uvjet"
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_carrier
 msgid "Carrier and delivery grids"
-msgstr ""
+msgstr "Mreža Prijevoza i Isporuka"
 
 #. module: delivery
 #: field:delivery.grid.line,standard_price:0
@@ -176,7 +178,7 @@ msgstr "Naziv"
 #. module: delivery
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
+msgstr "Greška: UOS mora biti u kategoriji drogačijoj od one u kojoj je UOM"
 
 #. module: delivery
 #: field:delivery.grid,country_ids:0
@@ -188,6 +190,7 @@ msgstr "Zemlje"
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Greška: Predefinirani UOM i UOM kupnje moraju biti u istoj kategoriji."
 
 #. module: delivery
 #: view:sale.order:0
@@ -216,14 +219,14 @@ msgstr "Naziv Mreže"
 #: field:delivery.grid,carrier_id:0
 #: field:stock.picking,carrier_id:0
 msgid "Carrier"
-msgstr "Nosač"
+msgstr "Prijevoznik"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: field:stock.picking,volume:0
 msgid "Volume"
-msgstr "Zapremina"
+msgstr "Volumen"
 
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
@@ -256,7 +259,7 @@ msgstr "Operator"
 #. module: delivery
 #: model:ir.module.module,shortdesc:delivery.module_meta_information
 msgid "Carriers and deliveries"
-msgstr ""
+msgstr "Prijevoznici i Isporuke"
 
 #. module: delivery
 #: field:delivery.carrier,grids_id:0
@@ -278,7 +281,7 @@ msgstr "Sekvenca"
 #. module: delivery
 #: field:delivery.carrier,partner_id:0
 msgid "Carrier Partner"
-msgstr ""
+msgstr "Partner Prijevoznik"
 
 #. module: delivery
 #: model:ir.module.module,description:delivery.module_meta_information
@@ -287,23 +290,28 @@ msgid ""
 "define your own carrier and delivery grids for prices. When creating "
 "invoices from picking, Open ERP is able to add and compute the shipping line."
 msgstr ""
+"Omogućuje Vam da dodate načine isporuke Prodajnim narudžbama i pakiranjima. "
+"Možete odrediti vlastitog prijevoznika i cjenike  mreže isporuke. Kada se "
+"Računi kreiraju kod preuzimanja, Open ERP može dodati i izračunati način i "
+"troškove otpreme."
 
 #. module: delivery
 #: field:delivery.grid,zip_to:0
 msgid "To Zip"
-msgstr ""
+msgstr "Na Pošt. Broj"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_picking_tree4
 #: model:ir.ui.menu,name:delivery.menu_action_picking_tree3
 msgid "Packing to be invoiced"
-msgstr ""
+msgstr "Pakiranje za koje treba izdati račun"
 
 #. module: delivery
 #: help:sale.order,carrier_id:0
 msgid ""
 "Complete this field if you plan to invoice the shipping based on packing."
 msgstr ""
+"Popunite ovo polje ako planirate Otpremu fakturirati na bazi Pakiranja."
 
 #. module: delivery
 #: model:ir.actions.wizard,name:delivery.wizard_deliver_line_add
@@ -318,7 +326,7 @@ msgstr "Prodajna Cijena"
 #. module: delivery
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Greška: Nepravilan ean kod"
 
 #. module: delivery
 #: view:delivery.grid:0
@@ -328,7 +336,7 @@ msgstr "Dostavne mreže"
 #. module: delivery
 #: wizard_button:delivery.sale.order,init,end:0
 msgid "Cancel"
-msgstr "Poništi"
+msgstr "Otkaži"
 
 #. module: delivery
 #: field:sale.order,carrier_id:0
@@ -345,7 +353,7 @@ msgstr "Cijena"
 #. module: delivery
 #: constraint:res.partner:0
 msgid "The VAT doesn't seem to be correct."
-msgstr ""
+msgstr "PDV nije točno naveden."
 
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
diff --git a/addons/delivery/i18n/pt_BR.po b/addons/delivery/i18n/pt_BR.po
index 7f638659b38..9534a2fb9e9 100644
--- a/addons/delivery/i18n/pt_BR.po
+++ b/addons/delivery/i18n/pt_BR.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-03-24 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/document/i18n/hr.po b/addons/document/i18n/hr.po
index 7f599d3c91a..c397d2e6aab 100644
--- a/addons/document/i18n/hr.po
+++ b/addons/document/i18n/hr.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* document
-#
+# * document
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-12-21 01:41+0000\n"
-"Last-Translator: Jožek Prikratki <Unknown>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-24 10:09+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\n"
+"Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: document
 #: field:document.directory,create_date:0
@@ -29,7 +30,7 @@ msgstr "ID resursa"
 #. module: document
 #: field:document.directory.content,include_name:0
 msgid "Include Record Name"
-msgstr "Uključi naziv stavke"
+msgstr "Uključi naziv zapisa"
 
 #. module: document
 #: constraint:ir.model:0
@@ -56,7 +57,7 @@ msgstr "Postavke dokumenta"
 #. module: document
 #: view:ir.attachment:0
 msgid "Preview"
-msgstr "Pretpregled"
+msgstr "Pregled"
 
 #. module: document
 #: field:ir.attachment,store_method:0
@@ -66,7 +67,7 @@ msgstr "Metoda pohrane"
 #. module: document
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
 msgid "Auto Configure Directory"
-msgstr "Automatski konfiguriraj mapu"
+msgstr "Automatski podesi mapu"
 
 #. module: document
 #: field:ir.attachment,file_size:0
@@ -79,7 +80,7 @@ msgid ""
 "Check this field if you want that the name of the file start by the record "
 "name."
 msgstr ""
-"Uključite ovu opciju ako želite da naziv datoteke počinje s nazivom stavke"
+"Uključite ovu opciju ako želite da naziv datoteke počinje s nazivom zapisa"
 
 #. module: document
 #: selection:document.directory,type:0
@@ -89,7 +90,7 @@ msgstr "Drugi resursi"
 #. module: document
 #: field:document.directory,ressource_parent_type_id:0
 msgid "Parent Model"
-msgstr "Model roditelj"
+msgstr "Ishodni Model"
 
 #. module: document
 #: view:document.configuration.wizard:0
@@ -147,7 +148,7 @@ msgstr "Struktura mape"
 #. module: document
 #: field:document.directory,parent_id:0
 msgid "Parent Item"
-msgstr "Roditelj"
+msgstr "Ishodna stavka"
 
 #. module: document
 #: view:ir.attachment:0
@@ -174,7 +175,7 @@ msgstr "Korisnik posljednje promjene"
 #. module: document
 #: view:document.configuration.wizard:0
 msgid "Configure"
-msgstr "Postavi"
+msgstr "Podesi"
 
 #. module: document
 #: field:document.directory,ressource_tree:0
@@ -267,7 +268,7 @@ msgstr "Bilješke"
 #: view:ir.attachment:0
 #: field:ir.attachment,index_content:0
 msgid "Indexed Content"
-msgstr "Indeksirani dokument"
+msgstr "Indeksirani sadržaj"
 
 #. module: document
 #: view:document.directory:0
@@ -482,7 +483,7 @@ msgstr "Vrsta dokumenta"
 #. module: document
 #: field:document.directory,child_ids:0
 msgid "Children"
-msgstr "Djeca"
+msgstr "Slijedne stavke"
 
 #. module: document
 #: view:document.directory:0
diff --git a/addons/document_webdav/i18n/pt_BR.po b/addons/document_webdav/i18n/pt_BR.po
index 6b243cb883f..aca9eaf8488 100644
--- a/addons/document_webdav/i18n/pt_BR.po
+++ b/addons/document_webdav/i18n/pt_BR.po
@@ -14,7 +14,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-03-24 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_webdav_old
diff --git a/addons/idea/i18n/hr.po b/addons/idea/i18n/hr.po
index 020d7d042ba..0d143c7948c 100644
--- a/addons/idea/i18n/hr.po
+++ b/addons/idea/i18n/hr.po
@@ -1,172 +1,174 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* idea
-#
+# * idea
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-24 10:38+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\n"
+"Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: idea
 #: field:idea.category,name:0
 #: field:idea.idea,category_id:0
 msgid "Category"
-msgstr ""
+msgstr "Kategorija"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Very Good"
-msgstr ""
+msgstr "Vrlo dobro"
 
 #. module: idea
 #: view:idea.idea:0
 #: field:idea.idea,stat_vote_ids:0
 msgid "Statistics"
-msgstr ""
+msgstr "Statistika"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea_my_idea
 #: model:ir.ui.menu,name:idea.menu_idea_idea_my_idea
 msgid "My Ideas"
-msgstr ""
+msgstr "Moje ideje"
 
 #. module: idea
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nepravilno ime modela u definiciji radnje."
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Not Voted"
-msgstr ""
+msgstr "Nije izglasan"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea_open_my
 #: model:ir.ui.menu,name:idea.menu_idea_idea_open_my
 msgid "My Open Ideas"
-msgstr ""
+msgstr "Moje otvorene Ideje"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea
 #: model:ir.ui.menu,name:idea.menu_ideas
 #: model:ir.ui.menu,name:idea.menu_ideas1
 msgid "Ideas"
-msgstr ""
+msgstr "Ideje"
 
 #. module: idea
 #: field:idea.category,child_ids:0
 msgid "Child Categories"
-msgstr ""
+msgstr "Slijedne Kategorije"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "New Idea"
-msgstr ""
+msgstr "Nova Ideja"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_category_tree
 #: model:ir.ui.menu,name:idea.menu_idea_category_tree
 msgid "Ideas by Categories"
-msgstr ""
+msgstr "Ideje po Kategorijama"
 
 #. module: idea
 #: field:idea.vote,score:0
 #: field:idea.vote.stat,score:0
 msgid "Score"
-msgstr ""
+msgstr "Bodovanje"
 
 #. module: idea
 #: selection:idea.idea,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Nacrt"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_vote
 msgid "Idea's vote"
-msgstr ""
+msgstr "Glasanje za Ideju"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_vote_stat
 msgid "Statistics on Votes"
-msgstr ""
+msgstr "Statistika Glasanja"
 
 #. module: idea
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Naziv Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_category
 msgid "Category for an idea"
-msgstr ""
+msgstr "Kategorija za Ideju"
 
 #. module: idea
 #: model:ir.module.module,shortdesc:idea.module_meta_information
 msgid "Idea Manager"
-msgstr ""
+msgstr "Upravitelj Idejama"
 
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_idea_vote_stat
 msgid "Vote Statistics"
-msgstr ""
+msgstr "Statistika Glasovanja"
 
 #. module: idea
 #: selection:idea.idea,state:0
 msgid "Opened"
-msgstr ""
+msgstr "Otvoren"
 
 #. module: idea
 #: field:idea.idea,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Good"
-msgstr ""
+msgstr "Dobro"
 
 #. module: idea
 #: field:idea.idea,description:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Normal"
-msgstr ""
+msgstr "Običan"
 
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_reporting
 msgid "Reporting"
-msgstr ""
+msgstr "Izvještavanje"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_vote_stat
 msgid "Idea Votes Statistics"
-msgstr ""
+msgstr "Statistika Glasovanja o Ideji"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_vote
 msgid "idea.vote"
-msgstr ""
+msgstr "idea.vote"
 
 #. module: idea
 #: field:idea.comment,user_id:0
@@ -177,38 +179,38 @@ msgstr ""
 #. module: idea
 #: view:idea.idea:0
 msgid "Your comment"
-msgstr ""
+msgstr "Vaš komentar"
 
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_config
 msgid "Configuration"
-msgstr ""
+msgstr "Konfiguracija"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_category
 #: model:ir.ui.menu,name:idea.menu_idea_category
 msgid "Categories"
-msgstr ""
+msgstr "Kategorije"
 
 #. module: idea
 #: view:idea.stat:0
 msgid "stat"
-msgstr ""
+msgstr "Stat"
 
 #. module: idea
 #: field:idea.idea,my_vote:0
 msgid "My Vote"
-msgstr ""
+msgstr "Moj glas"
 
 #. module: idea
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Neispravan XML za Arhitekturu Prikaza!"
 
 #. module: idea
 #: view:idea.vote:0
 msgid "Votes"
-msgstr ""
+msgstr "Glasovi"
 
 #. module: idea
 #: model:ir.module.module,description:idea.module_meta_information
@@ -220,51 +222,58 @@ msgid ""
 "managers can obtain an easy view on best ideas from all the users. Once "
 "installed, check the menu 'Ideas' in the 'Tools' main menu."
 msgstr ""
+"Ovaj modul omogućuje Vašem korisniku da lako i jednostavno sudjeluje u "
+"unaprijeđenju poslovanja u okviru tvrtke. Omogućuje svakome da izrazi Ideje "
+"o različitim temama i područjima. Tada ostali korisnici mogu komentirati "
+"ideju i glasovati prema tome koje ideje smatraju važnima. Svaka ideja dobija "
+"zbroj bodova na osnovi glasovanja. Voditelji tako mogu imati jasan uvid u "
+"ideje djelatnika i o tome kako su one percipirane u tvrtki. Po instalaciji, "
+"odaberite izbornik \"Ideje\" u glavnom izborniku \"Pomagala\"."
 
 #. module: idea
 #: field:idea.comment,create_date:0
 #: field:idea.idea,create_date:0
 msgid "Creation date"
-msgstr ""
+msgstr "Datum stvaranja"
 
 #. module: idea
 #: field:idea.idea,count_votes:0
 msgid "Count of votes"
-msgstr ""
+msgstr "Zbrajanje glasova"
 
 #. module: idea
 #: field:idea.vote.stat,nbr:0
 msgid "Number of Votes"
-msgstr ""
+msgstr "Broj glasova"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_idea
 msgid "idea.idea"
-msgstr ""
+msgstr "idea.idea"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea_draft_my
 #: model:ir.ui.menu,name:idea.menu_idea_idea_draft_my
 msgid "My Draft Ideas"
-msgstr ""
+msgstr "Moje Ideje u Nacrtu."
 
 #. module: idea
 #: field:idea.idea,vote_ids:0
 msgid "Vote"
-msgstr ""
+msgstr "Glasuj"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Bad"
-msgstr ""
+msgstr "Loše"
 
 #. module: idea
 #: view:idea.idea:0
 #: model:ir.ui.menu,name:idea.menu_idea_idea
 msgid "All Ideas"
-msgstr ""
+msgstr "Sve ideje"
 
 #. module: idea
 #: view:idea.comment:0
@@ -272,62 +281,62 @@ msgstr ""
 #: field:idea.idea,comment_ids:0
 #: model:ir.model,name:idea.model_idea_comment
 msgid "Comments"
-msgstr ""
+msgstr "Komentari"
 
 #. module: idea
 #: field:idea.idea,count_comments:0
 msgid "Count of comments"
-msgstr ""
+msgstr "Zbrajanje komentara"
 
 #. module: idea
 #: field:idea.idea,title:0
 msgid "Idea Summary"
-msgstr ""
+msgstr "Sižetak Ideje"
 
 #. module: idea
 #: view:idea.category:0
 msgid "Category of ideas"
-msgstr ""
+msgstr "Kategorija Ideja"
 
 #. module: idea
 #: field:idea.category,summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Sižetak"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea_categ_open
 #: model:ir.actions.act_window,name:idea.action_idea_idea_open
 #: model:ir.ui.menu,name:idea.menu_idea_idea_open
 msgid "Open Ideas"
-msgstr ""
+msgstr "Otvorene Ideje"
 
 #. module: idea
 #: view:idea.idea:0
 #: view:idea.vote.stat:0
 msgid "vote_stat of ideas"
-msgstr ""
+msgstr "Statistika glasovanja o Idejama"
 
 #. module: idea
 #: view:idea.comment:0
 #: field:idea.comment,content:0
 #: view:idea.idea:0
 msgid "Comment"
-msgstr ""
+msgstr "Komentar"
 
 #. module: idea
 #: field:idea.category,parent_id:0
 msgid "Parent Categories"
-msgstr ""
+msgstr "Ishodne Kategorije"
 
 #. module: idea
 #: field:idea.idea,user_id:0
 msgid "Creator"
-msgstr ""
+msgstr "Kreator"
 
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_tools
 msgid "Tools"
-msgstr ""
+msgstr "Pomagala"
 
 #. module: idea
 #: field:idea.comment,idea_id:0
@@ -335,46 +344,46 @@ msgstr ""
 #: field:idea.vote,idea_id:0
 #: field:idea.vote.stat,idea_id:0
 msgid "Idea"
-msgstr ""
+msgstr "Ideja"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Very Bad"
-msgstr ""
+msgstr "Vrlo loše"
 
 #. module: idea
 #: selection:idea.idea,state:0
 msgid "Canceled"
-msgstr ""
+msgstr "Otkazan"
 
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_idea_vote
 msgid "All Votes"
-msgstr ""
+msgstr "Svi glasovi"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Close"
-msgstr ""
+msgstr "Zaključi"
 
 #. module: idea
 #: field:idea.idea,vote_avg:0
 msgid "Average Score"
-msgstr ""
+msgstr "Prosječan zbroj bodova"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Open"
-msgstr ""
+msgstr "Otvori"
 
 #. module: idea
 #: help:idea.idea,description:0
 msgid "Content of the idea"
-msgstr ""
+msgstr "Sadržaj Ideje"
diff --git a/addons/olap_crm/i18n/pt_BR.po b/addons/olap_crm/i18n/pt_BR.po
index 478f2803ff8..1608cac66d5 100644
--- a/addons/olap_crm/i18n/pt_BR.po
+++ b/addons/olap_crm/i18n/pt_BR.po
@@ -14,7 +14,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-03-24 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap_crm
diff --git a/addons/olap_extract/i18n/pt_BR.po b/addons/olap_extract/i18n/pt_BR.po
index 9049669952e..178edd2bfeb 100644
--- a/addons/olap_extract/i18n/pt_BR.po
+++ b/addons/olap_extract/i18n/pt_BR.po
@@ -14,7 +14,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-03-24 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap_extract
diff --git a/addons/olap_sale/i18n/pt_BR.po b/addons/olap_sale/i18n/pt_BR.po
index 6031ea21a6d..f946a91bc88 100644
--- a/addons/olap_sale/i18n/pt_BR.po
+++ b/addons/olap_sale/i18n/pt_BR.po
@@ -14,7 +14,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-03-24 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap_sale
diff --git a/addons/profile_crm/i18n/pt_BR.po b/addons/profile_crm/i18n/pt_BR.po
index efb7a9a8cbe..9dcdf808e07 100644
--- a/addons/profile_crm/i18n/pt_BR.po
+++ b/addons/profile_crm/i18n/pt_BR.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-03-24 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/report_account/i18n/hr.po b/addons/report_account/i18n/hr.po
index 8fbac0905bd..0a30ded862a 100644
--- a/addons/report_account/i18n/hr.po
+++ b/addons/report_account/i18n/hr.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_account
-#
+# * report_account
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-17 10:14+0000\n"
-"Last-Translator: dzuvela <drazen@radez.hr>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-25 00:58+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\n"
+"Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: report_account
 #: selection:report.invoice.created,type:0
@@ -31,27 +32,27 @@ msgstr ""
 #. module: report_account
 #: field:report.aged.receivable,name:0
 msgid "Month Range"
-msgstr ""
+msgstr "Raspon Mjeseci"
 
 #. module: report_account
 #: selection:report.invoice.created,type:0
 msgid "Customer Invoice"
-msgstr ""
+msgstr "Račun Stranke"
 
 #. module: report_account
 #: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard
 msgid "Invoices Created Within Past 15 Days"
-msgstr ""
+msgstr "Računi kreirani u zadnjih 15 dana"
 
 #. module: report_account
 #: model:ir.model,name:report_account.model_report_invoice_created
 msgid "Report of Invoices Created within Last 15 days"
-msgstr ""
+msgstr "Izvještaj o računima kreiranima u zadnjih 15 dana"
 
 #. module: report_account
 #: selection:report.invoice.created,type:0
 msgid "Supplier Invoice"
-msgstr ""
+msgstr "Račun Dobavljača"
 
 #. module: report_account
 #: field:report.invoice.created,state:0
@@ -61,27 +62,27 @@ msgstr "Status"
 #. module: report_account
 #: selection:report.invoice.created,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Nacrt"
 
 #. module: report_account
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nepravilno ime modela u definiciji radnje."
 
 #. module: report_account
 #: field:report.account.receivable,debit:0
 msgid "Debit"
-msgstr ""
+msgstr "Dug"
 
 #. module: report_account
 #: field:report.account.receivable,type:0
 msgid "Account Type"
-msgstr ""
+msgstr "Tip Tvrtke Kupca"
 
 #. module: report_account
 #: field:report.invoice.created,type:0
 msgid "Type"
-msgstr ""
+msgstr "Tip"
 
 #. module: report_account
 #: field:report.invoice.created,name:0
@@ -96,47 +97,47 @@ msgstr "Ukupni iznos"
 #. module: report_account
 #: field:report.invoice.created,residual:0
 msgid "Residual"
-msgstr ""
+msgstr "Preostali"
 
 #. module: report_account
 #: field:report.invoice.created,date_invoice:0
 msgid "Date Invoiced"
-msgstr ""
+msgstr "Datum izrade računa"
 
 #. module: report_account
 #: view:report.account.receivable:0
 msgid "Accounts by type"
-msgstr ""
+msgstr "Tvrtke kupci po tipu"
 
 #. module: report_account
 #: field:report.invoice.created,number:0
 msgid "Invoice Number"
-msgstr ""
+msgstr "Broj računa"
 
 #. module: report_account
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
-msgstr ""
+msgstr "Bez poreza"
 
 #. module: report_account
 #: selection:report.invoice.created,state:0
 msgid "Done"
-msgstr ""
+msgstr "Gotovo"
 
 #. module: report_account
 #: model:ir.model,name:report_account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr ""
+msgstr "Stara potraživanja do danas"
 
 #. module: report_account
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Neispravan XML za Arhitekturu Prikaza!"
 
 #. module: report_account
 #: model:ir.model,name:report_account.model_report_account_receivable
 msgid "Receivable accounts"
-msgstr ""
+msgstr "Konta Potraživanja"
 
 #. module: report_account
 #: field:report.invoice.created,date_due:0
@@ -146,22 +147,22 @@ msgstr "Datum dospijeća"
 #. module: report_account
 #: field:report.account.receivable,credit:0
 msgid "Credit"
-msgstr ""
+msgstr "Kredit"
 
 #. module: report_account
 #: field:temp.range,name:0
 msgid "Range"
-msgstr ""
+msgstr "Raspon"
 
 #. module: report_account
 #: model:ir.module.module,description:report_account.module_meta_information
 msgid "A module that adds new reports based on the account module."
-msgstr ""
+msgstr "Modul koji dodaje nove izvještaje na osnovi ACCOUNT Modula"
 
 #. module: report_account
 #: selection:report.invoice.created,type:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "Namirenje dobavljača"
 
 #. module: report_account
 #: selection:report.invoice.created,state:0
@@ -172,33 +173,33 @@ msgstr "Poništeno"
 #: field:report.account.receivable,balance:0
 #: field:report.aged.receivable,balance:0
 msgid "Balance"
-msgstr ""
+msgstr "Saldo"
 
 #. module: report_account
 #: model:ir.module.module,shortdesc:report_account.module_meta_information
 msgid "Account Reporting - Reporting"
-msgstr ""
+msgstr "Izvještavanje o tvrtki Kupcu - Izvještavanje"
 
 #. module: report_account
 #: field:report.invoice.created,origin:0
 msgid "Origin"
-msgstr ""
+msgstr "Porijeklo"
 
 #. module: report_account
 #: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
 #: model:ir.ui.menu,name:report_account.menu_account_receivable_graph
 msgid "Balance by Type of Account"
-msgstr ""
+msgstr "Saldo po tipu konta"
 
 #. module: report_account
 #: view:report.invoice.created:0
 msgid "Invoices"
-msgstr ""
+msgstr "računi"
 
 #. module: report_account
 #: selection:report.invoice.created,state:0
 msgid "Pro-forma"
-msgstr ""
+msgstr "Pro-forma"
 
 #. module: report_account
 #: field:report.invoice.created,currency_id:0
@@ -213,18 +214,18 @@ msgstr "Tjedan"
 #. module: report_account
 #: field:report.invoice.created,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Kreiraj datum"
 
 #. module: report_account
 #: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
-msgstr ""
+msgstr "Stara potraživanja"
 
 #. module: report_account
 #: field:report.invoice.created,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: report_account
 #: field:report.invoice.created,amount_total:0
@@ -234,9 +235,9 @@ msgstr "Ukupno"
 #. module: report_account
 #: selection:report.invoice.created,state:0
 msgid "Open"
-msgstr ""
+msgstr "Otvori"
 
 #. module: report_account
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "Iznos bez poreza"
diff --git a/addons/report_analytic/i18n/hr.po b/addons/report_analytic/i18n/hr.po
index 5b903e730d2..ef3677a8475 100644
--- a/addons/report_analytic/i18n/hr.po
+++ b/addons/report_analytic/i18n/hr.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic
-#
+# * report_analytic
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-17 10:14+0000\n"
-"Last-Translator: dzuvela <drazen@radez.hr>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-25 10:39+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\n"
+"Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: report_analytic
 #: model:ir.model,name:report_analytic.model_report_analytic_account_close
@@ -26,36 +27,37 @@ msgstr ""
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Naziv Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !"
 
 #. module: report_analytic
 #: field:report.analytic.account.close,quantity_max:0
 msgid "Max. Quantity"
-msgstr ""
+msgstr "Maks. količina"
 
 #. module: report_analytic
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Neispravan XML za Arhitekturu Prikaza!"
 
 #. module: report_analytic
 #: field:report.analytic.account.close,name:0
 msgid "Analytic account"
-msgstr ""
+msgstr "Analitički Konto"
 
 #. module: report_analytic
 #: field:report.analytic.account.close,state:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: report_analytic
 #: field:report.analytic.account.close,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Rok"
 
 #. module: report_analytic
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nepravilno ime modela u definiciji radnje."
 
 #. module: report_analytic
 #: model:ir.module.module,shortdesc:report_analytic.module_meta_information
@@ -65,19 +67,19 @@ msgstr "Izvještaji analitike"
 #. module: report_analytic
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: report_analytic
 #: field:report.analytic.account.close,balance:0
 msgid "Balance"
-msgstr ""
+msgstr "Saldo"
 
 #. module: report_analytic
 #: model:ir.actions.act_window,name:report_analytic.action_analytic_account_tree
 #: model:ir.ui.menu,name:report_analytic.menu_action_analytic_account_tree
 #: view:report.analytic.account.close:0
 msgid "Expired analytic accounts"
-msgstr ""
+msgstr "Zastarjela Analitička Konta"
 
 #. module: report_analytic
 #: field:report.analytic.account.close,quantity:0
diff --git a/addons/report_analytic_line/i18n/hr.po b/addons/report_analytic_line/i18n/hr.po
index 48d5e8f2418..7c64c5f5968 100644
--- a/addons/report_analytic_line/i18n/hr.po
+++ b/addons/report_analytic_line/i18n/hr.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_line
-#
+# * report_analytic_line
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-12-22 12:39+0000\n"
-"Last-Translator: Jožek Prikratki <Unknown>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-25 10:46+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\n"
+"Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: report_analytic_line
 #: model:ir.actions.act_window,name:report_analytic_line.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
@@ -24,7 +25,7 @@ msgstr "Stavke za fakturiranje"
 #. module: report_analytic_line
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "Neispravan XML za izgradnju preglednog ekrana!"
+msgstr "Nevažeći XML za Arhitekturu Prikaza!"
 
 #. module: report_analytic_line
 #: field:report.account.analytic.line.to.invoice,product_id:0
@@ -78,7 +79,7 @@ msgstr "Analitičke stavke za ispis na fakturi"
 #. module: report_analytic_line
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "Pogrešno ime modela u definiciji akcije."
+msgstr "Pogrešno ime modela u definiciji Radnje"
 
 #. module: report_analytic_line
 #: field:report.account.analytic.line.to.invoice,unit_amount:0
diff --git a/addons/report_analytic_planning/i18n/hr.po b/addons/report_analytic_planning/i18n/hr.po
index 33103817671..fd213f045fa 100644
--- a/addons/report_analytic_planning/i18n/hr.po
+++ b/addons/report_analytic_planning/i18n/hr.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
-#
+# * report_analytic_planning
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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: 2009-10-01 07:47+0000\n"
-"Last-Translator: Miro Glavić <glavicmiro@gmail.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-25 10:49+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\n"
+"Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
@@ -24,170 +25,171 @@ msgstr ""
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
-msgstr ""
+msgstr "Planiranje po Kontu"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
-msgstr ""
+msgstr "Sižetak po Projektu"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
-msgstr ""
+msgstr "Količina JM"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Odgovoran"
 
 #. module: report_analytic_planning
 #: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
-msgstr ""
+msgstr "Stat Planiranja"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
-msgstr ""
+msgstr "Analitički Konto"
 
 #. module: report_analytic_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nepravilno ime modela u definiciji radnje."
 
 #. module: report_analytic_planning
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Naziv Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !"
 
 #. module: report_analytic_planning
 #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
 #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
-msgstr ""
+msgstr "Statistike Planiranja"
 
 #. module: report_analytic_planning
 #: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
-msgstr ""
+msgstr "Stat Planskog Konta"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
-msgstr ""
+msgstr "Planirani Sati"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
-msgstr ""
+msgstr "Stvarno"
 
 #. module: report_analytic_planning
 #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
 #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
-msgstr ""
+msgstr "Moje Statistike Planiranja"
 
 #. module: report_analytic_planning
 #: model:ir.module.module,description:report_analytic_planning.module_meta_information
 msgid "Planning on analytic accounts."
-msgstr ""
+msgstr "Planiranje Analitičkih konta"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
-msgstr ""
+msgstr "Ime Planiranja"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
-msgstr ""
+msgstr "Količine"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
-msgstr ""
+msgstr "Planiranje Ljudskih resursa"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
-msgstr ""
+msgstr "Raspored"
 
 #. module: report_analytic_planning
 #: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
-msgstr ""
+msgstr "Linija Planiranja"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
-msgstr ""
+msgstr "Odgovoran :"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
-msgstr ""
+msgstr "Količina"
 
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
-msgstr ""
+msgstr "Količine po Kontu"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
-msgstr ""
+msgstr "Od:"
 
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
-msgstr ""
+msgstr "Vrijeme po Kontu"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
-msgstr ""
+msgstr "Datum završetka"
 
 #. module: report_analytic_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nevažeći XML za Arhitekturu Prikaza!"
 
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
-msgstr ""
+msgstr "Vrijem po Korisniku"
 
 #. module: report_analytic_planning
 #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
 #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
-msgstr ""
+msgstr "Dtatistike Planiranja za moje Projekte"
 
 #. module: report_analytic_planning
 #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
 #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
-msgstr ""
+msgstr "Tekuće Planiranje"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
-msgstr ""
+msgstr "Sižetak prema Korisniku"
 
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
-msgstr ""
+msgstr "Analiza"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.line,user_id:0
@@ -195,7 +197,7 @@ msgstr ""
 #: field:report_account_analytic.planning.stat,user_id:0
 #: field:report_account_analytic.planning.stat.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Korisnik"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
@@ -205,97 +207,97 @@ msgstr ""
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
-msgstr ""
+msgstr "Zbirni Raspored"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
-msgstr ""
+msgstr "Detalji Vremena Korisnika po Projektima"
 
 #. module: report_analytic_planning
 #: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
-msgstr ""
+msgstr "Stat Planiranja Korisnika"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
-msgstr ""
+msgstr "Planiran"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
-msgstr ""
+msgstr "Analiza Planiranja"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
-msgstr ""
+msgstr "["
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
-msgstr ""
+msgstr "Linija Planiranja"
 
 #. module: report_analytic_planning
 #: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
 msgid "Analytic planning - Reporting"
-msgstr ""
+msgstr "Analitičko Planiranje - Izvještavanje"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
-msgstr ""
+msgstr "]"
 
 #. module: report_analytic_planning
 #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
 #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
-msgstr ""
+msgstr "Moje Planiranje"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
-msgstr ""
+msgstr "Planiranje prema Korisniku"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
-msgstr ""
+msgstr "Bilješka"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
-msgstr ""
+msgstr "Zadaci"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
-msgstr ""
+msgstr "Planiranje po Kontu"
 
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
-msgstr ""
+msgstr "Količine prema Korisniku"
 
 #. module: report_analytic_planning
 #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
 #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
-msgstr ""
+msgstr "Moje Tekuće Planiranje"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analitički konto"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
-msgstr ""
+msgstr "Upravitelj"
 
 #. module: report_analytic_planning
 #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
@@ -310,7 +312,7 @@ msgstr ""
 #: field:report_account_analytic.planning.stat.account,planning_id:0
 #: field:report_account_analytic.planning.stat.user,planning_id:0
 msgid "Planning"
-msgstr ""
+msgstr "Planiranje"
 
 #. module: report_analytic_planning
 #: selection:report_account_analytic.planning,state:0
@@ -320,25 +322,25 @@ msgstr ""
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
-msgstr ""
+msgstr "Ukupno planirano"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
-msgstr ""
+msgstr "Datum početka"
 
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
-msgstr ""
+msgstr "Statistike Planiranja"
 
 #. module: report_analytic_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
-msgstr ""
+msgstr "Otvori"
 
 #. module: report_analytic_planning
 #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
 #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
-msgstr ""
+msgstr "Novo Planiranje"
diff --git a/addons/report_document/i18n/hr.po b/addons/report_document/i18n/hr.po
index 0cea7c6d5b7..1c0de4d901d 100644
--- a/addons/report_document/i18n/hr.po
+++ b/addons/report_document/i18n/hr.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_document
-#
+# * report_document
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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: 2009-10-01 07:47+0000\n"
-"Last-Translator: Miro Glavić <glavicmiro@gmail.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-25 10:49+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\n"
+"Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: report_document
 #: field:report.document.user,create_date:0
@@ -25,188 +26,189 @@ msgstr ""
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_files_by_partner
 msgid "Files Per Month"
-msgstr ""
+msgstr "Spisi po Mjesecu"
 
 #. module: report_document
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Naziv Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_wall
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_shame
 #: view:report.document.wall:0
 msgid "Wall of Shame"
-msgstr ""
+msgstr "Zid Srama"
 
 #. module: report_document
 #: model:ir.model,name:report_document.model_report_files_partner
 msgid "Files details by Partners"
-msgstr ""
+msgstr "Detalji Spisa po Partneru"
 
 #. module: report_document
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 #: field:report.files.partner,file_size:0
 msgid "File Size"
-msgstr ""
+msgstr "Veličina Spisa"
 
 #. module: report_document
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nepravilno ime modela u definiciji radnje."
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_all
 msgid "All Months"
-msgstr ""
+msgstr "Svi mjeseci"
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_all_myfile
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_this_myfile
 msgid "My files"
-msgstr ""
+msgstr "Moji Spisi"
 
 #. module: report_document
 #: view:report.document.user:0
 msgid "Files by users"
-msgstr ""
+msgstr "Spisi po Korisniku"
 
 #. module: report_document
 #: view:report.document.user:0
 msgid "Files"
-msgstr ""
+msgstr "Spisi"
 
 #. module: report_document
 #: view:report.files.partner:0
 msgid "Files per Month"
-msgstr ""
+msgstr "Spisi po Mjesecu"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_my_document_tree1
 msgid "My files (All months)"
-msgstr ""
+msgstr "Moji Spisi (Svi mjeseci)"
 
 #. module: report_document
 #: field:report.document.wall,file_name:0
 msgid "Last Posted File Name"
-msgstr ""
+msgstr "Zadnje postavljeno Ime Spisa"
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report
 msgid "Reporting"
-msgstr ""
+msgstr "Izvještavanje"
 
 #. module: report_document
 #: model:ir.model,name:report_document.model_report_document_wall
 msgid "Users that did not inserted documents since one month"
-msgstr ""
+msgstr "Korisnici koji jedan mjesec nisu unijeli Dokument"
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document
 msgid "Document Management"
-msgstr ""
+msgstr "Upravljanje Dokumentima"
 
 #. module: report_document
 #: field:report.document.user,type:0
 #: field:report.files.partner,type:0
 msgid "Directory Type"
-msgstr ""
+msgstr "Tip Direktorija"
 
 #. module: report_document
 #: view:report.files.partner:0
 msgid "Files By Partner"
-msgstr ""
+msgstr "Spisi po Partneru"
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_this
 msgid "This Month"
-msgstr ""
+msgstr "Ovaj mjesec"
 
 #. module: report_document
 #: field:report.document.user,user:0
 #: field:report.document.wall,user:0
 msgid "User"
-msgstr ""
+msgstr "Korisnik"
 
 #. module: report_document
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nevažeći XML za Arhitekturu Prikaza!"
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_all_userfile
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_this_userfile
 msgid "All Users files"
-msgstr ""
+msgstr "Svi Spisi Korisnika"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_my_document_tree
 msgid "My files (This months)"
-msgstr ""
+msgstr "Moji Spisi (Ovaj mjesec)"
 
 #. module: report_document
 #: model:ir.model,name:report_document.model_report_document_user
 msgid "Files details by Users"
-msgstr ""
+msgstr "Detalji Spisa prema Korisnicima"
 
 #. module: report_document
 #: field:report.document.user,user_id:0
 #: field:report.document.wall,user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "Vlasnik"
 
 #. module: report_document
 #: field:report.document.file,nbr:0
 #: field:report.document.user,nbr:0
 #: field:report.files.partner,nbr:0
 msgid "# of Files"
-msgstr ""
+msgstr "# Spisa"
 
 #. module: report_document
 #: field:report.document.user,directory:0
 #: field:report.files.partner,directory:0
 msgid "Directory"
-msgstr ""
+msgstr "Direktorij"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_user_graph
 msgid "Files By Users"
-msgstr ""
+msgstr "Spisi prema Korisnicima"
 
 #. module: report_document
 #: model:ir.module.module,shortdesc:report_document.module_meta_information
 msgid "Document Management - Reporting"
-msgstr ""
+msgstr "Upravljanje Dokumentima - Izvještavanje"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_all_document_tree1
 msgid "All Users files (All months)"
-msgstr ""
+msgstr "Spisi svih Korisnika (Svi mjeseci)"
 
 #. module: report_document
 #: model:ir.model,name:report_document.model_report_document_file
 msgid "Files details by Directory"
-msgstr ""
+msgstr "Detalji Spisa prema Direktoriju"
 
 #. module: report_document
 #: field:report.document.user,change_date:0
 #: field:report.files.partner,change_date:0
 msgid "Modified Date"
-msgstr ""
+msgstr "Izmjenjen Datum"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_size_month
 #: view:report.document.file:0
 msgid "File Size by Month"
-msgstr ""
+msgstr "Veličina spisa po Mjesecu"
 
 #. module: report_document
 #: field:report.document.user,file_title:0
 #: field:report.files.partner,file_title:0
 msgid "File Name"
-msgstr ""
+msgstr "Ime Spisa"
 
 #. module: report_document
 #: field:report.document.file,month:0
@@ -216,32 +218,32 @@ msgstr ""
 #: field:report.document.wall,name:0
 #: field:report.files.partner,name:0
 msgid "Month"
-msgstr ""
+msgstr "Mjesec"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
-msgstr ""
+msgstr "Spisi po Mjesecu"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_document_by_resourcetype_graph
 #: view:report.document.user:0
 msgid "Files by Resource Type"
-msgstr ""
+msgstr "Spisi po tipu Izvora"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_all_document_tree
 msgid "All Users files (This month)"
-msgstr ""
+msgstr "Spisi svih Korisnika (Ovaj mjesec)"
 
 #. module: report_document
 #: field:report.document.wall,last:0
 msgid "Last Posted Time"
-msgstr ""
+msgstr "Zadnje postavljeno Vrijeme"
 
 #. module: report_document
 #: field:report.document.user,partner:0
 #: field:report.files.partner,partner:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
diff --git a/addons/report_intrastat/i18n/hr.po b/addons/report_intrastat/i18n/hr.po
index 7a38f85adfd..cdcc128a069 100644
--- a/addons/report_intrastat/i18n/hr.po
+++ b/addons/report_intrastat/i18n/hr.po
@@ -1,173 +1,175 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_intrastat
-#
+# * report_intrastat
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-02-03 06:26+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-25 10:49+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\n"
+"Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: report_intrastat
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Naziv Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Canceled Invoice"
-msgstr ""
+msgstr "Poništen Račun"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Disc. (%)"
-msgstr ""
+msgstr "Popust (%)"
 
 #. module: report_intrastat
 #: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_tree
 #: model:ir.ui.menu,name:report_intrastat.menu_report_intrastat
 msgid "Intrastat (this month)"
-msgstr ""
+msgstr "Intrastat (Ovaj mjesec)"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Supplier Invoice"
-msgstr ""
+msgstr "Račun Dobavljača"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Jedinična cijena"
 
 #. module: report_intrastat
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nepravilno ime modela u definiciji radnje."
 
 #. module: report_intrastat
 #: field:report.intrastat,name:0
 msgid "Period"
-msgstr ""
+msgstr "Razdoblje"
 
 #. module: report_intrastat
 #: model:ir.ui.menu,name:report_intrastat.next_id_90
 msgid "All Months"
-msgstr ""
+msgstr "Svi mjeseci"
 
 #. module: report_intrastat
 #: selection:report.intrastat,type:0
 msgid "Import"
-msgstr ""
+msgstr "Uvoz"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "VAT :"
-msgstr ""
+msgstr "PDV :"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Document"
-msgstr ""
+msgstr "Dokument"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "PRO-FORMA"
-msgstr ""
+msgstr "PRO-FORMA"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Taxes:"
-msgstr ""
+msgstr "Porezi:"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 #: field:report.intrastat.code,description:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: report_intrastat
 #: field:report.intrastat,type:0
 msgid "Type"
-msgstr ""
+msgstr "Tip"
 
 #. module: report_intrastat
 #: model:ir.actions.report.xml,name:report_intrastat.invoice_intrastat_id
 msgid "Invoice Intrastat"
-msgstr ""
+msgstr "Intrastat Račun"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Datum Računa"
 
 #. module: report_intrastat
 #: model:ir.module.module,shortdesc:report_intrastat.module_meta_information
 msgid "Intrastat Reporting - Reporting"
-msgstr ""
+msgstr "Intrastat Izvještavanje - Izvještavanje"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Tel:"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Base"
-msgstr ""
+msgstr "Osnova"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Quantity"
-msgstr ""
+msgstr "Količina"
 
 #. module: report_intrastat
 #: model:ir.ui.menu,name:report_intrastat.next_id_89
 msgid "This Month"
-msgstr ""
+msgstr "Ovaj mjesec"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Partner Ref."
-msgstr ""
+msgstr "Referenca Partnera"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Total (inclu. taxes):"
-msgstr ""
+msgstr "Ukupno (uklj. poreze)"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Refund"
-msgstr ""
+msgstr "Povrat novca"
 
 #. module: report_intrastat
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nevažeći XML za Arhitekturu Prikaza!"
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_report_intrastat
 msgid "Intrastat report"
-msgstr ""
+msgstr "Intrastat Izvještaj"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Invoice"
-msgstr ""
+msgstr "Račun"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Taxes"
-msgstr ""
+msgstr "Porezi"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
@@ -177,29 +179,29 @@ msgstr ""
 #. module: report_intrastat
 #: view:report.intrastat:0
 msgid "Intrastat Data"
-msgstr ""
+msgstr "Intrastat Podaci"
 
 #. module: report_intrastat
 #: field:report.intrastat,value:0
 msgid "Value"
-msgstr ""
+msgstr "Vrijednost"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 #: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_tree_all
 #: model:ir.ui.menu,name:report_intrastat.menu_report_intrastat_all
 msgid "Intrastat"
-msgstr ""
+msgstr "Intrastat"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "Nacrt računa"
 
 #. module: report_intrastat
 #: field:report.intrastat,supply_units:0
 msgid "Supply Units"
-msgstr ""
+msgstr "Jedinice Dobave"
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_report_intrastat_code
@@ -207,67 +209,67 @@ msgstr ""
 #: field:report.intrastat,intrastat_id:0
 #: view:report.intrastat.code:0
 msgid "Intrastat code"
-msgstr ""
+msgstr "Intrastat Kod"
 
 #. module: report_intrastat
 #: field:report.intrastat,ref:0
 msgid "Origin"
-msgstr ""
+msgstr "Porijeklo"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 #: field:report.intrastat,weight:0
 msgid "Weight"
-msgstr ""
+msgstr "Težina"
 
 #. module: report_intrastat
 #: field:res.country,intrastat:0
 msgid "Intrastat member"
-msgstr ""
+msgstr "Intarstat Član"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Tax"
-msgstr ""
+msgstr "Porez"
 
 #. module: report_intrastat
 #: field:report.intrastat,code:0
 msgid "Country code"
-msgstr ""
+msgstr "Kod Zemlje"
 
 #. module: report_intrastat
 #: field:report.intrastat,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: report_intrastat
 #: selection:report.intrastat,type:0
 msgid "Export"
-msgstr ""
+msgstr "Izvezi"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Fax :"
-msgstr ""
+msgstr "Fax :"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "Povrat Dobavljaču"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Total (excl. taxes):"
-msgstr ""
+msgstr "Ukupno (isklj. poreze)"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Price"
-msgstr ""
+msgstr "Cijena"
 
 #. module: report_intrastat
 #: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_code_tree
 #: model:ir.ui.menu,name:report_intrastat.menu_report_intrastat_code
 #: field:report.intrastat.code,name:0
 msgid "Intrastat Code"
-msgstr ""
+msgstr "Intrastat Kod"
diff --git a/addons/report_mrp/i18n/hr.po b/addons/report_mrp/i18n/hr.po
index 8f25955e687..43b0e877a21 100644
--- a/addons/report_mrp/i18n/hr.po
+++ b/addons/report_mrp/i18n/hr.po
@@ -1,83 +1,85 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_mrp
-#
+# * report_mrp
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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: 2009-11-17 10:24+0000\n"
-"Last-Translator: nafterburner <nafterburner@gmail.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-25 10:49+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\n"
+"Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: report_mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
 msgid "Week"
-msgstr ""
+msgstr "Tjedni"
 
 #. module: report_mrp
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nevažeći XML za Arhitekturu Prikaza!"
 
 #. module: report_mrp
 #: model:ir.ui.menu,name:report_mrp.next_id_77
 msgid "Reporting"
-msgstr ""
+msgstr "Izvještavanje"
 
 #. module: report_mrp
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Naziv Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !"
 
 #. module: report_mrp
 #: view:report.workcenter.load:0
 msgid "Workcenters load"
-msgstr ""
+msgstr "Teret Radnih Centara"
 
 #. module: report_mrp
 #: model:ir.model,name:report_mrp.model_report_workcenter_load
 msgid "Workcenter Load"
-msgstr ""
+msgstr "Teret Radnog Centra"
 
 #. module: report_mrp
 #: model:ir.module.module,shortdesc:report_mrp.module_meta_information
 msgid "MRP Management - Reporting"
-msgstr ""
+msgstr "Upravljanje Proizvodnjom - Izvještavanje"
 
 #. module: report_mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
-msgstr ""
+msgstr "Vrijednost Zalihe"
 
 #. module: report_mrp
 #: field:report.workcenter.load,cycle:0
 msgid "Nbr of cycle"
-msgstr ""
+msgstr "Broj Ciklusa"
 
 #. module: report_mrp
 #: field:report.workcenter.load,hour:0
 msgid "Nbr of hour"
-msgstr ""
+msgstr "Broj Sati"
 
 #. module: report_mrp
 #: field:report.workcenter.load,workcenter_id:0
 msgid "Workcenter"
-msgstr ""
+msgstr "Radni Centar"
 
 #. module: report_mrp
 #: model:ir.actions.act_window,name:report_mrp.action_report_workcenter_load_tree
 #: model:ir.ui.menu,name:report_mrp.menu_report_workcenter_load
 msgid "Workcenter Loads"
-msgstr ""
+msgstr "Tereti Radnog Centra"
 
 #. module: report_mrp
 #: model:ir.actions.act_window,name:report_mrp.action_report_in_out_picking_tree
@@ -88,15 +90,15 @@ msgstr "Tjedna Varijacija Vrijednosti Zalihe"
 #. module: report_mrp
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "Pogrešno ime modela u definiciji akcije."
+msgstr "Pogrešno ime modela u definiciji Radnje."
 
 #. module: report_mrp
 #: model:ir.model,name:report_mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
 msgid "Stock value variation"
-msgstr ""
+msgstr "Varijacija vrijednosti Zalihe"
 
 #. module: report_mrp
 #: view:report.workcenter.load:0
 msgid "Workcenter load"
-msgstr ""
+msgstr "Teret Radnog Centra"
diff --git a/addons/sale/i18n/hr.po b/addons/sale/i18n/hr.po
index 9eb8f513f8e..2dfc21f0d54 100644
--- a/addons/sale/i18n/hr.po
+++ b/addons/sale/i18n/hr.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-03-24 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/sale_analytic_plans/i18n/hr.po b/addons/sale_analytic_plans/i18n/hr.po
index 3c6f11c17c6..a126a2fc3c2 100644
--- a/addons/sale_analytic_plans/i18n/hr.po
+++ b/addons/sale_analytic_plans/i18n/hr.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-03-24 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/sale_delivery_report/i18n/sv.po b/addons/sale_delivery_report/i18n/sv.po
index a57144ab3ad..f196cf650d3 100644
--- a/addons/sale_delivery_report/i18n/sv.po
+++ b/addons/sale_delivery_report/i18n/sv.po
@@ -7,29 +7,29 @@ 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-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-24 14:36+0000\n"
+"Last-Translator: Jeanette <jd@mobilasystem.se>\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-03-11 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
 msgid "Order Date"
-msgstr ""
+msgstr "Orderdatum"
 
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
 msgid "Order Ref."
-msgstr ""
+msgstr "Order Ref."
 
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
 msgid "Weight"
-msgstr ""
+msgstr "Vikt"
 
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
@@ -39,17 +39,17 @@ msgstr ""
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
 msgid "Delivery Order :"
-msgstr ""
+msgstr "Leveransorder:"
 
 #. module: sale_delivery_report
 #: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
 msgid "Delivery order"
-msgstr ""
+msgstr "Leveransorder"
 
 #. module: sale_delivery_report
 #: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
 msgid "Print Delivery Order"
-msgstr ""
+msgstr "Skriv ut leveransorder"
 
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
@@ -59,7 +59,7 @@ msgstr ""
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
 msgid "Invoiced to"
-msgstr ""
+msgstr "Fakturamottagare"
 
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
@@ -74,4 +74,4 @@ msgstr ""
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
 msgid "Quantity"
-msgstr ""
+msgstr "Antal"
diff --git a/addons/sale_journal/i18n/hr.po b/addons/sale_journal/i18n/hr.po
index f4d2e7b297d..3f8e5efd873 100644
--- a/addons/sale_journal/i18n/hr.po
+++ b/addons/sale_journal/i18n/hr.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-03-24 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/stock/i18n/fr.po b/addons/stock/i18n/fr.po
index a8230d8bcfb..52ff32ffb02 100644
--- a/addons/stock/i18n/fr.po
+++ b/addons/stock/i18n/fr.po
@@ -7,20 +7,15 @@ 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: 2009-11-17 10:46+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-25 14:13+0000\n"
+"Last-Translator: Numérigraphe <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-03-11 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: stock
-#: model:ir.actions.wizard,name:stock.return_picking
-msgid "Return packing"
-msgstr "Retour de livraison"
-
 #. module: stock
 #: field:stock.move,product_uos_qty:0
 msgid "Quantity (UOS)"
@@ -104,6 +99,11 @@ msgstr "STOCK_ZOOM_100"
 msgid "UoM"
 msgstr "UdM"
 
+#. module: stock
+#: model:ir.actions.wizard,name:stock.return_picking
+msgid "Return packing"
+msgstr "Colisage en retour"
+
 #. module: stock
 #: field:product.category,property_stock_journal:0
 msgid "Stock journal"
@@ -682,7 +682,7 @@ msgstr ""
 #. module: stock
 #: view:stock.tracking:0
 msgid "Tracking/Serial"
-msgstr "Tracer N° Série"
+msgstr "Suivi/N° de série"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1094,7 +1094,7 @@ msgstr "STOCK_SPELL_CHECK"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_tracking
 msgid "Stock Tracking Lots"
-msgstr "Stock suivi par lot"
+msgstr "Lot de suivi de stock"
 
 #. module: stock
 #: rml:lot.stock.overview:0
@@ -1251,7 +1251,7 @@ msgstr "STOCK_STOP"
 #. module: stock
 #: wizard_view:stock.move.track,init:0
 msgid "Tracking a move"
-msgstr "Tracer un mouvement"
+msgstr "Suivi de mouvement"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1525,7 +1525,7 @@ msgstr "STOCK_SORT_DESCENDING"
 #: model:ir.actions.act_window,name:stock.action_tracking_form
 #: model:ir.ui.menu,name:stock.menu_action_tracking_form
 msgid "Tracking Lots"
-msgstr "Tracer les lots"
+msgstr "Lots de suivi"
 
 #. module: stock
 #: wizard_button:inventory.merge,init,merge:0
@@ -1656,7 +1656,7 @@ msgstr "STOCK_ZOOM_OUT"
 #. module: stock
 #: wizard_field:stock.move.track,init,tracking_prefix:0
 msgid "Tracking prefix"
-msgstr "Préfix du Suivi"
+msgstr "Préfix du suivi"
 
 #. module: stock
 #: selection:stock.location,allocation_method:0
diff --git a/addons/stock_invoice_directly/i18n/pt_BR.po b/addons/stock_invoice_directly/i18n/pt_BR.po
index 82da1f47308..34ca6b82f62 100644
--- a/addons/stock_invoice_directly/i18n/pt_BR.po
+++ b/addons/stock_invoice_directly/i18n/pt_BR.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-03-24 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly

From b6f5ae027ded23098bc9d0ce1a6a1db229718597 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Mon, 29 Mar 2010 04:45:36 +0100
Subject: [PATCH 238/251] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100320044237-0n8t8gp0nl0fuyqt
bzr revid: codehost@crowberry-20100321044153-s0y7eivx43ck859g
bzr revid: codehost@crowberry-20100322044637-xjp4wdw10wpwv601
bzr revid: codehost@crowberry-20100324045250-iszzaukziu6uxznx
bzr revid: codehost@crowberry-20100326044819-vku920nqvrb2lufb
bzr revid: codehost@crowberry-20100327045920-fqolv2unkpzt63um
bzr revid: codehost@crowberry-20100328034636-ni30n5szoo5f8z8w
bzr revid: codehost@crowberry-20100329034536-bo8n0hhw3btepsh8
---
 bin/addons/base/i18n/bg.po    |  54 ++++---
 bin/addons/base/i18n/et.po    |   6 +-
 bin/addons/base/i18n/fi.po    |  16 +-
 bin/addons/base/i18n/hr.po    |   4 +-
 bin/addons/base/i18n/ja.po    |   4 +-
 bin/addons/base/i18n/pl.po    |  14 +-
 bin/addons/base/i18n/pt_BR.po | 289 ++++++++++++++++++----------------
 bin/addons/base/i18n/sv.po    |   4 +-
 bin/addons/base/i18n/uk.po    |   4 +-
 bin/addons/base/i18n/zh_CN.po |   4 +-
 10 files changed, 211 insertions(+), 188 deletions(-)

diff --git a/bin/addons/base/i18n/bg.po b/bin/addons/base/i18n/bg.po
index 1e17e3f0311..54f38a8d16e 100644
--- a/bin/addons/base/i18n/bg.po
+++ b/bin/addons/base/i18n/bg.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-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-02-18 05:29+0000\n"
+"PO-Revision-Date: 2010-03-26 05:19+0000\n"
 "Last-Translator: Boris <boris.t.ivanov@gmail.com>\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-02-19 04:36+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -582,7 +582,7 @@ msgstr "Папуа Нова Гвинея"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_4
 msgid "Basic Partner"
-msgstr ""
+msgstr "Обикновен партньор"
 
 #. module: base
 #: rml:ir.module.reference:0
@@ -1883,7 +1883,7 @@ msgstr "Рождена дата"
 #: model:ir.actions.act_window,name:base.action_partner_title_contact
 #: model:ir.ui.menu,name:base.menu_partner_title_contact
 msgid "Contact Titles"
-msgstr ""
+msgstr "Обръщение"
 
 #. module: base
 #: model:ir.model,name:base.model_res_partner_som
@@ -2587,7 +2587,7 @@ msgstr "Лиценз"
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Invalid operation"
-msgstr ""
+msgstr "Невалидна операция"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -3375,7 +3375,7 @@ msgstr "Собственик на банковата сметка"
 #: model:ir.actions.act_window,name:base.act_values_form
 #: model:ir.ui.menu,name:base.menu_values_form
 msgid "Client Actions Connections"
-msgstr ""
+msgstr "Връзки на действията на клиента"
 
 #. module: base
 #: field:ir.ui.view_sc,resource:0
@@ -3395,7 +3395,7 @@ msgstr "Гваделупа (Франция)"
 #. module: base
 #: field:ir.report.custom.fields,cumulate:0
 msgid "Accumulate"
-msgstr ""
+msgstr "Акумулирай"
 
 #. module: base
 #: code:addons/base/ir/ir_report_custom.py:0
@@ -4340,7 +4340,7 @@ msgstr "E-mail на изпращащия"
 #. module: base
 #: field:ir.default,field_name:0
 msgid "Object Field"
-msgstr ""
+msgstr "Поле на Обекта"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -5011,7 +5011,7 @@ msgstr "Откажи"
 #: code:addons/base/ir/ir_actions.py:0
 #, python-format
 msgid "Please specify server option --smtp-from !"
-msgstr ""
+msgstr "Моля укажете опцията на сървъра --smtp-from !"
 
 #. module: base
 #: selection:wizard.module.lang.export,format:0
@@ -5337,6 +5337,8 @@ msgid ""
 "Select the action that will be executed. Loop action will not be avaliable "
 "inside loop."
 msgstr ""
+"Изберете действие което да бъде изпълнено. Циклични действия няма да бъдат "
+"допустими в цикъла."
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -5409,7 +5411,7 @@ msgstr "Активни събития на партньора"
 #: model:ir.ui.menu,name:base.menu_partner_function_form
 #: view:res.partner.function:0
 msgid "Contact Functions"
-msgstr ""
+msgstr "Функции на контакта"
 
 #. module: base
 #: view:multi_company.default:0
@@ -5553,7 +5555,7 @@ msgstr "GPL-3 или по-късна версия"
 #. module: base
 #: selection:ir.actions.report.xml,report_type:0
 msgid "HTML from HTML(Mako)"
-msgstr ""
+msgstr "HTML от HTML(Mako)"
 
 #. module: base
 #: field:workflow.activity,action:0
@@ -5739,19 +5741,19 @@ msgstr "Самоа"
 #. module: base
 #: field:ir.ui.menu,child_id:0
 msgid "Child IDs"
-msgstr ""
+msgstr "Подчинени идентификатори"
 
 #. module: base
 #: code:addons/base/ir/ir_actions.py:0
 #, python-format
 msgid "Problem in configuration `Record Id` in Server Action!"
-msgstr ""
+msgstr "Проблем в конфигурацията 'Record Id' в Действия на Сървъра!"
 
 #. module: base
 #: code:addons/base/maintenance/maintenance.py:0
 #, python-format
 msgid "This error occurs on database %s"
-msgstr ""
+msgstr "Тази грешка възниква в база данни %s"
 
 #. module: base
 #: wizard_button:base.module.import,init,import:0
@@ -5794,7 +5796,7 @@ msgstr "Спиране на всички"
 #. module: base
 #: view:res.lang:0
 msgid "3.  %x ,%X         ==> 12/05/08, 18:25:20"
-msgstr ""
+msgstr "3. %x ,%X ==> 12/05/08, 18:25:20"
 
 #. module: base
 #: selection:ir.model.fields,on_delete:0
@@ -5805,7 +5807,7 @@ msgstr "Каскадно"
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Field %d should be a figure"
-msgstr ""
+msgstr "Поле %d трябва да бъде изображение"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_inventory_form
@@ -5986,7 +5988,7 @@ msgstr "Сомалия"
 #. module: base
 #: model:ir.actions.act_window,name:base.action_config_simple_view_form
 msgid "Configure Simple View"
-msgstr ""
+msgstr "Настрой прост изглед"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_13
@@ -6055,7 +6057,7 @@ msgstr "Час 00->24: %(h24)"
 #. module: base
 #: help:multi_company.default,field_id:0
 msgid "Select field property"
-msgstr ""
+msgstr "Изберете свойство на полето"
 
 #. module: base
 #: field:res.request.history,date_sent:0
@@ -6146,7 +6148,7 @@ msgstr "Родител"
 #. module: base
 #: view:multi_company.default:0
 msgid "Returning"
-msgstr ""
+msgstr "Възвращаемо"
 
 #. module: base
 #: field:ir.actions.act_window,res_model:0
@@ -6306,7 +6308,7 @@ msgstr "Норвегия"
 #. module: base
 #: view:res.lang:0
 msgid "4.  %b, %B         ==> Dec, December"
-msgstr ""
+msgstr "4. %b, %B ==> Дек, Декември"
 
 #. module: base
 #: model:ir.actions.wizard,name:base.wizard_lang_install
@@ -6472,7 +6474,7 @@ msgstr "workflow.instance"
 #. module: base
 #: view:res.lang:0
 msgid "10. %S              ==> 20"
-msgstr ""
+msgstr "10. %S ==> 20"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_madam
@@ -6563,6 +6565,8 @@ msgid ""
 "Important when you deal with multiple actions, the execution order will be "
 "decided based on this, low number is higher priority."
 msgstr ""
+"Важно! Когато работите с множество действия, реда на изпълнение ще се "
+"определя от това, че по-малкия номер има по-висок приоритет."
 
 #. module: base
 #: field:ir.actions.report.xml,header:0
@@ -6602,7 +6606,7 @@ msgstr "Неинсталируем"
 #. module: base
 #: view:res.partner.category:0
 msgid "Partner Category"
-msgstr ""
+msgstr "Категория на партньора"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -6761,7 +6765,7 @@ msgstr "От"
 #. module: base
 #: wizard_button:server.action.create,init,step_1:0
 msgid "Next"
-msgstr ""
+msgstr "Напред"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -6861,7 +6865,7 @@ msgstr "Име на канала"
 #. module: base
 #: view:res.lang:0
 msgid "5.  %y, %Y         ==> 08, 2008"
-msgstr ""
+msgstr "5. %y, %Y ==> 08, 2008"
 
 #. module: base
 #: field:ir.model.fields,model_id:0
@@ -6948,7 +6952,7 @@ msgstr "CSV Файл"
 #: selection:ir.model,state:0
 #: selection:ir.model.grid,state:0
 msgid "Base Object"
-msgstr ""
+msgstr "Базов обект"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
diff --git a/bin/addons/base/i18n/et.po b/bin/addons/base/i18n/et.po
index e799c7d2187..309dca1a8ff 100644
--- a/bin/addons/base/i18n/et.po
+++ b/bin/addons/base/i18n/et.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-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-18 11:18+0000\n"
-"Last-Translator: Tanel Kurvits <Unknown>\n"
+"PO-Revision-Date: 2010-03-19 08:39+0000\n"
+"Last-Translator: OpenERP Administrators <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-03-19 07:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-20 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/fi.po b/bin/addons/base/i18n/fi.po
index d76791b3541..aabfe2c1ca5 100644
--- a/bin/addons/base/i18n/fi.po
+++ b/bin/addons/base/i18n/fi.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-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-13 05:29+0000\n"
+"PO-Revision-Date: 2010-03-24 05:45+0000\n"
 "Last-Translator: OpenERP Administrators <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-03-14 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-26 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -938,7 +938,7 @@ msgstr ""
 #. module: base
 #: field:res.roles,name:0
 msgid "Role Name"
-msgstr "Roolinimi"
+msgstr "Työtehtävän nimi"
 
 #. module: base
 #: field:res.partner,user_id:0
@@ -2173,7 +2173,7 @@ msgstr "Yrityksen nimi"
 #: view:res.users:0
 #: field:res.users,roles_id:0
 msgid "Roles"
-msgstr "Roolit"
+msgstr "Työtehtävät"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_country
@@ -3240,7 +3240,7 @@ msgstr "%H - Tunnit (24:n tunnin kello) desimaalilukuna [00,23]."
 #. module: base
 #: view:res.roles:0
 msgid "Role"
-msgstr "Rooli"
+msgstr "Työtehtävä"
 
 #. module: base
 #: help:res.country.state,code:0
@@ -3485,7 +3485,7 @@ msgstr "Tapahtumat"
 #: model:ir.actions.act_window,name:base.action_res_roles
 #: model:ir.ui.menu,name:base.menu_action_res_roles
 msgid "Roles Structure"
-msgstr "Roolien rakenne"
+msgstr "Työtehtävien rakenne"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_url
@@ -3517,7 +3517,7 @@ msgstr "Lisättyjen moduulien määrä"
 #. module: base
 #: field:workflow.transition,role_id:0
 msgid "Role Required"
-msgstr "Vaadittu rooli"
+msgstr "Vaadittu työtehtävä"
 
 #. module: base
 #: view:ir.module.module:0
@@ -5060,7 +5060,7 @@ msgstr "Islanti"
 #: view:res.users:0
 msgid "Roles are used to defined available actions, provided by workflows."
 msgstr ""
-"Roolit määrittelevät käytettävissä olevat toiminnot, joita työnkulut "
+"Työtehtävät määrittelevät käytettävissä olevat toiminnot, joita työnkulut "
 "edellyttävät."
 
 #. module: base
diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index cbd967f6bf0..9796ae7dd6c 100644
--- a/bin/addons/base/i18n/hr.po
+++ b/bin/addons/base/i18n/hr.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-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-18 04:57+0000\n"
+"PO-Revision-Date: 2010-03-28 04:33+0000\n"
 "Last-Translator: goranc <goranc@gmail.com>\n"
 "Language-Team: openerp-translators\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-19 07:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-29 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index 09a712e6589..75f564da990 100644
--- a/bin/addons/base/i18n/ja.po
+++ b/bin/addons/base/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-18 04:55+0000\n"
+"PO-Revision-Date: 2010-03-28 04:35+0000\n"
 "Last-Translator: Harry (Open ERP) <hmo@tinyerp.com>\n"
 "Language-Team: Japanese <ja@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-03-19 07:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-29 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/pl.po b/bin/addons/base/i18n/pl.po
index 8fbd25231e0..63fd07334ec 100644
--- a/bin/addons/base/i18n/pl.po
+++ b/bin/addons/base/i18n/pl.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-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-02-21 06:01+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-03-22 05:21+0000\n"
+"Last-Translator: Bartosz Kaszubowski <gosimek@gmail.com>\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-02-22 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-24 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -1592,7 +1592,7 @@ msgstr "Akcja serwera"
 #. module: base
 #: model:res.country,name:base.tt
 msgid "Trinidad and Tobago"
-msgstr "Trinidad i Tobago"
+msgstr "Trynidad i Tobago"
 
 #. module: base
 #: model:res.country,name:base.lv
@@ -2687,7 +2687,7 @@ msgstr "Boliwia"
 #. module: base
 #: model:res.country,name:base.gh
 msgid "Ghana"
-msgstr "Gana"
+msgstr "Ghana"
 
 #. module: base
 #: field:res.lang,direction:0
@@ -6817,7 +6817,7 @@ msgstr "Puste hasło !"
 #. module: base
 #: model:res.country,name:base.eh
 msgid "Western Sahara"
-msgstr "Zachodnia Sahara"
+msgstr "Sahara Zachodnia"
 
 #. module: base
 #: model:ir.model,name:base.model_workflow
@@ -7218,7 +7218,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.cx
 msgid "Christmas Island"
-msgstr "Wyspy Bożego Narodzenia"
+msgstr "Wyspa Bożego Narodzenia"
 
 #. module: base
 #: view:ir.actions.server:0
diff --git a/bin/addons/base/i18n/pt_BR.po b/bin/addons/base/i18n/pt_BR.po
index 11e0be4a1c1..2be3d5f5ac0 100644
--- a/bin/addons/base/i18n/pt_BR.po
+++ b/bin/addons/base/i18n/pt_BR.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-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-01-12 06:01+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-24 05:43+0000\n"
+"Last-Translator: OpenERP Administrators <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-01-14 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-26 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -746,7 +746,7 @@ msgstr "Irã"
 #: model:ir.actions.act_window,name:base.res_request-act
 #: model:ir.ui.menu,name:base.menu_res_request_act
 msgid "My Requests"
-msgstr "Minhas Solicitações"
+msgstr "Minhas mensagens"
 
 #. module: base
 #: field:ir.sequence,name:0
@@ -955,7 +955,7 @@ msgstr "-"
 #. module: base
 #: field:res.payterm,name:0
 msgid "Payment Term (short name)"
-msgstr ""
+msgstr "Condições de pagamento(abreviado)"
 
 #. module: base
 #: model:ir.model,name:base.model_res_bank
@@ -999,7 +999,7 @@ msgstr "Login"
 #: view:maintenance.contract:0
 #: field:maintenance.contract,module_ids:0
 msgid "Covered Modules"
-msgstr ""
+msgstr "Módulos cobertos"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1047,7 +1047,7 @@ msgstr "Ações do Servidor"
 #. module: base
 #: model:res.country,name:base.tp
 msgid "East Timor"
-msgstr ""
+msgstr "Timor Leste"
 
 #. module: base
 #: view:ir.rule:0
@@ -1062,7 +1062,7 @@ msgstr "Precisão computacional"
 #. module: base
 #: model:res.country,name:base.kg
 msgid "Kyrgyz Republic (Kyrgyzstan)"
-msgstr ""
+msgstr "República do Quirguizistão"
 
 #. module: base
 #: model:ir.model,name:base.model_wizard_ir_model_menu_create_line
@@ -1231,7 +1231,7 @@ msgstr "Automático"
 #. module: base
 #: view:res.request:0
 msgid "End of Request"
-msgstr "Fim da requisição"
+msgstr "Fim da mensagem"
 
 #. module: base
 #: view:res.request:0
@@ -1522,13 +1522,13 @@ msgstr ""
 #. module: base
 #: field:ir.model.config,password_check:0
 msgid "Confirmation"
-msgstr ""
+msgstr "Confirmação"
 
 #. module: base
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Enter at least one field !"
-msgstr ""
+msgstr "Digite pelo menos um campo !"
 
 #. module: base
 #: field:ir.ui.view_sc,name:0
@@ -1546,11 +1546,13 @@ msgid ""
 "Provide the field name that the record id refers to for the write operation. "
 "If it is empty it will refer to the active id of the object."
 msgstr ""
+"Forneça o nome do campo que o id do registro refere para a operação de "
+"gravação(write). Se vazio, se refere ao id do objeto ativo."
 
 #. module: base
 #: model:res.country,name:base.zw
 msgid "Zimbabwe"
-msgstr ""
+msgstr "Zimbábue"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_translation_export
@@ -1571,29 +1573,29 @@ msgstr "Endereço de E-mail"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "French (BE) / Français (BE)"
-msgstr ""
+msgstr "Frances(BE) / Frances(BE)"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "You can not write in this document! (%s)"
-msgstr ""
+msgstr "Voce não pode atualizar este documento! (%s)"
 
 #. module: base
 #: view:ir.actions.server:0
 #: field:workflow.activity,action_id:0
 msgid "Server Action"
-msgstr ""
+msgstr "Ação de servidor"
 
 #. module: base
 #: model:res.country,name:base.tt
 msgid "Trinidad and Tobago"
-msgstr ""
+msgstr "Trinidade e Tobago"
 
 #. module: base
 #: model:res.country,name:base.lv
 msgid "Latvia"
-msgstr ""
+msgstr "Letônia"
 
 #. module: base
 #: view:ir.values:0
@@ -1609,7 +1611,7 @@ msgstr "Mapeando campos"
 #: model:ir.actions.act_window,name:base.res_request-closed
 #: model:ir.ui.menu,name:base.next_id_12_close
 msgid "My Closed Requests"
-msgstr "Minhas Requisições Encerradas"
+msgstr "Minhas mensagens encerradas"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom
@@ -1619,7 +1621,7 @@ msgstr "Customização"
 #. module: base
 #: model:res.country,name:base.py
 msgid "Paraguay"
-msgstr ""
+msgstr "Paraguai"
 
 #. module: base
 #: selection:ir.report.custom.fields,alignment:0
@@ -1639,7 +1641,7 @@ msgstr "Destino"
 #. module: base
 #: model:res.country,name:base.lt
 msgid "Lithuania"
-msgstr ""
+msgstr "Lituânia"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1649,7 +1651,7 @@ msgstr "STOCK_PRINT_PREVIEW"
 #. module: base
 #: model:res.country,name:base.si
 msgid "Slovenia"
-msgstr ""
+msgstr "Eslovênia"
 
 #. module: base
 #: view:res.partner.canal:0
@@ -1665,7 +1667,7 @@ msgstr "%p - Equivalente de cada uma das AM ou PM."
 #. module: base
 #: view:ir.actions.server:0
 msgid "Iteration Actions"
-msgstr ""
+msgstr "Ações de repetição"
 
 #. module: base
 #: field:maintenance.contract,date_stop:0
@@ -1675,7 +1677,7 @@ msgstr "Data final"
 #. module: base
 #: model:res.country,name:base.nz
 msgid "New Zealand"
-msgstr ""
+msgstr "Nova Zelândia"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_7
@@ -1685,7 +1687,7 @@ msgstr "Openstuff.net"
 #. module: base
 #: model:res.country,name:base.nf
 msgid "Norfolk Island"
-msgstr ""
+msgstr "Ilhas Norfolk"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1700,7 +1702,7 @@ msgstr "Operador"
 #. module: base
 #: wizard_view:module.lang.install,start:0
 msgid "Installation Done"
-msgstr ""
+msgstr "Instalação concluída"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1711,7 +1713,7 @@ msgstr "STOCK_OPEN"
 #: field:ir.actions.server,action_id:0
 #: selection:ir.actions.server,state:0
 msgid "Client Action"
-msgstr ""
+msgstr "Ação de cliente"
 
 #. module: base
 #: selection:ir.report.custom.fields,alignment:0
@@ -1721,7 +1723,7 @@ msgstr "direita"
 #. module: base
 #: model:res.country,name:base.bd
 msgid "Bangladesh"
-msgstr ""
+msgstr "Bangladesh"
 
 #. module: base
 #: constraint:res.company:0
@@ -1737,7 +1739,7 @@ msgstr "Válido"
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "You can not delete this document! (%s)"
-msgstr ""
+msgstr "Você não pode excluir este documento! (%s)"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -1753,7 +1755,7 @@ msgstr "Impossível atualizar o módulo '%s'. Ele não está instalado."
 #. module: base
 #: model:res.country,name:base.cu
 msgid "Cuba"
-msgstr ""
+msgstr "Cuba"
 
 #. module: base
 #: view:res.lang:0
@@ -2133,7 +2135,7 @@ msgstr "terp-account"
 #: code:addons/base/module/module.py:0
 #, python-format
 msgid "Recursion error in modules dependencies !"
-msgstr ""
+msgstr "Erro de recursão nas dependências dos módulos !"
 
 #. module: base
 #: view:ir.model:0
@@ -2146,6 +2148,8 @@ msgid ""
 "Value Added Tax number. Check the box if the partner is subjected to the "
 "VAT. Used by the VAT legal statement."
 msgstr ""
+"Valor do imposto adicionado. Marque a caixa se o parceiro está sujeito ao "
+"imposto. Usado para impostos oficiais."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_category_tree
@@ -2156,7 +2160,7 @@ msgstr "Categorias de Módulos"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Ukrainian / украї́нська мо́ва"
-msgstr ""
+msgstr "Ucrânia"
 
 #. module: base
 #: selection:ir.actions.todo,state:0
@@ -2166,7 +2170,7 @@ msgstr "Não Iniciado"
 #. module: base
 #: model:res.country,name:base.ru
 msgid "Russian Federation"
-msgstr ""
+msgstr "Rússia"
 
 #. module: base
 #: field:res.company,name:0
@@ -2234,7 +2238,7 @@ msgstr "%M - Minuto com dois decimais [00,59]."
 #. module: base
 #: model:res.country,name:base.tj
 msgid "Tajikistan"
-msgstr ""
+msgstr "Tajiquistão"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_values_form_action
@@ -2250,7 +2254,7 @@ msgstr "GPL-2 ou versão superior"
 #. module: base
 #: selection:res.partner.event,type:0
 msgid "Prospect Contact"
-msgstr ""
+msgstr "Contato"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_wizard
@@ -2261,7 +2265,7 @@ msgstr "ir.actions.wizard"
 #. module: base
 #: model:res.country,name:base.nr
 msgid "Nauru"
-msgstr ""
+msgstr "Nauru"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_property
@@ -2279,7 +2283,7 @@ msgstr "Form."
 #. module: base
 #: model:res.country,name:base.me
 msgid "Montenegro"
-msgstr ""
+msgstr "Montenegro"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -2289,7 +2293,7 @@ msgstr "STOCK_QUIT"
 #. module: base
 #: view:ir.cron:0
 msgid "Technical Data"
-msgstr ""
+msgstr "Dados Técnicos"
 
 #. module: base
 #: view:res.partner:0
@@ -2312,7 +2316,7 @@ msgstr "A ser atualizado"
 #. module: base
 #: model:res.country,name:base.ly
 msgid "Libya"
-msgstr ""
+msgstr "Líbia"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -2327,12 +2331,12 @@ msgstr "Repositórios"
 #. module: base
 #: model:res.country,name:base.cf
 msgid "Central African Republic"
-msgstr ""
+msgstr "República Centro-Africana"
 
 #. module: base
 #: model:res.country,name:base.li
 msgid "Liechtenstein"
-msgstr ""
+msgstr "Suíça"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_ltd
@@ -2347,7 +2351,7 @@ msgstr "EAN13"
 #. module: base
 #: model:res.country,name:base.pt
 msgid "Portugal"
-msgstr ""
+msgstr "Portugal"
 
 #. module: base
 #: selection:maintenance.contract,state:0
@@ -2357,7 +2361,7 @@ msgstr "Inválido"
 #. module: base
 #: field:ir.module.module,certificate:0
 msgid "Quality Certificate"
-msgstr ""
+msgstr "Certificado de qualidade"
 
 #. module: base
 #: view:res.lang:0
@@ -2380,12 +2384,12 @@ msgstr "Idiomas"
 #. module: base
 #: model:res.country,name:base.pw
 msgid "Palau"
-msgstr ""
+msgstr "Palau"
 
 #. module: base
 #: model:res.country,name:base.ec
 msgid "Ecuador"
-msgstr ""
+msgstr "Equador"
 
 #. module: base
 #: code:addons/base/module/wizard/wizard_export_lang.py:0
@@ -2403,12 +2407,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_partner_customer_form
 #: view:res.partner:0
 msgid "Customers"
-msgstr ""
+msgstr "Clientes"
 
 #. module: base
 #: model:res.country,name:base.au
 msgid "Australia"
-msgstr ""
+msgstr "Austrália"
 
 #. module: base
 #: help:res.partner,lang:0
@@ -2443,7 +2447,7 @@ msgstr "Conteúdo SXW"
 #. module: base
 #: view:ir.cron:0
 msgid "Action to Trigger"
-msgstr ""
+msgstr "Ação a Disparar"
 
 #. module: base
 #: field:ir.report.custom.fields,fc0_operande:0
@@ -2493,7 +2497,7 @@ msgstr "Cabeçalho/Rodapé"
 #. module: base
 #: model:res.country,name:base.lb
 msgid "Lebanon"
-msgstr ""
+msgstr "Líbano"
 
 #. module: base
 #: wizard_field:module.lang.import,init,name:0
@@ -2503,7 +2507,7 @@ msgstr "Idioma"
 #. module: base
 #: model:res.country,name:base.va
 msgid "Holy See (Vatican City State)"
-msgstr ""
+msgstr "Santa Sé (Vaticano)"
 
 #. module: base
 #: help:ir.actions.server,condition:0
@@ -2511,6 +2515,8 @@ msgid ""
 "Condition that is to be tested before action is executed, e.g. "
 "object.list_price > object.cost_price"
 msgstr ""
+"Condição a ser testada antes da ação ser executada. Ex.: object.list_price > "
+"object.cost_price"
 
 #. module: base
 #: wizard_field:base.module.import,init,module_file:0
@@ -2520,7 +2526,7 @@ msgstr "Arquivo de módulo .ZIP"
 #. module: base
 #: field:res.roles,child_id:0
 msgid "Children"
-msgstr ""
+msgstr "Filhos"
 
 #. module: base
 #: field:workflow.transition,trigger_model:0
@@ -2546,7 +2552,7 @@ msgstr "Transações de Entrada"
 #. module: base
 #: model:res.country,name:base.sr
 msgid "Suriname"
-msgstr ""
+msgstr "Suriname"
 
 #. module: base
 #: field:ir.values,key2:0
@@ -2590,7 +2596,7 @@ msgstr "Licença"
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Invalid operation"
-msgstr ""
+msgstr "Operação inválida"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -2600,7 +2606,7 @@ msgstr "STOCK_SAVE_AS"
 #. module: base
 #: selection:ir.translation,type:0
 msgid "SQL Constraint"
-msgstr ""
+msgstr "Restrição de SQL"
 
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
@@ -2623,18 +2629,18 @@ msgstr "Abrir uma janela"
 #. module: base
 #: model:res.country,name:base.gq
 msgid "Equatorial Guinea"
-msgstr ""
+msgstr "Guiné Equatorial"
 
 #. module: base
 #: wizard_view:base.module.import,init:0
 msgid "Module Import"
-msgstr ""
+msgstr "Importar módulo"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "You can not remove the field '%s' !"
-msgstr ""
+msgstr "Voce não pode remover o campo '%s' !"
 
 #. module: base
 #: field:res.bank,zip:0
@@ -2666,17 +2672,17 @@ msgstr "%c - representação adequada para Data e hora."
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Finland / Suomi"
-msgstr ""
+msgstr "Finlândia"
 
 #. module: base
 #: model:res.country,name:base.bo
 msgid "Bolivia"
-msgstr ""
+msgstr "Bolívia"
 
 #. module: base
 #: model:res.country,name:base.gh
 msgid "Ghana"
-msgstr ""
+msgstr "Gana"
 
 #. module: base
 #: field:res.lang,direction:0
@@ -2713,12 +2719,13 @@ msgstr "Regras"
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
+"Voce tentou remover um módulo que esta instalado ou poderá ser instalado"
 
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
 "The kind of action or button in the client side that will trigger the action."
-msgstr ""
+msgstr "O tipo de ação ou butão no lado cliente que irá disparar a ação."
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -2728,7 +2735,7 @@ msgstr "STOCK_PASTE"
 #. module: base
 #: model:res.country,name:base.gt
 msgid "Guatemala"
-msgstr ""
+msgstr "Guatemala"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_workflow_form
@@ -2765,17 +2772,17 @@ msgstr "Saltar"
 #: model:ir.actions.act_window,name:base.res_request_link-act
 #: model:ir.ui.menu,name:base.menu_res_request_link_act
 msgid "Accepted Links in Requests"
-msgstr "Ligações aceitas nas mensagens"
+msgstr "Links aceitos nas mensagens"
 
 #. module: base
 #: model:res.country,name:base.ls
 msgid "Lesotho"
-msgstr ""
+msgstr "Lesoto"
 
 #. module: base
 #: model:res.country,name:base.ke
 msgid "Kenya"
-msgstr ""
+msgstr "Quênia"
 
 #. module: base
 #: view:res.config.view:0
@@ -2791,22 +2798,22 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.sm
 msgid "San Marino"
-msgstr ""
+msgstr "São Marinho"
 
 #. module: base
 #: model:res.country,name:base.bm
 msgid "Bermuda"
-msgstr ""
+msgstr "Bermudas"
 
 #. module: base
 #: model:res.country,name:base.pe
 msgid "Peru"
-msgstr ""
+msgstr "Perú"
 
 #. module: base
 #: selection:ir.model.fields,on_delete:0
 msgid "Set NULL"
-msgstr ""
+msgstr "Definir como NULL"
 
 #. module: base
 #: field:res.partner.event,som:0
@@ -2842,7 +2849,7 @@ msgstr "Chave"
 #. module: base
 #: field:ir.cron,nextcall:0
 msgid "Next Call Date"
-msgstr ""
+msgstr "Data da próxima chamada"
 
 #. module: base
 #: field:res.company,rml_header:0
@@ -2852,7 +2859,7 @@ msgstr "Cabeçalho RML"
 #. module: base
 #: wizard_field:res.partner.sms_send,init,app_id:0
 msgid "API ID"
-msgstr ""
+msgstr "API ID"
 
 #. module: base
 #: model:res.country,name:base.mu
@@ -2874,12 +2881,12 @@ msgstr "Segurança"
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Using a relation field which uses an unknown object"
-msgstr ""
+msgstr "Usando uma relação que usa um objeto desconhecido"
 
 #. module: base
 #: model:res.country,name:base.za
 msgid "South Africa"
-msgstr ""
+msgstr "África do Sul"
 
 #. module: base
 #: model:ir.model,name:base.model_wizard_module_lang_export
@@ -2895,12 +2902,12 @@ msgstr "Instalado"
 #. module: base
 #: model:res.country,name:base.sn
 msgid "Senegal"
-msgstr ""
+msgstr "Senegal"
 
 #. module: base
 #: model:res.country,name:base.hu
 msgid "Hungary"
-msgstr ""
+msgstr "Hungria"
 
 #. module: base
 #: model:ir.model,name:base.model_res_groups
@@ -2926,12 +2933,12 @@ msgstr "Preços"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Albanian / Shqipëri"
-msgstr ""
+msgstr "Albânia"
 
 #. module: base
 #: model:res.country,name:base.sy
 msgid "Syria"
-msgstr ""
+msgstr "Síria"
 
 #. module: base
 #: view:res.lang:0
@@ -2941,22 +2948,22 @@ msgstr "======================================================"
 #. module: base
 #: field:ir.report.custom.fields,field_child2:0
 msgid "Field child2"
-msgstr ""
+msgstr "Campo filho2"
 
 #. module: base
 #: field:ir.report.custom.fields,field_child3:0
 msgid "Field child3"
-msgstr ""
+msgstr "Campo filho3"
 
 #. module: base
 #: field:ir.report.custom.fields,field_child0:0
 msgid "Field child0"
-msgstr ""
+msgstr "Campo filho0"
 
 #. module: base
 #: field:ir.report.custom.fields,field_child1:0
 msgid "Field child1"
-msgstr ""
+msgstr "Campo filho 1"
 
 #. module: base
 #: field:ir.model.fields,selection:0
@@ -2966,7 +2973,7 @@ msgstr ": Seleção de Campo"
 #. module: base
 #: selection:res.request,state:0
 msgid "draft"
-msgstr ""
+msgstr "esboço"
 
 #. module: base
 #: field:res.currency,date:0
@@ -2980,7 +2987,7 @@ msgstr "Data"
 #. module: base
 #: field:ir.actions.report.xml,report_sxw:0
 msgid "SXW path"
-msgstr ""
+msgstr "endereço do SXW"
 
 #. module: base
 #: view:ir.attachment:0
@@ -3008,6 +3015,8 @@ msgid ""
 "If set to true, the action will not be displayed on the right toolbar of a "
 "form view."
 msgstr ""
+"Se definido como verdadeiro, a ação não será exibida na barra de ferramentas "
+"a direita."
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom_multicompany
@@ -3039,7 +3048,7 @@ msgstr "Criador"
 #. module: base
 #: model:res.country,name:base.mx
 msgid "Mexico"
-msgstr ""
+msgstr "México"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -3059,7 +3068,7 @@ msgstr "res.users"
 #. module: base
 #: model:res.country,name:base.ni
 msgid "Nicaragua"
-msgstr ""
+msgstr "Nicarágua"
 
 #. module: base
 #: view:res.partner.event:0
@@ -3086,7 +3095,7 @@ msgstr "Campo"
 #. module: base
 #: model:res.country,name:base.ve
 msgid "Venezuela"
-msgstr ""
+msgstr "Venezuela"
 
 #. module: base
 #: view:res.lang:0
@@ -3096,7 +3105,7 @@ msgstr "9.  %j              ==> 340"
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
-msgstr ""
+msgstr "Zâmbia"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_action_report_xml
@@ -3116,7 +3125,7 @@ msgstr ""
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Parent Partner"
-msgstr ""
+msgstr "Parceiro Pai"
 
 #. module: base
 #: view:ir.module.module:0
@@ -3126,12 +3135,12 @@ msgstr "Cancelar Atualização"
 #. module: base
 #: model:res.country,name:base.ci
 msgid "Ivory Coast (Cote D'Ivoire)"
-msgstr ""
+msgstr "Costa do Marfim"
 
 #. module: base
 #: model:res.country,name:base.kz
 msgid "Kazakhstan"
-msgstr ""
+msgstr "Cazaquistão"
 
 #. module: base
 #: field:ir.actions.report.xml,name:0
@@ -3164,7 +3173,7 @@ msgstr "Nome"
 #. module: base
 #: model:res.country,name:base.ms
 msgid "Montserrat"
-msgstr ""
+msgstr "Montserrat"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_translation_app
@@ -3326,7 +3335,7 @@ msgstr "Lista de controles de acesso"
 #. module: base
 #: model:res.country,name:base.um
 msgid "USA Minor Outlying Islands"
-msgstr ""
+msgstr "USA Minor Outlying Islands"
 
 #. module: base
 #: field:res.partner.bank,state:0
@@ -3377,7 +3386,7 @@ msgstr "Titular da conta bancária"
 #: model:ir.actions.act_window,name:base.act_values_form
 #: model:ir.ui.menu,name:base.menu_values_form
 msgid "Client Actions Connections"
-msgstr ""
+msgstr "Conexões de ações de cliente"
 
 #. module: base
 #: field:ir.ui.view_sc,resource:0
@@ -3601,7 +3610,7 @@ msgstr "Micronésia"
 #. module: base
 #: view:res.request.history:0
 msgid "Request History"
-msgstr "Pedir Histórico"
+msgstr "Histórico das mensagens"
 
 #. module: base
 #: field:ir.actions.act_window,menus:0
@@ -4340,7 +4349,7 @@ msgstr ""
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "French (CH) / Français (CH)"
-msgstr ""
+msgstr "Frances (CH)"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4559,7 +4568,7 @@ msgstr "%a - Nome da semana abreviado."
 #. module: base
 #: rml:ir.module.reference:0
 msgid "Introspection report on objects"
-msgstr ""
+msgstr "Relatório de instrospecção nos objetos"
 
 #. module: base
 #: model:res.country,name:base.pf
@@ -4569,7 +4578,7 @@ msgstr "Polinésia (França)"
 #. module: base
 #: model:res.country,name:base.dm
 msgid "Dominica"
-msgstr ""
+msgstr "Dominica"
 
 #. module: base
 #: model:ir.model,name:base.model_res_currency_rate
@@ -4737,12 +4746,12 @@ msgstr "Objetos"
 #. module: base
 #: field:ir.model.fields,selectable:0
 msgid "Selectable"
-msgstr ""
+msgstr "Selecionável"
 
 #. module: base
 #: view:res.request.link:0
 msgid "Request Link"
-msgstr ""
+msgstr "Link"
 
 #. module: base
 #: field:ir.module.module,url:0
@@ -4815,7 +4824,7 @@ msgstr "Traduções"
 #. module: base
 #: field:ir.sequence,padding:0
 msgid "Number padding"
-msgstr ""
+msgstr "Preencher número"
 
 #. module: base
 #: model:res.country,name:base.ua
@@ -4876,7 +4885,7 @@ msgstr "XSL path"
 #. module: base
 #: model:res.country,name:base.bn
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "Brunei Darussalam"
 
 #. module: base
 #: field:ir.actions.act_window,view_type:0
@@ -5445,7 +5454,7 @@ msgstr "Seleção"
 #. module: base
 #: field:ir.actions.act_window,search_view:0
 msgid "Search View"
-msgstr ""
+msgstr "Visão de Pesquisa"
 
 #. module: base
 #: field:ir.rule,domain_force:0
@@ -5546,7 +5555,7 @@ msgstr "GPL-3 ou versão posterior"
 #. module: base
 #: selection:ir.actions.report.xml,report_type:0
 msgid "HTML from HTML(Mako)"
-msgstr ""
+msgstr "HTML from HTML(Mako)"
 
 #. module: base
 #: field:workflow.activity,action:0
@@ -5646,7 +5655,7 @@ msgstr "Ações da janela"
 #. module: base
 #: model:res.country,name:base.kn
 msgid "Saint Kitts & Nevis Anguilla"
-msgstr ""
+msgstr "Saint Kitts & Nevis Anguilla"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -5667,6 +5676,7 @@ msgid ""
 "Object in which you want to create / write the object. If it is empty then "
 "refer to the Object field."
 msgstr ""
+"Objeto no qual você deseja gravar/criar. Se vazio, veja o campo \"Objeto\"."
 
 #. module: base
 #: selection:ir.module.module,state:0
@@ -5700,7 +5710,7 @@ msgstr "Martinica(França)"
 #: model:ir.ui.menu,name:base.next_id_12
 #: view:res.request:0
 msgid "Requests"
-msgstr "Requisições"
+msgstr "Mensagens"
 
 #. module: base
 #: model:res.country,name:base.ye
@@ -5730,13 +5740,13 @@ msgstr "Samoa"
 #. module: base
 #: field:ir.ui.menu,child_id:0
 msgid "Child IDs"
-msgstr ""
+msgstr "IDs filhos"
 
 #. module: base
 #: code:addons/base/ir/ir_actions.py:0
 #, python-format
 msgid "Problem in configuration `Record Id` in Server Action!"
-msgstr ""
+msgstr "Prbolemas na configuracao do 'id do registro' na ação do servidor!"
 
 #. module: base
 #: code:addons/base/maintenance/maintenance.py:0
@@ -5770,7 +5780,7 @@ msgstr "E-mail"
 #: model:ir.actions.act_window,name:base.action_wizard_update_translations
 #: model:ir.ui.menu,name:base.menu_wizard_update_translations
 msgid "Resynchronise Terms"
-msgstr ""
+msgstr "Re-sincroniar termos"
 
 #. module: base
 #: model:res.country,name:base.tg
@@ -5796,7 +5806,7 @@ msgstr "Cascata"
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Field %d should be a figure"
-msgstr ""
+msgstr "Campo %d pode ser uma imagem"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_inventory_form
@@ -5832,7 +5842,7 @@ msgstr "Nome do Estado"
 #. module: base
 #: field:workflow.activity,join_mode:0
 msgid "Join Mode"
-msgstr ""
+msgstr "Modo de junção"
 
 #. module: base
 #: field:res.users,context_tz:0
@@ -5871,6 +5881,7 @@ msgstr "Iniciar instalação"
 #: help:res.lang,code:0
 msgid "This field is used to set/get locales for user"
 msgstr ""
+"Este campo é utilizado para gravar/obter localização (locale) do usuário"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_2
@@ -5952,7 +5963,7 @@ msgstr "Granada"
 #. module: base
 #: view:ir.actions.server:0
 msgid "Trigger Configuration"
-msgstr ""
+msgstr "Configuração de Gatilhos"
 
 #. module: base
 #: selection:server.action.create,init,type:0
@@ -6052,7 +6063,7 @@ msgstr "Hora 00->24: %(h24)s"
 #. module: base
 #: help:multi_company.default,field_id:0
 msgid "Select field property"
-msgstr ""
+msgstr "Selecionar propriedade do campo"
 
 #. module: base
 #: field:res.request.history,date_sent:0
@@ -6133,7 +6144,7 @@ msgstr "Regras de Acesso"
 #. module: base
 #: field:ir.default,ref_table:0
 msgid "Table Ref."
-msgstr ""
+msgstr "Ref. Tabela"
 
 #. module: base
 #: field:res.roles,parent_id:0
@@ -6143,7 +6154,7 @@ msgstr "Superior"
 #. module: base
 #: view:multi_company.default:0
 msgid "Returning"
-msgstr ""
+msgstr "Retornando"
 
 #. module: base
 #: field:ir.actions.act_window,res_model:0
@@ -6197,7 +6208,7 @@ msgstr "Exportar arquivo de tradução"
 #. module: base
 #: field:ir.ui.view_sc,user_id:0
 msgid "User Ref."
-msgstr ""
+msgstr "Ref. Usuário"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_base_config
@@ -6209,7 +6220,7 @@ msgstr "Configuração"
 #. module: base
 #: field:ir.actions.server,expression:0
 msgid "Loop Expression"
-msgstr ""
+msgstr "Expressão de repetição"
 
 #. module: base
 #: selection:res.partner.event,partner_type:0
@@ -6347,6 +6358,7 @@ msgid ""
 "If set to true, the wizard will not be displayed on the right toolbar of a "
 "form view."
 msgstr ""
+"Se marcado, o ajudante não mostrará a barra de ferramenta no formulário"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -6361,7 +6373,7 @@ msgstr "Ilhas Heard e McDonald"
 #. module: base
 #: field:ir.actions.act_window,view_id:0
 msgid "View Ref."
-msgstr ""
+msgstr "Ref. de visão"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -6522,7 +6534,7 @@ msgstr "República Democrática do Congo"
 #: field:res.request,body:0
 #: field:res.request.history,req_id:0
 msgid "Request"
-msgstr "Requisitar"
+msgstr "Mensagem"
 
 #. module: base
 #: model:res.country,name:base.jp
@@ -6532,7 +6544,7 @@ msgstr "Japão"
 #. module: base
 #: field:ir.cron,numbercall:0
 msgid "Number of Calls"
-msgstr ""
+msgstr "Numero de chamadas"
 
 #. module: base
 #: wizard_view:module.lang.install,start:0
@@ -6821,7 +6833,7 @@ msgstr "só uma vez"
 #. module: base
 #: selection:ir.actions.server,state:0
 msgid "Write Object"
-msgstr ""
+msgstr "Objeto de gravação"
 
 #. module: base
 #: model:res.country,name:base.bg
@@ -6844,6 +6856,8 @@ msgid ""
 "Only one client action will be execute, last                                 "
 "clinent action will be consider in case of multiples clients actions"
 msgstr ""
+"Somente uma ação do cliente será executada, a ultima ação do cliente será "
+"considerada no caso de múltiplas ações."
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -7111,13 +7125,13 @@ msgstr "="
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Second field should be figures"
-msgstr ""
+msgstr "O segundo campo deve ser uma imagem"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_model_grid_security
 #: model:ir.ui.menu,name:base.menu_ir_access_grid
 msgid "Access Controls Grid"
-msgstr ""
+msgstr "Grid dos controles de acesso"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_actions
@@ -7200,7 +7214,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.cx
 msgid "Christmas Island"
-msgstr ""
+msgstr "Ilhas Natal"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -7314,7 +7328,7 @@ msgstr ""
 #. module: base
 #: field:ir.model.fields,relation_field:0
 msgid "Relation Field"
-msgstr ""
+msgstr "Campo de relação"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -7388,7 +7402,7 @@ msgstr "Telefone"
 #. module: base
 #: field:res.groups,menu_access:0
 msgid "Access Menu"
-msgstr ""
+msgstr "Menu de Acesso"
 
 #. module: base
 #: model:res.country,name:base.th
@@ -7479,7 +7493,7 @@ msgstr "Campo inferior(filho)"
 #: field:ir.actions.server,usage:0
 #: field:ir.actions.wizard,usage:0
 msgid "Action Usage"
-msgstr ""
+msgstr "Uso de ação"
 
 #. module: base
 #: model:ir.model,name:base.model_workflow_workitem
@@ -7499,7 +7513,7 @@ msgstr "View :"
 #. module: base
 #: field:ir.model.fields,view_load:0
 msgid "View Auto-Load"
-msgstr ""
+msgstr "Auto-carregar Visão"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_supplier_form
@@ -7542,7 +7556,7 @@ msgstr "Estados"
 #. module: base
 #: view:multi_company.default:0
 msgid "Matching"
-msgstr ""
+msgstr "Correspondendo a"
 
 #. module: base
 #: field:ir.actions.configuration.wizard,name:0
@@ -7606,7 +7620,7 @@ msgstr "Incluir contrato de manutenção"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Vietnam / Cộng hòa xã hội chủ nghĩa Việt Nam"
-msgstr ""
+msgstr "Vietnam"
 
 #. module: base
 #: field:ir.actions.act_window,limit:0
@@ -7617,7 +7631,7 @@ msgstr "Limite"
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid "Workflow to be executed on this model."
-msgstr ""
+msgstr "Fluxo de trabalho a ser executado nesse modelo"
 
 #. module: base
 #: model:res.country,name:base.jm
@@ -7724,7 +7738,7 @@ msgstr "Janela Atual"
 #. module: base
 #: view:ir.values:0
 msgid "Action Source"
-msgstr ""
+msgstr "Fonte de ação"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -7751,7 +7765,7 @@ msgstr "Nome Completo"
 #. module: base
 #: view:ir.report.custom:0
 msgid "Subscribe Report"
-msgstr ""
+msgstr "Subscreva relatório"
 
 #. module: base
 #: field:ir.values,object:0
@@ -7791,6 +7805,11 @@ msgid ""
 "1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
 "106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"O Formato de Separador deveria ser como [, n] onde 0 < n: a partir de dígito "
+"de Unidade.-1 terminará a separação. por exemplo. [3,2, -1] representará "
+"106500 para ser 1,06,500; [1,2, -1] representará isto para ser 106,50,0; [3] "
+"representará isto como 106500. Sendo ',' como o separador de milhar em cada "
+"caso."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_customer_form_new
@@ -7851,7 +7870,7 @@ msgstr "Código de País/Língua"
 #. module: base
 #: field:workflow.activity,split_mode:0
 msgid "Split Mode"
-msgstr ""
+msgstr "Modo de separação"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_localisation
@@ -8019,7 +8038,7 @@ msgstr "Coréia do Norte"
 #. module: base
 #: view:ir.report.custom:0
 msgid "Unsubscribe Report"
-msgstr ""
+msgstr "Cancelar relatorio"
 
 #. module: base
 #: selection:ir.actions.server,state:0
@@ -8034,7 +8053,7 @@ msgstr "Código BIC/Swift"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Prospect"
-msgstr ""
+msgstr "Prospecto"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -8044,7 +8063,7 @@ msgstr "Polish / Język polski"
 #. module: base
 #: field:ir.exports,name:0
 msgid "Export Name"
-msgstr ""
+msgstr "Nome de exportação"
 
 #. module: base
 #: help:res.partner.address,type:0
diff --git a/bin/addons/base/i18n/sv.po b/bin/addons/base/i18n/sv.po
index 3415c7fd6b4..0b550763688 100644
--- a/bin/addons/base/i18n/sv.po
+++ b/bin/addons/base/i18n/sv.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-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-18 04:58+0000\n"
+"PO-Revision-Date: 2010-03-28 04:27+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\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-03-19 07:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-29 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/uk.po b/bin/addons/base/i18n/uk.po
index 97f5c876733..6b492ef857f 100644
--- a/bin/addons/base/i18n/uk.po
+++ b/bin/addons/base/i18n/uk.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-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-18 04:58+0000\n"
+"PO-Revision-Date: 2010-03-28 04:33+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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-03-19 07:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-29 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index 76d3525e164..17a98775903 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.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-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-18 04:59+0000\n"
+"PO-Revision-Date: 2010-03-28 04:32+0000\n"
 "Last-Translator: OpenERP Administrators <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-03-19 07:50+0000\n"
+"X-Launchpad-Export-Date: 2010-03-29 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base

From a7adad39c28e5b414b190168b6d311127548f640 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Mon, 29 Mar 2010 04:46:04 +0100
Subject: [PATCH 239/251] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100329034604-0f9quc9u5en4qe1q
---
 addons/account/i18n/cs.po                     |  8 ++--
 addons/account/i18n/zh_CN.po                  | 10 ++---
 addons/account_analytic_default/i18n/zh_CN.po |  8 ++--
 addons/base_contact/i18n/zh_CN.po             |  6 +--
 addons/board_project/i18n/zh_CN.po            |  8 ++--
 addons/hr/i18n/it.po                          | 12 +++---
 addons/mrp/i18n/zh_CN.po                      |  6 +--
 addons/stock/i18n/zh_CN.po                    | 40 +++++++++----------
 8 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po
index 932d4e3cf3d..417964044e5 100644
--- a/addons/account/i18n/cs.po
+++ b/addons/account/i18n/cs.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-03-17 20:55+0000\n"
+"PO-Revision-Date: 2010-03-28 20:40+0000\n"
 "Last-Translator: mitev.dmitry <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-03-18 04:34+0000\n"
+"X-Launchpad-Export-Date: 2010-03-29 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -110,7 +110,7 @@ msgstr "Vytištěné reporty o daních"
 #. module: account
 #: field:account.account,parent_id:0
 msgid "Parent"
-msgstr ""
+msgstr "Rodič"
 
 #. module: account
 #: selection:account.move,type:0
@@ -415,7 +415,7 @@ msgstr "Datum:"
 #. module: account
 #: selection:account.account.type,sign:0
 msgid "Negative"
-msgstr ""
+msgstr "Negativ"
 
 #. module: account
 #: rml:account.partner.balance:0
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 8b5131c0683..8d2ee5edb76 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 07:43+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"PO-Revision-Date: 2010-03-29 00:34+0000\n"
+"Last-Translator: digitalsatori <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-03-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-29 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -896,7 +896,7 @@ msgstr "货币金额"
 #. module: account
 #: field:account.chart.template,property_account_expense_categ:0
 msgid "Expense Category Account"
-msgstr ""
+msgstr "费用类科目"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,fy2_id:0
@@ -1110,7 +1110,7 @@ msgstr "列表模板"
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
-msgstr ""
+msgstr "收入类科目"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.analytic_account_form
diff --git a/addons/account_analytic_default/i18n/zh_CN.po b/addons/account_analytic_default/i18n/zh_CN.po
index a20701c0aae..a37b184a372 100644
--- a/addons/account_analytic_default/i18n/zh_CN.po
+++ b/addons/account_analytic_default/i18n/zh_CN.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: 2010-03-20 03:48+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"PO-Revision-Date: 2010-03-29 00:37+0000\n"
+"Last-Translator: digitalsatori <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-03-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-29 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -42,7 +42,7 @@ msgstr "这对象名必须以x_开头并且不能包含特殊的字符!"
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Seq"
-msgstr ""
+msgstr "序号"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
diff --git a/addons/base_contact/i18n/zh_CN.po b/addons/base_contact/i18n/zh_CN.po
index af2071d08b9..2b1ea9bf09d 100644
--- a/addons/base_contact/i18n/zh_CN.po
+++ b/addons/base_contact/i18n/zh_CN.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: 2009-12-01 14:36+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-29 00:51+0000\n"
+"Last-Translator: digitalsatori <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-03-11 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-29 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/board_project/i18n/zh_CN.po b/addons/board_project/i18n/zh_CN.po
index f29a6851dcd..c21a62def53 100644
--- a/addons/board_project/i18n/zh_CN.po
+++ b/addons/board_project/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 07:39+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"PO-Revision-Date: 2010-03-29 00:44+0000\n"
+"Last-Translator: digitalsatori <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-03-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-29 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
@@ -116,7 +116,7 @@ msgstr "项目管理控制台"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_project.action_view_task_tree
 msgid "My Open Tasks"
-msgstr "我打开的任务"
+msgstr "我的未结任务"
 
 #. module: board_project
 #: view:board.board:0
diff --git a/addons/hr/i18n/it.po b/addons/hr/i18n/it.po
index 625f910a1e0..ccae93abc2f 100644
--- a/addons/hr/i18n/it.po
+++ b/addons/hr/i18n/it.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-02-03 16:29+0000\n"
-"Last-Translator: Mario Riva <mario.riva@domsense.com>\n"
+"PO-Revision-Date: 2010-03-28 10:20+0000\n"
+"Last-Translator: aiedail92 <aiedail92@gmail.com>\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-03-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-29 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -52,12 +52,12 @@ msgstr "Domenica"
 #. module: hr
 #: view:res.users:0
 msgid "Parents"
-msgstr ""
+msgstr "Genitori"
 
 #. module: hr
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Modello di nome non valido nella definzione dell'azione."
 
 #. module: hr
 #: view:hr.department:0
@@ -417,7 +417,7 @@ msgstr "Categorie Dipendenti"
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
-msgstr ""
+msgstr "Indirizzo abitazione"
 
 #. module: hr
 #: view:hr.department:0
diff --git a/addons/mrp/i18n/zh_CN.po b/addons/mrp/i18n/zh_CN.po
index 3da923faf93..8f9e0cabe47 100644
--- a/addons/mrp/i18n/zh_CN.po
+++ b/addons/mrp/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 08:33+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"PO-Revision-Date: 2010-03-29 00:43+0000\n"
+"Last-Translator: digitalsatori <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-03-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-29 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/stock/i18n/zh_CN.po b/addons/stock/i18n/zh_CN.po
index d046f9c0519..efb18200eb8 100644
--- a/addons/stock/i18n/zh_CN.po
+++ b/addons/stock/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 10:28+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"PO-Revision-Date: 2010-03-29 01:06+0000\n"
+"Last-Translator: digitalsatori <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-03-21 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-29 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -24,12 +24,12 @@ msgstr "后进先出"
 #. module: stock
 #: field:stock.location,chained_location_id:0
 msgid "Chained Location If Fixed"
-msgstr "如果固定连锁库位"
+msgstr "固定连锁库位"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SAVE"
-msgstr "保存"
+msgstr "STOCK_SAVE"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_15
@@ -39,12 +39,12 @@ msgstr "子产品"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-account"
-msgstr "会计"
+msgstr "terp-account"
 
 #. module: stock
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在这动作定义中有无效的模块名"
+msgstr "在动作定义使用了无效的模型名称。"
 
 #. module: stock
 #: model:ir.module.module,shortdesc:stock.module_meta_information
@@ -55,17 +55,17 @@ msgstr "库存管理"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SORT_ASCENDING"
-msgstr "升序"
+msgstr "STOCK_SORT_ASCENDING"
 
 #. module: stock
 #: field:stock.production.lot.revision,indice:0
 msgid "Revision"
-msgstr "修改"
+msgstr "修订版"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_FORWARD"
-msgstr "向前"
+msgstr "STOCK_MEDIA_FORWARD"
 
 #. module: stock
 #: rml:lot.location:0
@@ -75,7 +75,7 @@ msgstr "合计:"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ZOOM_100"
-msgstr "放大100"
+msgstr "STOCK_ZOOM_100"
 
 #. module: stock
 #: rml:lot.stock.overview:0
@@ -86,7 +86,7 @@ msgstr "计量单位"
 #. module: stock
 #: model:ir.actions.wizard,name:stock.return_picking
 msgid "Return packing"
-msgstr "退回包装"
+msgstr "退货"
 
 #. module: stock
 #: field:product.category,property_stock_journal:0
@@ -103,7 +103,7 @@ msgstr "填写具体库位盘存"
 #: view:stock.picking:0
 #: field:stock.picking.move.wizard,picking_id:0
 msgid "Packing list"
-msgstr "包装单"
+msgstr "分拣单"
 
 #. module: stock
 #: rml:lot.stock.overview:0
@@ -114,13 +114,13 @@ msgstr "金额"
 #. module: stock
 #: view:stock.picking:0
 msgid "Products Received"
-msgstr "产品接收"
+msgstr "已收到的货品"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree4
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree4
 msgid "Incoming Products"
-msgstr "接收产品"
+msgstr "入库货品"
 
 #. module: stock
 #: field:stock.picking,name:0
@@ -147,7 +147,7 @@ msgstr "接收强制的生产批次"
 #: field:stock.move,move_history_ids:0
 #: field:stock.move,move_history_ids2:0
 msgid "Move History"
-msgstr "移动历史记录"
+msgstr "库存移动记录"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot
@@ -159,12 +159,12 @@ msgstr "生产批次"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_NEW"
-msgstr "新"
+msgstr "STOCK_NEW"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CANCEL"
-msgstr "取消"
+msgstr "STOCK_CANCEL"
 
 #. module: stock
 #: selection:stock.location,usage:0
@@ -174,7 +174,7 @@ msgstr "内部库位"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PRINT"
-msgstr "打印"
+msgstr "STOCK_PRINT"
 
 #. module: stock
 #: rml:stock.picking.list:0
@@ -654,7 +654,7 @@ msgstr "预计运送日期"
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Shipping Address :"
-msgstr ""
+msgstr "运输地址"
 
 #. module: stock
 #: view:stock.tracking:0

From 9230dac3165509e2c950388530016622a45cf667 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Mon, 29 Mar 2010 11:57:45 +0530
Subject: [PATCH 240/251] [IMP] Partner Address : Better Layout

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

bzr revid: jvo@tinyerp.com-20100329062745-hxmvfvxkdl0qruai
---
 bin/addons/base/res/partner/partner_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index b638742fd41..8c374acb80b 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -104,6 +104,7 @@
                     </group>
                       <group colspan="2" col="2">
                         <separator string="Postal Address" colspan="4" col="4"/>
+                        <field name="type"/>
                         <field name="street"/>
                         <field name="street2"/>
                         <field name="zip"/>
@@ -113,7 +114,6 @@
                       </group>
                       <group colspan="2" col="2">
                         <separator string="Communication" colspan="4" col="4"/>
-                        <field name="type"/>
                         <field name="phone"/>
                         <field name="fax"/>
                         <field name="mobile"/>
@@ -287,6 +287,7 @@
                                     <newline/>
                                       <group colspan="2" col="4">
                                         <separator string="Postal Address" colspan="4" col="4" />
+                                        <field name="type" string="Type" colspan="2"/>
                                         <field name="street" colspan="4"/>
                                         <field name="street2" colspan="4"/>
                                         <field name="zip"/>
@@ -296,7 +297,6 @@
                                      </group>
                                      <group colspan="2" col="2">
                                         <separator string="Communication" colspan="2" col="2" />
-                                        <field name="type" string="Type" />
                                         <field name="phone"/>
                                         <field name="mobile"/>
                                         <field name="fax"/>

From 8756f1f7c4064da5011cf03ff0499085912ab382 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 29 Mar 2010 12:33:35 +0530
Subject: [PATCH 241/251] [REM] point_of_sale: Remove the conflict

bzr revid: sbh@tinyerp.com-20100329070335-q4acrhpqt33v7y0n
---
 addons/point_of_sale/statement_report.xml | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/addons/point_of_sale/statement_report.xml b/addons/point_of_sale/statement_report.xml
index 7bdece39a77..719729a5d45 100644
--- a/addons/point_of_sale/statement_report.xml
+++ b/addons/point_of_sale/statement_report.xml
@@ -22,21 +22,6 @@
 			rml="point_of_sale/report/account_statement.rml"
 			 />
 
-		<!--report
-			id="all_closed_cashbox_of_the_day"
-			string="All Cloded CashBOx"
-			model="account.bank.statement"
-			name="all.closed.cashbox.of.the.day"
-			auto="False"
-			multi="True"
-			menu = 'False'
-<<<<<<< TREE
-			rml="point_of_sale/report/all_closed_cashbox_of_the_day.rml"
-			 /-->
-=======
-			rml="point_of_sale/report/all_closed_cashbox_of_the_day.rml"
-			 />
->>>>>>> MERGE-SOURCE
 		<report
 			id="pos_users_product_re"
 			string="User's Product"

From 9a7120d5c3ad8d59dc0456f835b195b7257e3311 Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Mon, 29 Mar 2010 10:49:49 +0200
Subject: [PATCH 242/251] [IMP] uniformisation layout views / wizards Human
 resourses

bzr revid: nel@tinyerp.com-20100329084949-zfqbfqrxqgqxea4n
---
 addons/hr/hr_view.xml                                   | 2 ++
 addons/hr_attendance/hr_attendance_view.xml             | 2 ++
 addons/hr_attendance/wizard/print_attendance_error.py   | 4 ++--
 addons/hr_attendance/wizard/print_bymonth.py            | 6 +++---
 addons/hr_attendance/wizard/print_byweek.py             | 4 ++--
 addons/hr_holidays/hr_view.xml                          | 9 ++++++++-
 addons/hr_holidays/wizard/holidays_summary_employees.py | 4 ++--
 7 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index f98150f815b..f8b7c58985c 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -113,6 +113,8 @@
 
                     <group expand="1" string="Group By..." colspan="11" col="11">
                         <filter string="Manager" icon="terp-sale" domain="[]" context="{'group_by':'parent_id'}"/>
+                        <filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/>
+                        <filter string="Job" icon="terp-sale" domain="[]" context="{'group_by':'job_id'}"/>
                     </group>
                 </search>
              </field>
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 0c25e6eb34f..a97987dd89e 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -112,9 +112,11 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <field name="coach_id" position="after">
+                  <group col="7" colspan="4">
                     <field name="state"/>
                     <button name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}"/>
                     <button name="attendance_action_change" states="present" string="Sign Out" type="object" icon="gtk-go-forward" context="{'type':'sign_out'}"/>
+                  </group>
                 </field>
             </field>
         </record>
diff --git a/addons/hr_attendance/wizard/print_attendance_error.py b/addons/hr_attendance/wizard/print_attendance_error.py
index 82503318fbe..c7c9ab18068 100644
--- a/addons/hr_attendance/wizard/print_attendance_error.py
+++ b/addons/hr_attendance/wizard/print_attendance_error.py
@@ -25,7 +25,7 @@ import pooler
 from tools.translate import _
 
 _date_form = '''<?xml version="1.0"?>
-<form string="Select a time span">
+<form string="Attendance Report">
     <separator string="Analysis Information" colspan="4"/>
     <field name="init_date"/>
     <field name="end_date"/>
@@ -62,7 +62,7 @@ class wiz_attendance(wizard.interface):
     states = {
         'init': {
             'actions': [],
-            'result': {'type': 'form', 'arch':_date_form, 'fields':_date_fields, 'state':[('print','Print Attendance Report'),('end','Cancel') ]}
+            'result': {'type': 'form', 'arch':_date_form, 'fields':_date_fields, 'state':[('end','Cancel', 'gtk-cancel'),('print','Print', 'gtk-ok') ]}
         },
         'print': {
             'actions': [_check_data],
diff --git a/addons/hr_attendance/wizard/print_bymonth.py b/addons/hr_attendance/wizard/print_bymonth.py
index a20f5258a7c..ae2d5df937b 100644
--- a/addons/hr_attendance/wizard/print_bymonth.py
+++ b/addons/hr_attendance/wizard/print_bymonth.py
@@ -23,7 +23,7 @@ import wizard
 import time
 
 _date_form = '''<?xml version="1.0"?>
-<form string="Select a month">
+<form string="Timesheets by month">
     <separator string="Select a month" colspan="4"/>
     <field name="month"/>
     <field name="year"/>
@@ -49,11 +49,11 @@ class wiz_bymonth(wizard.interface):
     states = {
         'init': {
             'actions': [],
-            'result': {'type': 'form', 'arch':_date_form, 'fields':_date_fields, 'state':[('print', 'Print Timesheet'), ('end', 'Cancel')]}
+            'result': {'type': 'form', 'arch':_date_form, 'fields':_date_fields, 'state':[ ('end', 'Cancel', 'gtk-cancel'),('print', 'Print', 'gtk-ok')] }
         },
         'print': {
             'actions': [],
-            'result': {'type': 'print', 'report': 'hr.attendance.bymonth', 'state': 'end'}
+            'result': {'type': 'print', 'report': 'hr.attendance.bymonth', 'state': 'end' }
         }
     }
 wiz_bymonth('hr.attendance.print_month')
diff --git a/addons/hr_attendance/wizard/print_byweek.py b/addons/hr_attendance/wizard/print_byweek.py
index 8922cef8a97..d859e81aea5 100644
--- a/addons/hr_attendance/wizard/print_byweek.py
+++ b/addons/hr_attendance/wizard/print_byweek.py
@@ -23,7 +23,7 @@ import wizard
 import time
 
 _date_form = '''<?xml version="1.0"?>
-<form string="Select a time span">
+<form string="Timesheets by week">
     <separator string="Select a starting and a end date" colspan="4"/>
     <field name="init_date"/>
     <newline/>
@@ -39,7 +39,7 @@ class wiz_byweek(wizard.interface):
     states = {
         'init': {
             'actions': [],
-            'result': {'type': 'form', 'arch':_date_form, 'fields':_date_fields, 'state':[('print','Print Timesheet'),('end','Cancel') ]}
+            'result': {'type': 'form', 'arch':_date_form, 'fields':_date_fields, 'state':[('end','Cancel', 'gtk-cancel'), ('print','Print', 'gtk-ok')]}
         },
         'print': {
             'actions': [],
diff --git a/addons/hr_holidays/hr_view.xml b/addons/hr_holidays/hr_view.xml
index b5de7ee3f4b..e8d3d6ea32b 100644
--- a/addons/hr_holidays/hr_view.xml
+++ b/addons/hr_holidays/hr_view.xml
@@ -24,6 +24,13 @@
 								help="My Departments Leaves"/>
                           </field>
                       </group>
+                      <newline/>
+                    <group expand="1" string="Group By..." colspan="2" col="2">
+                        <filter string="Employee" icon="terp-sale" domain="[]" context="{'group_by':'employee_id'}"/>
+                        <filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/>
+                        <filter string="Manager" icon="terp-sale" domain="[]" context="{'group_by':'manager_id'}"/>
+                    </group>
+
                  </search>
             </field>
         </record>
@@ -289,7 +296,7 @@
             parent="hr.menu_open_view_attendance_reason_config"/>
 
     <!--  Shortcuts -->
-        <act_window name="My Holiday Requests"
+        <act_window name="Holidays"
             domain="[('employee_id', '=', active_id), ('type','=','remove')]"
             res_model="hr.holidays"
             src_model="hr.employee"
diff --git a/addons/hr_holidays/wizard/holidays_summary_employees.py b/addons/hr_holidays/wizard/holidays_summary_employees.py
index a621e6d5912..c4e92a196dc 100644
--- a/addons/hr_holidays/wizard/holidays_summary_employees.py
+++ b/addons/hr_holidays/wizard/holidays_summary_employees.py
@@ -26,7 +26,7 @@ import pooler
 
 
 form='''<?xml version="1.0"?>
-<form string="Report Options">
+<form string="Employee's Holidays">
     <field name="date_from" colspan="2" />
     <field name="holiday_type" colspan="2" />
     <field name="emp" colspan="4" invisible="True"/>
@@ -67,7 +67,7 @@ class wizard_report(wizard.interface):
     states={
         'init':{
             'actions':[_check],
-            'result':{'type':'form', 'arch':form, 'fields':fields, 'state':[('end', 'Cancel'), ('checkemp', 'Print')]}
+            'result':{'type':'form', 'arch':form, 'fields':fields, 'state':[('end', 'Cancel', 'gtk-cancel'), ('checkemp', 'Print', 'gtk-ok')]}
         },
         'checkemp': {
             'actions': [],

From 2b6955d42687ba480cb4a3a87da629af051a3ab4 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 29 Mar 2010 14:23:39 +0530
Subject: [PATCH 243/251] [Fix] point_of_sale: add the missing file

bzr revid: sbh@tinyerp.com-20100329085339-4l2usy02z683549i
---
 .../wizard/all_closed_cashbox_of_the_day.py   | 60 +++++++++++++++++
 .../{pos_return.py => wizard_return.py}       | 64 ++-----------------
 2 files changed, 67 insertions(+), 57 deletions(-)
 create mode 100644 addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py
 rename addons/point_of_sale/wizard/{pos_return.py => wizard_return.py} (93%)

diff --git a/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py b/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py
new file mode 100644
index 00000000000..0968c6c71d4
--- /dev/null
+++ b/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py
@@ -0,0 +1,60 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import netsvc
+from osv import osv,fields
+from tools.translate import _
+from mx import DateTime
+import time
+
+class all_closed_cashbox_of_the_day(osv.osv_memory):
+    _name = 'all.closed.cashbox.of.the.day'
+    _description = 'All closed cashbox of the day'
+
+    _columns = {
+                
+    }
+    
+    def print_report(self, cr, uid, ids, context=None):
+
+        """ 
+             To get the date and print the report 
+                       
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary 
+             @return : retrun report
+        """        
+        datas = {'ids' : context.get('active_ids',[])}
+        res =  {}        
+        datas['form'] = res
+        
+        return { 
+                'type' : 'ir.actions.report.xml',
+                'report_name':'all.closed.cashbox.of.the.day',
+                'datas' : datas,               
+       }
+
+all_closed_cashbox_of_the_day()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/wizard_return.py
similarity index 93%
rename from addons/point_of_sale/wizard/pos_return.py
rename to addons/point_of_sale/wizard/wizard_return.py
index 1b5860cef1c..591fd00b18a 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/wizard_return.py
@@ -20,69 +20,19 @@
 #
 ##############################################################################
 
-#import wizard
-#import pooler
-#from tools.misc import UpdateableStr
-#
-#import netsvc
-#import time
-#
-#from tools.translate import _
-#from decimal import Decimal
-
-#arch=UpdateableStr()
-#fields={}
+import wizard
+import pooler
+from tools.misc import UpdateableStr
 
 import netsvc
-from osv import osv,fields
-from tools.translate import _
-from mx import DateTime
 import time
 
+from tools.translate import _
+from decimal import Decimal
 
-class pos_return(osv.osv_memory):
-    _name = 'pos.return'
-    _description = 'Point of sale return'
 
-    _columns = {
-                
-    }
-pos_return()
-
-class pos_add_payment(osv.osv_memory):
-    _name = 'pos.add.payment'
-    _description = 'Add Payment'
-
-    _columns = {
-        'amount': fields.float('Amount', digits=(16,2),required=True),
-        'journal': fields.function(_get_journal, 'Journal', method=True, required=True),
-        'payment_date': fields.date('Payment date',required=True),
-        'payment_name': fields.char('Payment name', size=32,required=True),
-        'invoice_wanted': fields.boolean('Invoice'),
-        'num_sale': fields.char('Num.Cof', size=32)        
-    }
-    _defaults = {
-          'payment_name': lambda *a: 'Payment'
-        }
-
-pos_add_payment()
-
-class pos_add_product(osv.osv_memory):
-    _name = 'pos.add.product'
-    _description = 'Add Product'
-
-    _columns = {
-        'product': fields.many2one('product.product','Product', required=True),
-        'quantity': fields.integer( 'Quantity',required=True),
-             
-    }
-
-    _defaults = {
-          'product': lambda *a: 'False',
-          'quantity': lambda *a: 1
-        }
-
-pos_add_product()
+arch=UpdateableStr()
+fields={}
 
 
 def _get_journal(self, cr, uid, context):

From 45e715d7139afc680970dce8d55002a9380a2111 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 29 Mar 2010 10:56:00 +0200
Subject: [PATCH 244/251] [FIX] Database creation fixed by breaking the
 circular dependencies with multi-company init. Still need to fix the init to
 re-establish the FK reference on res_users' company_id field.

bzr revid: odo@openerp.com-20100329085600-r0pjh7rjyq2rw44n
---
 bin/addons/base/base.sql      |  5 ++++-
 bin/addons/base/base_data.xml | 21 ++++++++++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/bin/addons/base/base.sql b/bin/addons/base/base.sql
index 1f7955eff10..19d401b75ba 100644
--- a/bin/addons/base/base.sql
+++ b/bin/addons/base/base.sql
@@ -147,7 +147,10 @@ CREATE TABLE res_users (
     signature text,
 --  action_id int references ir_act_window on delete set null,
     context_lang varchar(64) default '',
+    -- No FK references below, will be added later by ORM
+    -- (when the destination rows exist)
     action_id int,
+    company_id int,
     primary key(id)
 );
 alter table res_users add constraint res_users_login_uniq unique (login);
@@ -342,7 +345,7 @@ CREATE TABLE ir_model_data (
 -- Users
 ---------------------------------
 
-insert into res_users (id,login,password,name,action_id,active) values (1,'admin',NULL,'Administrator',NULL,True);
+insert into res_users (id,login,password,name,action_id,active,company_id) values (1,'admin',NULL,'Administrator',NULL,True,1);
 insert into ir_model_data (name,module,model,noupdate,res_id) values ('user_root','base','res.users',True,1);
 
 -- Compatibility purpose, to remove V6.0
diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml
index 4f61dd1ddfc..6c9185eee7a 100644
--- a/bin/addons/base/base_data.xml
+++ b/bin/addons/base/base_data.xml
@@ -1001,6 +1001,8 @@
 
         <record id="main_partner" model="res.partner">
             <field name="name">Tiny sprl</field>
+            <!-- Company ID will be set later -->
+            <field name="company_id" eval="None"/>
         </record>
         <record id="main_address" model="res.partner.address">
             <field name="partner_id" ref="main_partner"/>
@@ -1011,14 +1013,18 @@
             <field name="phone">(+32).81.81.37.00</field>
             <field name="type">default</field>
             <field model="res.country" name="country_id" ref="be"/>
+            <!-- Company ID will be set later -->
+            <field name="company_id" eval="None"/>
         </record>
-        
+
         <!-- Currencies -->
         <record id="EUR" model="res.currency">
             <field name="name">EUR</field>
             <field name="code">EUR</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
+            <!-- Company ID will be set later -->
+            <field name="company_id" eval="None"/>
         </record>
         <record id="rateEUR" model="res.currency.rate">
             <field name="rate">1.0</field>
@@ -1042,12 +1048,21 @@
         </assert>
         <record id="user_admin" model="res.users">
             <field name="company_id" ref="main_company"/>
-        </record>    
+        </record>
+        <record id="main_partner" model="res.partner">
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="main_address" model="res.partner.address">
+            <field name="company_id" ref="main_company"/>
+        </record>
         <record id="EUR" model="res.currency">
             <field name="company_id" ref="main_company"/>
         </record>
-        
+
         <!-- Currencies -->
+        <record id="EUR" model="res.currency">
+            <field name="company_id" ref="main_company"/>
+        </record>
         <record id="USD" model="res.currency">
             <field name="name">USD</field>
             <field name="code">USD</field>

From cef8abda3b83968a3c5f7725f3250c69904fde2c Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 29 Mar 2010 10:58:43 +0200
Subject: [PATCH 245/251] [IMP] remove commented action_id reference/constraint

bzr revid: odo@openerp.com-20100329085843-cliw31nbpvgr2skq
---
 bin/addons/base/base.sql | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bin/addons/base/base.sql b/bin/addons/base/base.sql
index 19d401b75ba..bb792b78845 100644
--- a/bin/addons/base/base.sql
+++ b/bin/addons/base/base.sql
@@ -145,7 +145,6 @@ CREATE TABLE res_users (
     email varchar(64) default null,
     context_tz varchar(64) default null,
     signature text,
---  action_id int references ir_act_window on delete set null,
     context_lang varchar(64) default '',
     -- No FK references below, will be added later by ORM
     -- (when the destination rows exist)

From b2234d42dc3eb76b505f96f9e49ca0b5b4f69de3 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Mon, 29 Mar 2010 14:41:23 +0530
Subject: [PATCH 246/251] [REF] Base_Calendar : Improvement for report

bzr revid: jvo@tinyerp.com-20100329091123-blmy4mcvxvnw4bzh
---
 addons/base_calendar/base_calendar.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 62ffc7c39d8..17202c3ba83 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1173,7 +1173,10 @@ class virtual_report_spool(web_services.report_spool):
         new_ids = []
         for id in ids:
             new_ids.append(base_calendar_id2real_id(id))
-        datas['id'] = base_calendar_id2real_id(datas['id'])        
+        if datas is None:
+            datas = {}
+        if datas.get('id',False):
+            datas['id'] = base_calendar_id2real_id(datas['id'])        
         return super(virtual_report_spool, self).exp_report(db, uid, object, new_ids, datas, context)
 
 virtual_report_spool()

From 2eb6c26df4474fb1de5ec34096f48ca0d0eaf0c7 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 29 Mar 2010 11:25:37 +0200
Subject: [PATCH 247/251] [REF] Refactored postgres' confdeltypes as a constant

bzr revid: odo@openerp.com-20100329092537-6v8vaxyvbzpywxld
---
 bin/osv/orm.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 165b9a21137..fcdf3042361 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -69,6 +69,15 @@ from tools.config import config
 
 regex_order = re.compile('^(([a-z0-9_]+|"[a-z0-9_]+")( *desc| *asc)?( *, *|))+$', re.I)
 
+
+POSTGRES_CONFDELTYPES = {
+    'RESTRICT': 'r',
+    'NO ACTION': 'a',
+    'CASCADE': 'c',
+    'SET NULL': 'n',
+    'SET DEFAULT': 'd',
+}
+
 def last_day_of_current_month():
     today = datetime.date.today()
     last_day = str(calendar.monthrange(today.year, today.month)[1])
@@ -2277,14 +2286,7 @@ class orm(orm_template):
                                                 "AND con.contype = 'f'", (self._table, ref, k, 'id'))
                                     res = cr.dictfetchall()
                                     if res:
-                                        confdeltype = {
-                                            'RESTRICT': 'r',
-                                            'NO ACTION': 'a',
-                                            'CASCADE': 'c',
-                                            'SET NULL': 'n',
-                                            'SET DEFAULT': 'd',
-                                        }
-                                        if res[0]['confdeltype'] != confdeltype.get(f.ondelete.upper(), 'a'):
+                                        if res[0]['confdeltype'] != POSTGRES_CONFDELTYPES.get(f.ondelete.upper(), 'a'):
                                             cr.execute('ALTER TABLE "' + self._table + '" DROP CONSTRAINT "' + res[0]['conname'] + '"')
                                             cr.execute('ALTER TABLE "' + self._table + '" ADD FOREIGN KEY ("' + k + '") REFERENCES "' + ref + '" ON DELETE ' + f.ondelete)
                                             cr.commit()

From 40bb8599dd6cacb45599f3aa16edccc641a8d032 Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Mon, 29 Mar 2010 11:50:29 +0200
Subject: [PATCH 248/251] [IMP] improve views of expense

bzr revid: nel@tinyerp.com-20100329095029-crh321t0u57r1d8u
---
 addons/hr_expense/hr_expense.py       | 8 ++++----
 addons/hr_expense/hr_expense_view.xml | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 3c99276f7f8..d4747758682 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -56,17 +56,17 @@ class hr_expense_expense(osv.osv):
         'id': fields.integer('Sheet ID', readonly=True),
         'ref': fields.char('Reference', size=32),
         'date': fields.date('Date'),
-        'journal_id': fields.many2one('account.journal', 'Force Journal'),
+        'journal_id': fields.many2one('account.journal', 'Force Journal', help = "The journal used when the expense is invoiced"),
         'employee_id': fields.many2one('hr.employee', "Employee's Name", required=True),
         'user_id': fields.many2one('res.users', 'User', required=True),
-        'date_confirm': fields.date('Date Confirmed'),
-        'date_valid': fields.date('Date Validated'),
+        'date_confirm': fields.date('Confirmation Date', help = "Date of the confirmation of the sheet expense. It's filled when the button Confirm is pressed."),
+        'date_valid': fields.date('Validation Date', help = "Date of the acceptation of the sheet expense. It's filled when the button Accept is pressed."),
         'user_valid': fields.many2one('res.users', 'Validation User'),
         'account_move_id': fields.many2one('account.move', 'Ledger Posting'),
         'line_ids': fields.one2many('hr.expense.line', 'expense_id', 'Expense Lines', readonly=True, states={'draft':[('readonly',False)]} ),
         'note': fields.text('Note'),
         'amount': fields.function(_amount, method=True, string='Total Amount'),
-        'invoice_id': fields.many2one('account.invoice', 'Invoice'),
+        'invoice_id': fields.many2one('account.invoice', "Employee's Invoice"),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True),
         'department_id':fields.many2one('hr.department','Department'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 16828a87a1a..0cf1b941b5c 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -68,7 +68,7 @@
                     <group colspan="4" col="6">
                         <field name="name" select="1"/>
                         <field name="employee_id" select="1"/>
-                        <field name="id" select="2"/>
+                        <field name="ref" select="2"/>
                         <field name="date" select="1"/>
                         <field name="amount"/>
                         <field name="currency_id"/>
@@ -77,7 +77,6 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Expense Sheet">
-                            <field name="ref" select="2"/>
                             <newline/>
                             <field colspan="4" name="line_ids" nolabel="1">
                                 <form string="Expense Lines">
@@ -108,8 +107,8 @@
                             <separator colspan="4" string="Accounting data"/>
                             <field name="journal_id"/>
                             <separator colspan="4" string="Validation"/>
-                            <field name="date_confirm" select="2"/>
-                            <field name="date_valid" select="2"/>
+                            <field name="date_confirm" select="2" readonly = "1"/>
+                            <field name="date_valid" select="2" readonly = "1"/>
                             <field name="user_valid" select="2"/>
                             <field name="invoice_id" select="2"/>
                             <separator colspan="4" string="Notes"/>
@@ -145,6 +144,7 @@
                         help="Expenses to Invoice"/>
                       <separator orientation="vertical"/>
                       <field name="name" select='1'/>
+                      <field name="date" select='1'/>
                       <field name="user_id" select="1" widget="selection">
                           <filter
                             icon="gtk-execute"

From 3d4f428de6044d32f690e60f5cf0be1ecba04095 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 29 Mar 2010 15:56:29 +0530
Subject: [PATCH 249/251] [FIX] caldav: remove unneccassry import packages

bzr revid: hmo@tinyerp.com-20100329102629-v6hxscfl264su1fz
---
 addons/caldav/caldav_fs.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/caldav/caldav_fs.py b/addons/caldav/caldav_fs.py
index 28424acedf8..40f0f56b45e 100644
--- a/addons/caldav/caldav_fs.py
+++ b/addons/caldav/caldav_fs.py
@@ -38,7 +38,6 @@ from DAV.iface import *
 import urllib
 
 from DAV.davcmd import copyone, copytree, moveone, movetree, delone, deltree
-from document.nodes import node_res_dir, node_res_obj
 from caldav_cache import memoize
 from tools import misc
 CACHE_SIZE=20000

From a373c33c786b68422c000bcb168d9c5a7b7f6985 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Mon, 29 Mar 2010 12:36:25 +0200
Subject: [PATCH 250/251] [FIX] pos receipt wizard title was "Fill Inventory".
 Now it's "Print Receipt"

bzr revid: olt@tinyerp.com-20100329103625-tkwg1xvuyeccgtll
---
 .../point_of_sale/wizard/pos_receipt_view.xml | 69 ++++++++++---------
 1 file changed, 35 insertions(+), 34 deletions(-)

diff --git a/addons/point_of_sale/wizard/pos_receipt_view.xml b/addons/point_of_sale/wizard/pos_receipt_view.xml
index 5839e4fcb3e..c046259bef6 100644
--- a/addons/point_of_sale/wizard/pos_receipt_view.xml
+++ b/addons/point_of_sale/wizard/pos_receipt_view.xml
@@ -1,37 +1,38 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>        
-        <!--   pos.details -->
-        
-		<record id="view_pos_receipt" model="ir.ui.view">
-            <field name="name">Receipt</field>
-            <field name="model">pos.receipt</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Receipt :">
-                		<button icon='gtk-cancel' special="cancel"
-                			string="Close" />
-                		<button name="print_report" string="Print Report"
-                			colspan="1" type="object" icon="gtk-ok" />				  
-                </form>
-            </field>
-        </record>
-
- 	<act_window name="Fill Inventory"		    
-		    res_model="pos.receipt"
-		    src_model="pos.order"
-		    view_mode="form"
-		    target="new"        
-            key2="client_action_multi"    
-		    id="action_report_pos_receipt"/>	
-       
-  		<!--record id="action_report_pos_receipt" model="ir.actions.act_window">
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+    <!--   pos.details -->
+
+    <record id="view_pos_receipt" model="ir.ui.view">
+      <field name="name">Receipt</field>
+      <field name="model">pos.receipt</field>
+      <field name="type">form</field>
+      <field name="arch" type="xml">
+        <form string="Receipt :">
+          <button icon='gtk-cancel' special="cancel"
+                  string="Close" />
+          <button name="print_report" string="Print Report"
+                  colspan="1" type="object" icon="gtk-ok" />
+        </form>
+      </field>
+    </record>
+
+    <act_window name="Print Receipt"
+        res_model="pos.receipt"
+        src_model="pos.order"
+        view_mode="form"
+        target="new"
+        key2="client_action_multi"
+        id="action_report_pos_receipt"/>
+
+      <!--record id="action_report_pos_receipt" model="ir.actions.act_window">
             <field name="name">Receipt</field>
             <field name="res_model">pos.receipt</field>
             <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-           	<field name="target">new</field>
-        </record-->	
-		
-	</data>
-</openerp>	        
+            <field name="view_mode">form</field>
+             <field name="target">new</field>
+        </record-->
+
+</data>
+</openerp>

From fb7b3153b03026d384beb6a29f3e24b09e9a25bc Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Mon, 29 Mar 2010 12:55:41 +0200
Subject: [PATCH 251/251] [FIX] 'time' module used but not imported

bzr revid: olt@tinyerp.com-20100329105541-l2154cgxsvfl6j87
---
 addons/point_of_sale/wizard/pos_box_entries.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/point_of_sale/wizard/pos_box_entries.py b/addons/point_of_sale/wizard/pos_box_entries.py
index 83e3e576044..fd7b3a5d7b2 100644
--- a/addons/point_of_sale/wizard/pos_box_entries.py
+++ b/addons/point_of_sale/wizard/pos_box_entries.py
@@ -25,6 +25,7 @@ from tools.translate import _
 from tools.misc import UpdateableStr
 from mx import DateTime
 from tools.translate import _
+import time
 
 def get_journal(self,cr,uid,context):
     """ 
@@ -130,4 +131,4 @@ class pos_box_entries(osv.osv_memory):
             statement_line_id =bank_statement.create(cr, uid, args)
         
             return {}
-pos_box_entries()    
\ No newline at end of file
+pos_box_entries()