diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index d38b9e78254..3e1cac8d4b5 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.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-04-26 07:46+0000\n"
+"PO-Revision-Date: 2010-05-10 08:37+0000\n"
 "Last-Translator: eLBati - albatos.com <lorenzo.battistini@albatos.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-04-28 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-05-11 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1192,7 +1192,7 @@ msgstr "Report tassa"
 #: wizard_button:account.analytic.account.chart,init,open:0
 #: wizard_button:account.chart,init,open:0
 msgid "Open Charts"
-msgstr "Apri"
+msgstr "Apri conti"
 
 #. module: account
 #: wizard_view:account.fiscalyear.close.state,init:0
@@ -4162,7 +4162,7 @@ msgstr "Fattura"
 #: wizard_button:account.open_closed_fiscalyear,init,open:0
 #: wizard_button:account_use_models,create,open_move:0
 msgid "Open"
-msgstr "Apri"
+msgstr "Aperto"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_29
diff --git a/addons/base_vat/partner.py b/addons/base_vat/partner.py
index a056171f730..e21aac5fa29 100644
--- a/addons/base_vat/partner.py
+++ b/addons/base_vat/partner.py
@@ -24,6 +24,11 @@ from osv import osv
 from osv import fields
 import string
 from tools.func import partial
+from tools.translate import _
+
+_ref_vat = {
+    'be': 'BE0477472701',
+}
 
 def mult_add(i, j):
     """Sum each digits of the multiplication of i and j."""
@@ -32,6 +37,10 @@ def mult_add(i, j):
 class res_partner(osv.osv):
     _inherit = 'res.partner'
 
+    def _split_vat(self, vat):
+        vat_country, vat_number = vat[:2].lower(), vat[2:].replace(' ', '')
+        return vat_country, vat_number
+
     def check_vat(self, cr, uid, ids):
         '''
         Check the VAT number depending of the country.
@@ -39,11 +48,9 @@ class res_partner(osv.osv):
         '''
         for partner in self.browse(cr, uid, ids):
             if not partner.vat:
-                continue    #FIXME return False? empty vat numbre is invalid?
-
-            vat_country, vat_number = partner.vat[:2].lower(), partner.vat[2:].replace(' ', '')
-            res = self.pool.get('res.country').search(cr, uid, [('code', '=', vat_country.upper())])
-            if not res:
+                continue
+            vat_country, vat_number = self._split_vat(partner.vat)
+            if not hasattr(self, 'check_vat_' + vat_country):
                 return False
             check = getattr(self, 'check_vat_' + vat_country)
             if not check(vat_number):
@@ -51,26 +58,26 @@ class res_partner(osv.osv):
 
         return True
 
-    def __getattr__(self, attr):
-        if not attr.startswith('check_vat_'):
-            super(res_partner, self).__getattr__(attr)
-
-        def default_vat_check(self, cn, vn):
-            # by default, a VAT number is valid if:
-            #  it starts with 2 letters
-            #  has more than 3 characters
-            return len(vn) > 0 and len(cn) == 2 and cn[0] in string.ascii_lowercase and cn[1] in string.ascii_lowercase
-
-        return partial(default_vat_check, self, attr[10:])
-
-
     def vat_change(self, cr, uid, ids, value, context={}):
         return {'value': {'vat_subjected': bool(value)}}
 
     _columns = {
         'vat_subjected': fields.boolean('VAT Legal Statement', help="Check this box if the partner is subjected to the VAT. It will be used for the VAT legal statement.")
     }
-    _constraints = [(check_vat, "The VAT doesn't seem to be correct.", ["vat"])]
+
+    def _construct_constraint_msg(self, cr, uid, ids):
+        def default_vat_check(cn, vn):
+            # by default, a VAT number is valid if:
+            #  it starts with 2 letters
+            #  has more than 3 characters
+            return cn[0] in string.ascii_lowercase and cn[1] in string.ascii_lowercase
+
+        vat_country, vat_number = self._split_vat(self.browse(cr, uid, ids)[0].vat)
+        if default_vat_check(vat_country, vat_number):
+            return _('The Vat does not seems to be correct. You should have entered something like this %s'), (_ref_vat[vat_country])
+        return _('The VAT is invalid, it shoul begin with the country code'), ()
+
+    _constraints = [(check_vat, _construct_constraint_msg, ["vat"])]
 
     # code from the following methods come from Tryton (B2CK)
     # http://www.tryton.org/hgwebdir.cgi/modules/relationship/file/544d1de586d9/party.py
diff --git a/addons/board_manufacturing/board_manufacturing_view.xml b/addons/board_manufacturing/board_manufacturing_view.xml
index 17b4bc486bc..191f1818612 100644
--- a/addons/board_manufacturing/board_manufacturing_view.xml
+++ b/addons/board_manufacturing/board_manufacturing_view.xml
@@ -15,7 +15,7 @@
                         <child1>
                             <action colspan="4" height="200" name="%(mrp.mrp_production_action2)d" string="Next production orders" width="510"/>
                             <action colspan="4" name="%(stock.action_picking_all)d" string="Deliveries (Out picking)" domain="[('state','=','assigned'),('type','=','out')]"/>
-                            <action colspan="4" name="%(mrp.mrp_procurement_action4)d" string="Procurements in Exception"/>
+                            <action colspan="4" name="%(mrp_procurement.mrp_procurement_action4)d" string="Procurements in Exception"/>
                         </child1>
 
 
diff --git a/addons/board_warehouse/board_warehouse_view.xml b/addons/board_warehouse/board_warehouse_view.xml
index cdc93d9a274..af797401935 100644
--- a/addons/board_warehouse/board_warehouse_view.xml
+++ b/addons/board_warehouse/board_warehouse_view.xml
@@ -23,7 +23,7 @@
                 <form string="Warehouse board">
                     <hpaned position="100">
                         <child1>
-					    	<action colspan="4" name="%(mrp.mrp_procurement_action5)d" string="Procurement Exceptions" width="510" />
+					    	<action colspan="4" name="%(mrp_procurement.mrp_procurement_action5)d" string="Procurement Exceptions" width="510" />
 					    	<action colspan="4" name="%(action_reception_picking_move_board)d" string="Products To Receive" />
                         </child1>
 
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 91ef20be892..34d8b46bcf4 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -774,7 +774,7 @@ class crm_case_history(osv.osv):
         """
         res = {}
         for hist in self.browse(cursor, user, ids, context or {}):
-            res[hist.id] = (hist.email or '/') + ' (' + str(hist.date) + ')\n'
+            res[hist.id] = (hist.email_from or '/') + ' (' + str(hist.date) + ')\n'
             res[hist.id] += (hist.description or '')
         return res
 
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index f89c558fee4..9608616debd 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -141,8 +141,8 @@
                         <separator string="Dates" colspan="2" col="2"/>
                         <field name="create_date"/>
                         <field name="write_date"/>
-                        <field name="date_closed"/>
                         <field name="date_open"/>
+                        <field name="date_closed"/>
                     </group>
                     <group colspan="2" col="2">
                         <separator string="Statistics" colspan="2" col="2"/>
diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index b0d20cd6e55..ae9ff8541c6 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -92,9 +92,10 @@ class crm_send_new_email(osv.osv_memory):
             email_from = data.get('email_from', False)
             case_pool._history(cr, uid, [case], _('Send'), history=True, email=data['email_to'], details=body, email_from=email_from, message_id=message_id)
 
-            x_headers = {
-                'Reply-To':"%s" % case.section_id.reply_to,
-            }
+            x_headers = dict()
+            #x_headers = {
+            #    'Reply-To':"%s" % case.section_id.reply_to,
+            #}
             if message_id:
                 x_headers['References'] = "%s" % (message_id)
 
diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index 7e7d31975e5..35b3ed481e9 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -28,6 +28,17 @@ class delivery_carrier(osv.osv):
     _name = "delivery.carrier"
     _description = "Carrier and delivery grids"
 
+    def name_get(self, cr, uid, ids, context={}):
+        if not len(ids):
+            return []
+        order_id = context.get('order_id',False)
+        if not order_id:
+            res = super(delivery_carrier, self).name_get(cr, uid, ids, context=context)
+        else:
+            order = self.pool.get('sale.order').browse(cr, uid, [order_id])[0]
+            currency = order.pricelist_id.currency_id.name or ''
+            res = [(r['id'], r['name']+' ('+(str(r['price']))+' '+currency+')') for r in self.read(cr, uid, ids, ['name', 'price'], context)]
+        return res
     def get_price(self, cr, uid, ids, field_name, arg=None, context={}):
         res={}
         sale_obj=self.pool.get('sale.order')
@@ -94,9 +105,7 @@ class delivery_grid(osv.osv):
     }
     _order = 'sequence'
 
-
     def get_price(self, cr, uid, id, order, dt, context):
-
         total = 0
         weight = 0
         volume = 0
@@ -112,7 +121,6 @@ class delivery_grid(osv.osv):
 
     def get_price_from_picking(self, cr, uid, id, total, weight, volume, context={}):
         grid = self.browse(cr, uid, id, context)
-
         price = 0.0
         ok = False
 
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 16f4a61ed1e..f14d45c79de 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -289,5 +289,16 @@
             </field>
         </record>
 
+        <record model="ir.ui.view" id="edit_project_multicompany">
+            <field name="name">sale.order.multicompany</field>
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_order_form"/>
+            <field name="arch" type="xml">
+                    <xpath expr="/form/notebook/page[@string='Sale Order']/group[1]/button[@name='button_dummy']" position="after">
+ 			        	<button name="%(action_delivery_cost)d" states="draft" string="Delivery Costs" type="action" icon="gtk-execute" context="{'order_id':id}"/>                    
+ 			        </xpath>
+            </field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/delivery/wizard/delivery_sale_order.py b/addons/delivery/wizard/delivery_sale_order.py
index efc82ae4141..5f066b23bb0 100644
--- a/addons/delivery/wizard/delivery_sale_order.py
+++ b/addons/delivery/wizard/delivery_sale_order.py
@@ -50,7 +50,11 @@ class make_delivery(osv.osv_memory):
         res = super(make_delivery, self).default_get(cr, uid, fields, context=context)
         order_obj = self.pool.get('sale.order')
         for order in order_obj.browse(cr, uid, context.get('active_ids', [])):
-             res.update({'carrier_id': order.partner_id.property_delivery_carrier.id})
+             carrier = order.carrier_id.id
+             if not carrier:
+                  carrier = order.partner_id.property_delivery_carrier.id
+             res.update({'carrier_id': carrier})
+             
         return res
     
     def view_init(self, cr , uid , fields, context=None):
diff --git a/addons/delivery/wizard/delivery_sale_order_view.xml b/addons/delivery/wizard/delivery_sale_order_view.xml
index c2609bc3923..6ac0883493f 100644
--- a/addons/delivery/wizard/delivery_sale_order_view.xml
+++ b/addons/delivery/wizard/delivery_sale_order_view.xml
@@ -11,26 +11,28 @@
             <field name="arch" type="xml">
                 <form string="Create Deliveries">
                 	<separator colspan="4" string="Delivery Method" />
-				    <field name="carrier_id"/>
+				    <field name="carrier_id" widget="selection"/>
 				    <newline/>
+				    <separator colspan="4"/>
 				    <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" />
+                			string="_Cancel" />
+                		<button name="delivery_set" string="_Apply"
+                			colspan="1" type="object" icon="gtk-apply" />
                 	</group>
                 </form>
             </field>
         </record>
+        
+		<record id="action_delivery_cost" model="ir.actions.act_window">
+            <field name="name">Delivery Costs</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="view_id" ref="view_make_delivery_wizard"/>
+            <field name="target">new</field>            
+        </record>
 
-        <act_window name="Delivery Costs"		    
-		    res_model="delivery.sale.order"
-		    src_model="sale.order"
-		    view_mode="form"
-		    target="new"        
-            key2="client_action_multi"    
-		    id="act_delivery_cost"/>
-
-       
 	</data>
 </openerp>	
diff --git a/addons/event/i18n/et.po b/addons/event/i18n/et.po
index d184aebb4cc..d7595209b97 100644
--- a/addons/event/i18n/et.po
+++ b/addons/event/i18n/et.po
@@ -7,25 +7,25 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 13:36+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-10 10:27+0000\n"
+"Last-Translator: lyyser <logard.1961@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-04-17 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-05-11 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
 #: field:event.event,date_end:0
 #: field:report.event.registration,date_end:0
 msgid "Ending date"
-msgstr ""
+msgstr "Lõpu kuupäev"
 
 #. module: event
 #: field:event.event,register_min:0
 msgid "Minimum Registrations"
-msgstr ""
+msgstr "Miinimum registreerimised"
 
 #. module: event
 #: constraint:ir.actions.act_window:0
@@ -35,17 +35,17 @@ msgstr "Vigane mudeli nimi toimingu definitsioonis."
 #. module: event
 #: field:event.event,mail_registr:0
 msgid "Registration Email"
-msgstr ""
+msgstr "Registreerimise Email"
 
 #. module: event
 #: model:crm.case.section,name:event.event_0_crm_case_section
 msgid "Concert of Bon Jovi"
-msgstr ""
+msgstr "Bon Jovi kontsert"
 
 #. module: event
 #: field:event.event,mail_confirm:0
 msgid "Confirmation Email"
-msgstr ""
+msgstr "Kinnitus Email"
 
 #. module: event
 #: constraint:crm.case.section:0
@@ -55,7 +55,7 @@ msgstr "Viga! Sa ei saa luua rekursiivseid sektsioone."
 #. module: event
 #: model:ir.model,name:event.model_event_registration
 msgid "Event Registration"
-msgstr ""
+msgstr "Sündmuse registreerimine"
 
 #. module: event
 #: model:ir.actions.wizard,name:event.event_reg_invoice
@@ -65,52 +65,52 @@ msgstr ""
 #. module: event
 #: field:report.event.type.registration,draft_state:0
 msgid "Draft Registrations"
-msgstr ""
+msgstr "Registreerimiste mustand"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Event on Registration"
-msgstr ""
+msgstr "Registreerimise sündmus"
 
 #. module: event
 #: wizard_button:event.reg_make_invoice,init,end:0
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #. module: event
 #: field:event.event,mail_auto_confirm:0
 msgid "Mail Auto Confirm"
-msgstr ""
+msgstr "Autokinnituse meil"
 
 #. module: event
 #: model:product.template,name:event.event_product_1_product_template
 msgid "Ticket for Opera"
-msgstr ""
+msgstr "Ooperi pilet"
 
 #. module: event
 #: wizard_field:event.reg_make_invoice,init,inv_rejected:0
 msgid "Invoice Rejected"
-msgstr ""
+msgstr "Arve väljapraagitud"
 
 #. module: event
 #: view:event.event:0
 msgid "Confirm Event"
-msgstr ""
+msgstr "Kinnita sündmus"
 
 #. module: event
 #: model:crm.case.section,name:event.event_1_crm_case_section
 msgid "Opera of Verdi"
-msgstr ""
+msgstr "Verdi ooper"
 
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid "Draft Registration"
-msgstr ""
+msgstr "Registreerimise mustand"
 
 #. module: event
 #: wizard_view:event.reg_make_invoice,init:0
 msgid "Create Invoices"
-msgstr ""
+msgstr "Loo arved"
 
 #. module: event
 #: model:ir.module.module,description:event.module_meta_information
@@ -134,12 +134,12 @@ msgstr ""
 #. module: event
 #: view:event.registration:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Täiendav info"
 
 #. module: event
 #: view:event.registration:0
 msgid "Registration"
-msgstr ""
+msgstr "Registreerimine"
 
 #. module: event
 #: field:event.type,name:0
diff --git a/addons/hr/i18n/tr.po b/addons/hr/i18n/tr.po
index 5e4be7c5558..86e7205ef3a 100644
--- a/addons/hr/i18n/tr.po
+++ b/addons/hr/i18n/tr.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-02-14 21:34+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-10 13:18+0000\n"
+"Last-Translator: Angel Spy <melissadilara@yahoo.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-04-17 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-05-11 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -62,7 +62,7 @@ msgstr ""
 #. module: hr
 #: view:hr.department:0
 msgid "Department"
-msgstr ""
+msgstr "Bölüm"
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
@@ -340,7 +340,7 @@ msgstr "Firmalar"
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Wednesday"
-msgstr "Carsamba"
+msgstr "Çarşamba"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_form
diff --git a/addons/idea/i18n/hr.po b/addons/idea/i18n/hr.po
index 9083bd8d0aa..97112788aea 100644
--- a/addons/idea/i18n/hr.po
+++ b/addons/idea/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-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-24 10:38+0000\n"
-"Last-Translator: Drazen Bosak <Unknown>\n"
+"PO-Revision-Date: 2010-05-10 06:56+0000\n"
+"Last-Translator: nafterburner <nafterburner@gmail.com>\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-04-17 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-05-11 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
@@ -336,7 +336,7 @@ msgstr "Kreator"
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_tools
 msgid "Tools"
-msgstr "Pomagala"
+msgstr "Alati"
 
 #. module: idea
 #: field:idea.comment,idea_id:0
diff --git a/addons/mrp/__init__.py b/addons/mrp/__init__.py
index 39d97d0ba11..d23cee8d565 100644
--- a/addons/mrp/__init__.py
+++ b/addons/mrp/__init__.py
@@ -26,5 +26,6 @@ import installer
 import wizard
 import report
 import company
-import schedulers
+import mrp_procurement
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index a69e8ce4025..0fa66ac7bd1 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -26,7 +26,7 @@
     "author" : "Tiny",
     "website" : "http://www.openerp.com",
     "category" : "Generic Modules/Production",
-    "depends" : ["stock", "resource", "purchase", "product","process"],
+    "depends" : ["mrp_procurement", "stock", "resource", "purchase", "product","process"],
     "description": """
     This is the base module to manage the manufacturing process in Open ERP.
 
@@ -61,15 +61,11 @@
         'mrp_workflow.xml',
         'mrp_data.xml',
         'wizard/mrp_product_produce_view.xml',
-        'wizard/make_procurement_view.xml',
-        'wizard/mrp_procurement_view.xml',
         'wizard/change_production_qty_view.xml',
-        'wizard/orderpoint_procurement_view.xml',
         'wizard/mrp_price_view.xml',
         'wizard/mrp_workcenter_load_view.xml',
 #        'wizard/mrp_track_prod_view.xml',
         'mrp_view.xml',
-        'wizard/schedulers_all_view.xml',
         'mrp_wizard.xml',
         'mrp_report.xml',
         'company_view.xml',
@@ -81,6 +77,7 @@
         'report/mrp_production_order_view.xml',
     ],
     'demo_xml': ['mrp_demo.xml', 'mrp_order_point.xml'],
+#    'test': ['test/mrp_phantom_bom.yml','test/mrp_production_order.yml'],
     'installable': True,
     'active': False,
     'certificate': '0032052481373',
diff --git a/addons/mrp/company.py b/addons/mrp/company.py
index 1844fff47eb..22acf4fc5dd 100644
--- a/addons/mrp/company.py
+++ b/addons/mrp/company.py
@@ -24,22 +24,10 @@ from osv import osv,fields
 class company(osv.osv):
     _inherit = 'res.company'
     _columns = {
-        'schedule_range': fields.float('Scheduler Range', required=True,
-            help="This is the time frame analysed by the scheduler when "\
-            "computing procurements. All procurements that are not between "\
-            "today and today+range are skipped for futur computation."),
-        'po_lead': fields.float('Purchase Lead Time', required=True,
-            help="This is the leads/security time for each purchase order."),
-        'security_lead': fields.float('Security Days', required=True,
-            help="This is the days added to what you promise to customers "\
-            "for security purpose"),
         'manufacturing_lead': fields.float('Manufacturing Lead Time', required=True,
             help="Security days for each manufacturing operation."),
     }
     _defaults = {
-        'schedule_range': lambda *a: 80.0,
-        'po_lead': lambda *a: 1.0,
-        'security_lead': lambda *a: 5.0,
         'manufacturing_lead': lambda *a: 1.0,
     }
 company()
diff --git a/addons/mrp/company_view.xml b/addons/mrp/company_view.xml
index 1975bf5bb72..e94324f8195 100644
--- a/addons/mrp/company_view.xml
+++ b/addons/mrp/company_view.xml
@@ -9,12 +9,7 @@
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
                 <page string="Configuration" position="inside">
-                    <separator string="MRP &amp; Logistic Scheduler" colspan="4"/>
-                    <field name="schedule_range"/>
-                    <field name="po_lead"/>
-                    <field name="security_lead"/>
                     <field name="manufacturing_lead"/>
-                    <newline/>
                 </page>
             </field>
         </record>
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 675c4a73bb0..d5cea81933b 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -64,35 +64,6 @@ class mrp_workcenter(osv.osv):
 mrp_workcenter()
 
 
-class mrp_property_group(osv.osv):
-    """
-    Group of mrp properties.
-    """
-    _name = 'mrp.property.group'
-    _description = 'Property Group'
-    _columns = {
-        'name': fields.char('Property Group', size=64, required=True),
-        'description': fields.text('Description'),
-    }
-mrp_property_group()
-
-class mrp_property(osv.osv):
-    """
-    Properties of mrp.
-    """
-    _name = 'mrp.property'
-    _description = 'Property'
-    _columns = {
-        'name': fields.char('Name', size=64, required=True),
-        'composition': fields.selection([('min','min'),('max','max'),('plus','plus')], 'Properties composition', required=True, help="Not used in computations, for information purpose only."),
-        'group_id': fields.many2one('mrp.property.group', 'Property Group', required=True),
-        'description': fields.text('Description'),
-    }
-    _defaults = {
-        'composition': lambda *a: 'min',
-    }
-mrp_property()
-
 class mrp_routing(osv.osv):
     """
     For specifying the routings of workcenters.
@@ -996,520 +967,6 @@ class mrp_production_product_line(osv.osv):
     }
 mrp_production_product_line()
 
-# ------------------------------------------------------------------
-# Procurement
-# ------------------------------------------------------------------
-#
-# Produce, Buy or Find products and place a move
-#     then wizard for picking lists & move
-#
-class mrp_procurement(osv.osv):
-    """
-    Procument Orders
-    """
-    _name = "mrp.procurement"
-    _description = "Procurement"
-    _order = 'priority,date_planned'
-    
-    _columns = {
-        'name': fields.char('Reason', size=64, required=True, help='Procurement name.'),
-        'origin': fields.char('Source Document', size=64,
-            help="Reference of the document that created this Procurement.\n"
-            "This is automatically completed by Open ERP."),
-        'priority': fields.selection([('0','Not urgent'),('1','Normal'),('2','Urgent'),('3','Very Urgent')], 'Priority', required=True),
-        'date_planned': fields.datetime('Scheduled date', required=True),
-        'date_close': fields.datetime('Date Closed'),
-        'product_id': fields.many2one('product.product', 'Product', required=True, states={'draft':[('readonly',False)]}, readonly=True),
-        'product_qty': fields.float('Quantity', required=True, states={'draft':[('readonly',False)]}, readonly=True),
-        'product_uom': fields.many2one('product.uom', 'Product UoM', required=True, states={'draft':[('readonly',False)]}, readonly=True),
-        'product_uos_qty': fields.float('UoS Quantity', states={'draft':[('readonly',False)]}, readonly=True),
-        'product_uos': fields.many2one('product.uom', 'Product UoS', states={'draft':[('readonly',False)]}, readonly=True),
-        'move_id': fields.many2one('stock.move', 'Reservation', ondelete='set null'),
 
-        'bom_id': fields.many2one('mrp.bom', 'BoM', ondelete='cascade', select=True),
-
-        'close_move': fields.boolean('Close Move at end', required=True),
-        'location_id': fields.many2one('stock.location', 'Location', required=True, states={'draft':[('readonly',False)]}, readonly=True),
-        'procure_method': fields.selection([('make_to_stock','from stock'),('make_to_order','on order')], 'Procurement Method', states={'draft':[('readonly',False)], 'confirmed':[('readonly',False)]},
-            readonly=True, required=True, help="If you encode manually a Procurement, you probably want to use" \
-            " a make to order method."),
-
-        'purchase_id': fields.many2one('purchase.order', 'Purchase Order'),
-        'note': fields.text('Note'),
-
-        'property_ids': fields.many2many('mrp.property', 'mrp_procurement_property_rel', 'procurement_id','property_id', 'Properties'),
-
-        'message': fields.char('Latest error', size=64, help="Exception occurred while computing procurement orders."),
-        'state': fields.selection([
-            ('draft','Draft'),
-            ('confirmed','Confirmed'),
-            ('exception','Exception'),
-            ('running','Running'),
-            ('cancel','Cancel'),
-            ('ready','Ready'),
-            ('done','Done'),
-            ('waiting','Waiting')], 'State', required=True,
-            help='When a procurement is created the state is set to \'Draft\'.\n If the procurement is confirmed, the state is set to \'Confirmed\'.\
-            \nAfter confirming the state is set to \'Running\'.\n If any exception arises in the order then the state is set to \'Exception\'.\n Once the exception is removed the state becomes \'Ready\'.\n It is in \'Waiting\'. state when the procurement is waiting for another one to finish.'),
-        'note': fields.text('Note'),
-        'company_id': fields.many2one('res.company','Company',required=True),
-    }
-    _defaults = {
-        'state': lambda *a: 'draft',
-        'priority': lambda *a: '1',
-        'date_planned': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
-        'close_move': lambda *a: 0,
-        'procure_method': lambda *a: 'make_to_order',
-        'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'mrp.procurement', context=c)
-    }
-
-    def unlink(self, cr, uid, ids, context=None):
-        procurements = self.read(cr, uid, ids, ['state'])
-        unlink_ids = []
-        for s in procurements:
-            if s['state'] in ['draft','cancel']:
-                unlink_ids.append(s['id'])
-            else:
-                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Procurement Order(s) which are in %s State!' % s['state']))
-        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
-
-    def onchange_product_id(self, cr, uid, ids, product_id, context={}):
-        """ Finds UoM and UoS of changed product.
-        @param product_id: Changed id of product.
-        @return: Dictionary of values.
-        """
-        if product_id:
-            w = self.pool.get('product.product').browse(cr, uid, product_id, context)
-            v = {
-                'product_uom': w.uom_id.id,
-                'product_uos': w.uos_id and w.uos_id.id or w.uom_id.id
-            }
-            return {'value': v}
-        return {}
-
-    def check_product(self, cr, uid, ids):
-        """ Checks product type.
-        @return: True or False 
-        """
-        for procurement in self.browse(cr, uid, ids):
-            if procurement.product_id.type in ('product', 'consu'):
-                return True
-        return False
-
-    def check_move_cancel(self, cr, uid, ids, context={}):
-        """ Checks if move is cancelled or not.
-        @return: True or False. 
-        """
-        res = True
-        ok = False
-        for procurement in self.browse(cr, uid, ids, context):
-            if procurement.move_id:
-                ok = True
-                if not procurement.move_id.state == 'cancel':
-                    res = False
-        return res and ok
-
-    def check_move_done(self, cr, uid, ids, context={}):
-        """ Checks if move is done or not.
-        @return: True or False. 
-        """
-        res = True
-        for proc in self.browse(cr, uid, ids, context):
-            if proc.move_id:
-                if not proc.move_id.state == 'done':
-                    res = False
-        return res
-
-    #
-    # This method may be overrided by objects that override mrp.procurment
-    # for computing their own purpose
-    #
-    def _quantity_compute_get(self, cr, uid, proc, context={}):
-        """ Finds sold quantity of product.
-        @param proc: Current procurement.
-        @return: Quantity or False.
-        """
-        if proc.product_id.type == 'product':
-            if proc.move_id.product_uos:
-                return proc.move_id.product_uos_qty
-        return False
-
-    def _uom_compute_get(self, cr, uid, proc, context={}):
-        """ Finds UoS if product is Stockable Product. 
-        @param proc: Current procurement.
-        @return: UoS or False.
-        """
-        if proc.product_id.type == 'product':
-            if proc.move_id.product_uos:
-                return proc.move_id.product_uos.id
-        return False
-
-    #
-    # Return the quantity of product shipped/produced/served, wich may be
-    # different from the planned quantity
-    #
-    def quantity_get(self, cr, uid, id, context={}):
-        """ Finds quantity of product used in procurement.
-        @return: Quantity of product. 
-        """
-        proc = self.browse(cr, uid, id, context)
-        result = self._quantity_compute_get(cr, uid, proc, context)
-        if not result:
-            result = proc.product_qty
-        return result
-
-    def uom_get(self, cr, uid, id, context=None):
-        """ Finds UoM of product used in procurement.
-        @return: UoM of product. 
-        """
-        proc = self.browse(cr, uid, id, context)
-        result = self._uom_compute_get(cr, uid, proc, context)
-        if not result:
-            result = proc.product_uom.id
-        return result
-
-    def check_waiting(self, cr, uid, ids, context=[]):
-        """ Checks state of move.
-        @return: True or False 
-        """
-        for procurement in self.browse(cr, uid, ids, context=context):
-            if procurement.move_id and procurement.move_id.state == 'auto':
-                return True
-        return False
-
-    def check_produce_service(self, cr, uid, procurement, context=[]):
-        return True
-
-    def check_produce_product(self, cr, uid, procurement, context=[]):
-        """ Finds BoM of a product if not found writes exception message.
-        @param procurement: Current procurement.
-        @return: True or False.
-        """
-        properties = [x.id for x in procurement.property_ids]
-        bom_id = self.pool.get('mrp.bom')._bom_find(cr, uid, procurement.product_id.id, procurement.product_uom.id, properties)
-        if not bom_id:
-            cr.execute('update mrp_procurement set message=%s where id=%s', (_('No BoM defined for this product !'), procurement.id))
-            return False
-        return True
-
-    def check_make_to_stock(self, cr, uid, ids, context={}):
-        """ Checks product type.
-        @return: True or False 
-        """
-        ok = True
-        for procurement in self.browse(cr, uid, ids, context=context):
-            if procurement.product_id.type == 'service':
-                ok = ok and self._check_make_to_stock_service(cr, uid, procurement, context)
-            else:
-                ok = ok and self._check_make_to_stock_product(cr, uid, procurement, context)
-        return ok
-
-    def check_produce(self, cr, uid, ids, context={}):
-        """ Checks product type.
-        @return: True or Product Id.
-        """
-        res = True
-        user = self.pool.get('res.users').browse(cr, uid, uid)
-        for procurement in self.browse(cr, uid, ids):
-            if procurement.product_id.product_tmpl_id.supply_method <> 'produce':
-                if procurement.product_id.seller_ids:
-                    partner = procurement.product_id.seller_ids[0].name
-                    if user.company_id and user.company_id.partner_id:
-                        if partner.id == user.company_id.partner_id.id:
-                            return True
-                return False
-            if procurement.product_id.product_tmpl_id.type=='service':
-                res = res and self.check_produce_service(cr, uid, procurement, context)
-            else:
-                res = res and self.check_produce_product(cr, uid, procurement, context)
-            if not res:
-                return False
-        return res
-
-    def check_buy(self, cr, uid, ids):
-        """ Checks product type.
-        @return: True or Product Id.
-        """
-        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
-            if not procurement.product_id.seller_ids:
-                cr.execute('update mrp_procurement set message=%s where id=%s', (_('No supplier defined for this product !'), procurement.id))
-                return False
-            partner = procurement.product_id.seller_ids[0].name
-            if user.company_id and user.company_id.partner_id:
-                if partner.id == user.company_id.partner_id.id:
-                    return False
-            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
-        return True
-
-    def test_cancel(self, cr, uid, ids):
-        """ Tests whether state of move is cancelled or not. 
-        @return: True or False
-        """
-        for record in self.browse(cr, uid, ids):
-            if record.move_id and record.move_id.state == 'cancel':
-                return True
-        return False
-
-    def action_confirm(self, cr, uid, ids, context={}):
-        """ Confirms procurement and writes exception message if any.
-        @return: True
-        """
-        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 Procurement Order(s), it should not be less than 1!'))
-            if procurement.product_id.type in ('product', 'consu'):
-                if not procurement.move_id:
-                    source = procurement.location_id.id
-                    if procurement.procure_method == 'make_to_order':
-                        source = procurement.product_id.product_tmpl_id.property_stock_procurement.id
-                    id = move_obj.create(cr, uid, {
-                        'name': 'PROC:' + procurement.name,
-                        'location_id': source,
-                        'location_dest_id': procurement.location_id.id,
-                        'product_id': procurement.product_id.id,
-                        'product_qty': procurement.product_qty,
-                        'product_uom': procurement.product_uom.id,
-                        'date_planned': procurement.date_planned,
-                        'state': 'confirmed',
-                        'company_id': procurement.company_id.id,
-                    })
-                    self.write(cr, uid, [procurement.id], {'move_id': id, 'close_move': 1})
-                else:
-                    # TODO: check this
-                    if procurement.procure_method == 'make_to_stock' and procurement.move_id.state in ('waiting',):
-                        id = move_obj.write(cr, uid, [procurement.move_id.id], {'state':'confirmed'})
-        self.write(cr, uid, ids, {'state': 'confirmed', 'message': ''})
-        return True
-
-    def action_move_assigned(self, cr, uid, ids, context={}):
-        """ Changes procurement state to Running and writes message.
-        @return: True 
-        """
-        self.write(cr, uid, ids, {'state': 'running', 'message': _('from stock: products assigned.')})
-        return True
-
-    def _check_make_to_stock_service(self, cr, uid, procurement, context={}):
-        return True
-
-    def _check_make_to_stock_product(self, cr, uid, procurement, context={}):
-        """ Checks procurement move state.
-        @param procurement: Current procurement.
-        @return: True or move id.
-        """
-        ok = True
-        if procurement.move_id:
-            id = procurement.move_id.id
-            if not (procurement.move_id.state in ('done','assigned','cancel')):
-                ok = ok and self.pool.get('stock.move').action_assign(cr, uid, [id])
-                cr.execute('select count(id) from stock_warehouse_orderpoint where product_id=%s', (procurement.product_id.id,))
-                if not cr.fetchone()[0]:
-                    cr.execute('update mrp_procurement set message=%s where id=%s', (_('from stock and no minimum orderpoint rule defined'), procurement.id))
-        return ok
-
-    def action_produce_assign_service(self, cr, uid, ids, context={}):
-        """ Changes procurement state to Running.
-        @return: True 
-        """
-        for procurement in self.browse(cr, uid, ids):
-            self.write(cr, uid, [procurement.id], {'state': 'running'})
-        return True
-
-    def action_produce_assign_product(self, cr, uid, ids, context={}):
-        """ This is action which call from workflow to assign production order to procurements
-        @return: True
-        """
-        res = self.make_mo(cr, uid, ids, context=context)
-        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={}):
-        """ 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 = production_obj.create(cr, uid, {
-                'origin': procurement.origin,
-                'product_id': procurement.product_id.id,
-                'product_qty': procurement.product_qty,
-                'product_uom': procurement.product_uom.id,
-                'product_uos_qty': procurement.product_uos and procurement.product_uos_qty or False,
-                'product_uos': procurement.product_uos and procurement.product_uos.id or False,
-                'location_src_id': procurement.location_id.id,
-                'location_dest_id': procurement.location_id.id,
-                'bom_id': procurement.bom_id and procurement.bom_id.id or False,
-                'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'),
-                '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 = production_obj.action_compute(cr, uid,
-                    [produce_id], properties=[x.id for x in procurement.property_ids])
-            wf_service.trg_validate(uid, 'mrp.production', produce_id, 'button_confirm', cr)
-            move_obj.write(cr, uid, [res_id],
-                    {'location_id': procurement.location_id.id})
-        return res
-    
-    def action_po_assign(self, cr, uid, ids, context={}):
-        """ This is action which call from workflow to assign purchase order to procuments
-        @return: True
-        """
-        res = self.make_po(cr, uid, ids, context=context)
-        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={}):
-        """ 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 = 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 = 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 = 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)
-            newdate = newdate - procurement.product_id.seller_ids[0].delay
-
-            #Passing partner_id to context for purchase order line integrity of Line name
-            context.update({'lang': partner.lang, 'partner_id': partner_id})
-
-            product = prod_obj.browse(cr, uid, procurement.product_id.id, context=context)
-
-            line = {
-                'name': product.partner_ref,
-                'product_qty': qty,
-                'product_id': procurement.product_id.id,
-                'product_uom': uom_id,
-                'price_unit': price,
-                'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'),
-                'move_dest_id': res_id,
-                'notes': product.description_purchase,
-            }
-
-            taxes_ids = procurement.product_id.product_tmpl_id.supplier_taxes_id
-            taxes = acc_pos_obj.map_tax(cr, uid, partner.property_account_position, taxes_ids)
-            line.update({
-                'taxes_id': [(6,0,taxes)]
-            })
-            purchase_id = po_obj.create(cr, uid, {
-                'origin': procurement.origin,
-                'partner_id': partner_id,
-                'partner_address_id': address_id,
-                'location_id': procurement.location_id.id,
-                'pricelist_id': pricelist_id,
-                'order_line': [(0,0,line)],
-                '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 res
-
-    def action_cancel(self, cr, uid, ids):
-        """ Cancels procurement and writes move state to Assigned.
-        @return: True 
-        """
-        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'):
-                    todo2.append(proc.move_id.id)
-            else:
-                if proc.move_id and proc.move_id.state == 'waiting':
-                    todo.append(proc.move_id.id)
-        if len(todo2):
-            move_obj.action_cancel(cr, uid, todo2)
-        if len(todo):
-            move_obj.write(cr, uid, todo, {'state': 'assigned'})
-        self.write(cr, uid, ids, {'state': 'cancel'})
-        wf_service = netsvc.LocalService("workflow")
-        for id in ids:
-            wf_service.trg_trigger(uid, 'mrp.procurement', id, cr)
-        return True
-
-    def action_check_finnished(self, cr, uid, ids):
-        return self.check_move_done(cr, uid, ids)
-
-    def action_check(self, cr, uid, ids):
-        """ Checks procurement move state whether assigned or done. 
-        @return: True 
-        """
-        ok = False
-        for procurement in self.browse(cr, uid, ids):
-            if procurement.move_id.state == 'assigned' or procurement.move_id.state == 'done':
-                self.action_done(cr, uid, [procurement.id])
-                ok = True
-        return ok
-
-    def action_ready(self, cr, uid, ids):
-        """ Changes procurement state to Ready.
-        @return: True 
-        """
-        res = self.write(cr, uid, ids, {'state': 'ready'})
-        return res
-
-    def action_done(self, cr, uid, ids):
-        """ Changes procurement state to Done and writes Closed date.
-        @return: True 
-        """
-        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'):
-                    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:
-            wf_service.trg_trigger(uid, 'mrp.procurement', id, cr)
-        return res
-
-    def run_scheduler(self, cr, uid, automatic=False, use_new_cursor=False, context=None):
-        ''' Runs through scheduler.
-        @param use_new_cursor: False or the dbname
-        '''
-        if not context:
-            context={}
-        self._procure_confirm(cr, uid, use_new_cursor=use_new_cursor, context=context)
-        self._procure_orderpoint_confirm(cr, uid, automatic=automatic,\
-                use_new_cursor=use_new_cursor, context=context)
-mrp_procurement()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/mrp/mrp_data.xml b/addons/mrp/mrp_data.xml
index 2793f84b924..a7db7109e55 100644
--- a/addons/mrp/mrp_data.xml
+++ b/addons/mrp/mrp_data.xml
@@ -31,18 +31,5 @@
             <field name="number_increment">1</field>
         </record>
         
-        <record forcecreate="True" id="ir_cron_scheduler_action" model="ir.cron">
-            <field name="name">Run mrp scheduler</field>
-            <field eval="False" name="active"/>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="interval_number">1</field>
-            <field name="interval_type">days</field>
-            <field name="numbercall">-1</field>
-            <field eval="False" name="doall"/>
-            <field eval="'mrp.procurement'" name="model"/>
-            <field eval="'run_scheduler'" name="function"/>
-            <field eval="'(False,)'" name="args"/>
-        </record>
-        
     </data>
 </openerp>
diff --git a/addons/mrp/mrp_procurement.py b/addons/mrp/mrp_procurement.py
new file mode 100644
index 00000000000..84392b329ea
--- /dev/null
+++ b/addons/mrp/mrp_procurement.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 mx import DateTime
+from osv import fields
+from osv import osv
+from tools.translate import _
+import ir
+import netsvc
+import time
+
+class mrp_procurement(osv.osv):
+    _inherit = 'mrp.procurement'
+    _columns = {
+        'bom_id': fields.many2one('mrp.bom', 'BoM', ondelete='cascade', select=True),
+    }
+    
+    def check_produce_product(self, cr, uid, procurement, context=[]):
+        properties = [x.id for x in procurement.property_ids]
+        bom_id = self.pool.get('mrp.bom')._bom_find(cr, uid, procurement.product_id.id, procurement.product_uom.id, properties)
+        if not bom_id:
+            cr.execute('update mrp_procurement set message=%s where id=%s', (_('No BoM defined for this product !'), procurement.id))
+            return False
+        return True
+    
+    def action_produce_assign_product(self, cr, uid, ids, context={}):
+        """ This is action which call from workflow to assign production order to procurements
+        @return: True
+        """
+        procurement_obj = self.pool.get('mrp.procurement')
+        res = procurement_obj.make_mo(cr, uid, ids, context=context)
+        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={}):
+        """ Make Manufacturing(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")
+        procurement_obj = self.pool.get('mrp.procurement')
+        for procurement in procurement_obj.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 = production_obj.create(cr, uid, {
+                'origin': procurement.origin,
+                'product_id': procurement.product_id.id,
+                'product_qty': procurement.product_qty,
+                'product_uom': procurement.product_uom.id,
+                'product_uos_qty': procurement.product_uos and procurement.product_uos_qty or False,
+                'product_uos': procurement.product_uos and procurement.product_uos.id or False,
+                'location_src_id': procurement.location_id.id,
+                'location_dest_id': procurement.location_id.id,
+                'bom_id': procurement.bom_id and procurement.bom_id.id or False,
+                'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'),
+                '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 = production_obj.action_compute(cr, uid,
+                    [produce_id], properties=[x.id for x in procurement.property_ids])
+            wf_service.trg_validate(uid, 'mrp.production', produce_id, 'button_confirm', cr)
+            move_obj.write(cr, uid, [res_id],
+                    {'location_id': procurement.location_id.id})
+        return res
+    
+mrp_procurement()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 5b8b7c41084..ba86fc1facc 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -12,6 +12,7 @@
                   id="menu_mrp_bom"
                   parent="base.menu_mrp_root"
                   sequence="5" />
+        
         <!--
         Property / Property Group
         -->
@@ -257,14 +258,14 @@
                         <field name="type" groups="base.group_extended"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     </group>
-                    <notebook colspan="4">
-                        <page string="General Information">
+                    <notebook colspan="4" >
+                        <page string="General Information" attrs="{'invisible': [('bom_id','!=',False),('multi_level_bom','=',False)]}">
                             <field colspan="4" name="bom_lines" nolabel="1" widget="one2many_list" />
                         </page>
-                        <page string="Revisions" groups="base.group_extended">
+                        <page string="Revisions" groups="base.group_extended" attrs="{'invisible': [('bom_id','!=',False),('multi_level_bom','=',False)]}">
                             <field colspan="4" name="revision_ids" nolabel="1" widget="one2many_list"/>
                         </page>
-                        <page string="Properties" groups="base.group_extended">
+                        <page string="Properties" groups="base.group_extended" attrs="{'invisible': [('bom_id','!=',False),('multi_level_bom','=',False)]}">
                             <field name="position"/>
                             <field name="active"/>
                             <field name="sequence"/>
@@ -378,10 +379,27 @@
                 </form>
             </field>
         </record>
-
+		
+		<!--
+        Procurement
+        -->
+	
+		<menuitem action="mrp_procurement.mrp_procurement_action" id="menu_mrp_procurement_action"
+        		  parent="mrp.menu_mrp_manufacturing" sequence="2" />
+        <menuitem action="mrp_procurement.mrp_procurement_action5" id="menu_mrp_procurement_exception_action" 
+        		  parent="mrp.menu_mrp_control" sequence="1" />
+     	
+     	<menuitem id="menu_mrp_scheduler" name="Schedulers" parent="base.menu_mrp_root" sequence="4"/>
+        <menuitem action="mrp_procurement.action_compute_schedulers" id="mrp_Sched_all" parent="mrp.menu_mrp_scheduler" sequence="90"/>
+	
+		<!-- 
+		Order Point 
+		-->	
+		<menuitem action="mrp_procurement.action_orderpoint_form" id="menu_action_orderpoint_form" parent="mrp.menu_mrp_reordering"/>
+        
         <!--
-    Production Management
-    -->
+	    Production Management
+	    -->
 
         <record id="mrp_production_tree_view" model="ir.ui.view">
             <field name="name">mrp.production.tree</field>
@@ -765,259 +783,22 @@
                 </tree>
             </field>
         </record>
-
-        <!--
-        Procurement
+        
+        <!-- 
+        	Procurements
         -->
-
-        <record id="mrp_procurement_tree_view" model="ir.ui.view">
-            <field name="name">mrp.procurement.tree</field>
-            <field name="model">mrp.procurement</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Procurement Lines" colors="red:state=='draft';black:state=='running';green:state=='confirmed';gray:state in ['done','cancel']">
-                    <field name="date_planned" widget="date"/>
-                    <field name="origin"/>
-                    <field name="product_id"/>
-                    <field name="product_qty"/>
-                    <field name="product_uom" string="UOM"/>
-                    <field name="procure_method"/>
-                    <field name="state"/>
-                </tree>
-            </field>
+         
+        <record id="view_procurement_form_inherit" model="ir.ui.view">
+        	<field name="name">mrp.procurement.form.inherit</field>
+        	<field name="model">mrp.procurement</field>
+        	<field name="inherit_id" ref="mrp_procurement.mrp_procurement_form_view"/>
+        	<field name="type">form</field>
+        	<field name="arch" type="xml">
+        		<xpath expr="/form/notebook/page/field[@name='move_id']" position="before">
+        			<field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]"/>
+        		</xpath>
+        	</field>
         </record>
-        <record id="mrp_procurement_form_view" model="ir.ui.view">
-            <field name="name">mrp.procurement.form</field>
-            <field name="model">mrp.procurement</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Procurement">
-                    <group col="2" colspan="2">
-                        <separator colspan="2" string="References"/>
-                        <field name="name" select="1" string="Procurement Reason"/>
-                        <field name="origin"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator colspan="2" string="Planification"/>
-                        <field name="date_planned" select="1"/>
-                        <field name="procure_method"/>
-                        <field name="priority" groups="base.group_extended"/>
-                    </group>
-                    <notebook colspan="4">
-                    <page string="Procurement Details">
-                        <separator colspan="4" string="Product &amp; Location"/>
-                        <field name="product_id" select="1" on_change="onchange_product_id(product_id)"/>
-                        <field name="location_id" domain="[('usage','=','internal')]"/>
-                        <field name="product_qty"/>
-                        <field name="product_uom"/>
-
-                        <field name="product_uos_qty" groups="product.group_uos"/>
-                        <field name="product_uos" groups="product.group_uos"/>
-
-                        <separator colspan="4" string="Status"/>
-                        <field colspan="4" name="message" readonly="1"/>
-                        <field name="state" readonly="1"/>
-                        <group col="7" colspan="2">
-                            <button name="button_confirm" states="draft" string="Confirm" icon="gtk-apply"/>
-                            <button name="button_restart" states="exception" string="Retry" icon="gtk-convert"/>
-                            <button name="button_cancel" states="draft,exception,waiting" string="Cancel" icon="gtk-cancel"/>
-                            <button name="button_check" states="confirmed" string="Run     Procurement" icon="gtk-media-play"/>
-                        </group>
-                    </page>
-                    <page string="Extra Information">
-                        <separator colspan="4" string="Details"/>
-                        <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]"/>
-                        <field name="move_id" groups="base.group_extended"/>
-                        <field name="date_close"/>
-                        <field name="close_move" groups="base.group_extended"/>
-                        <field name="purchase_id"/>
-                        <group colspan="4"  groups="base.group_extended">
-                            <separator colspan="4" string="Properties" />
-                            <field colspan="4" name="property_ids" nolabel="1"/>
-                        </group>
-                    </page>
-                    <page string="Notes">
-                        <separator colspan="4" string="Note" />
-                        <field name="note" colspan="4" nolabel="1"/>
-                    </page>
-                    </notebook>
-                </form>
-            </field>
-        </record>
-        <record id="view_mrp_procurement_filter" model="ir.ui.view">
-            <field name="name">mrp.procurement.select</field>
-            <field name="model">mrp.procurement</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Search Procurement">
-                    <group col='10' colspan='4'>
-                       <filter icon="terp-mrp" string="Current" domain="[('state','in',('draft','confirmed'))]" default="1" help="Procurement Orders in draft or open state."/>
-                       <filter icon="terp-mrp" string="Exceptions" domain="[('state','=','exception')]" help="Procurement Orders with exceptions"/>
-                       <filter icon="terp-mrp" string="Late"
-                           domain="['&amp;', ('date_planned::date','&lt;', current_date), ('state', 'in', ('draft', 'confirmed'))]"
-                           help="Procurement started late" />
-                       <separator orientation="vertical"/>
-                       <field name="name"/>
-                       <field name="origin"/>
-                       <field name="product_id" />
-                       <field name="date_planned" widget="date"/>
-                       <field name="state" />
-                    </group>
-                    <newline/>
-                    <group expand="1" string="Group By" colspan="4" col="8">
-                        <filter string="Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Reason" icon="terp-mrp" domain="[]" context="{'group_by':'name'}"/>
-                        <filter string="Scheduled Date" icon="terp-mrp" domain="[]" context="{'group_by':'date_planned'}"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-        <record id="mrp_procurement_action" model="ir.actions.act_window">
-            <field name="name">Procurement Orders</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">mrp.procurement</field>
-            <field name="view_type">form</field>
-            <field name="view_id" eval="False"/>
-            <field name="search_view_id" ref="view_mrp_procurement_filter"/>
-        </record>
-        <menuitem action="mrp_procurement_action" id="menu_mrp_procurement_action" parent="mrp.menu_mrp_manufacturing"
-                  sequence="2" />
-
-        <record id="mrp_procurement_action3" model="ir.actions.act_window">
-            <field name="name">Procurements</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">mrp.procurement</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="search_view_id" ref="view_mrp_procurement_filter"/>
-            <field name="domain">[]</field>
-            <field name="context">{}</field>
-        </record>
-
-        <record id="mrp_procurement_action5" model="ir.actions.act_window">
-            <field name="name">Procurement Exceptions</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">mrp.procurement</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','=','exception')]</field>
-        </record>
-
-        <menuitem action="mrp_procurement_action5" id="menu_mrp_procurement_exception_action" parent="mrp.menu_mrp_control"
-                  sequence="1" />
-        <record id="mrp_procurement_action4" model="ir.actions.act_window">
-            <field name="name">Procurement Exceptions to Fix</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">mrp.procurement</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','=','exception'), ('message', '&lt;&gt;', '')]</field>
-            <field name="filter" eval="True"/>
-        </record>
-
-        <record id="mrp_procurement_action11" model="ir.actions.act_window">
-            <field name="name">Temporary Procurement Exceptions</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">mrp.procurement</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','=','exception'), ('message', '=', '')]</field>
-        </record>
-
-        <!-- Order Point -->
-        <record id="view_warehouse_orderpoint_tree" model="ir.ui.view">
-            <field name="name">stock.warehouse.orderpoint.tree</field>
-            <field name="model">stock.warehouse.orderpoint</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <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"/>
-                    <field name="product_max_qty"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="warehouse_orderpoint_search">
-            <field name="name">stock.warehouse.orderpoint.search</field>
-            <field name="model">stock.warehouse.orderpoint</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Minimum Stock Rules Search">
-                    <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>
-
-        <record id="view_warehouse_orderpoint_form" model="ir.ui.view">
-            <field name="name">stock.warehouse.orderpoint.form</field>
-            <field name="model">stock.warehouse.orderpoint</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Minimum Stock Rules">
-                    <group col="2" colspan="2">
-                        <separator string="General Information" colspan="2" />
-                        <field name="name" />
-                        <field name="product_id" on_change="onchange_product_id(product_id)"/>
-                        <field name="product_uom"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Locations" colspan="2" />
-                        <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection"/>
-                        <field name="location_id"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Quantity Rules" colspan="2" />
-                        <field name="product_min_qty"/>
-                        <field name="product_max_qty"/>
-                        <field name="qty_multiple"/>
-                    </group>
-                    <group col="2" colspan="2" groups="base.group_extended">
-                        <separator string="Misc" colspan="2" />
-                        <field name="procurement_id" readonly="1"/>
-                        <field name="active" />
-                    </group>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_orderpoint_form" model="ir.actions.act_window">
-            <field name="name">Minimum Stock Rules</field>
-            <field name="res_model">stock.warehouse.orderpoint</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="view_warehouse_orderpoint_tree"/>
-            <field name="search_view_id" ref="warehouse_orderpoint_search" />
-        </record>
-        <menuitem action="action_orderpoint_form" id="menu_action_orderpoint_form" parent="menu_mrp_reordering"/>
-
-        <act_window domain="[('warehouse_id', '=', active_id)]" id="act_stock_warehouse_2_stock_warehouse_orderpoint" name="Minimum Stock Rules" res_model="stock.warehouse.orderpoint" src_model="stock.warehouse"/>
-
-        <!-- add product_uom to context to be the default value when adding new orderpoints -->
-        <act_window
-            context="{'product_uom': locals().has_key('uom_id') and uom_id}"
-            domain="[('product_id', '=', active_id)]"
-            id="act_product_product_2_stock_warehouse_orderpoint"
-            name="Minimum Stock Rules"
-            res_model="stock.warehouse.orderpoint"
-            src_model="product.product"/>
 
         <act_window
             id="action_product_bom_structure"
diff --git a/addons/mrp/mrp_workflow.xml b/addons/mrp/mrp_workflow.xml
index 8be8f97b5d9..791c376ef92 100644
--- a/addons/mrp/mrp_workflow.xml
+++ b/addons/mrp/mrp_workflow.xml
@@ -113,241 +113,66 @@
             <field name="act_to" ref="prod_act_cancel"/>
             <field name="signal">button_cancel</field>
         </record>
-
+        
         <!-- Procurement -->
-
-        <record id="wkf" model="workflow">
-            <field name="name">mrp.procurement.basic</field>
-            <field name="osv">mrp.procurement</field>
-            <field name="on_create">True</field>
-        </record>
-
-        <record id="act_draft" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="flow_start">True</field>
-            <field name="name">draft</field>
-        </record>
-        <record id="act_cancel" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="name">cancel</field>
-            <field name="kind">function</field>
-            <field name="action">action_cancel()</field>
-            <field name="flow_stop">True</field>
-        </record>
-        <record id="act_confirm" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="name">confirm</field>
-            <field name="kind">function</field>
-            <field name="action">action_confirm()</field>
-        </record>
-        <record id="act_confirm_wait" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="name">confirm_wait</field>
-            <field name="kind">function</field>
-            <field name="action">write({'state':'exception'})</field>
-        </record>
-        <record id="act_confirm_mts" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="name">confirm_mts</field>
-        </record>
-        <record id="act_confirm_mto" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="name">confirm_mto</field>
-        </record>
-        <record id="act_make_to_stock" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="name">make_to_stock</field>
-            <field name="kind">function</field>
-            <field name="action">action_move_assigned()</field>
-        </record>
         <record id="act_produce" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
+            <field name="wkf_id" ref="mrp_procurement.wkf_procurement"/>
             <field name="name">produce</field>
             <field name="kind">subflow</field>
             <field name="subflow_id" search="[('osv','=','mrp.production')]"/>
             <field name="action">action_produce_assign_product()</field>
         </record>
         <record id="act_produce_check" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
+            <field name="wkf_id" ref="mrp_procurement.wkf_procurement"/>
             <field name="name">produce_check</field>
         </record>
         <record id="act_produce_service" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
+            <field name="wkf_id" ref="mrp_procurement.wkf_procurement"/>
             <field name="name">produce_service</field>
             <field name="kind">function</field>
             <field name="action">action_produce_assign_service()</field>
         </record>
-        <record id="act_buy" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="name">buy</field>
-            <field name="kind">subflow</field>
-            <field name="subflow_id" search="[('osv','=','purchase.order')]"/>
-            <field name="action">action_po_assign()</field>
-        </record>
-        <record id="act_make_done" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="name">ready</field>
-            <field name="kind">function</field>
-            <field name="action">action_ready()</field>
-        </record>
-        <record id="act_wait_done" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="name">wait_done</field>
-            <field name="kind">function</field>
-            <field name="action">write({'state':'waiting'})</field>
-        </record>
-
-        <record id="act_done" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="flow_stop">True</field>
-            <field name="name">done</field>
-            <field name="kind">function</field>
-            <field name="action">action_done()</field>
-        </record>
-
-        <record id="trans_draft_confirm" model="workflow.transition">
-            <field name="act_from" ref="act_draft"/>
-            <field name="act_to" ref="act_confirm"/>
-            <field name="signal">button_confirm</field>
-        </record>
-        <record id="trans_confirm_cancel2" model="workflow.transition">
-            <field name="act_from" ref="act_confirm"/>
-            <field name="act_to" ref="act_wait_done"/>
-            <field name="signal">button_wait_done</field>
-            <field name="condition">True</field>
-        </record>
-        <record id="trans_confirm_wait_done" model="workflow.transition">
-            <field name="act_from" ref="act_wait_done"/>
-            <field name="act_to" ref="act_done"/>
-            <field name="condition">check_move_done()</field>
-            <field name="trigger_model">stock.move</field>
-            <field name="trigger_expr_id">[move_id.id]</field>
-        </record>
-
-        <record id="trans_confirm_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_confirm"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">button_check</field>
-            <field name="condition">test_cancel()</field>
-        </record>
-        <record id="trans_confirm_confirm_wait" model="workflow.transition">
-            <field name="act_from" ref="act_confirm"/>
-            <field name="act_to" ref="act_confirm_wait"/>
-            <field name="signal">button_check</field>
-            <field name="condition">not test_cancel()</field>
-        </record>
-        <record id="trans_confirm_wait_confirm_mto" model="workflow.transition">
-            <field name="act_from" ref="act_confirm_wait"/>
-            <field name="act_to" ref="act_confirm_mto"/>
-            <field name="condition">procure_method=='make_to_order'</field>
-        </record>
-        <record id="trans_confirm_wait_confirm_mts" model="workflow.transition">
-            <field name="act_from" ref="act_confirm_wait"/>
-            <field name="act_to" ref="act_confirm_mts"/>
-            <field name="condition">procure_method=='make_to_stock'</field>
-        </record>
-        <record id="trans_confirm_mts_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_confirm_mts"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">button_cancel</field>
-        </record>
-        <record id="trans_confirm_waiting_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_wait_done"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">button_cancel</field>
-        </record>
-        <record id="trans_confirm_mts_confirm" model="workflow.transition">
-            <field name="act_from" ref="act_confirm_mts"/>
-            <field name="act_to" ref="act_confirm"/>
-            <field name="signal">button_restart</field>
-        </record>
-        <record id="trans_confirm_mto_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_confirm_mto"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">button_cancel</field>
-        </record>
-        <record id="trans_confirm_mto_confirm" model="workflow.transition">
-            <field name="act_from" ref="act_confirm_mto"/>
-            <field name="act_to" ref="act_confirm"/>
-            <field name="signal">button_restart</field>
-        </record>
-        <record id="trans_draft_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_draft"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">button_cancel</field>
-        </record>
-        <record id="trans_confirm_mts_make_to_stock" model="workflow.transition">
-            <field name="act_from" ref="act_confirm_mts"/>
-            <field name="act_to" ref="act_make_to_stock"/>
-            <field name="condition">check_make_to_stock()</field>
-        </record>
+        
         <record id="trans_confirm_mto_produce_check" model="workflow.transition">
-            <field name="act_from" ref="act_confirm_mto"/>
+            <field name="act_from" ref="mrp_procurement.act_confirm_mto"/>
             <field name="act_to" ref="act_produce_check"/>
             <field name="condition">check_produce()</field>
         </record>
-        <record id="trans_product_check_produce" model="workflow.transition">
-            <field name="act_from" ref="act_produce_check"/>
-            <field name="act_to" ref="act_produce"/>
-            <field name="condition">check_product()</field>
-        </record>
         <record id="trans_product_check_produce_service" model="workflow.transition">
             <field name="act_from" ref="act_produce_check"/>
             <field name="act_to" ref="act_produce_service"/>
             <field name="condition">not check_product()</field>
         </record>
-        <record id="trans_confirm_mto_buy" model="workflow.transition">
-            <field name="act_from" ref="act_confirm_mto"/>
-            <field name="act_to" ref="act_buy"/>
-            <field name="condition">check_buy()</field>
-        </record>
-        <record id="trans_make_to_stock_make_done" model="workflow.transition">
-            <field name="act_from" ref="act_make_to_stock"/>
-            <field name="act_to" ref="act_make_done"/>
-            <field name="condition">True</field>
-            <field name="trigger_model" eval="False"/>
-            <field name="trigger_expr_id" eval="False"/>
-        </record>
-        <record id="trans_produce_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_produce"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">subflow.cancel</field>
-        </record>
+        
         <record id="trans_produce_service_cancel" model="workflow.transition">
             <field name="act_from" ref="act_produce_service"/>
-            <field name="act_to" ref="act_cancel"/>
+            <field name="act_to" ref="mrp_procurement.act_cancel"/>
             <field name="signal">subflow.cancel</field>
         </record>
-        <record id="trans_buy_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_buy"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">subflow.cancel</field>
-        </record>
-
-        <record id="trans_produce_make_done" model="workflow.transition">
-            <field name="act_from" ref="act_produce"/>
-            <field name="act_to" ref="act_make_done"/>
-            <field name="signal">subflow.done</field>
-        </record>
-
+        
         <record id="trans_produce_service_make_done" model="workflow.transition">
             <field name="act_from" ref="act_produce_service"/>
-            <field name="act_to" ref="act_make_done"/>
+            <field name="act_to" ref="mrp_procurement.act_make_done"/>
         </record>
-        <record id="trans_buy_make_done" model="workflow.transition">
-            <field name="act_from" ref="act_buy"/>
-            <field name="act_to" ref="act_make_done"/>
-            <field name="signal">subflow.delivery_done</field>
+        
+        <record id="trans_product_check_produce" model="workflow.transition">
+            <field name="act_from" ref="act_produce_check"/>
+            <field name="act_to" ref="act_produce"/>
+            <field name="condition">check_product()</field>
         </record>
-        <record id="trans_make_done_done" model="workflow.transition">
-            <field name="act_from" ref="act_make_done"/>
-            <field name="act_to" ref="act_done"/>
-            <field name="condition">action_check_finnished()</field>
+        
+        <record id="trans_produce_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_produce"/>
+            <field name="act_to" ref="mrp_procurement.act_cancel"/>
+            <field name="signal">subflow.cancel</field>
         </record>
-        <record id="trans_make_done_confirm" model="workflow.transition">
-            <field name="act_from" ref="act_make_done"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="condition">check_move_cancel()</field>
+        
+        <record id="trans_produce_make_done" model="workflow.transition">
+            <field name="act_from" ref="act_produce"/>
+            <field name="act_to" ref="mrp_procurement.act_make_done"/>
+            <field name="signal">subflow.done</field>
         </record>
+        
+        
     </data>
 </openerp>
diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml
index 17d72a520f2..08d66570b1f 100644
--- a/addons/mrp/process/procurement_process.xml
+++ b/addons/mrp/process/procurement_process.xml
@@ -1,43 +1,16 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
-
-        <!--
-            Process
-        -->
-
-        <record id="process_process_procurementprocess0" model="process.process">
-            <field eval="&quot;&quot;&quot;Procurement&quot;&quot;&quot;" name="name"/>
-            <field name="model_id" ref="mrp.model_mrp_procurement"/>
-            <field eval="1" name="active"/>
-        </record>
-
-        <!--
-            Process Node
-        -->
-
-        <record id="process_node_stockproduct1" model="process.node">
+    
+    	<record id="process_node_procureproducts0" model="process.node">
             <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
-            <field name="model_id" ref="mrp.model_mrp_procurement"/>
-            <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;For stockable products and consumables&quot;&quot;&quot;" name="note"/>
-            <field eval="&quot;&quot;&quot;Stockable Product&quot;&quot;&quot;" name="name"/>
-            <field name="process_id" ref="mrp.process_process_stockableproductprocess0"/>
-            <field name="subflow_id" ref="process_process_procurementprocess0"/>
+            <field name="model_id" ref="mrp_procurement.model_mrp_procurement"/>
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;The way to procurement depends on the product type.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Procure Products&quot;&quot;&quot;" name="name"/>
+            <field name="process_id" ref="mrp_procurement.process_process_procurementprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
-            <field eval="1" name="flow_start"/>
-        </record>
-
-        <record id="process_node_serviceproduct1" model="process.node">
-            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
-            <field name="model_id" ref="mrp.model_mrp_procurement"/>
-            <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;For Services.&quot;&quot;&quot;" name="note"/>
-            <field eval="&quot;&quot;&quot;Service&quot;&quot;&quot;" name="name"/>
-            <field name="process_id" ref="mrp.process_process_serviceproductprocess0"/>
-            <field name="subflow_id" ref="process_process_procurementprocess0"/>
-            <field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
-            <field eval="1" name="flow_start"/>
+            <field eval="0" name="flow_start"/>
         </record>
 
         <record id="process_node_productionorder0" model="process.node">
@@ -46,31 +19,31 @@
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Drives the procurement orders for raw material.&quot;&quot;&quot;" name="note"/>
             <field eval="&quot;&quot;&quot;Production Order&quot;&quot;&quot;" name="name"/>
-            <field name="process_id" ref="process_process_procurementprocess0"/>
+            <field name="process_id" ref="mrp_procurement.process_process_procurementprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'picking_except', 'confirmed', 'ready', 'in_production', 'cancel', 'done')&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
         </record>
 
-        <record id="process_node_minimumstockrule0" model="process.node">
-            <field name="menu_id" ref="mrp.menu_action_orderpoint_form"/>
-            <field name="model_id" ref="mrp.model_stock_warehouse_orderpoint"/>
-            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Linked to the 'Minimum stock rule' supplying method.&quot;&quot;&quot;" name="note"/>
-            <field eval="&quot;&quot;&quot;Minimum Stock&quot;&quot;&quot;" name="name"/>
-            <field name="process_id" ref="process_process_procurementprocess0"/>
-            <field eval="1" name="flow_start"/>
-        </record>
-
         <record id="process_node_procureproducts0" model="process.node">
             <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
             <field name="model_id" ref="mrp.model_mrp_procurement"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;The way to procurement depends on the product type.&quot;&quot;&quot;" name="note"/>
             <field eval="&quot;&quot;&quot;Procure Products&quot;&quot;&quot;" name="name"/>
-            <field name="process_id" ref="process_process_procurementprocess0"/>
+            <field name="process_id" ref="mrp_procurement.process_process_procurementprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
+        
+        <record id="process_node_minimumstockrule0" model="process.node">
+            <field name="menu_id" ref="mrp.menu_action_orderpoint_form"/>
+            <field name="model_id" ref="mrp_procurement.model_stock_warehouse_orderpoint"/>
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Linked to the 'Minimum stock rule' supplying method.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Minimum Stock&quot;&quot;&quot;" name="name"/>
+            <field name="process_id" ref="mrp_procurement.process_process_procurementprocess0"/>
+            <field eval="1" name="flow_start"/>
+        </record>
 
         <record id="process_node_stockproduct0" model="process.node">
             <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
@@ -79,10 +52,22 @@
             <field eval="&quot;&quot;&quot;Product type is Stockable or Consumable.&quot;&quot;&quot;" name="note"/>
             <field eval="&quot;&quot;&quot;Stockable Product&quot;&quot;&quot;" name="name"/>
             <field name="subflow_id" ref="process_process_stockableproductprocess0"/>
-            <field name="process_id" ref="process_process_procurementprocess0"/>
+            <field name="process_id" ref="mrp_procurement.process_process_procurementprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
+        
+        <record id="process_node_stockproduct1" model="process.node">
+            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
+            <field name="model_id" ref="mrp.model_mrp_procurement"/>
+            <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;For stockable products and consumables&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Stockable Product&quot;&quot;&quot;" name="name"/>
+            <field name="process_id" ref="mrp.process_process_stockableproductprocess0"/>
+            <field name="subflow_id" ref="mrp_procurement.process_process_procurementprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
+            <field eval="1" name="flow_start"/>
+        </record>
 
         <record id="process_node_serviceproduct0" model="process.node">
             <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
@@ -91,10 +76,22 @@
             <field eval="&quot;&quot;&quot;Product type is service&quot;&quot;&quot;" name="note"/>
             <field eval="&quot;&quot;&quot;Service&quot;&quot;&quot;" name="name"/>
             <field name="subflow_id" ref="process_process_serviceproductprocess0"/>
-            <field name="process_id" ref="process_process_procurementprocess0"/>
+            <field name="process_id" ref="mrp_procurement.process_process_procurementprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
+        
+        <record id="process_node_serviceproduct1" model="process.node">
+            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
+            <field name="model_id" ref="mrp.model_mrp_procurement"/>
+            <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;For Services.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Service&quot;&quot;&quot;" name="name"/>
+            <field name="process_id" ref="mrp.process_process_serviceproductprocess0"/>
+            <field name="subflow_id" ref="mrp_procurement.process_process_procurementprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
+            <field eval="1" name="flow_start"/>
+        </record>
 
         <record id="process_node_purchaseprocure0" model="process.node">
             <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
@@ -102,14 +99,14 @@
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Procurement Orders&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;For purchased material&quot;&quot;&quot;" name="note"/>
-            <field name="subflow_id" ref="process_process_procurementprocess0"/>
+            <field name="subflow_id" ref="mrp_procurement.process_process_procurementprocess0"/>
             <field name="process_id" ref="purchase.process_process_purchaseprocess0"/>
             <field eval="1" name="flow_start"/>
         </record>
 
         <record id="process_node_productminimumstockrule0" model="process.node">
             <field name="menu_id" ref="mrp.menu_action_orderpoint_form"/>
-            <field name="model_id" ref="mrp.model_stock_warehouse_orderpoint"/>
+            <field name="model_id" ref="mrp_procurement.model_stock_warehouse_orderpoint"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Minimum Stock&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Automatic procurement rule&quot;&quot;&quot;" name="note"/>
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index 48f27679435..d5e00b9cbda 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -1,7 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_mrp_workcenter","mrp.workcenter","model_mrp_workcenter","mrp.group_mrp_user",1,0,0,0
-"access_mrp_property_group","mrp.property.group","model_mrp_property_group","mrp.group_mrp_user",1,0,0,0
-"access_mrp_property","mrp.property","model_mrp_property","mrp.group_mrp_user",1,0,0,0
 "access_mrp_routing","mrp.routing","model_mrp_routing","mrp.group_mrp_user",1,0,0,0
 "access_mrp_routing_workcenter","mrp.routing.workcenter","model_mrp_routing_workcenter","mrp.group_mrp_user",1,0,0,0
 "access_mrp_bom","mrp.bom","model_mrp_bom","mrp.group_mrp_user",1,0,0,0
@@ -10,11 +8,7 @@
 "access_mrp_production_workcenter_line","mrp.production.workcenter.line","model_mrp_production_workcenter_line","mrp.group_mrp_user",1,1,1,1
 "access_mrp_production_product_line","mrp.production.product.line","model_mrp_production_product_line","mrp.group_mrp_user",1,1,1,1
 "access_mrp_procurement","mrp.procurement","model_mrp_procurement","mrp.group_mrp_user",1,1,1,1
-"access_stock_warehouse_orderpoint","stock.warehouse.orderpoint","model_stock_warehouse_orderpoint","mrp.group_mrp_user",1,0,0,0
-"access_stock_warehouse_orderpoint_manager","stock.warehouse.orderpoint.manager","model_stock_warehouse_orderpoint","mrp.group_mrp_manager",1,1,1,1
 "access_mrp_workcenter_manager","mrp.workcenter.manager","model_mrp_workcenter","mrp.group_mrp_user",1,1,1,1
-"access_mrp_property_group_manager","mrp.property.group.manager","model_mrp_property_group","mrp.group_mrp_user",1,1,1,1
-"access_mrp_property_manager","mrp.property.manager","model_mrp_property","mrp.group_mrp_user",1,1,1,1
 "access_mrp_routing_manager","mrp.routing.manager","model_mrp_routing","mrp.group_mrp_manager",1,1,1,1
 "access_mrp_routing_workcenter_manager","mrp.routing.workcenter.manager","model_mrp_routing_workcenter","mrp.group_mrp_manager",1,1,1,1
 "access_mrp_bom_manager","mrp.bom.manager","model_mrp_bom","mrp.group_mrp_manager",1,1,1,1
@@ -32,10 +26,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
 "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
diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml
index 955bdad2fdd..4d47e374e02 100644
--- a/addons/mrp/security/mrp_security.xml
+++ b/addons/mrp/security/mrp_security.xml
@@ -16,20 +16,6 @@
   	</record>
 
 <!-- Multi -->
-    <record model="ir.rule" id="mrp_procurement_rule">
-    	<field name="name">mrp_procurement multi-company</field>
-        <field name="model_id" search="[('model','=','mrp.procurement')]" model="ir.model"/>
-        <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
-    </record>
-
-    <record model="ir.rule" id="stock_warehouse_orderpoint_rule">
-    	<field name="name">stock_warehouse.orderpoint multi-company</field>
-        <field name="model_id" search="[('model','=','stock.warehouse.orderpoint')]" model="ir.model"/>
-        <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
-    </record>
-
     <record model="ir.rule" id="mrp_production_rule">
     	<field name="name">mrp_production multi-company</field>
         <field name="model_id" search="[('model','=','mrp.production')]" model="ir.model"/>
diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index 4a35d6003cf..dcb7d4573c1 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -27,74 +27,6 @@ import ir
 import netsvc
 import time
 
-
-class stock_warehouse_orderpoint(osv.osv):
-    """
-    Defines Minimum stock rules.
-    """
-    _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, ondelete='cascade', 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 procurement 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 procurement to bring the virtual stock to the Max Quantity."),
-        'qty_multiple': fields.integer('Qty Multiple', required=True,
-            help="The procurement quantity will by rounded up to this multiple."),
-        'procurement_id': fields.many2one('mrp.procurement', 'Latest procurement'),
-        '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={}):
-        """ Finds location id for changed warehouse.
-        @param warehouse_id: Changed id of warehouse.
-        @return: Dictionary of values.
-        """
-        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={}):
-        """ Finds UoM for changed product.
-        @param product_id: Changed id of product.
-        @return: Dictionary of values.
-        """
-        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'
     
diff --git a/addons/mrp/test/mrp_phantom_bom.yml b/addons/mrp/test/mrp_phantom_bom.yml
new file mode 100644
index 00000000000..df4ade1cb6e
--- /dev/null
+++ b/addons/mrp/test/mrp_phantom_bom.yml
@@ -0,0 +1,234 @@
+-
+  In order to test the mrp phantom bom type in OpenERP, I will create products 
+  and then I will create Phantom bom structure for those products.
+-
+  I create the products required to produce some orange juices: Oranges, Sugar and Water.
+-
+  !record {model: product.uom, id: product_uom_litre0}:
+    category_id: product.product_uom_categ_kgm
+    factor: 1.0
+    name: Litre
+    rounding: 0.01 
+- 
+  !record {model: product.product, id: product_product_orangejuice0}:
+    categ_id: product.cat1
+    name: Orange Juice
+    procure_method: make_to_order
+    supply_method: produce
+    type: product
+    uom_id: product_uom_litre0
+    uom_po_id: product_uom_litre0
+- 
+  !record {model: product.product, id: product_product_orange0}:
+    categ_id: product.cat1
+    name: Orange
+    procure_method: make_to_stock
+    seller_ids:
+      - delay: 1
+        name: base.res_partner_asus
+        qty: 1.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_kgm
+    uom_po_id: product.product_uom_kgm
+- 
+  !record {model: product.product, id: product_product_sugar0}:
+    categ_id: product.cat1
+    name: Sugar
+    procure_method: make_to_stock
+    seller_ids:
+      - delay: 1
+        name: base.res_partner_desertic_hispafuentes
+        qty: 2.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_kgm
+    uom_po_id: product.product_uom_kgm
+- 
+  !record {model: product.product, id: product_product_water0}:
+    categ_id: product.cat1
+    name: Water
+    procure_method: make_to_stock
+    supply_method: buy
+    type: consu
+    uom_id: product_uom_litre0
+    uom_po_id: product_uom_litre0
+-
+  I define the BoM to produce an orange juice
+- 
+  !record {model: mrp.bom, id: mrp_bom_orangejuice0}:
+    company_id: base.main_company
+    name: Orange Juice
+    product_efficiency: 1.0
+    product_id: product_product_orangejuice0
+    product_qty: 1.0
+    product_uom: product_uom_litre0
+    type: phantom
+- 
+  !record {model: mrp.bom, id: mrp_bom_orangejuice0}:
+    bom_lines:
+      - bom_id: mrp_bom_orangejuice0
+        company_id: base.main_company
+        name: Orange
+        product_efficiency: 1.0
+        product_id: product_product_orange0
+        product_qty: 0.5
+        product_uom: product.product_uom_kgm
+        type: normal
+      - bom_id: mrp_bom_orangejuice0
+        company_id: base.main_company
+        name: Sugar
+        product_efficiency: 1.0
+        product_id: product_product_sugar0
+        product_qty: 0.02
+        product_uom: product.product_uom_kgm
+        type: normal
+      - bom_id: mrp_bom_orangejuice0
+        company_id: base.main_company
+        name: Water
+        product_efficiency: 1.0
+        product_id: product_product_water0
+        product_qty: 0.80000000000000004
+        product_uom: product_uom_litre0
+        type: normal
+-
+  I define Minimum stock rules for my stockable products orange and sugar
+- 
+  !record {model: stock.warehouse.orderpoint, id: stock_warehouse_orderpoint_op0}:
+    company_id: base.main_company
+    location_id: stock.stock_location_stock
+    logic: max
+    name: OP/00002
+    product_id: product_product_orange0
+    product_max_qty: 10.0
+    product_min_qty: 5.0
+    product_uom: product.product_uom_kgm
+    qty_multiple: 1
+    warehouse_id: stock.warehouse0
+- 
+  !record {model: stock.warehouse.orderpoint, id: stock_warehouse_orderpoint_op1}:
+    company_id: base.main_company
+    location_id: stock.stock_location_stock
+    logic: max
+    name: OP/00003
+    product_id: product_product_sugar0
+    product_max_qty: 4.0
+    product_min_qty: 2.0
+    product_uom: product.product_uom_kgm
+    qty_multiple: 1
+    warehouse_id: stock.warehouse0
+-
+  I want to produce 100 litres of Orange juice. I am creating a manufacturing order for this. 
+  I want to see how much quantities of sub products I need, to produce the Orange juice. 
+-
+  I compute the data. I get the bill of material of Orange juice and list of 
+  scheduled products according to my bom.
+- 
+  !record {model: mrp.production, id: mrp_production_mo0}:
+    company_id: base.main_company
+    date_planned: '2010-04-16 15:53:36'
+    location_dest_id: stock.stock_location_output
+    location_src_id: stock.stock_location_stock
+    name: MO/00002
+    product_id: product_product_orangejuice0
+    product_qty: 100.0
+    product_uom: product_uom_litre0
+- 
+  Creating an mrp.production record. Computing Bills of materials.
+- 
+  !record {model: mrp.production, id: mrp_production_mo0}:
+    bom_id: mrp.mrp_bom_orangejuice0
+    company_id: base.main_company
+    date_planned: '2010-04-16 15:53:36'
+    location_dest_id: stock.stock_location_output
+    location_src_id: stock.stock_location_stock
+    name: MO/00002
+    product_id: mrp.product_product_orangejuice0
+    product_lines:
+      - name: Orange
+        product_id: mrp.product_product_orange0
+        product_qty: 50.0
+        product_uom: product.product_uom_kgm
+        production_id: mrp_production_mo0
+      - name: Sugar
+        product_id: mrp.product_product_sugar0
+        product_qty: 2.0
+        product_uom: product.product_uom_kgm
+        production_id: mrp_production_mo0
+      - name: Water
+        product_id: mrp.product_product_water0
+        product_qty: 80.0
+        product_uom: mrp.product_uom_litre0
+        production_id: mrp_production_mo0
+    product_qty: 100.0
+    product_uom: mrp.product_uom_litre0
+-
+  I confirm the order.
+- 
+  !workflow {model: mrp.production, action: button_confirm, ref: mrp_production_mo0}
+-
+  I am checking Procurement orders. There are 3 orders generated for Oranges, Sugar and Water.
+-
+  !python {model: mrp.procurement}: |
+    from tools.translate import _
+    proc_ids = self.search(cr, uid, [('origin','=',':MO/00002')])
+    assert proc_ids, _('No Procurements!')
+-
+  The scheduler runs.
+-
+  !function {model: mrp.procurement, name: run_scheduler}:
+    - model: mrp.procurement
+      search: "[('origin','=',':MO/00002')]"
+-
+  I am checking Internal picking. I see one picking for Orange juice and its 
+  stock moves for Oranges, Sugar and Water made correctly.
+-
+  !python {model: stock.picking}: |
+    from tools.translate import _
+    pick_ids = self.search(cr, uid, [('origin','=',':MO/00002'),('type','=','internal')])
+    assert pick_ids, _('No Internal Pickings!')
+-
+  According to minimum stock rules. I have 2 purchase orders for 
+  Sugar with 6 Kg from Axelor and Orange 60 Kg from ASUStek.
+-
+  I confirm the purchase order of Sugar and Orange.
+-
+  !python {model: purchase.order}: |
+    from tools.translate import _
+    import netsvc
+    purch_ids = self.search(cr, uid, [('origin','in',['SCHEDULER','OP/00002','OP/00003'])])
+    assert purch_ids, _('No Purchase Orders were made!')
+    wf_service = netsvc.LocalService("workflow")
+    for p_id in purch_ids:
+    	wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
+-
+  I get the approval from both the suppliers. So I approve my purchase orders.
+-
+  !python {model: purchase.order}: |
+    from tools.translate import _
+    import netsvc
+    purch_ids = self.search(cr, uid, [('origin','in',['SCHEDULER','OP/00002','OP/00003']),('state','=','confirmed')])
+    assert purch_ids, _('No Confirmed Purchase Orders found!')
+    wf_service = netsvc.LocalService("workflow")
+    for p_id in purch_ids:
+    	wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_approve', cr)
+-
+  I see two incoming pickings for Orange and Sugar.
+-
+  !python {model: stock.picking}: |
+    from tools.translate import _
+    pick_ids = self.search(cr, uid, [('origin','in',['PO00001:SCHEDULER','PO00002:SCHEDULER','PO00003:OP/00002','PO00004:OP/00003']),('type','=','in')])
+    assert pick_ids, _('No Incoming Shipments found!')
+-
+  I receive both the products. My incoming pickings are done.
+-
+  !record {model: stock.partial.picking, id: stock_partial_picking0}:
+    date: '2010-04-30 16:53:36'
+    partner_id: base.res_partner_asus
+    address_id: base.res_partner_address_tang
+-
+  !python {model: stock.partial.picking}: |
+     pick_obj = self.pool.get('stock.picking')
+     picking_ids = pick_obj.search(cr, uid, [('origin','in',['PO00001:SCHEDULER','PO00002:SCHEDULER','PO00003:OP/00002','PO00004:OP/00003']),('type','=','in')])
+     self.do_partial(cr, uid, [1],context={'active_ids': picking_ids})
+     
\ No newline at end of file
diff --git a/addons/mrp/test/mrp_production_order.yml b/addons/mrp/test/mrp_production_order.yml
new file mode 100644
index 00000000000..023a9f22f31
--- /dev/null
+++ b/addons/mrp/test/mrp_production_order.yml
@@ -0,0 +1,139 @@
+-
+  In order to test the manufacturing order working with procurements I will use
+  some products with different supply method and procurement method, also check 
+  the bills of material for the products.
+-
+  I am creating one manufacturing order.
+- 
+  !record {model: mrp.production, id: mrp_production_mo0}:
+    bom_id: mrp.mrp_bom_9
+    routing_id: mrp.mrp_routing_0
+    company_id: base.main_company
+    date_planned: '2010-05-06 14:55:52'
+    location_dest_id: stock.stock_location_stock
+    location_src_id: stock.stock_location_stock
+    name: MO/00004
+    product_id: product.product_product_pc1
+    product_qty: 5.0
+    product_uom: product.product_uom_unit
+    product_uos_qty: 0.0
+- 
+  Creating a mrp.production.workcenter.line record
+- 
+  !record {model: mrp.production.workcenter.line, id: mrp_production_workcenter_line_assemblyline0}:
+    cycle: 5.0
+    hour: 10.0
+    name: Assembly Line 1
+    production_id: mrp_production_mo0
+    sequence: 0.0
+    workcenter_id: mrp.mrp_workcenter_0
+- 
+  Creating a mrp.production.product.line record
+- 
+  !record {model: mrp.production.product.line, id: mrp_production_product_line_regularprocessorconfig0}:
+    name: Regular processor config
+    product_id: product.product_product_cpu_gen
+    product_qty: 5.0
+    product_uom: product.product_uom_unit
+    product_uos_qty: 0.0
+    production_id: mrp_production_mo0
+- 
+  Creating a mrp.production.product.line record
+- 
+  !record {model: mrp.production.product.line, id: mrp_production_product_line_hddseagategb0}:
+    name: HDD Seagate 7200.8 80GB
+    product_id: product.product_product_hdd1
+    product_qty: 5.0
+    product_uom: product.product_uom_unit
+    product_uos_qty: 0.0
+    production_id: mrp_production_mo0
+- 
+  Creating a mrp.production.product.line record
+- 
+  !record {model: mrp.production.product.line, id: mrp_production_product_line_atxmidsizetower0}:
+    name: ATX Mid-size Tower
+    product_id: product.product_product_tow1
+    product_qty: 5.0
+    product_uom: product.product_uom_unit
+    product_uos_qty: 0.0
+    production_id: mrp_production_mo0
+- 
+  Creating a mrp.production.product.line record
+- 
+  !record {model: mrp.production.product.line, id: mrp_production_product_line_mouse0}:
+    name: Mouse
+    product_id: product.product_product_25
+    product_qty: 5.0
+    product_uom: product.product_uom_unit
+    product_uos_qty: 0.0
+    production_id: mrp_production_mo0
+- 
+  Creating a mrp.production.product.line record
+- 
+  !record {model: mrp.production.product.line, id: mrp_production_product_line_keyboard0}:
+    name: Keyboard
+    product_id: product.product_product_24
+    product_qty: 5.0
+    product_uom: product.product_uom_unit
+    product_uos_qty: 0.0
+    production_id: mrp_production_mo0
+-
+  I confirm the order.
+- 
+  !workflow {model: mrp.production, action: button_confirm, ref: mrp_production_mo0}
+-
+  I am checking Procurement orders. 
+-
+  !python {model: mrp.procurement}: |
+    from tools.translate import _
+    proc_ids = self.search(cr, uid, [('origin','=',':MO/00004')])
+    assert proc_ids, _('No Procurements!')
+-
+  The scheduler runs.
+-
+  !function {model: mrp.procurement, name: run_scheduler}:
+    - model: mrp.procurement
+      search: "[('origin','=',':MO/00004')]"
+-
+  I am checking Internal picking.
+-
+  !python {model: stock.picking}: |
+    from tools.translate import _
+    pick_ids = self.search(cr, uid, [('origin','=',':MO/00004'),('type','=','internal')])
+    assert pick_ids, _('No Internal Pickings!')
+-
+  I see that there is a manufacturing order for the subproduct of PC1 with ready state.
+-
+  !python {model: mrp.production}: |
+    from tools.translate import _
+    order_ids = self.search(cr, uid, [('origin','=',':MO/00004'),('state','=','ready')])
+    assert order_ids, _('No manufacturing order!')
+-
+  I start producing that product first. So I marked it as started.
+-
+  !record {model: mrp.product.produce, id: mrp_product_produce0}:
+    product_qty: 5.00
+    mode: 'consume_produce'
+-
+  !python {model: mrp.product.produce}: |
+    prod_obj = self.pool.get('mrp.production')
+    prod_ids = prod_obj.search(cr, uid, [('origin','=',':MO/00004')])
+    self.do_produce(cr, uid, [1], context={'active_ids': prod_ids})
+-
+  Now the manufacturing order for subproduct CPU_GEN is done. And manufacturing
+  order for PC1 is in ready state.
+-
+  !python {model: mrp.production}: |
+    from tools.translate import _
+    prod_ids = self.search(cr, uid, [('origin','=',':MO/00004'),('state','=','done')])
+    assert prod_ids, _('Manufacturing order is yet not done!')
+-
+  I start producing the product PC1.
+-
+  !workflow {model: mrp.production, action: button_produce, ref: mrp_production_mo0}
+-
+  !python {model: mrp.product.produce}: |
+    from tools.translate import _
+    prod_obj = self.pool.get('mrp.production')
+    prod_ids = prod_obj.search(cr, uid, [('product_id.default_code','=','PC1')])
+    self.do_produce(cr, uid, [1], context={'active_ids': prod_ids})
diff --git a/addons/mrp/wizard/__init__.py b/addons/mrp/wizard/__init__.py
index 045d7f1bd71..aa4408e543e 100644
--- a/addons/mrp/wizard/__init__.py
+++ b/addons/mrp/wizard/__init__.py
@@ -20,14 +20,10 @@
 ##############################################################################
 
 import mrp_product_produce
-import orderpoint_procurement
-import mrp_procurement
-import schedulers_all
 import mrp_price
 import mrp_workcenter_load
 #import mrp_track_prod
 import change_production_qty
-import make_procurement_product
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/mrp/wizard/mrp_track_prod.py b/addons/mrp/wizard/mrp_track_prod.py
index 11e1ec32ec6..43929b47dc7 100644
--- a/addons/mrp/wizard/mrp_track_prod.py
+++ b/addons/mrp/wizard/mrp_track_prod.py
@@ -56,33 +56,35 @@ class mrp_track_move(osv.osv_memory):
         """
         res = super(mrp_track_move, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
         record_id = context and context.get('active_id', False) or False
-        if record_id:
-            prod_obj = self.pool.get('mrp.production')
-            prod = prod_obj.browse(cr, uid, record_id)
-            try:
-                if prod.state != 'done':
-                    res['arch'] = '''<form string="Track lines">
-                                        <label colspan="4" string="You can not split an unfinished production Output." />
-                                        <group col="2" colspan="4">
-                                            <button icon='gtk-cancel' special="cancel"
-                                                string="Exit" />
-                                        </group>
-                                    </form>
-                                    '''
-                else:
-                    arch_lst = ['<form string="Track lines">', '<label colspan="4" string="The field on each line says whether this lot should be tracked or not." />']
-                    for m in [line for line in prod.move_created_ids]:
-                        quantity = m.product_qty
-                        res['fields']['track%s' %m.id] = {'string' : m.product_id.name, 'type' : 'boolean', 'default' : lambda x,y,z: False}
-                        arch_lst.append('<field name="track%s" />\n<newline />' %m.id)
-                    arch_lst.append('<group col="2" colspan="4">')
-                    arch_lst.append('<button icon=\'gtk-cancel\' special="cancel" string="Cancel" />')
-                    arch_lst.append('<button name="track_lines" string="Track" colspan="1" type="object" icon="gtk-ok" />')
-                    arch_lst.append('</group>')
-                    arch_lst.append('</form>')
-                    res['arch'] = '\n'.join(arch_lst)
-            except Exception,e:
-                return res
+        active_model = context.get('active_model')
+
+        if not record_id or (active_model and active_model != 'mrp.production'):
+            return res
+        
+        prod_obj = self.pool.get('mrp.production')
+        prod = prod_obj.browse(cr, uid, record_id)
+        if prod.state != 'done':
+            res['arch'] = '''<form string="Track lines">
+                                <label colspan="4" string="You can not split an unfinished production Output." />
+                                <group col="2" colspan="4">
+                                    <button icon='gtk-cancel' special="cancel"
+                                        string="Exit" />
+                                </group>
+                            </form>
+                            '''
+        else:
+            arch_lst = ['<form string="Track lines">', '<label colspan="4" string="The field on each line says whether this lot should be tracked or not." />']
+            for m in [line for line in prod.move_created_ids]:
+                quantity = m.product_qty
+                res['fields']['track%s' %m.id] = {'string' : m.product_id.name, 'type' : 'boolean', 'default' : lambda x,y,z: False}
+                arch_lst.append('<field name="track%s" />\n<newline />' %m.id)
+            arch_lst.append('<group col="2" colspan="4">')
+            arch_lst.append('<button icon=\'gtk-cancel\' special="cancel" string="Cancel" />')
+            arch_lst.append('<button name="track_lines" string="Track" colspan="1" type="object" icon="gtk-ok" />')
+            arch_lst.append('</group>')
+            arch_lst.append('</form>')
+            res['arch'] = '\n'.join(arch_lst)
+        
         return res
     
     def track_lines(self, cr, uid, ids, context):
diff --git a/addons/mrp_procurement/__init__.py b/addons/mrp_procurement/__init__.py
new file mode 100644
index 00000000000..6cb8ad4027b
--- /dev/null
+++ b/addons/mrp_procurement/__init__.py
@@ -0,0 +1,25 @@
+# -*- 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 mrp_procurement
+import wizard
+import schedulers
+import company
\ No newline at end of file
diff --git a/addons/mrp_procurement/__openerp__.py b/addons/mrp_procurement/__openerp__.py
new file mode 100644
index 00000000000..82c611c6c78
--- /dev/null
+++ b/addons/mrp_procurement/__openerp__.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/>.
+#
+##############################################################################
+
+
+{
+    "name" : "Procurements",
+    "version" : "1.0",
+    "author" : "Tiny",
+    "website" : "http://www.openerp.com",
+    "category" : "Generic Modules/Production",
+    "depends" : ["base","process", "product", "stock"],
+    "description": """
+    This is the module for computing Procurements.
+    """,
+    'init_xml': [],
+    'update_xml': [
+        'security/ir.model.access.csv',
+        'security/mrp_procurement_security.xml',
+        'mrp_procurement_data.xml',
+        'wizard/make_procurement_view.xml',
+        'wizard/mrp_procurement_view.xml',
+        'wizard/orderpoint_procurement_view.xml',
+        'mrp_procurement_view.xml',
+        'wizard/schedulers_all_view.xml',
+        'mrp_procurement_workflow.xml',
+        'process/procurement_process.xml',
+        "company_view.xml",
+    ],
+#    'demo_xml': [],
+    'installable': True,
+    'active': False,
+    'certificate': '',
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_procurement/company.py b/addons/mrp_procurement/company.py
new file mode 100644
index 00000000000..ce39ca9a684
--- /dev/null
+++ b/addons/mrp_procurement/company.py
@@ -0,0 +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 osv,fields
+
+class company(osv.osv):
+    _inherit = 'res.company'
+    _columns = {
+        'schedule_range': fields.float('Scheduler Range', required=True,
+            help="This is the time frame analysed by the scheduler when "\
+            "computing procurements. All procurements that are not between "\
+            "today and today+range are skipped for futur computation."),
+    }
+    _defaults = {
+        'schedule_range': lambda *a: 80.0,
+    }
+company()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_procurement/company_view.xml b/addons/mrp_procurement/company_view.xml
new file mode 100644
index 00000000000..543e36fe02f
--- /dev/null
+++ b/addons/mrp_procurement/company_view.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+
+        <record id="mrp_company" model="ir.ui.view">
+            <field name="name">res.company.mrp.config</field>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="arch" type="xml">
+                <page string="Configuration" position="inside">
+                    <separator string="MRP &amp; Logistic Scheduler" colspan="4"/>
+                    <field name="schedule_range"/>
+                </page>
+            </field>
+       </record>
+    
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/mrp_procurement/mrp_procurement.py b/addons/mrp_procurement/mrp_procurement.py
new file mode 100644
index 00000000000..bd5b223779f
--- /dev/null
+++ b/addons/mrp_procurement/mrp_procurement.py
@@ -0,0 +1,527 @@
+# -*- 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 osv, fields
+from tools.translate import _
+import netsvc
+import time
+
+
+class mrp_property_group(osv.osv):
+    """
+    Group of mrp properties.
+    """
+    _name = 'mrp.property.group'
+    _description = 'Property Group'
+    _columns = {
+        'name': fields.char('Property Group', size=64, required=True),
+        'description': fields.text('Description'),
+    }
+mrp_property_group()
+
+class mrp_property(osv.osv):
+    """
+    Properties of mrp.
+    """
+    _name = 'mrp.property'
+    _description = 'Property'
+    _columns = {
+        'name': fields.char('Name', size=64, required=True),
+        'composition': fields.selection([('min','min'),('max','max'),('plus','plus')], 'Properties composition', required=True, help="Not used in computations, for information purpose only."),
+        'group_id': fields.many2one('mrp.property.group', 'Property Group', required=True),
+        'description': fields.text('Description'),
+    }
+    _defaults = {
+        'composition': lambda *a: 'min',
+    }
+mrp_property()
+
+# ------------------------------------------------------------------
+# Procurement
+# ------------------------------------------------------------------
+#
+# Produce, Buy or Find products and place a move
+#     then wizard for picking lists & move
+#
+class mrp_procurement(osv.osv):
+    """
+    Procurement Orders
+    """
+    _name = "mrp.procurement"
+    _description = "Procurement"
+    _order = 'priority,date_planned'
+    
+    _columns = {
+        'name': fields.char('Reason', size=64, required=True, help='Procurement name.'),
+        'origin': fields.char('Source Document', size=64,
+            help="Reference of the document that created this Procurement.\n"
+            "This is automatically completed by Open ERP."),
+        'priority': fields.selection([('0','Not urgent'),('1','Normal'),('2','Urgent'),('3','Very Urgent')], 'Priority', required=True),
+        'date_planned': fields.datetime('Scheduled date', required=True),
+        'date_close': fields.datetime('Date Closed'),
+        'product_id': fields.many2one('product.product', 'Product', required=True, states={'draft':[('readonly',False)]}, readonly=True),
+        'product_qty': fields.float('Quantity', required=True, states={'draft':[('readonly',False)]}, readonly=True),
+        'product_uom': fields.many2one('product.uom', 'Product UoM', required=True, states={'draft':[('readonly',False)]}, readonly=True),
+        'product_uos_qty': fields.float('UoS Quantity', states={'draft':[('readonly',False)]}, readonly=True),
+        'product_uos': fields.many2one('product.uom', 'Product UoS', states={'draft':[('readonly',False)]}, readonly=True),
+        'move_id': fields.many2one('stock.move', 'Reservation', ondelete='set null'),
+        'close_move': fields.boolean('Close Move at end', required=True),
+        'location_id': fields.many2one('stock.location', 'Location', required=True, states={'draft':[('readonly',False)]}, readonly=True),
+        'procure_method': fields.selection([('make_to_stock','from stock'),('make_to_order','on order')], 'Procurement Method', states={'draft':[('readonly',False)], 'confirmed':[('readonly',False)]},
+            readonly=True, required=True, help="If you encode manually a Procurement, you probably want to use" \
+            " a make to order method."),
+
+        'note': fields.text('Note'),
+        
+        'property_ids': fields.many2many('mrp.property', 'mrp_procurement_property_rel', 'procurement_id','property_id', 'Properties'),
+
+        'message': fields.char('Latest error', size=64, help="Exception occurred while computing procurement orders."),
+        'state': fields.selection([
+            ('draft','Draft'),
+            ('confirmed','Confirmed'),
+            ('exception','Exception'),
+            ('running','Running'),
+            ('cancel','Cancel'),
+            ('ready','Ready'),
+            ('done','Done'),
+            ('waiting','Waiting')], 'State', required=True,
+            help='When a procurement is created the state is set to \'Draft\'.\n If the procurement is confirmed, the state is set to \'Confirmed\'.\
+            \nAfter confirming the state is set to \'Running\'.\n If any exception arises in the order then the state is set to \'Exception\'.\n Once the exception is removed the state becomes \'Ready\'.\n It is in \'Waiting\'. state when the procurement is waiting for another one to finish.'),
+        'note': fields.text('Note'),
+        'company_id': fields.many2one('res.company','Company',required=True),
+    }
+    _defaults = {
+        'state': lambda *a: 'draft',
+        'priority': lambda *a: '1',
+        'date_planned': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
+        'close_move': lambda *a: 0,
+        'procure_method': lambda *a: 'make_to_order',
+        'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'mrp.procurement', context=c)
+    }
+
+    def unlink(self, cr, uid, ids, context=None):
+        procurements = self.read(cr, uid, ids, ['state'])
+        unlink_ids = []
+        for s in procurements:
+            if s['state'] in ['draft','cancel']:
+                unlink_ids.append(s['id'])
+            else:
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Procurement Order(s) which are in %s State!' % s['state']))
+        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
+
+    def onchange_product_id(self, cr, uid, ids, product_id, context={}):
+        """ Finds UoM and UoS of changed product.
+        @param product_id: Changed id of product.
+        @return: Dictionary of values.
+        """
+        if product_id:
+            w = self.pool.get('product.product').browse(cr, uid, product_id, context)
+            v = {
+                'product_uom': w.uom_id.id,
+                'product_uos': w.uos_id and w.uos_id.id or w.uom_id.id
+            }
+            return {'value': v}
+        return {}
+
+    def check_product(self, cr, uid, ids):
+        """ Checks product type.
+        @return: True or False 
+        """
+        for procurement in self.browse(cr, uid, ids):
+            if procurement.product_id.type in ('product', 'consu'):
+                return True
+        return False
+
+    def check_move_cancel(self, cr, uid, ids, context={}):
+        """ Checks if move is cancelled or not.
+        @return: True or False. 
+        """
+        res = True
+        ok = False
+        for procurement in self.browse(cr, uid, ids, context):
+            if procurement.move_id:
+                ok = True
+                if not procurement.move_id.state == 'cancel':
+                    res = False
+        return res and ok
+
+    def check_move_done(self, cr, uid, ids, context={}):
+        """ Checks if move is done or not.
+        @return: True or False. 
+        """
+        res = True
+        for proc in self.browse(cr, uid, ids, context):
+            if proc.move_id:
+                if not proc.move_id.state == 'done':
+                    res = False
+        return res
+
+    #
+    # This method may be overrided by objects that override mrp.procurment
+    # for computing their own purpose
+    #
+    def _quantity_compute_get(self, cr, uid, proc, context={}):
+        """ Finds sold quantity of product.
+        @param proc: Current procurement.
+        @return: Quantity or False.
+        """
+        if proc.product_id.type == 'product':
+            if proc.move_id.product_uos:
+                return proc.move_id.product_uos_qty
+        return False
+
+    def _uom_compute_get(self, cr, uid, proc, context={}):
+        """ Finds UoS if product is Stockable Product. 
+        @param proc: Current procurement.
+        @return: UoS or False.
+        """
+        if proc.product_id.type == 'product':
+            if proc.move_id.product_uos:
+                return proc.move_id.product_uos.id
+        return False
+
+    #
+    # Return the quantity of product shipped/produced/served, wich may be
+    # different from the planned quantity
+    #
+    def quantity_get(self, cr, uid, id, context={}):
+        """ Finds quantity of product used in procurement.
+        @return: Quantity of product. 
+        """
+        proc = self.browse(cr, uid, id, context)
+        result = self._quantity_compute_get(cr, uid, proc, context)
+        if not result:
+            result = proc.product_qty
+        return result
+
+    def uom_get(self, cr, uid, id, context=None):
+        """ Finds UoM of product used in procurement.
+        @return: UoM of product. 
+        """
+        proc = self.browse(cr, uid, id, context)
+        result = self._uom_compute_get(cr, uid, proc, context)
+        if not result:
+            result = proc.product_uom.id
+        return result
+
+    def check_waiting(self, cr, uid, ids, context=[]):
+        """ Checks state of move.
+        @return: True or False 
+        """
+        for procurement in self.browse(cr, uid, ids, context=context):
+            if procurement.move_id and procurement.move_id.state == 'auto':
+                return True
+        return False
+
+    def check_produce_service(self, cr, uid, procurement, context=[]):
+        return True
+
+    def check_produce_product(self, cr, uid, procurement, context=[]):
+        """ Finds BoM of a product if not found writes exception message.
+        @param procurement: Current procurement.
+        @return: True or False.
+        """
+        return True
+
+    def check_make_to_stock(self, cr, uid, ids, context={}):
+        """ Checks product type.
+        @return: True or False 
+        """
+        ok = True
+        for procurement in self.browse(cr, uid, ids, context=context):
+            if procurement.product_id.type == 'service':
+                ok = ok and self._check_make_to_stock_service(cr, uid, procurement, context)
+            else:
+                ok = ok and self._check_make_to_stock_product(cr, uid, procurement, context)
+        return ok
+
+    def check_produce(self, cr, uid, ids, context={}):
+        """ Checks product type.
+        @return: True or Product Id.
+        """
+        res = True
+        user = self.pool.get('res.users').browse(cr, uid, uid)
+        for procurement in self.browse(cr, uid, ids):
+            if procurement.product_id.product_tmpl_id.supply_method <> 'produce':
+                if procurement.product_id.seller_ids:
+                    partner = procurement.product_id.seller_ids[0].name
+                    if user.company_id and user.company_id.partner_id:
+                        if partner.id == user.company_id.partner_id.id:
+                            return True
+                return False
+            if procurement.product_id.product_tmpl_id.type=='service':
+                res = res and self.check_produce_service(cr, uid, procurement, context)
+            else:
+                res = res and self.check_produce_product(cr, uid, procurement, context)
+            if not res:
+                return False
+        return res
+
+    def check_buy(self, cr, uid, ids):
+        """ Checks product type.
+        @return: True or Product Id.
+        """
+        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
+            if not procurement.product_id.seller_ids:
+                cr.execute('update mrp_procurement set message=%s where id=%s', (_('No supplier defined for this product !'), procurement.id))
+                return False
+            partner = procurement.product_id.seller_ids[0].name
+            if user.company_id and user.company_id.partner_id:
+                if partner.id == user.company_id.partner_id.id:
+                    return False
+            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
+        return True
+
+    def test_cancel(self, cr, uid, ids):
+        """ Tests whether state of move is cancelled or not. 
+        @return: True or False
+        """
+        for record in self.browse(cr, uid, ids):
+            if record.move_id and record.move_id.state == 'cancel':
+                return True
+        return False
+
+    def action_confirm(self, cr, uid, ids, context={}):
+        """ Confirms procurement and writes exception message if any.
+        @return: True
+        """
+        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 Procurement Order(s), it should not be less than 1!'))
+            if procurement.product_id.type in ('product', 'consu'):
+                if not procurement.move_id:
+                    source = procurement.location_id.id
+                    if procurement.procure_method == 'make_to_order':
+                        source = procurement.product_id.product_tmpl_id.property_stock_procurement.id
+                    id = move_obj.create(cr, uid, {
+                        'name': 'PROC:' + procurement.name,
+                        'location_id': source,
+                        'location_dest_id': procurement.location_id.id,
+                        'product_id': procurement.product_id.id,
+                        'product_qty': procurement.product_qty,
+                        'product_uom': procurement.product_uom.id,
+                        'date_planned': procurement.date_planned,
+                        'state': 'confirmed',
+                        'company_id': procurement.company_id.id,
+                    })
+                    self.write(cr, uid, [procurement.id], {'move_id': id, 'close_move': 1})
+                else:
+                    # TODO: check this
+                    if procurement.procure_method == 'make_to_stock' and procurement.move_id.state in ('waiting',):
+                        id = move_obj.write(cr, uid, [procurement.move_id.id], {'state':'confirmed'})
+        self.write(cr, uid, ids, {'state': 'confirmed', 'message': ''})
+        return True
+
+    def action_move_assigned(self, cr, uid, ids, context={}):
+        """ Changes procurement state to Running and writes message.
+        @return: True 
+        """
+        self.write(cr, uid, ids, {'state': 'running', 'message': _('from stock: products assigned.')})
+        return True
+
+    def _check_make_to_stock_service(self, cr, uid, procurement, context={}):
+        return True
+
+    def _check_make_to_stock_product(self, cr, uid, procurement, context={}):
+        """ Checks procurement move state.
+        @param procurement: Current procurement.
+        @return: True or move id.
+        """
+        ok = True
+        if procurement.move_id:
+            id = procurement.move_id.id
+            if not (procurement.move_id.state in ('done','assigned','cancel')):
+                ok = ok and self.pool.get('stock.move').action_assign(cr, uid, [id])
+                cr.execute('select count(id) from stock_warehouse_orderpoint where product_id=%s', (procurement.product_id.id,))
+                if not cr.fetchone()[0]:
+                    cr.execute('update mrp_procurement set message=%s where id=%s', (_('from stock and no minimum orderpoint rule defined'), procurement.id))
+        return ok
+
+    def action_produce_assign_service(self, cr, uid, ids, context={}):
+        """ Changes procurement state to Running.
+        @return: True 
+        """
+        for procurement in self.browse(cr, uid, ids):
+            self.write(cr, uid, [procurement.id], {'state': 'running'})
+        return True
+
+    def action_produce_assign_product(self, cr, uid, ids, context={}):
+        """ This is action which call from workflow to assign production order to procurements
+        @return: True
+        """
+        return 0
+
+    
+    def action_po_assign(self, cr, uid, ids, context={}):
+        """ This is action which call from workflow to assign purchase order to procurements
+        @return: True
+        """
+        return 0
+
+    def action_cancel(self, cr, uid, ids):
+        """ Cancels procurement and writes move state to Assigned.
+        @return: True 
+        """
+        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'):
+                    todo2.append(proc.move_id.id)
+            else:
+                if proc.move_id and proc.move_id.state == 'waiting':
+                    todo.append(proc.move_id.id)
+        if len(todo2):
+            move_obj.action_cancel(cr, uid, todo2)
+        if len(todo):
+            move_obj.write(cr, uid, todo, {'state': 'assigned'})
+        self.write(cr, uid, ids, {'state': 'cancel'})
+        wf_service = netsvc.LocalService("workflow")
+        for id in ids:
+            wf_service.trg_trigger(uid, 'mrp.procurement', id, cr)
+        return True
+
+    def action_check_finnished(self, cr, uid, ids):
+        return self.check_move_done(cr, uid, ids)
+
+    def action_check(self, cr, uid, ids):
+        """ Checks procurement move state whether assigned or done. 
+        @return: True 
+        """
+        ok = False
+        for procurement in self.browse(cr, uid, ids):
+            if procurement.move_id.state == 'assigned' or procurement.move_id.state == 'done':
+                self.action_done(cr, uid, [procurement.id])
+                ok = True
+        return ok
+
+    def action_ready(self, cr, uid, ids):
+        """ Changes procurement state to Ready.
+        @return: True 
+        """
+        res = self.write(cr, uid, ids, {'state': 'ready'})
+        return res
+
+    def action_done(self, cr, uid, ids):
+        """ Changes procurement state to Done and writes Closed date.
+        @return: True 
+        """
+        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'):
+                    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:
+            wf_service.trg_trigger(uid, 'mrp.procurement', id, cr)
+        return res
+
+    def run_scheduler(self, cr, uid, automatic=False, use_new_cursor=False, context=None):
+        ''' Runs through scheduler.
+        @param use_new_cursor: False or the dbname
+        '''
+        if not context:
+            context={}
+        self._procure_confirm(cr, uid, use_new_cursor=use_new_cursor, context=context)
+        self._procure_orderpoint_confirm(cr, uid, automatic=automatic,\
+                use_new_cursor=use_new_cursor, context=context)
+        
+mrp_procurement()
+
+
+class stock_warehouse_orderpoint(osv.osv):
+    """
+    Defines Minimum stock rules.
+    """
+    _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, ondelete='cascade', 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 procurement 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 procurement to bring the virtual stock to the Max Quantity."),
+        'qty_multiple': fields.integer('Qty Multiple', required=True,
+            help="The procurement quantity will by rounded up to this multiple."),
+        'procurement_id': fields.many2one('mrp.procurement', 'Latest procurement'),
+        '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={}):
+        """ Finds location id for changed warehouse.
+        @param warehouse_id: Changed id of warehouse.
+        @return: Dictionary of values.
+        """
+        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={}):
+        """ Finds UoM for changed product.
+        @param product_id: Changed id of product.
+        @return: Dictionary of values.
+        """
+        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()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_procurement/mrp_procurement_data.xml b/addons/mrp_procurement/mrp_procurement_data.xml
new file mode 100644
index 00000000000..256472bd2fd
--- /dev/null
+++ b/addons/mrp_procurement/mrp_procurement_data.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        
+        <record forcecreate="True" id="ir_cron_scheduler_action" model="ir.cron">
+            <field name="name">Run mrp scheduler</field>
+            <field eval="False" name="active"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="interval_number">1</field>
+            <field name="interval_type">days</field>
+            <field name="numbercall">-1</field>
+            <field eval="False" name="doall"/>
+            <field eval="'mrp.procurement'" name="model"/>
+            <field eval="'run_scheduler'" name="function"/>
+            <field eval="'(False,)'" name="args"/>
+        </record>
+        
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/mrp_procurement/mrp_procurement_view.xml b/addons/mrp_procurement/mrp_procurement_view.xml
new file mode 100644
index 00000000000..84b47ee516d
--- /dev/null
+++ b/addons/mrp_procurement/mrp_procurement_view.xml
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>		
+		<!--
+        Procurement
+        -->
+        
+        <record id="mrp_procurement_tree_view" model="ir.ui.view">
+            <field name="name">mrp.procurement.tree</field>
+            <field name="model">mrp.procurement</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Procurement Lines" colors="red:state=='draft';black:state=='running';green:state=='confirmed';gray:state in ['done','cancel']">
+                    <field name="date_planned" widget="date"/>
+                    <field name="origin"/>
+                    <field name="product_id"/>
+                    <field name="product_qty"/>
+                    <field name="product_uom" string="UOM"/>
+                    <field name="procure_method"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
+        <record id="mrp_procurement_form_view" model="ir.ui.view">
+            <field name="name">mrp.procurement.form</field>
+            <field name="model">mrp.procurement</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Procurement">
+                    <group col="2" colspan="2">
+                        <separator colspan="2" string="References"/>
+                        <field name="name" select="1" string="Procurement Reason"/>
+                        <field name="origin"/>
+                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                    </group>
+                    <group col="2" colspan="2">
+                        <separator colspan="2" string="Planification"/>
+                        <field name="date_planned" select="1"/>
+                        <field name="procure_method"/>
+                        <field name="priority" groups="base.group_extended"/>
+                    </group>
+                    <notebook colspan="4">
+                    <page string="Procurement Details">
+                        <separator colspan="4" string="Product &amp; Location"/>
+                        <field name="product_id" select="1" on_change="onchange_product_id(product_id)"/>
+                        <field name="location_id" domain="[('usage','=','internal')]"/>
+                        <field name="product_qty"/>
+                        <field name="product_uom"/>
+
+                        <field name="product_uos_qty" groups="product.group_uos"/>
+                        <field name="product_uos" groups="product.group_uos"/>
+
+                        <separator colspan="4" string="Status"/>
+                        <field colspan="4" name="message" readonly="1"/>
+                        <field name="state" readonly="1"/>
+                        <group col="7" colspan="2">
+                            <button name="button_confirm" states="draft" string="Confirm" icon="gtk-apply"/>
+                            <button name="button_restart" states="exception" string="Retry" icon="gtk-convert"/>
+                            <button name="button_cancel" states="draft,exception,waiting" string="Cancel" icon="gtk-cancel"/>
+                            <button name="button_check" states="confirmed" string="Run     Procurement" icon="gtk-media-play"/>
+                        </group>
+                    </page>
+                    <page string="Extra Information">
+                        <separator colspan="4" string="Details"/>
+                        <field name="move_id" groups="base.group_extended"/>
+                        <field name="date_close"/>
+                        <field name="close_move" groups="base.group_extended"/>
+						<group colspan="4"  groups="base.group_extended">
+	                    	<separator colspan="4" string="Properties" />
+	                        <field colspan="4" name="property_ids" nolabel="1"/>
+	                    </group>
+                    </page>
+                    <page string="Notes">
+                        <separator colspan="4" string="Note" />
+                        <field name="note" colspan="4" nolabel="1"/>
+                    </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
+        <record id="view_mrp_procurement_filter" model="ir.ui.view">
+            <field name="name">mrp.procurement.select</field>
+            <field name="model">mrp.procurement</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Procurement">
+                    <group col='10' colspan='4'>
+                       <filter icon="terp-mrp" string="Current" domain="[('state','in',('draft','confirmed'))]" default="1" help="Procurement Orders in draft or open state."/>
+                       <filter icon="terp-mrp" string="Exceptions" domain="[('state','=','exception')]" help="Procurement Orders with exceptions"/>
+                       <filter icon="terp-mrp" string="Late"
+                           domain="['&amp;', ('date_planned::date','&lt;', current_date), ('state', 'in', ('draft', 'confirmed'))]"
+                           help="Procurement started late" />
+                       <separator orientation="vertical"/>
+                       <field name="name"/>
+                       <field name="origin"/>
+                       <field name="product_id" />
+                       <field name="date_planned" widget="date"/>
+                       <field name="state" />
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By" colspan="4" col="8">
+                        <filter string="Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="Reason" icon="terp-mrp" domain="[]" context="{'group_by':'name'}"/>
+                        <filter string="Scheduled Date" icon="terp-mrp" domain="[]" context="{'group_by':'date_planned'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+        <record id="mrp_procurement_action" model="ir.actions.act_window">
+            <field name="name">Procurement Orders</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.procurement</field>
+            <field name="view_type">form</field>
+            <field name="view_id" eval="False"/>
+            <field name="search_view_id" ref="view_mrp_procurement_filter"/>
+        </record>
+
+        <record id="mrp_procurement_action3" model="ir.actions.act_window">
+            <field name="name">Procurements</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.procurement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_mrp_procurement_filter"/>
+            <field name="domain">[]</field>
+            <field name="context">{}</field>
+        </record>
+
+        <record id="mrp_procurement_action5" model="ir.actions.act_window">
+            <field name="name">Procurement Exceptions</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.procurement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','exception')]</field>
+        </record>
+
+        <record id="mrp_procurement_action4" model="ir.actions.act_window">
+            <field name="name">Procurement Exceptions to Fix</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.procurement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','exception'), ('message', '&lt;&gt;', '')]</field>
+            <field name="filter" eval="True"/>
+        </record>
+
+        <record id="mrp_procurement_action11" model="ir.actions.act_window">
+            <field name="name">Temporary Procurement Exceptions</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.procurement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','exception'), ('message', '=', '')]</field>
+        </record>
+        
+        <!-- Order Point -->
+        <record id="view_warehouse_orderpoint_tree" model="ir.ui.view">
+            <field name="name">stock.warehouse.orderpoint.tree</field>
+            <field name="model">stock.warehouse.orderpoint</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <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"/>
+                    <field name="product_max_qty"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="warehouse_orderpoint_search">
+            <field name="name">stock.warehouse.orderpoint.search</field>
+            <field name="model">stock.warehouse.orderpoint</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Minimum Stock Rules Search">
+                    <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>
+
+        <record id="view_warehouse_orderpoint_form" model="ir.ui.view">
+            <field name="name">stock.warehouse.orderpoint.form</field>
+            <field name="model">stock.warehouse.orderpoint</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Minimum Stock Rules">
+                    <group col="2" colspan="2">
+                        <separator string="General Information" colspan="2" />
+                        <field name="name" />
+                        <field name="product_id" on_change="onchange_product_id(product_id)"/>
+                        <field name="product_uom"/>
+                    </group>
+                    <group col="2" colspan="2">
+                        <separator string="Locations" colspan="2" />
+                        <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection"/>
+                        <field name="location_id"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    </group>
+                    <group col="2" colspan="2">
+                        <separator string="Quantity Rules" colspan="2" />
+                        <field name="product_min_qty"/>
+                        <field name="product_max_qty"/>
+                        <field name="qty_multiple"/>
+                    </group>
+                    <group col="2" colspan="2" groups="base.group_extended">
+                        <separator string="Misc" colspan="2" />
+                        <field name="procurement_id" readonly="1"/>
+                        <field name="active" />
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_orderpoint_form" model="ir.actions.act_window">
+            <field name="name">Minimum Stock Rules</field>
+            <field name="res_model">stock.warehouse.orderpoint</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_warehouse_orderpoint_tree"/>
+            <field name="search_view_id" ref="warehouse_orderpoint_search" />
+        </record>
+
+        <act_window domain="[('warehouse_id', '=', active_id)]" id="act_stock_warehouse_2_stock_warehouse_orderpoint" name="Minimum Stock Rules" res_model="stock.warehouse.orderpoint" src_model="stock.warehouse"/>
+
+        <!-- add product_uom to context to be the default value when adding new orderpoints -->
+        <act_window
+            context="{'product_uom': locals().has_key('uom_id') and uom_id}"
+            domain="[('product_id', '=', active_id)]"
+            id="act_product_product_2_stock_warehouse_orderpoint"
+            name="Minimum Stock Rules"
+            res_model="stock.warehouse.orderpoint"
+            src_model="product.product"/>
+            
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/mrp_procurement/mrp_procurement_workflow.xml b/addons/mrp_procurement/mrp_procurement_workflow.xml
new file mode 100644
index 00000000000..46c4a10fffc
--- /dev/null
+++ b/addons/mrp_procurement/mrp_procurement_workflow.xml
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+		<!-- Procurement -->
+
+        <record id="wkf_procurement" model="workflow">
+            <field name="name">mrp.procurement.basic</field>
+            <field name="osv">mrp.procurement</field>
+            <field name="on_create">True</field>
+        </record>
+
+        <record id="act_draft" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_procurement"/>
+            <field name="flow_start">True</field>
+            <field name="name">draft</field>
+        </record>
+        <record id="act_cancel" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_procurement"/>
+            <field name="name">cancel</field>
+            <field name="kind">function</field>
+            <field name="action">action_cancel()</field>
+            <field name="flow_stop">True</field>
+        </record>
+        <record id="act_confirm" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_procurement"/>
+            <field name="name">confirm</field>
+            <field name="kind">function</field>
+            <field name="action">action_confirm()</field>
+        </record>
+        <record id="act_confirm_wait" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_procurement"/>
+            <field name="name">confirm_wait</field>
+            <field name="kind">function</field>
+            <field name="action">write({'state':'exception'})</field>
+        </record>
+        <record id="act_confirm_mts" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_procurement"/>
+            <field name="name">confirm_mts</field>
+        </record>
+        <record id="act_confirm_mto" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_procurement"/>
+            <field name="name">confirm_mto</field>
+        </record>
+        <record id="act_make_to_stock" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_procurement"/>
+            <field name="name">make_to_stock</field>
+            <field name="kind">function</field>
+            <field name="action">action_move_assigned()</field>
+        </record>
+<!--        <record id="act_produce_check" model="workflow.activity">-->
+<!--            <field name="wkf_id" ref="wkf_procurement"/>-->
+<!--            <field name="name">produce_check</field>-->
+<!--        </record>-->
+<!--        <record id="act_produce_service" model="workflow.activity">-->
+<!--            <field name="wkf_id" ref="wkf_procurement"/>-->
+<!--            <field name="name">produce_service</field>-->
+<!--            <field name="kind">function</field>-->
+<!--            <field name="action">action_produce_assign_service()</field>-->
+<!--        </record>-->
+        <record id="act_make_done" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_procurement"/>
+            <field name="name">ready</field>
+            <field name="kind">function</field>
+            <field name="action">action_ready()</field>
+        </record>
+        <record id="act_wait_done" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_procurement"/>
+            <field name="name">wait_done</field>
+            <field name="kind">function</field>
+            <field name="action">write({'state':'waiting'})</field>
+        </record>
+
+        <record id="act_done" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_procurement"/>
+            <field name="flow_stop">True</field>
+            <field name="name">done</field>
+            <field name="kind">function</field>
+            <field name="action">action_done()</field>
+        </record>
+
+        <record id="trans_draft_confirm" model="workflow.transition">
+            <field name="act_from" ref="act_draft"/>
+            <field name="act_to" ref="act_confirm"/>
+            <field name="signal">button_confirm</field>
+        </record>
+        <record id="trans_confirm_cancel2" model="workflow.transition">
+            <field name="act_from" ref="act_confirm"/>
+            <field name="act_to" ref="act_wait_done"/>
+            <field name="signal">button_wait_done</field>
+            <field name="condition">True</field>
+        </record>
+        <record id="trans_confirm_wait_done" model="workflow.transition">
+            <field name="act_from" ref="act_wait_done"/>
+            <field name="act_to" ref="act_done"/>
+            <field name="condition">check_move_done()</field>
+            <field name="trigger_model">stock.move</field>
+            <field name="trigger_expr_id">[move_id.id]</field>
+        </record>
+
+        <record id="trans_confirm_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_confirm"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">button_check</field>
+            <field name="condition">test_cancel()</field>
+        </record>
+        <record id="trans_confirm_confirm_wait" model="workflow.transition">
+            <field name="act_from" ref="act_confirm"/>
+            <field name="act_to" ref="act_confirm_wait"/>
+            <field name="signal">button_check</field>
+            <field name="condition">not test_cancel()</field>
+        </record>
+        <record id="trans_confirm_wait_confirm_mto" model="workflow.transition">
+            <field name="act_from" ref="act_confirm_wait"/>
+            <field name="act_to" ref="act_confirm_mto"/>
+            <field name="condition">procure_method=='make_to_order'</field>
+        </record>
+        <record id="trans_confirm_wait_confirm_mts" model="workflow.transition">
+            <field name="act_from" ref="act_confirm_wait"/>
+            <field name="act_to" ref="act_confirm_mts"/>
+            <field name="condition">procure_method=='make_to_stock'</field>
+        </record>
+        <record id="trans_confirm_mts_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_confirm_mts"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">button_cancel</field>
+        </record>
+        <record id="trans_confirm_waiting_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_wait_done"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">button_cancel</field>
+        </record>
+        <record id="trans_confirm_mts_confirm" model="workflow.transition">
+            <field name="act_from" ref="act_confirm_mts"/>
+            <field name="act_to" ref="act_confirm"/>
+            <field name="signal">button_restart</field>
+        </record>
+        <record id="trans_confirm_mto_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_confirm_mto"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">button_cancel</field>
+        </record>
+        <record id="trans_confirm_mto_confirm" model="workflow.transition">
+            <field name="act_from" ref="act_confirm_mto"/>
+            <field name="act_to" ref="act_confirm"/>
+            <field name="signal">button_restart</field>
+        </record>
+        <record id="trans_draft_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_draft"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">button_cancel</field>
+        </record>
+        <record id="trans_confirm_mts_make_to_stock" model="workflow.transition">
+            <field name="act_from" ref="act_confirm_mts"/>
+            <field name="act_to" ref="act_make_to_stock"/>
+            <field name="condition">check_make_to_stock()</field>
+        </record>
+<!--        <record id="trans_confirm_mto_produce_check" model="workflow.transition">-->
+<!--            <field name="act_from" ref="act_confirm_mto"/>-->
+<!--            <field name="act_to" ref="act_produce_check"/>-->
+<!--            <field name="condition">check_produce()</field>-->
+<!--        </record>-->
+<!--        <record id="trans_product_check_produce_service" model="workflow.transition">-->
+<!--            <field name="act_from" ref="act_produce_check"/>-->
+<!--            <field name="act_to" ref="act_produce_service"/>-->
+<!--            <field name="condition">not check_product()</field>-->
+<!--        </record>-->
+        <record id="trans_make_to_stock_make_done" model="workflow.transition">
+            <field name="act_from" ref="act_make_to_stock"/>
+            <field name="act_to" ref="act_make_done"/>
+            <field name="condition">True</field>
+            <field name="trigger_model" eval="False"/>
+            <field name="trigger_expr_id" eval="False"/>
+        </record>
+<!--        <record id="trans_produce_service_cancel" model="workflow.transition">-->
+<!--            <field name="act_from" ref="act_produce_service"/>-->
+<!--            <field name="act_to" ref="act_cancel"/>-->
+<!--            <field name="signal">subflow.cancel</field>-->
+<!--        </record>-->
+<!--        <record id="trans_produce_service_make_done" model="workflow.transition">-->
+<!--            <field name="act_from" ref="act_produce_service"/>-->
+<!--            <field name="act_to" ref="act_make_done"/>-->
+<!--        </record>-->
+        <record id="trans_make_done_done" model="workflow.transition">
+            <field name="act_from" ref="act_make_done"/>
+            <field name="act_to" ref="act_done"/>
+            <field name="condition">action_check_finnished()</field>
+        </record>
+        <record id="trans_make_done_confirm" model="workflow.transition">
+            <field name="act_from" ref="act_make_done"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="condition">check_move_cancel()</field>
+        </record>
+    
+    </data>
+</openerp>
diff --git a/addons/mrp_procurement/process/procurement_process.xml b/addons/mrp_procurement/process/procurement_process.xml
new file mode 100644
index 00000000000..21f953c6a6f
--- /dev/null
+++ b/addons/mrp_procurement/process/procurement_process.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+
+        <!--
+            Process
+        -->
+
+        <record id="process_process_procurementprocess0" model="process.process">
+            <field eval="&quot;&quot;&quot;Procurement&quot;&quot;&quot;" name="name"/>
+            <field name="model_id" ref="mrp_procurement.model_mrp_procurement"/>
+            <field eval="1" name="active"/>
+        </record>
+
+        <!--
+            Process Node
+        -->
+
+        
+    </data>
+</openerp>
diff --git a/addons/mrp/schedulers.py b/addons/mrp_procurement/schedulers.py
similarity index 99%
rename from addons/mrp/schedulers.py
rename to addons/mrp_procurement/schedulers.py
index cc482d95c52..7a89723e5ca 100644
--- a/addons/mrp/schedulers.py
+++ b/addons/mrp_procurement/schedulers.py
@@ -238,4 +238,5 @@ class mrp_procurement(osv.osv):
             cr.close()
         return {}
 mrp_procurement()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/scripts/scheduler.py b/addons/mrp_procurement/scripts/scheduler.py
similarity index 100%
rename from addons/mrp/scripts/scheduler.py
rename to addons/mrp_procurement/scripts/scheduler.py
diff --git a/addons/mrp_procurement/security/ir.model.access.csv b/addons/mrp_procurement/security/ir.model.access.csv
new file mode 100644
index 00000000000..ce022a730b0
--- /dev/null
+++ b/addons/mrp_procurement/security/ir.model.access.csv
@@ -0,0 +1,9 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_mrp_property_group","mrp.property.group","model_mrp_property_group",,1,0,0,0
+"access_mrp_property","mrp.property","model_mrp_property",,1,0,0,0
+"access_mrp_procurement","mrp.procurement","model_mrp_procurement",,1,0,0,0
+"access_stock_warehouse_orderpoint","stock.warehouse.orderpoint","model_stock_warehouse_orderpoint",,1,0,0,0
+"access_mrp_procurement_compute_all","mrp.procurement.compute.all","model_mrp_procurement_compute_all",,1,0,0,0
+"access_mrp_procurement_orderpoint_compute","mrp.procurement.orderpoint.compute","model_mrp_procurement_orderpoint_compute",,1,0,0,0
+"access_mrp_make_procurement","make.procurement","model_make_procurement",,1,0,0,0
+"access_mrp_make_procurement","mrp.procurement.compute","model_mrp_procurement_compute",,1,0,0,0
diff --git a/addons/mrp_procurement/security/mrp_procurement_security.xml b/addons/mrp_procurement/security/mrp_procurement_security.xml
new file mode 100644
index 00000000000..a0f2ef431bf
--- /dev/null
+++ b/addons/mrp_procurement/security/mrp_procurement_security.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data noupdate="0">
+	
+	    <record model="ir.rule" id="mrp_procurement_rule">
+	    	<field name="name">mrp_procurement multi-company</field>
+	        <field name="model_id" search="[('model','=','mrp.procurement')]" model="ir.model"/>
+	        <field name="global" eval="True"/>
+	        <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
+	    </record>
+	
+	    <record model="ir.rule" id="stock_warehouse_orderpoint_rule">
+	    	<field name="name">stock_warehouse.orderpoint multi-company</field>
+	        <field name="model_id" search="[('model','=','stock.warehouse.orderpoint')]" model="ir.model"/>
+	        <field name="global" eval="True"/>
+	        <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
+	    </record>
+	    
+	</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/mrp_procurement/wizard/__init__.py b/addons/mrp_procurement/wizard/__init__.py
new file mode 100644
index 00000000000..ae70ffbf941
--- /dev/null
+++ b/addons/mrp_procurement/wizard/__init__.py
@@ -0,0 +1,27 @@
+# -*- 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 orderpoint_procurement
+import mrp_procurement
+import schedulers_all
+import make_procurement_product
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/wizard/make_procurement_product.py b/addons/mrp_procurement/wizard/make_procurement_product.py
similarity index 96%
rename from addons/mrp/wizard/make_procurement_product.py
rename to addons/mrp_procurement/wizard/make_procurement_product.py
index a2dd62327bb..96f00b89eb4 100644
--- a/addons/mrp/wizard/make_procurement_product.py
+++ b/addons/mrp_procurement/wizard/make_procurement_product.py
@@ -83,8 +83,8 @@ class make_procurement(osv.osv_memory):
             wf_service.trg_validate(uid, 'mrp.procurement', procure_id, 'button_confirm', cr)
         
         
-        id2 = data_obj._get_id(cr, uid, 'mrp', 'mrp_procurement_tree_view')
-        id3 = data_obj._get_id(cr, uid, 'mrp', 'mrp_procurement_form_view')
+        id2 = data_obj._get_id(cr, uid, 'mrp_procurement', 'mrp_procurement_tree_view')
+        id3 = data_obj._get_id(cr, uid, 'mrp_procurement', 'mrp_procurement_form_view')
         
         if id2:
             id2 = data_obj.browse(cr, uid, id2, context=context).res_id
diff --git a/addons/mrp/wizard/make_procurement_view.xml b/addons/mrp_procurement/wizard/make_procurement_view.xml
similarity index 100%
rename from addons/mrp/wizard/make_procurement_view.xml
rename to addons/mrp_procurement/wizard/make_procurement_view.xml
diff --git a/addons/mrp/wizard/mrp_procurement.py b/addons/mrp_procurement/wizard/mrp_procurement.py
similarity index 100%
rename from addons/mrp/wizard/mrp_procurement.py
rename to addons/mrp_procurement/wizard/mrp_procurement.py
diff --git a/addons/mrp/wizard/mrp_procurement_view.xml b/addons/mrp_procurement/wizard/mrp_procurement_view.xml
similarity index 100%
rename from addons/mrp/wizard/mrp_procurement_view.xml
rename to addons/mrp_procurement/wizard/mrp_procurement_view.xml
diff --git a/addons/mrp/wizard/orderpoint_procurement.py b/addons/mrp_procurement/wizard/orderpoint_procurement.py
similarity index 100%
rename from addons/mrp/wizard/orderpoint_procurement.py
rename to addons/mrp_procurement/wizard/orderpoint_procurement.py
diff --git a/addons/mrp/wizard/orderpoint_procurement_view.xml b/addons/mrp_procurement/wizard/orderpoint_procurement_view.xml
similarity index 100%
rename from addons/mrp/wizard/orderpoint_procurement_view.xml
rename to addons/mrp_procurement/wizard/orderpoint_procurement_view.xml
diff --git a/addons/mrp/wizard/schedulers_all.py b/addons/mrp_procurement/wizard/schedulers_all.py
similarity index 100%
rename from addons/mrp/wizard/schedulers_all.py
rename to addons/mrp_procurement/wizard/schedulers_all.py
diff --git a/addons/mrp/wizard/schedulers_all_view.xml b/addons/mrp_procurement/wizard/schedulers_all_view.xml
similarity index 84%
rename from addons/mrp/wizard/schedulers_all_view.xml
rename to addons/mrp_procurement/wizard/schedulers_all_view.xml
index b8b465e03e9..33861287278 100644
--- a/addons/mrp/wizard/schedulers_all_view.xml
+++ b/addons/mrp_procurement/wizard/schedulers_all_view.xml
@@ -30,8 +30,5 @@
             key2="client_action_multi"    
 		    id="action_compute_schedulers"/>            
         
-        <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_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 9f629ad8a46..667e9763827 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -115,7 +115,7 @@
                                                 <field name="invoiced"/>
                                             </group>
                                             <newline/>
-                                            <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&gt;&gt;','purchase')]"/>
+                                            <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
                                          </page>
                                          <page string="History" groups="base.group_extended">
                                             <field colspan="4" name="invoice_line_id" />
diff --git a/addons/mrp_repair/wizard/cancel_repair.py b/addons/mrp_repair/wizard/cancel_repair.py
index 371b7ba82e3..ecc88ef6aae 100644
--- a/addons/mrp_repair/wizard/cancel_repair.py
+++ b/addons/mrp_repair/wizard/cancel_repair.py
@@ -57,23 +57,24 @@ class repair_cancel(osv.osv_memory):
         @param context: A standard dictionary 
         @return: New arch of view.
         """
-        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:
-            try:
-                repair_order = self.pool.get('mrp.repair').browse(cr, uid, record_id)
-                if not repair_order.invoiced:
-                    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>
-                                </form>                             
-                            """
-            except:
-                return res
+        record_id = context and context.get('active_id', False) or False        
+        active_model = context.get('active_model')
+        
+        if not record_id or (active_model and active_model != 'mrp.repair'):
+            return res
+        
+        repair_order = self.pool.get('mrp.repair').browse(cr, uid, record_id)
+        if not repair_order.invoiced:
+            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>
+                        </form>                             
+                    """
         return res
 
 repair_cancel()
diff --git a/addons/point_of_sale/__init__.py b/addons/point_of_sale/__init__.py
index 1a83d3f3b44..0baf4639019 100644
--- a/addons/point_of_sale/__init__.py
+++ b/addons/point_of_sale/__init__.py
@@ -21,11 +21,11 @@
 ##############################################################################
 
 import pos
+import account_bank_statement
+import pos_account_bank_statement
 import stock
 import wizard
 import report
-import pos_account_bank_statement
-import account_bank_statement
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index 95228bb044c..111702c2e74 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -37,7 +37,6 @@ 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': [],
 
     'update_xml': [
@@ -63,8 +62,9 @@ Main features :
         'wizard/pos_payment_report.xml',
         'wizard/pos_payment.xml',
         'wizard/pos_scan_product_view.xml',
+        'wizard/pos_return_view.xml',
         'pos_report.xml',
-        'pos_wizard.xml',
+       # 'pos_wizard.xml',
         'pos_view.xml',
         'pos_sequence.xml',
         'posrule_data.xml',
@@ -73,7 +73,6 @@ Main features :
         '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/multi_company_demo.xml b/addons/point_of_sale/multi_company_demo.xml
index dfc59cc09c8..e0e58ad75d7 100644
--- a/addons/point_of_sale/multi_company_demo.xml
+++ b/addons/point_of_sale/multi_company_demo.xml
@@ -2,11 +2,10 @@
 <openerp>
     <data noupdate="0">
         <record id="second_partner" model="res.partner">
-            <field name="name">Tiny Editor</field>
+            <field name="name">OpenERP Editor</field>
         </record>
-
         <record id="second_company" model="res.company">
-            <field name="name">Tiny Editor</field>
+            <field name="name">OpenERP Editor</field>
             <field name="partner_id" ref="base.main_partner"/>
             <field name="parent_id" ref="base.main_company"/>
             <field name="rml_header1">Free Business Solutions</field>
@@ -15,24 +14,19 @@
             <field name="currency_id" ref="base.EUR"/>
 
         </record>
-
         <record id="ter_partner" model="res.partner">
-            <field name="name">Tiny Integrator</field>
+            <field name="name">OpenERP Integrator</field>
         </record>
 
         <record id="ter_company" model="res.company">
-            <field name="name">Tiny Integrator</field>
+            <field name="name">OpenERP Integrator</field>
             <field name="partner_id" ref="base.main_partner"/>
             <field name="parent_id" ref="base.main_company"/>
             <field name="rml_header1">Free Business Solutions</field>
             <field name="rml_footer1">Web: http://tiny.be - Tel: (+32).81.81.37.00 - Bank: CPH 126-2013269-07</field>
             <field name="rml_footer2">IBAN: BE74 1262 0132 6907 - SWIFT: GKCCBEBB - VAT: BE0477.472.701</field>
             <field name="currency_id" ref="base.EUR"/>
-
         </record>
-
-  
-
     </data>
 </openerp>
 
diff --git a/addons/point_of_sale/multi_company_stock_data.xml b/addons/point_of_sale/multi_company_stock_data.xml
index 539a27ff1a2..a74ea0a56e9 100644
--- a/addons/point_of_sale/multi_company_stock_data.xml
+++ b/addons/point_of_sale/multi_company_stock_data.xml
@@ -2,104 +2,6 @@
 <openerp>
 
 <data>
-        <!-- <record id="res_partner_tinyshop0" model="res.partner">
-            <field eval="0" name="customer"/>
-            <field eval="0" name="supplier"/>
-            <field eval="1" name="active"/>
-            <field eval="&quot;&quot;&quot;Tiny Shop 1&quot;&quot;&quot;" name="name"/>
-        </record>
-        <record id="res_partner_address_fabien0" model="res.partner.address">
-            <field eval="&quot;&quot;&quot;Fabien&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;92000&quot;&quot;&quot;" name="zip"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
-            <field name="partner_id" ref="res_partner_tinyshop0"/>
-            <field name="country_id" ref="base.fr"/>
-            <field eval="&quot;&quot;&quot;Avenue de Paris&quot;&quot;&quot;" name="street"/>
-            <field eval="1" name="active"/>
-            <field eval="&quot;&quot;&quot;default&quot;&quot;&quot;" name="type"/>
-        </record>
-        <record id="res_company_shop0" model="res.company">
-            <field eval="5.0" name="security_lead"/>
-            <field name="currency_id" ref="base.EUR"/>
-            <field eval="1.0" name="po_lead"/>
-            <field name="partner_id" ref="res_partner_tinyshop0"/>
-            <field eval="1.0" name="manufacturing_lead"/>
-            <field name="parent_id" ref="base.main_company"/>
-            <field eval="80.0" name="schedule_range"/>
-            <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
-
-        </record>
-        <record id="res_partner_tinyshop1" model="res.partner">
-            <field eval="1" name="customer"/>
-            <field eval="0" name="supplier"/>
-            <field eval="1" name="active"/>
-            <field eval="&quot;&quot;&quot;Tiny Shop 2&quot;&quot;&quot;" name="name"/>
-       </record>
-        <record id="res_partner_address_eric0" model="res.partner.address">
-            <field eval="&quot;&quot;&quot;Eric&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;1500&quot;&quot;&quot;" name="zip"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
-            <field name="partner_id" ref="res_partner_tinyshop1"/>
-            <field name="country_id" ref="base.fr"/>
-            <field eval="&quot;&quot;&quot;Avenue de la Resistance&quot;&quot;&quot;" name="street"/>
-            <field eval="1" name="active"/>
-            <field eval="&quot;&quot;&quot;default&quot;&quot;&quot;" name="type"/>
-            <field name="partner_id" ref="res_partner_tinyshop1"/>
-            <field eval="1" name="active"/>
-        </record>
-        <record id="res_company_tinyshop0" model="res.company">
-            <field name="currency_id" ref="base.EUR"/>
-            <field eval="1.0" name="po_lead"/>
-            <field name="partner_id" ref="res_partner_tinyshop1"/>
-            <field eval="1.0" name="manufacturing_lead"/>
-            <field name="parent_id" ref="base.main_company"/>
-            <field eval="80.0" name="schedule_range"/>
-            <field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/>
-        </record>
-
-
-        <record id="res_users_shopuser0" model="res.users">
-            <field model="ir.actions.actions" name="menu_id" search="[('name','=','Menu')]"/>
-            <field eval="[(6,0,[ref('base.group_partner_manager')])]" name="groups_id"/>
-            <field model="res.partner.address" name="address_id" search="[('name','=','Fabien')]"/>
-            <field eval="[(6,0,[ref('purchase.res_roles_purchase0'),ref('sale.res_roles_salesman0')])]" name="roles_id"/>
-            <field eval="1" name="active"/>
-            <field eval="&quot;&quot;&quot;shop1&quot;&quot;&quot;" name="password"/>
-            <field eval="&quot;&quot;&quot;en_US&quot;&quot;&quot;" name="context_lang"/>
-            <field eval="&quot;&quot;&quot;Shop 1 User&quot;&quot;&quot;" name="name"/>
-            <field name="company_id" ref="res_company_shop0"/>
-            <field eval="&quot;&quot;&quot;shop1&quot;&quot;&quot;" name="login"/>
-            <field model="ir.actions.actions" name="action_id" search="[('name','=','Menu')]"/>
-        </record>
-        <record id="res_users_shopuser1" model="res.users">
-            <field model="ir.actions.actions" name="menu_id" search="[('name','=','Menu')]"/>
-            <field eval="[(6,0,[ref('base.group_partner_manager')])]" name="groups_id"/>
-            <field model="res.partner.address" name="address_id" search="[('name','=','Eric')]"/>
-            <field eval="&quot;&quot;&quot;shop2&quot;&quot;&quot;" name="password"/>
-            <field eval="&quot;&quot;&quot;Shop 2 User&quot;&quot;&quot;" name="name"/>
-            <field name="company_id" ref="res_company_tinyshop0"/>
-            <field eval="&quot;&quot;&quot;shop2&quot;&quot;&quot;" name="login"/>
-            <field model="ir.actions.actions" name="action_id" search="[('name','=','Menu')]"/>
-        </record>
-
-        <record id="res_groups_posuserposline0" model="res.groups">
-			<field eval="[(6,0,[ref('res_users_shopuser0'),ref('res_users_shopuser1')])]" name="users"/>
-			<field eval="&quot;&quot;&quot;POS_user_pos_line&quot;&quot;&quot;" name="name"/>
-		</record>
-
-		<record id="res_groups_posuser0" model="res.groups">
-			<field eval="[(6,0,[ref('res_users_shopuser0'),ref('res_users_shopuser1')])]" name="users"/>
-			<field eval="&quot;&quot;&quot;POS_user&quot;&quot;&quot;" name="name"/>
-		</record>-->
-
-        <record forcecreate="True" id="property_product_pricelist_multi" model="ir.property">
-            <field name="name">property_product_pricelist</field>
-            <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_product_pricelist')]"/>
-            <field eval="'product.pricelist,'+str(ref('product.list0'))" name="value"/>
-            <field name="company_id" ref="res_company_shop0"/>
-        </record>
-
-
         <record forcecreate="True" id="property_stock_account_output_prd_multi" model="ir.property">
             <field name="name">property_stock_account_output</field>
             <field name="fields_id" search="[('model','=','product.template'),('name','=','property_stock_account_output')]"/>
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index c87efa486b3..ede0f7bd15c 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -28,7 +28,7 @@ from tools.translate import _
 from decimal import Decimal
 import tools
 import re
-
+import decimal_precision as dp
 
 class pos_config_journal(osv.osv):
     
@@ -43,40 +43,14 @@ class pos_config_journal(osv.osv):
     }
 
 pos_config_journal()
-
-class res_mode_contact(osv.osv):
-
-    """ Contact mode for Partner  """    
-    
-    _name = "res.mode.contact"
-    _description = "Contact mode"
-    
-    _columns={
-        'name': fields.char('Mode', size=64, select=1),
-        'active': fields.boolean('Active', select=2),
-    }
-res_mode_contact()
-
-class contact_mode_partner(osv.osv):
-
-  
-    _inherit = 'res.partner'
-    _columns = {
-        'contact_mode_id': fields.many2one('res.mode.contact','Contact Mode'),
-     }
-contact_mode_partner()
-
-
 class pos_company_discount(osv.osv):
   
     """ Company Discount and Cashboxes """   
          
     _inherit = 'res.company'
     _columns = {
-        'company_discount': fields.float('Max Discount(%)', digits=(16,2)),
-        'max_diff': fields.float('Max Difference for Cashboxes', digits=(16,2)),
-        'account_receivable': fields.many2one('account.account',
-            'Default Receivable', states={'draft': [('readonly', False)]}),
+        'company_discount': fields.float('Max Discount(%)', digits_compute= dp.get_precision('Point Of Sale')),
+        'max_diff': fields.float('Max Difference for Cashboxes', digits_compute= dp.get_precision('Point Of Sale Discount')),
      }
 
 pos_company_discount()
@@ -149,7 +123,7 @@ class pos_order(osv.osv):
         tot =0.0
         val=None
         for order in self.browse(cr, uid, ids):
-            cr.execute("select date_payment2 from pos_order where id=%d"%(order.id))
+            cr.execute("select date_payment from pos_order where id=%d"%(order.id))
             date_p=cr.fetchone()
             date_p=date_p and date_p[0] or None
             if date_p:
@@ -176,7 +150,7 @@ class pos_order(osv.osv):
         tot =0.0
         val=None
         for order in self.browse(cr, uid, ids):
-            cr.execute("select date_payment from pos_order where id=%d"%(order.id))
+            cr.execute("select date_validation from pos_order where id=%d"%(order.id))
             date_p=cr.fetchone()
             date_p=date_p and date_p[0] or None
             if date_p:
@@ -199,65 +173,35 @@ class pos_order(osv.osv):
                 res[order.id]=val
         return res
 
-    def _amount_tax(self, cr, uid, ids, field_name, arg, context):
-        
-        """  Calculates Taxes of order
-        @return: Dictionary of values """    
-                  
-        res = {}
-        tax_obj = self.pool.get('account.tax')
+    def _amount_all(self, cr, uid, ids, name, args, context=None):
+        tax_obj = self.pool.get('account.tax')        
+        res={}
         for order in self.browse(cr, uid, ids):
-            val = 0.0
+            res[order.id] = {
+                'amount_paid': 0.0,
+                'amount_return':0.0,
+                'amount_tax':0.0,
+            }            
+            for payment in order.statement_ids:
+                 res[order.id]['amount_paid'] +=  payment.amount 
+            for payment in order.payments:
+                res[order.id]['amount_return']  += (payment.amount < 0 and payment.amount or 0)   
             for line in order.lines:
                 if order.price_type!='tax_excluded':
-                    val = reduce(lambda x, y: x+round(y['amount'], 2),
+                    res[order.id]['amount_tax'] = reduce(lambda x, y: x+round(y['amount'], 2),
                         tax_obj.compute_inv(cr, uid, line.product_id.taxes_id,
                             line.price_unit * \
                             (1-(line.discount or 0.0)/100.0), line.qty),
-                            val)
+                            res[order.id]['amount_tax'])
                 else:
-                    val = reduce(lambda x, y: x+round(y['amount'], 2),
+                    res[order.id]['amount_tax'] = reduce(lambda x, y: x+round(y['amount'], 2),
                         tax_obj.compute(cr, uid, line.product_id.taxes_id,
                             line.price_unit * \
                             (1-(line.discount or 0.0)/100.0), line.qty),
-                            val)
-
-            res[order.id] = val
+                            res[order.id]['amount_tax'])                                                    
         return res
-
-    def _total_payment(self, cr, uid, ids, field_name, arg, context):
         
-        """  Calculates Total payment  of order
-        @return: Dictionary of values """     
-             
-        res = {}
-        i=0
-        for order in self.browse(cr, uid, ids):
-            val = 0.0
-            for payment in order.statement_ids:
-                val += payment.amount
-            res[order.id] = val
-            return res
-        return {order.id:val}
 
-    def _total_return(self, cr, uid, ids, field_name, arg, context):
-        
-        """  Calculates Total Returned  from the order
-        @return: Dictionary of values """   
-                  
-        res = {}
-        for order in self.browse(cr, uid, ids):
-            val = 0.0
-            for payment in order.payments:
-                val += (payment.amount < 0 and payment.amount or 0)
-            res[order.id] = val
-        return res
-
-#    def payment_get(self, cr, uid, ids, context=None):
-#        """  Calculates Total Returned  from the order
-#        @return: Dictionary of values """          
-#        cr.execute("select id from pos_payment where order_id =ANY(%s)",(ids,))
-#        return [i[0] for i in cr.fetchall()]
 
     def _sale_journal_get(self, cr, uid, context):
         
@@ -279,13 +223,10 @@ class pos_order(osv.osv):
                
         company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
         res = self.pool.get('sale.shop').search(cr, uid, [])
-       # res = self.pool.get('sale.shop').search(cr, uid, [('company_id', '=', company.id)])
         if res:
             return res[0]
         else:
             return False
-
-
     def copy(self, cr, uid, id, default=None, context={}):
         
         if not default:
@@ -342,16 +283,16 @@ class pos_order(osv.osv):
         'shop_id': fields.many2one('sale.shop', 'Shop', required=True,
             states={'draft': [('readonly', False)]}, readonly=True),
         'date_order': fields.datetime('Date Ordered', readonly=True),
-        'date_payment': fields.function(_get_date_payment, method=True, string='Validation Date', type='date',  store=True),
-        'date_payment2': fields.function(_get_date_payment2, method=True, string='Payment Date', type='date',  store=True),
+        'date_validation': fields.function(_get_date_payment, method=True, string='Validation Date', type='date',  store=True),
+        'date_payment': fields.function(_get_date_payment2, method=True, string='Payment Date', type='date',  store=True),
         'date_validity': fields.date('Validity Date', required=True),
         'user_id': fields.many2one('res.users', 'Connected Salesman', readonly=True),
-        'user_id1': fields.many2one('res.users', 'Salesman', required=True),
-        'user_id2': fields.many2one('res.users', 'Salesman Manager'),
-        'amount_tax': fields.function(_amount_tax, method=True, string='Taxes'),
+        'user_salesman_id': fields.many2one('res.users', 'Salesman', required=True),
+        'sale_manager': fields.many2one('res.users', 'Salesman Manager'),
+        'amount_tax': fields.function(_amount_all, method=True, string='Taxes',digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
         'amount_total': fields.function(_amount_total, method=True, string='Total'),
-        'amount_paid': fields.function(_total_payment, 'Paid', states={'draft': [('readonly', False)]}, readonly=True, method=True),
-        'amount_return': fields.function(_total_return, 'Returned', method=True),
+        'amount_paid': fields.function(_amount_all, 'Paid', states={'draft': [('readonly', False)]}, readonly=True, method=True,digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
+        'amount_return': fields.function(_amount_all, 'Returned', method=True,digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
         'lines': fields.one2many('pos.order.line', 'order_id', 'Order Lines', states={'draft': [('readonly', False)]}, readonly=True),
         'price_type': fields.selection([
             ('tax_excluded','Tax excluded')
@@ -371,19 +312,9 @@ class pos_order(osv.osv):
         'first_name': fields.char('First Name', size=64),
         'state_2': fields.function(_get_v,type='selection',selection=[('to_verify', 'To Verify'), ('accepted', 'Accepted'),
             ('refused', 'Refused')], string='State', readonly=True, method=True, store=True),
-        
-    #    'last_name': fields.char('Last Name', size=64),
-    #    'street': fields.char('Street', size=64),
-    #    'zip2': fields.char('Zip', size=64),
-    #    'city': fields.char('City', size=64),
-    #    'mobile': fields.char('Mobile', size=64),
-    #    'email': fields.char('Email', size=64),
         'note': fields.text('Internal Notes'),
         'nb_print': fields.integer('Number of Print', readonly=True),
         'sale_journal': fields.many2one('account.journal', 'Journal', required=True, states={'draft': [('readonly', False)]}, readonly=True, ),
-      #  'account_receivable': fields.many2one('account.account',
-      #      'Default Receivable', required=True, states={'draft': [('readonly', False)]},
-      #      readonly=True, ),
         'invoice_wanted': fields.boolean('Create Invoice'),
         'note_2': fields.char('Customer Note',size=64),
         'type_rec': fields.char('Type of Receipt',size=64),
@@ -419,7 +350,7 @@ class pos_order(osv.osv):
 
     _defaults = {
         'user_id': lambda self, cr, uid, context: uid,
-        'user_id2': lambda self, cr, uid, context: uid,
+        'sale_manager': lambda self, cr, uid, context: uid,
         'state': lambda *a: 'draft',
         'price_type': lambda *a: 'tax_excluded',
         'state_2': lambda *a: 'to_verify',
@@ -565,12 +496,12 @@ class pos_order(osv.osv):
                     if line.product_id and line.product_id.type=='service':
                         continue
                     prop_ids = self.pool.get("ir.property").search(cr, uid, [('name', '=', 'property_stock_customer')])
-                    val = self.pool.get("ir.property").browse(cr, uid, prop_ids[0]).value
+                    val = self.pool.get("ir.property").browse(cr, uid, prop_ids[0]).value_reference
                     cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order.shop_id.warehouse_id.id))
                     res=cr.fetchone()
                     location_id=res and res[0] or None
 #                    location_id = order and order.shop_id and order.shop_id.warehouse_id and order.shop_id.warehouse_id.lot_stock_id.id or None
-                    stock_dest_id = int(val.split(',')[1])
+                    stock_dest_id = val.id
                     if line.qty < 0:
                         location_id, stock_dest_id = stock_dest_id, location_id
 
@@ -626,7 +557,7 @@ class pos_order(osv.osv):
 
     def button_validate(self, cr, uid, ids, *args):
                 
-        """ Check the access for the sale order  and update the date_payment
+        """ Check the access for the sale order  and update the date_validation
         @return: True
         """        
         res_obj = self.pool.get('res.company')
@@ -637,12 +568,12 @@ class pos_order(osv.osv):
         if part_company:
             raise osv.except_osv(_('Error'), _('You don\'t have enough access to validate this sale!'))
         for order in self.browse(cr, uid, ids):
-            if not order.date_payment:
+            if not order.date_validation:
                 cr.execute("select max(date) from account_bank_statement_line where pos_statement_id=%d"%(order.id))
                 val=cr.fetchone()
                 val=val and val[0] or None
                 if val:
-                    cr.execute("Update pos_order set date_payment='%s' where id = %d"%(val, order.id))
+                    cr.execute("Update pos_order set date_validation='%s' where id = %d"%(val, order.id))
         return True
 
 
@@ -679,7 +610,7 @@ class pos_order(osv.osv):
         if 'payment_name' in data.keys():
             args['name'] = data['payment_name'] + ' ' +order.name
         account_def = self.pool.get('ir.property').get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
-        args['account_id'] = order.partner_id and order.partner_id.property_account_receivable and order.partner_id.property_account_receivable.id or account_def or curr_c.account_receivable.id
+        args['account_id'] = order.partner_id and order.partner_id.property_account_receivable and order.partner_id.property_account_receivable.id or account_def.id or curr_c.account_receivable.id
         if data.get('is_acc',False):
             args['is_acc']=data['is_acc']
             args['account_id']= prod_obj.browse(cr,uid, data['product_id']).property_account_income and prod_obj.browse(cr,uid, data['product_id']).property_account_income.id
@@ -772,7 +703,7 @@ class pos_order(osv.osv):
         inv_ids = []
 
         for order in self.browse(cr, uid, ids, context):
-            curr_c = order.user_id1.company_id
+            curr_c = order.user_salesman_id.company_id
             if order.invoice_id:
                 inv_ids.append(order.invoice_id.id)
                 continue
@@ -780,9 +711,7 @@ class pos_order(osv.osv):
             if not order.partner_id:
                 raise osv.except_osv(_('Error'), _('Please provide a partner for the sale.'))
 
-            cr.execute('select a.id from account_account a, res_company p where p.account_receivable=a.id and p.id=%s', (curr_c.id, ))
-            res=cr.fetchone()
-            acc=res and res[0] or None
+            acc= order.partner_id.property_account_receivable.id
             inv = {
                 'name': 'Invoice from POS: '+order.name,
                 'origin': order.name,
@@ -834,15 +763,17 @@ class pos_order(osv.osv):
         account_move_line_obj = self.pool.get('account.move.line')
         account_period_obj = self.pool.get('account.period')
         account_tax_obj = self.pool.get('account.tax')
+        res_obj=self.pool.get('res.users')
+        property_obj=self.pool.get('ir.property')
         period = account_period_obj.find(cr, uid, context=context)[0]
 
         for order in self.browse(cr, uid, ids, context=context):
-            curr_c = self.pool.get('res.users').browse(cr, uid, uid).company_id
-            comp_id = self.pool.get('res.users').browse(cr, order.user_id.id, order.user_id.id).company_id
+            curr_c =res_obj.browse(cr, uid, uid).company_id
+            comp_id = res_obj.browse(cr, order.user_id.id, order.user_id.id).company_id
             comp_id=comp_id and comp_id.id or False
             to_reconcile = []
             group_tax = {}
-            account_def = self.pool.get('ir.property').get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
+            account_def = property_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
             order_account = order.partner_id and order.partner_id.property_account_receivable and order.partner_id.property_account_receivable.id or account_def or curr_c.account_receivable.id
 
             # Create an entry for the sale
@@ -1028,9 +959,8 @@ class pos_order(osv.osv):
                                                                         'statement_id': False,
                                                                         'account_id':order_account
                                                                      })
-           #     account_move_obj.button_validate(cr, uid, [move_id, payment_move_id], context=context)
+           
             self.write(cr,uid,order.id,{'state':'done'})
-         #       account_move_line_obj.reconcile(cr, uid, to_reconcile, type='manual', context=context)
         return True
 
     def cancel_picking(self, cr, uid, ids, context=None):
@@ -1042,6 +972,7 @@ class pos_order(osv.osv):
 
     def action_payment(self, cr, uid, ids, context=None):
         vals = {'state': 'payment'}
+        sequence_obj=self.pool.get('ir.sequence')
         for pos in self.browse(cr, uid, ids):
             create_contract_nb = False
             for line in pos.lines:
@@ -1049,8 +980,8 @@ class pos_order(osv.osv):
                     create_contract_nb = True
                     break
             if create_contract_nb:
-                seq = self.pool.get('ir.sequence').get(cr, uid, 'pos.user_%s' % pos.user_id1.login)
-                vals['contract_number'] ='%s-%s' % (pos.user_id1.login, seq)
+                seq = sequence_obj.get(cr, uid, 'pos.user_%s' % pos.user_salesman_id.login)
+                vals['contract_number'] ='%s-%s' % (pos.user_salesman_id.login, seq)
         self.write(cr, uid, ids, vals)
 
     def action_paid(self, cr, uid, ids, context=None):
@@ -1071,7 +1002,6 @@ class pos_order(osv.osv):
         for order in self.browse(cr, uid, ids, context=context):
             if not order.journal_entry:
                 self.create_account_move(cr, uid, ids, context={})
-        #self.write(cr, uid, ids, {'state': 'done'})
         return True
 
     def compute_state(self, cr, uid, id):
@@ -1145,7 +1075,6 @@ class pos_order_line(osv.osv):
             price = self.price_by_product(cr, uid, ids, line.order_id.pricelist_id.id, line.product_id.id, line.qty, line.order_id.partner_id.id)
             if line.discount!=0.0:
                 res[line.id] = line.price_unit * line.qty * (1 - (line.discount or 0.0) / 100.0)
-#                res[line.id] = price * line.qty * (1 - (line.discount or 0.0) / 100.0)
             else:
                 res[line.id]=line.price_unit*line.qty
         return res
@@ -1181,7 +1110,7 @@ class pos_order_line(osv.osv):
         disc=0.0
         if (disc != 0.0 or prod_id) and price_f>0:
             disc=100-(price/price_f*100)
-            return {'value':{'discount':disc, 'price_unit':price_f}}#,'notice':''}}#, 'price_subtotal':(price_f*qty*(1-disc))}}
+            return {'value':{'discount':disc, 'price_unit':price_f}}
         return {}
 
     def onchange_ded(self, cr, uid,ids, val_ded,price_u,*a):
@@ -1218,11 +1147,9 @@ class pos_order_line(osv.osv):
         'company_id':fields.many2one('res.company', 'Company', required=True),
         'notice': fields.char('Discount Notice', size=128, required=True),
         'serial_number': fields.char('Serial Number', size=128),
-#        'contract_number': fields.char('Contract Number', size=512),
         'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], required=True, change_default=True),
-#        'price_unit': fields.float('Unit Price'),
         'price_unit': fields.function(_get_amount, method=True, string='Unit Price', store=True),
-        'price_ded': fields.float('Discount(Amount)'),
+        'price_ded': fields.float('Discount(Amount)',digits_compute=dp.get_precision('Point Of Sale')),
         'qty': fields.float('Quantity'),
         'qty_rfd': fields.float('Refunded Quantity'),
         'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal w/o Tax'),
@@ -1283,7 +1210,7 @@ class pos_order_line(osv.osv):
                    }
             line_id = self.create(cr, uid, vals)
             if not line_id:
-                raise wizard.except_wizard(_('Error'), _('Create line failed !'))
+                raise osv.except_osv(_('Error'), _('Create line failed !'))
         else:
             vals = {
                 'qty': qty,
@@ -1348,226 +1275,8 @@ class pos_payment(osv.osv):
 
 pos_payment()
 
-
-class report_transaction_pos(osv.osv):
-    _name = "report.transaction.pos"
-    _description = "transaction for the pos"
-    _auto = False
-    _columns = {
-        'date_create': fields.char('Date', size=16, readonly=True),
-        'journal_id': fields.many2one('account.journal', 'Sales Journal', readonly=True),
-        'jl_id': fields.many2one('account.journal', 'Cash Journals', readonly=True),
-        'user_id': fields.many2one('res.users', 'User', readonly=True),
-        'no_trans': fields.float('Number of Transaction', readonly=True),
-        'amount': fields.float('Amount', readonly=True),
-        'invoice_id': fields.float('Nbr Invoice', readonly=True),
-        'invoice_am': fields.float('Invoice Amount', readonly=True),
-        'product_nb': fields.float('Product Nb.', readonly=True),
-        'disc': fields.float('Disc.', readonly=True),
-    }
-
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'report_transaction_pos')
-        cr.execute("""
-            create or replace view report_transaction_pos as (
-               select
-                    min(absl.id) as id,
-                    count(absl.id) as no_trans,
-                    sum(absl.amount) as amount,
-                    sum(line.price_ded) as disc,
-                    to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')::text as date_create,
-                    po.user_id as user_id,
-                    po.sale_journal as journal_id,
-                    abs.journal_id as jl_id,
-                    count(po.invoice_id) as invoice_id,
-                    count(p.id) as product_nb
-                from
-                    account_bank_statement_line as absl,
-                    account_bank_statement as abs,
-                    product_product as p,
-                    pos_order_line as line,
-                    pos_order as po
-                where
-                    absl.pos_statement_id = po.id and
-                    line.order_id=po.id and
-                    line.product_id=p.id and
-                    absl.statement_id=abs.id
-
-                group by
-                    po.user_id,po.sale_journal, abs.journal_id,
-                    to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')::text
-                )
-        """)
-                    #to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')
-                    #to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')::text as date_create,
-report_transaction_pos()
-
-class report_sales_by_user_pos(osv.osv):
-    _name = "report.sales.by.user.pos"
-    _description = "Sales by user"
-    _auto = False
-    _columns = {
-        'date_order': fields.date('Order Date',required=True, select=True),
-        'amount': fields.float('Total', readonly=True, select=True),
-        'qty': fields.float('Quantity', readonly=True, select=True),
-        'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
-    }
-
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'report_sales_by_user_pos')
-        cr.execute("""
-            create or replace view report_sales_by_user_pos as (
-                select
-                    min(po.id) as id,
-                    to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::text as date_order,
-                    po.user_id as user_id,
-                    sum(pol.qty)as qty,
-                    sum((pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))) as amount
-                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
-               group by
-                    to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::text,
-                    po.user_id
-
-                )
-        """)
-report_sales_by_user_pos()
-
-class report_sales_by_user_pos_month(osv.osv):
-    _name = "report.sales.by.user.pos.month"
-    _description = "Sales by user monthly"
-    _auto = False
-    _columns = {
-        'date_order': fields.date('Order Date',required=True, select=True),
-        'amount': fields.float('Total', readonly=True, select=True),
-        'qty': fields.float('Quantity', readonly=True, select=True),
-        'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
-    }
-
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'report_sales_by_user_pos_month')
-        cr.execute("""
-            create or replace view report_sales_by_user_pos_month as (
-                select
-                    min(po.id) as id,
-                    to_char(date_trunc('month',po.date_order),'YYYY-MM-DD')::text as date_order,
-                    po.user_id as user_id,
-                    sum(pol.qty)as qty,
-                    sum((pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))) as amount
-                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
-               group by
-                    to_char(date_trunc('month',po.date_order),'YYYY-MM-DD')::text,
-                    po.user_id
-
-                )
-        """)
-report_sales_by_user_pos_month()
-
-class report_sales_by_margin_pos(osv.osv):
-    _name = "report.sales.by.margin.pos"
-    _description = "Sales by margin"
-    _auto = False
-    _columns = {
-#        'pos_name': fields.char('POS Order', size=64, readonly=True),
-        'product_name':fields.char('Product Name', size=64, readonly=True),
-        'date_order': fields.date('Order Date',required=True, select=True),
-     #   'amount': fields.float('Total', readonly=True, select=True),
-        'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
-        'qty': fields.float('Qty', readonly=True, select=True),
-        'net_margin_per_qty':fields.float('Net margin per Qty', readonly=True, select=True),
-        'total':fields.float('Margin', readonly=True, select=True),
-
-    }
-
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'report_sales_by_margin_pos')
-        cr.execute("""
-            create or replace view report_sales_by_margin_pos as (
-                select
-                    min(pol.id) as id,
-                    po.user_id as user_id,
-                    pt.name as product_name,
-                    to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::text as date_order,
-                    sum(pol.qty) as qty,
-                    pt.list_price-pt.standard_price as net_margin_per_qty,
-                    (pt.list_price-pt.standard_price) *sum(pol.qty) as total
-                from
-                    product_template as pt,
-                    product_product as pp,
-                    pos_order_line as pol,
-                    pos_order as po
-                where
-                    pol.product_id = pp.product_tmpl_id and
-                    pp.product_tmpl_id = pt.id and
-                    po.id = pol.order_id
-
-                group by
-                    pt.name,
-                    pt.list_price,
-                    pt.standard_price,
-                    po.user_id,
-                    to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::text
-
-                )
-        """)
-report_sales_by_margin_pos()
-
-class report_sales_by_margin_pos_month(osv.osv):
-    _name = "report.sales.by.margin.pos.month"
-    _description = "Sales by margin monthly"
-    _auto = False
-    _columns = {
-#        'pos_name': fields.char('POS Order', size=64, readonly=True),
-        'product_name':fields.char('Product Name', size=64, readonly=True),
-        'date_order': fields.date('Order Date',required=True, select=True),
-        #'amount': fields.float('Total', readonly=True, select=True),
-        'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
-        'qty': fields.float('Qty', readonly=True, select=True),
-        'net_margin_per_qty':fields.float('Net margin per Qty', readonly=True, select=True),
-        'total':fields.float('Margin', readonly=True, select=True),
-
-    }
-
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'report_sales_by_margin_pos_month')
-        cr.execute("""
-            create or replace view report_sales_by_margin_pos_month as (
-                select
-                    min(pol.id) as id,
-                    po.user_id as user_id,
-                    pt.name as product_name,
-                    to_char(date_trunc('month',po.date_order),'YYYY-MM-DD')::text as date_order,
-                    sum(pol.qty) as qty,
-                    pt.list_price-pt.standard_price as net_margin_per_qty,
-                    (pt.list_price-pt.standard_price) *sum(pol.qty) as total
-                from
-                    product_template as pt,
-                    product_product as pp,
-                    pos_order_line as pol,
-                    pos_order as po
-                where
-                    pol.product_id = pp.product_tmpl_id and
-                    pp.product_tmpl_id = pt.id and
-                    po.id = pol.order_id
-
-                group by
-                    pt.name,
-                    pt.list_price,
-                    pt.standard_price,
-                    po.user_id,
-                    to_char(date_trunc('month',po.date_order),'YYYY-MM-DD')::text
-
-                )
-        """)
-report_sales_by_margin_pos_month()
-
-
 class account_move_line(osv.osv):
+    
     _inherit = 'account.move.line'
     def create(self, cr, user, vals, context={}):
         pos_obj = self.pool.get('pos.order')
@@ -1587,7 +1296,9 @@ account_move_line()
 
 
 class account_move(osv.osv):
+    
     _inherit = 'account.move'
+    
     def create(self, cr, user, vals, context={}):
         pos_obj = self.pool.get('pos.order')
         val_name = vals.get('name', '')
diff --git a/addons/point_of_sale/pos_account_bank_statement.py b/addons/point_of_sale/pos_account_bank_statement.py
index ccce315fe36..60924350014 100644
--- a/addons/point_of_sale/pos_account_bank_statement.py
+++ b/addons/point_of_sale/pos_account_bank_statement.py
@@ -65,4 +65,3 @@ class account_bank_statement_line(osv.osv):
 account_bank_statement_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/point_of_sale/pos_data.xml b/addons/point_of_sale/pos_data.xml
index 8ff4697804e..b36bd0827c2 100644
--- a/addons/point_of_sale/pos_data.xml
+++ b/addons/point_of_sale/pos_data.xml
@@ -11,7 +11,6 @@
             <field name="list_price">0.0</field>
             <field name="standard_price">0.0</field>
             <field name="uom_id" ref="product.product_uom_unit"/>
-            <!--  <field name="company_id" ref="base.main_company"/>  -->
             <field name="uom_po_id" ref="product.product_uom_unit"/>
         </record>
 
@@ -22,7 +21,6 @@
             <field name="list_price">100.0</field>
             <field name="standard_price">100.0</field>
             <field name="uom_id" ref="product.product_uom_unit"/>
-            <!--  <field name="company_id" ref="multi_company_stock.res_company_tinyshop0"/> -->
             <field name="uom_po_id" ref="product.product_uom_unit"/>
         </record>
 
diff --git a/addons/point_of_sale/pos_demo.xml b/addons/point_of_sale/pos_demo.xml
index 789d96b897d..b75f4362578 100644
--- a/addons/point_of_sale/pos_demo.xml
+++ b/addons/point_of_sale/pos_demo.xml
@@ -57,8 +57,8 @@
 			<field name="shop_id" ref="sale.shop"/>
 			<field eval="&quot;&quot;&quot;2009-05-29&quot;&quot;&quot;" name="date_order"/>
 			<field name="partner_id" ref="base.res_partner_5"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field name="user_id1" ref="base.user_root"/>
+			<field name="user_salesman_id" ref="base.user_root"/>
+			<field name="sale_manager" ref="base.user_root"/>
 			<field eval="&quot;&quot;&quot;POS/001&quot;&quot;&quot;" name="name"/>
 			<field name="company_id" ref="res_company_tinyshop0"/>
 			<field eval="0" name="invoice_wanted"/>
@@ -93,8 +93,8 @@
       <field name="shop_id" ref="sale.shop"/>
 			<field eval="&quot;&quot;&quot;2009-05-29&quot;&quot;&quot;" name="date_order"/>
 			<field name="partner_id" ref="base.res_partner_3"/>
-			<field name="user_id" ref="res_users_sofia0"/>
-			<field name="user_id1" ref="base.user_root"/>
+			<field name="user_salesman_id" ref="res_users_sofia0"/>
+			<field name="sale_manager" ref="base.user_root"/>
 			<field eval="&quot;&quot;&quot;POS/002&quot;&quot;&quot;" name="name"/>
 			<field name="company_id" ref="res_company_shop0"/>
 			<field eval="&quot;&quot;&quot;tax_excluded&quot;&quot;&quot;" name="price_type"/>
@@ -135,8 +135,8 @@
 			<field eval="&quot;&quot;&quot;2009-11-29&quot;&quot;&quot;" name="date_validity"/>
 			<field eval="&quot;&quot;&quot;2009-05-29&quot;&quot;&quot;" name="date_order"/>
 			<field name="partner_id" ref="base.res_partner_3"/>
-			<field name="user_id" ref="res_users_sofia0"/>
-			<field name="user_id1" ref="base.user_root"/>
+			<field name="user_salesman_id" ref="res_users_sofia0"/>
+			<field name="sale_manager" ref="base.user_root"/>
 			<field eval="&quot;&quot;&quot;POS/0012&quot;&quot;&quot;" name="name"/>
 			<field name="company_id" ref="res_company_shop0"/>
 			<field eval="0" name="invoice_wanted"/>
@@ -144,16 +144,6 @@
 			<field name="pricelist_id" ref="product.list0"/>
       <field name="shop_id" ref="sale.shop"/>
     </record>
-
-<!--		<record id="pos_order_line_orderlineadv" model="pos.order.line">
-			<field eval="0.0" name="discount"/>
-			<field name="product_id" ref="advance_product_pos"/>
-			<field eval="&quot;&quot;&quot;Order Line/Advance&quot;&quot;&quot;" name="name"/>
-			<field name="order_id" ref="pos_order_posadvance"/>
-			<field eval="50.0" name="price_unit"/>
-		    <field name="company_id" ref="res_company_shop0"/>
-			<field eval="-1.0" name="qty"/>
-		</record-->
           <record id="data_fiscalyear" model="account.fiscalyear">
             <field eval="'Fiscal Year Shop '+time.strftime('%Y')" name="name"/>
             <field eval="'FY'+time.strftime('%Y')" name="code"/>
@@ -194,12 +184,6 @@ do black box testing on entries on this chart of account, without modifying
 your own chart of account.
 </field>
         </record>
-<!--        <record id="stock_location.product_pulled_flow_d1" model="product.pulled.flow">
-          <field name="partner_addr_id" ref="multi_company_stock.res_partner_address_fabien0"/>
-        </record>
 
-        <record id="stock_location.product_pulled_flow_d2" model="product.pulled.flow">
-          <field name="partner_addr_id" ref="multi_company_stock.res_partner_address_eric0"/>
-        </record-->
   </data>
 </openerp>
diff --git a/addons/point_of_sale/pos_report.xml b/addons/point_of_sale/pos_report.xml
index 2e9ff5e6107..9123502d288 100644
--- a/addons/point_of_sale/pos_report.xml
+++ b/addons/point_of_sale/pos_report.xml
@@ -1,39 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <openerp>
 	<data>
-		<!--report
-			id="pos_receipt"
-			string="Receipt"
-			model="pos.order"
-			name="pos.receipt"
-			rml="point_of_sale/report/pos_receipt.rml"
-			auto="False"
-			header="False"
-			multi="True"
-			/-->
-
-
-<!--
-		<report
-			id="pos_receipt_with_remboursment"
-			string="Refund Receipt"
-			model="pos.order"
-			name="pos.receipt.with.remboursment"
-			rml="point_of_sale/report/pos_receipt_with_remboursment.rml"
-			auto="False"
-			header="False"
-			multi="True"
-			/>
-		<report
-			id="pos_receipt_without_remboursment"
-			string="Voucher Receipt"
-			model="pos.order"
-			name="pos.receipt.without.remboursment"
-			rml="point_of_sale/report/pos_receipt_without_remboursment.rml"
-			auto="False"
-			header="False"
-			multi="True"
-			/-->
 
 		<report
 			id="pos_invoice_report"
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index c0fc20de128..c36420da08a 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -11,7 +11,7 @@
                     <notebook >
                         <page string="Order lines">
                             <group colspan="4" col="6">
-                                <field name="user_id1" />
+                                <field name="user_salesman_id" />
                                 <field name="partner_id" on_change="onchange_partner_pricelist(partner_id)"/>
                                 <field name="contract_number" select="1" groups="base.group_extended"/>
                             </group>
@@ -58,28 +58,14 @@
                                     states="paid, draft"
                                         attrs="{'invisible':[('state_2','=','accepted')]}"/>
                               </group>
-
                             <separator colspan="4" string="Actions"/>
                             <group colspan="4" col="6">
-
                                 <field name="state" select="1"/>
-
-                                <!--
-                                <button name="%(pos_add_product)d" string="_Add product" type="action" states="draft"/>
-                                -->
-
-                                <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_pos_payment)d" string="Ma_ke Payment" icon="gtk-ok" type="action" states="draft,advance" />
                                 <button name="%(action_report_pos_receipt)d" string="_Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
-
-
-                                <!--
-                                <button name="action_cancel" string="Cancel" type="object" states="paid" />
-                                -->
                                 <button name="set_to_draft" string="Set to draft" states="paid" icon="gtk-execute" type="object" />
-
-                                <button name="%(pos_return_picking)d" string="Return Picking" type="action" icon="gtk-ok" states="paid"
-                                    attrs="{'invisible':[('state','!=','paid'),('state','!=','invoiced')]}"/>
-
+                                <button name="%(action_view_pos_return)d" string="Return Picking" type="action" icon="gtk-ok" states="paid"
+                                    attrs="{'invisible':[('state','!=','paid'),('state','!=','invoiced')]}"/>                             
                             </group>
                         </page>
 
@@ -90,14 +76,14 @@
                                 <field name="shop_id" widget="selection"  />
                                 <field name="name" select="1"/>
                                 <field name="user_id" />
-                                <field name="user_id2" />
+                                <field name="sale_manager" />
                                 <field name="price_type" />
                             </group>
                             <group colspan="2" col="2" name="Type">
                                 <separator string="Dates" colspan="4"/>
                                 <field name="date_order" select="1" />
-                                <field name="date_payment" select="1"  />
-                                <field name="date_payment2" select="1"  groups="base.group_extended"/>
+                                <field name="date_validation" select="1"  />
+                                <field name="date_payment" select="1"  groups="base.group_extended"/>
                             </group>
                             <group colspan="4">
                                 <separator string="Invoicing" colspan="4"/>
@@ -122,7 +108,6 @@
                                 </form>
                             </field>
                         </page>
-
                         <page string="Notes" >
                             <separator string="Notes" colspan="4" />
                             <group colspan="4">
@@ -135,8 +120,6 @@
                 </form>
             </field>
         </record>
-
-
         <record model="ir.actions.act_window" id="action_pos_pos_form">
             <field name="name">Point of Sale</field>
             <field name="type">ir.actions.act_window</field>
@@ -145,8 +128,6 @@
             <field name="view_id" ref="view_pos_pos_form"/>
             <field name="domain">[['date_order','>=',time.strftime('%Y-%m-%d')]]</field>
         </record>
-
-
         <record model="ir.ui.view" id="view_pos_order_tree">
             <field name="name">Sales</field>
             <field name="model">pos.order</field>
@@ -155,8 +136,8 @@
                 <tree string="POS Orders">
                     <field name="name"/>
                     <field name="date_order" select="1"/>
+                    <field name="date_validation"/>
                     <field name="date_payment"/>
-                    <field name="date_payment2"/>
                     <field name="user_id"/>
                     <field name="invoice_id"/>
                     <field name="state" select="1"/>
@@ -165,10 +146,38 @@
                 </tree>
             </field>
         </record>
+        <record id="view_pos_order_filter" model="ir.ui.view">
+            <field name="name">pos.order.list.select</field>
+            <field name="model">pos.order</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Sales Order">
+                    <filter icon="terp-sale" string="Quotations" domain="[('state','=','draft')]"/>
+                    <filter icon="terp-sale" string="Running" domain="[('state','in',('payment','advance'))]"/>
+                    <separator orientation="vertical"/>
+                    <field name="name" select="1"/>
+                    <field name="partner_id" select="1"/>
+                    <field name="user_id" select="1" widget="selection">
+                        <filter icon="terp-partner" string="My Sale" domain="[('user_id','=',uid)]" help="My Sale Orders" />
+                    </field>
+                    <field name="date_order" select="1" string="Order date" />
+                    <newline/>
+                    <group expand="1" string="Group By..." colspan="11" col="11">
+                        <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'}"/>
+                        <filter string="Salesman" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
+                    </group>
+               </search>
+            </field>
+        </record>
+        
         <menuitem name="Point of Sale" id="menu_point_root" sequence="10"/>
         <menuitem name="Point of Sale" id="menu_point_of_sale" parent="menu_point_root" sequence="1" />
         <menuitem name="Sales Order" parent="menu_point_of_sale" id="menu_point_ofsale" action="action_pos_pos_form" sequence="1"/>
-        <menuitem action="product.product_normal_action" id="menu_pos_products" parent="menu_point_of_sale" sequence="2" name="Products"/>
+        <menuitem name="Products" id="menu_point_of_sale_product" parent="menu_point_root" sequence="2" />
+        
+        <menuitem action="product.product_normal_action" id="menu_pos_products" parent="menu_point_of_sale_product" sequence="2" name="Products"/>
 
         <!--  POS Order view (date_payment)  -->
          <record model="ir.actions.act_window" id="action_pos_pos_form_user">
@@ -176,10 +185,12 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">pos.order</field>
             <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_pos_order_tree"/>
             <field name="domain">['|',('state_2','=','to_verify'),('state','=','advance')]</field>
+			<field name="search_view_id" ref="view_pos_order_filter"/>	             
+ 				           
         </record>
-invoiced
 
         <record model="ir.actions.act_window" id="action_pos_order_tobinvoiced">
             <field name="name">Sales to Invoice</field>
@@ -189,6 +200,8 @@ invoiced
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_pos_order_tree"/>
             <field name="domain">[('state','!=', 'invoiced')]</field>
+			<field name="search_view_id" ref="view_pos_order_filter"/>	             
+		    	             
         </record>
         <menuitem name="Invoicing" id="menu_point_of_sale_invoicing" parent="menu_point_root" sequence="4" />
         <menuitem name="Sales to Invoice" action="action_pos_order_tobinvoiced" id="menu_point_of_sale_tobinvoiced" parent="menu_point_of_sale_invoicing"/>
@@ -198,8 +211,8 @@ invoiced
             <field name="res_model">pos.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_pos_order_tree"/>
             <field name="domain">[('state','=', 'paid')]</field>
+ 			<field name="search_view_id" ref="view_pos_order_filter"/>	               
         </record>
         <record model="ir.actions.act_window" id="action_pos_order_tree2">
             <field name="name">Point of Sale</field>
@@ -207,29 +220,25 @@ invoiced
             <field name="res_model">pos.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_pos_order_tree"/>
             <field name="domain">[('date_order','&lt;=', time.strftime('%Y-%m-%d 23:59:59'))]</field>
+ 			<field name="search_view_id" ref="view_pos_order_filter"/>	               
         </record>
 
-<!--        <menuitem name="Orders of the day" parent="menu_point_ofsale" id="menu_action_pos_order_tree2" action="action_pos_order_tree2"/-->
-
         <record model="ir.actions.act_window" id="action_pos_order_tree3">
             <field name="name">Point of Sale</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">pos.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_pos_order_tree"/>
+			<field name="search_view_id" ref="view_pos_order_filter"/>            
         </record>
-<!--        <menuitem name="All orders" parent="menu_point_ofsale" id="menu_action_pos_order_tree3" action="action_pos_order_tree3"/-->
-
         <record model="ir.actions.act_window" id="action_pos_order_tree_open">
             <field name="name">Opened Sales</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">pos.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">form,tree</field>
-            <field name="view_id" ref="view_pos_pos_form"/>
+			<field name="search_view_id" ref="view_pos_order_filter"/>            
         </record>
 
         <record model="ir.ui.view" id="view_pos_order_line">
@@ -663,59 +672,11 @@ invoiced
                     <page string="Other">
                       <field  name="company_discount" colspan="4"/>
                       <field  name="max_diff" colspan="4"/>
-                      <field  name="account_receivable" required="1" colspan="4"/>
                     </page>
                 </notebook>
             </field>
            </record>
 
-
-        <record model="ir.ui.view" id="form_mode_p_contact">
-            <field name="name">Contact Mode</field>
-            <field name="model">res.mode.contact</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-             <form string="Contact Mode">
-                    <field  name="name" select="1"/>
-                    <field  name="active"/>
-              </form>
-            </field>
-          </record>
-
-        <record model="ir.ui.view" id="tree_mode_p_contact">
-            <field name="name">Contact Mode</field>
-            <field name="model">res.mode.contact</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-             <tree string="Contact Mode">
-                    <field  name="name"/>
-                    <field  name="active"/>
-              </tree>
-            </field>
-          </record>
-
-        <record model="ir.actions.act_window" id="action_mode_p">
-            <field name="name">Contact Mode</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">res.mode.contact</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <menuitem name="Contact Mode" parent="base.menu_base_config" action="action_mode_p" id="menu_mode_po"/>
-
-        <record model="ir.ui.view" id="view_partner_contact">
-            <field name="name">view.partner.contact</field>
-            <field name="model">res.partner</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-              <field name="website" position="after">
-                    <field  name="contact_mode_id"/>
-              </field>
-            </field>
-          </record>
-
         <record id="product_normal_form_view" model="ir.ui.view">
             <field name="name">product.normal.form.inherit</field>
             <field name="model">product.product</field>
@@ -748,7 +709,6 @@ invoiced
                         <field name="default_code" select="1"/>
                         <field groups="base.group_extended" name="ean13"/>
                     </group>
-
                    </group>
                    <notebook colspan="4">
                         <page string="Information">
@@ -829,13 +789,6 @@ invoiced
                     parent="menu_point_config_product"
                     action="action_product_output"
                     id="products_for_output_operations"/>
-
-<!--        <wizard
-            string="Refloat Box entries"
-            model="account.bank.statement"
-            name="pos.entry"
-            menu="False"
-            id="pos_entries"/>-->
             
         <menuitem name="Register Management" parent="menu_point_root"
             id="menu_point_config" sequence="3"/>
@@ -845,22 +798,12 @@ invoiced
             action="action_box_entries"
             id="menu_wizard_enter_jrnl" sequence="3" />
             
-    <!--    <wizard
-            string="Enter negative operations"
-            model="account.bank.statement"
-            name="pos.out"
-            menu="False"
-            id="pos_entries2"/>-->
         <menuitem
             name="Output Operations" parent="menu_point_config"
             string="Refloat"
             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"-->
-<!--            action="action_pos_pos_form_user" sequence="4"/>-->
-
-
         <record model="ir.ui.view" id="view_pos_order_tree_all_sales">
             <field name="name">POS Sales</field>
             <field name="model">pos.order</field>
@@ -870,8 +813,8 @@ invoiced
                     <field name="name"/>
                     <field name="date_order" select="1"/>
                     <field name="partner_id" />
+                    <field name="date_validation"/>
                     <field name="date_payment"/>
-                    <field name="date_payment2"/>
                     <field name="user_id"/>
                     <field name="invoice_id"/>
                     <field name="note" select="1" />
@@ -888,8 +831,6 @@ invoiced
             <field name="view_type">form</field>
             <field name="view_id" ref="view_pos_order_tree_all_sales" />
         </record>
-<!--        <menuitem name="All Sales" parent="menu_point_of_sale" id="menu_pos_all_sales" action="action_pos_all_sales" sequence="5" />-->
-
         <record model="ir.ui.view" id="view_pos_order_tree_all_sales_lines">
             <field name="name">POS Sales Lines</field>
             <field name="model">pos.order.line</field>
@@ -912,7 +853,6 @@ invoiced
             <field name="view_type">form</field>
             <field name="view_id" ref="view_pos_order_tree_all_sales_lines" />
         </record>
-<!--        <menuitem name="Toutes les lignes de ventes" parent="menu_point_root" id="menu_pos_all_sales_lines" action="action_pos_all_sales_lines" sequence="5" />-->
 
         <!--  Miscelleanous Operations/Reporting -->
         <menuitem name="Reporting" parent="menu_point_root" id="menu_point_rep" sequence="5"/>
@@ -926,8 +866,6 @@ invoiced
                         id="menu_action_sale_of_day_tree2" action="action_trans_pos_tree_today"/>
         <menuitem name="Accepted Sales" parent="menu_action_all_sales_tree3"
                         id="menu_action_sale_of_day_accept" action="action_pos_order_accepted"/>
-<!--        <menuitem name="Open Sales" parent="menu_action_all_sales_tree3"
-                        id="menu_action_open_sales_treeop" action="action_pos_order_tree_open"/-->
 
         <menuitem name="Sales Reports" parent="menu_point_report_sale" id="menu_sales_report" sequence="2"/>
 
@@ -975,11 +913,6 @@ invoiced
         <menuitem name="Sales Lines of the day" parent="menu_action_pos_order_line"
                     id="menu_action_pos_order_line_day" action="action_pos_order_line_day"/>
 
-<!--        <menuitem name="Open Sales Line" parent="menu_action_pos_order_line"
-                    id="menu_action_open_sales_line" action="action_pos_order_line_form"/-->
-
-<!--        <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="action_report_pos_sale_user"
                 id="menu_pos_sales_user" parent="menu_trans_pos_tree" sequence="3" groups="base.group_extended" />
diff --git a/addons/point_of_sale/pos_wizard.xml b/addons/point_of_sale/pos_wizard.xml
index 50e3630c4d7..4a321d7787f 100644
--- a/addons/point_of_sale/pos_wizard.xml
+++ b/addons/point_of_sale/pos_wizard.xml
@@ -1,74 +1,3 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
-  <wizard
-        id="pos_return_picking"
-        model="pos.order"
-        menu="False"
-        name="pos.return.picking"
-        string="Return Goods"/>
-
-
-
-<!--		<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="Create Invoices" model="pos.order"
-				name="pos.create_invoice" id="pos_invoice" multi="True"/>-->
-
-		<wizard string="Add products" model="pos.order"
-				name="pos.add_product" id="pos_add_product"  menu="False"/>
-
-			<!--<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"/>-->
-
-<!--		<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"/>-->
-
-<!--
-		<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"/>
-
-<!--		<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"/>
-
-		<wizard string="Scan Product" model="pos.order"
-				name="pos.scan_product" id="pos_scan_product"/-->
-<!--  		<wizard
-        	id="close_statement"
-        	model="account.bank.statement"
-        	menu="True"
-        	name="statement.close"
-        	string="Close Statements"/>-->
-
-
-       <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"/>
-
-
-	</data>
 </openerp>
diff --git a/addons/point_of_sale/pos_workflow.xml b/addons/point_of_sale/pos_workflow.xml
index d3f1313c13f..11cd9481343 100644
--- a/addons/point_of_sale/pos_workflow.xml
+++ b/addons/point_of_sale/pos_workflow.xml
@@ -66,7 +66,6 @@
 		<field name="act_from" ref="act_paid"/>
 		<field name="act_to" ref="act_done"/>
 		<field name="signal">done</field>
-	<!--	<field name="role_id" ref="role_pos"/-->
 	</record>
 
 	<record model="workflow.transition" id="trans_paid_invoice">
diff --git a/addons/point_of_sale/posrule_data.xml b/addons/point_of_sale/posrule_data.xml
index 1c58c50b43e..5fa46ad43a8 100644
--- a/addons/point_of_sale/posrule_data.xml
+++ b/addons/point_of_sale/posrule_data.xml
@@ -1,61 +1,6 @@
 <?xml version="1.0" ?>
 <openerp>
 	<data>
-        <!-- <record id="res_partner_tinyshop0" model="res.partner">
-            <field eval="0" name="customer"/>
-            <field eval="0" name="supplier"/>
-            <field eval="1" name="active"/>
-            <field eval="&quot;&quot;&quot;Tiny Shop 1&quot;&quot;&quot;" name="name"/>
-        </record>
-        <record id="res_partner_address_fabien0" model="res.partner.address">
-            <field eval="&quot;&quot;&quot;Fabien&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;92000&quot;&quot;&quot;" name="zip"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
-            <field name="partner_id" ref="stock.res_partner_tinyshop0"/>
-            <field name="country_id" ref="base.fr"/>
-            <field eval="&quot;&quot;&quot;Avenue de Paris&quot;&quot;&quot;" name="street"/>
-            <field eval="1" name="active"/>
-            <field eval="&quot;&quot;&quot;default&quot;&quot;&quot;" name="type"/>
-        </record>
-        <record id="res_company_shop0" model="res.company">
-            <field eval="5.0" name="security_lead"/>
-            <field name="currency_id" ref="base.EUR"/>
-            <field eval="1.0" name="po_lead"/>
-            <field name="partner_id" ref="res_partner_tinyshop0"/>
-            <field eval="1.0" name="manufacturing_lead"/>
-            <field name="parent_id" ref="base.main_company"/>
-            <field eval="80.0" name="schedule_range"/>
-            <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
-
-        </record>
-        <record id="res_partner_tinyshop1" model="res.partner">
-            <field eval="1" name="customer"/>
-            <field eval="0" name="supplier"/>
-            <field eval="1" name="active"/>
-            <field eval="&quot;&quot;&quot;Tiny Shop 2&quot;&quot;&quot;" name="name"/>
-       </record>
-        <record id="res_partner_address_eric0" model="res.partner.address">
-            <field eval="&quot;&quot;&quot;Eric&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;1500&quot;&quot;&quot;" name="zip"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
-            <field name="partner_id" ref="res_partner_tinyshop1"/>
-            <field name="country_id" ref="base.fr"/>
-            <field eval="&quot;&quot;&quot;Avenue de la Resistance&quot;&quot;&quot;" name="street"/>
-            <field eval="1" name="active"/>
-            <field eval="&quot;&quot;&quot;default&quot;&quot;&quot;" name="type"/>
-            <field name="partner_id" ref="res_partner_tinyshop1"/>
-            <field eval="1" name="active"/>
-        </record>-->
-<!--        <record id="res_company_tinyshop0" model="res.company">-->
-<!--            <field name="currency_id" ref="base.EUR"/>-->
-<!--            <field eval="1.0" name="po_lead"/>-->
-<!--            <field name="partner_id" ref="res_partner_tinyshop1"/>-->
-<!--            <field eval="1.0" name="manufacturing_lead"/>-->
-<!--            <field name="parent_id" ref="base.main_company"/>-->
-<!--            <field eval="80.0" name="schedule_range"/>-->
-<!--            <field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/>-->
-<!--        </record>-->
-
 
    		<record id="res_users_shopuser0" model="res.users">
             <field model="ir.actions.actions" name="menu_id" search="[('name','=','Menu')]"/>
@@ -82,23 +27,18 @@
             <field eval="&quot;&quot;&quot;shop2&quot;&quot;&quot;" name="login"/>
             <field model="ir.actions.actions" name="action_id" search="[('name','=','Menu')]"/>
         </record>
-		<record id="ir_rule_group_posline0" model="ir.rule.group">
-			<field name="model_id" ref="point_of_sale.model_pos_order_line"/>
-			<field eval="&quot;&quot;&quot;POS line&quot;&quot;&quot;" name="name"/>
-			<field eval="1" name="global"/>
-		</record>
 		<record id="ir_rule_0" model="ir.rule">
-			<field eval="&quot;&quot;&quot;child_of&quot;&quot;&quot;" name="operator"/>
-			<field eval="&quot;&quot;&quot;user.company_id.id&quot;&quot;&quot;" name="operand"/>
-			<field name="field_id" ref="point_of_sale.field_pos_order_line_company_id"/>
-			<field name="rule_group" ref="ir_rule_group_posline0"/>
+			<field name="name">POS line</field>
+	        <field name="model_id" ref="model_pos_order_line"/>
+	        <field name="global" eval="True"/>
+	        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
 		</record>
 	</data>
 
 	<data>
 		<record id="res_groups_posuserposline0" model="res.groups">
 			<field eval="[(6,0,[ref('point_of_sale.menu_action_pos_order_line'),ref('point_of_sale.menu_action_pos_order_line_day')])]" name="menu_access"/>
-			<field eval="[(6,0,[ref('ir_rule_group_posline0')])]" name="rule_groups"/>
+			<field eval="[(6,0,[ref('ir_rule_0')])]" name="rule_groups"/>
 			<field eval="[(6,0,[ref('res_users_shopuser0'),ref('res_users_shopuser1')])]" name="users"/>
 			<field eval="&quot;&quot;&quot;POS_user_pos_line&quot;&quot;&quot;" name="name"/>
 		</record>
@@ -123,42 +63,21 @@
 	</data>
 
 	<data>
-		<record id="ir_rule_group_point0" model="ir.rule.group">
-			<field name="model_id" ref="point_of_sale.model_pos_order"/>
-			<field eval="&quot;&quot;&quot;point&quot;&quot;&quot;" name="name"/>
-			<field eval="1" name="global"/>
-		</record>
-		<record id="ir_rule_0" model="ir.rule">
-			<field eval="&quot;&quot;&quot;child_of&quot;&quot;&quot;" name="operator"/>
-			<field eval="&quot;&quot;&quot;user.company_id.id&quot;&quot;&quot;" name="operand"/>
-			<field name="field_id" ref="point_of_sale.field_pos_order_company_id"/>
-			<field name="rule_group" ref="ir_rule_group_point0"/>
-		</record>
-
-
-		 <record id="ir_rule_group_poslinecompany0" model="ir.rule.group">
-			<field name="model_id" ref="point_of_sale.model_pos_order_line"/>
-			<field eval="&quot;&quot;&quot;POS line company&quot;&quot;&quot;" name="name"/>
-			<field eval="1" name="global"/>
-		</record>
-		<record id="ir_rule_4" model="ir.rule">
-			<field eval="&quot;&quot;&quot;child_of&quot;&quot;&quot;" name="operator"/>
-			<field eval="&quot;&quot;&quot;user.company_id.id&quot;&quot;&quot;" name="operand"/>
-			<field name="field_id" ref="point_of_sale.field_pos_order_line_company_id"/>
-			<field name="rule_group" ref="ir_rule_group_poslinecompany0"/>
-		</record>
-
-		<record id="ir_rule_group_posreporting0" model="ir.rule.group">
+	<record id="ir_rule_0" model="ir.rule">		
+    	<field eval="&quot;&quot;&quot;point&quot;&quot;&quot;" name="name"/>
+		<field name="model_id" ref="model_pos_order"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+	</record>     
+		<record id="ir_rule_group_posreporting0" model="ir.rule">
 			<field name="model_id" ref="point_of_sale.model_report_transaction_pos"/>
 			<field eval="&quot;&quot;&quot;POS Reporting&quot;&quot;&quot;" name="name"/>
-			<field eval="1" name="global"/>
+	  		<field name="global" eval="True"/>
 		</record>
 
 		<record id="ir_rule_5" model="ir.rule">
-			<field eval="&quot;&quot;&quot;=&quot;&quot;&quot;" name="operator"/>
-			<field eval="&quot;&quot;&quot;user.id&quot;&quot;&quot;" name="operand"/>
-			<field name="field_id" ref="point_of_sale.field_report_transaction_pos_user_id"/>
-			<field name="rule_group" ref="ir_rule_group_posreporting0"/>
+			<field name="model_id" ref="point_of_sale.model_report_transaction_pos"/>		
+			<field name="domain_force">['|',('user_id','=',False),('user_id','=',[user.id])]</field>			
 		</record>
 
 	</data>
@@ -176,7 +95,7 @@
       ref('stock.menu_action_picking_tree7'),
 	 		ref('stock.menu_action_picking_tree8'),
       ref('stock.menu_action_picking_tree9'),
-	 		ref('mrp.menu_mrp_procurement_action3'),
+	 		ref('mrp_procurement.menu_mrp_procurement_action3'),
 	 		ref('point_of_sale.menu_point_root')])]" name="menu_access"/>
 			<field eval="[(6,0,[ref('res_users_shopuser0'),ref('res_users_shopuser1')])]" name="users"/>
  				<field eval="[(6,0,[ref('point_of_sale.ir_rule_group_point0'),ref('point_of_sale.ir_rule_group_poslinecompany0'),ref('point_of_sale.ir_rule_group_posreporting0')])]" name="rule_groups"/>
@@ -213,7 +132,7 @@
 		</record>
 
 		<record id="ir_modelsmrp_pdt0" model="ir.model.access">
-			<field name="model_id" ref="mrp.model_mrp_procurement"/>
+			<field name="model_id" ref="mrp_procurement.model_mrp_procurement"/>
 			<field eval="1" name="perm_read"/>
 			<field eval="&quot;&quot;&quot;MRP - Procurement&quot;&quot;&quot;" name="name"/>
 			<field eval="0" name="perm_unlink"/>
@@ -287,7 +206,7 @@
 			<field name="group_id" ref="res_groups_posuser0"/>
 		</record>
 		<record id="ir_model_access_stockwarehouseorderpoint0" model="ir.model.access">
-			<field name="model_id" ref="mrp.model_stock_warehouse_orderpoint"/>
+			<field name="model_id" ref="mrp_procurement.model_stock_warehouse_orderpoint"/>
 			<field eval="1" name="perm_read"/>
 			<field eval="&quot;&quot;&quot;stock.warehouse.orderpoint&quot;&quot;&quot;" name="name"/>
 			<field eval="0" name="perm_unlink"/>
@@ -555,7 +474,7 @@
 			<field name="group_id" ref="res_groups_posuser0"/>
 		</record>
         <record id="ir_model_access_procurement0" model="ir.model.access">
-            <field name="model_id" ref="mrp.model_mrp_procurement" />
+            <field name="model_id" ref="mrp_procurement.model_mrp_procurement" />
             <field eval="1" name="perm_read" />
             <field eval="1" name="perm_write" />
             <field eval="1" name="perm_create" />
@@ -577,13 +496,8 @@
             id="stock.next_id_61"
             name="Reporting"
             parent="stock.menu_stock_root" groups="base.group_user"/>
-<!--        <menuitem-->
-<!--            id="stock.next_id_62"-->
-<!--            name="Traceability"-->
-<!--            parent="stock.next_id_61" groups="base.group_user"/>-->
-<!--        <menuitem id="stock.menu_traceability_low" name="Low Level" parent="stock.menu_traceability" groups="base.group_user"/>-->
 		<menuitem action="stock.action_picking_tree" id="stock.menu_action_picking_tree" parent="stock.menu_stock_root" sequence="19" groups="res_groups_posuser0"/>
-        <menuitem id="mrp.menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4" groups="base.group_user"/>
+        <menuitem id="mrp_procurement.menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4" groups="base.group_user"/>
         <menuitem parent="stock.next_id_61" action="stock.action_stock_line_date" id="stock.menu_report_stock_line_date" groups="base.group_user"/>
 
 	</data>
diff --git a/addons/point_of_sale/posrule_data2.xml b/addons/point_of_sale/posrule_data2.xml
index 680ae25d7b7..927584e92ce 100644
--- a/addons/point_of_sale/posrule_data2.xml
+++ b/addons/point_of_sale/posrule_data2.xml
@@ -177,7 +177,7 @@
       ref('stock.menu_action_picking_tree7'),
 	 		ref('stock.menu_action_picking_tree8'),
       ref('stock.menu_action_picking_tree9'),
-	 		ref('mrp.menu_mrp_procurement_action3'),
+	 		ref('mrp_procurement.menu_mrp_procurement_action3'),
 	 		ref('point_of_sale.menu_point_root')])]" name="menu_access"/>
  				<field eval="[(6,0,[ref('point_of_sale.ir_rule_group_point0'),ref('point_of_sale.ir_rule_group_poslinecompany0'),ref('point_of_sale.ir_rule_group_posreporting0')])]" name="rule_groups"/>
 			<field eva="[(6,0,[ref('res_users_shopuser0'),ref('res_users_shopuser1')])]" name="users"/>
@@ -214,7 +214,7 @@
 		</record>
 
 		<record id="ir_modelsmrp_pdt0" model="ir.model.access">
-			<field name="model_id" ref="mrp.model_mrp_procurement"/>
+			<field name="model_id" ref="mrp_procurement.model_mrp_procurement"/>
 			<field eval="1" name="perm_read"/>
 			<field eval="&quot;&quot;&quot;MRP - Procurement&quot;&quot;&quot;" name="name"/>
 			<field eval="0" name="perm_unlink"/>
@@ -557,7 +557,7 @@
 			<field name="group_id" ref="res_groups_posuser0"/>
 		</record>
         <record id="ir_model_access_procurement0" model="ir.model.access">
-            <field name="model_id" ref="mrp.model_mrp_procurement" />
+            <field name="model_id" ref="mrp_procurement.model_mrp_procurement" />
             <field eval="1" name="perm_read" />
             <field eval="1" name="perm_write" />
             <field eval="1" name="perm_create" />
diff --git a/addons/point_of_sale/report/__init__.py b/addons/point_of_sale/report/__init__.py
index a5798add7b4..4af503ff9da 100644
--- a/addons/point_of_sale/report/__init__.py
+++ b/addons/point_of_sale/report/__init__.py
@@ -36,5 +36,6 @@ import pos_payment_report_user
 import pos_sales_user_today_current_user
 import pos_receipt_with_remboursment
 import pos_receipt_without_remboursment
+import point_of_sale_report
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/report/point_of_sale_report.py b/addons/point_of_sale/report/point_of_sale_report.py
new file mode 100644
index 00000000000..10ba94662a2
--- /dev/null
+++ b/addons/point_of_sale/report/point_of_sale_report.py
@@ -0,0 +1,242 @@
+# -*- 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 time
+import netsvc
+import tools
+
+class report_transaction_pos(osv.osv):
+    _name = "report.transaction.pos"
+    _description = "transaction for the pos"
+    _auto = False
+    _columns = {
+        'date_create': fields.char('Date', size=16, readonly=True),
+        'journal_id': fields.many2one('account.journal', 'Sales Journal', readonly=True),
+        'jl_id': fields.many2one('account.journal', 'Cash Journals', readonly=True),
+        'user_id': fields.many2one('res.users', 'User', readonly=True),
+        'no_trans': fields.float('Number of Transaction', readonly=True),
+        'amount': fields.float('Amount', readonly=True),
+        'invoice_id': fields.float('Nbr Invoice', readonly=True),
+        'invoice_am': fields.float('Invoice Amount', readonly=True),
+        'product_nb': fields.float('Product Nb.', readonly=True),
+        'disc': fields.float('Disc.', readonly=True),
+    }
+
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_transaction_pos')
+        cr.execute("""
+            create or replace view report_transaction_pos as (
+               select
+                    min(absl.id) as id,
+                    count(absl.id) as no_trans,
+                    sum(absl.amount) as amount,
+                    sum(line.price_ded) as disc,
+                    to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')::text as date_create,
+                    po.user_id as user_id,
+                    po.sale_journal as journal_id,
+                    abs.journal_id as jl_id,
+                    count(po.invoice_id) as invoice_id,
+                    count(p.id) as product_nb
+                from
+                    account_bank_statement_line as absl,
+                    account_bank_statement as abs,
+                    product_product as p,
+                    pos_order_line as line,
+                    pos_order as po
+                where
+                    absl.pos_statement_id = po.id and
+                    line.order_id=po.id and
+                    line.product_id=p.id and
+                    absl.statement_id=abs.id
+
+                group by
+                    po.user_id,po.sale_journal, abs.journal_id,
+                    to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')::text
+                )
+        """)
+                    #to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')
+                    #to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')::text as date_create,
+report_transaction_pos()
+
+class report_sales_by_user_pos(osv.osv):
+    _name = "report.sales.by.user.pos"
+    _description = "Sales by user"
+    _auto = False
+    _columns = {
+        'date_order': fields.date('Order Date',required=True, select=True),
+        'amount': fields.float('Total', readonly=True, select=True),
+        'qty': fields.float('Quantity', readonly=True, select=True),
+        'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
+    }
+
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_sales_by_user_pos')
+        cr.execute("""
+            create or replace view report_sales_by_user_pos as (
+                select
+                    min(po.id) as id,
+                    to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::text as date_order,
+                    po.user_id as user_id,
+                    sum(pol.qty)as qty,
+                    sum((pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))) as amount
+                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
+               group by
+                    to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::text,
+                    po.user_id
+
+                )
+        """)
+report_sales_by_user_pos()
+
+class report_sales_by_user_pos_month(osv.osv):
+    _name = "report.sales.by.user.pos.month"
+    _description = "Sales by user monthly"
+    _auto = False
+    _columns = {
+        'date_order': fields.date('Order Date',required=True, select=True),
+        'amount': fields.float('Total', readonly=True, select=True),
+        'qty': fields.float('Quantity', readonly=True, select=True),
+        'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
+    }
+
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_sales_by_user_pos_month')
+        cr.execute("""
+            create or replace view report_sales_by_user_pos_month as (
+                select
+                    min(po.id) as id,
+                    to_char(date_trunc('month',po.date_order),'YYYY-MM-DD')::text as date_order,
+                    po.user_id as user_id,
+                    sum(pol.qty)as qty,
+                    sum((pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))) as amount
+                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
+               group by
+                    to_char(date_trunc('month',po.date_order),'YYYY-MM-DD')::text,
+                    po.user_id
+
+                )
+        """)
+report_sales_by_user_pos_month()
+
+class report_sales_by_margin_pos(osv.osv):
+    _name = "report.sales.by.margin.pos"
+    _description = "Sales by margin"
+    _auto = False
+    _columns = {
+#        'pos_name': fields.char('POS Order', size=64, readonly=True),
+        'product_name':fields.char('Product Name', size=64, readonly=True),
+        'date_order': fields.date('Order Date',required=True, select=True),
+     #   'amount': fields.float('Total', readonly=True, select=True),
+        'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
+        'qty': fields.float('Qty', readonly=True, select=True),
+        'net_margin_per_qty':fields.float('Net margin per Qty', readonly=True, select=True),
+        'total':fields.float('Margin', readonly=True, select=True),
+
+    }
+
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_sales_by_margin_pos')
+        cr.execute("""
+            create or replace view report_sales_by_margin_pos as (
+                select
+                    min(pol.id) as id,
+                    po.user_id as user_id,
+                    pt.name as product_name,
+                    to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::text as date_order,
+                    sum(pol.qty) as qty,
+                    pt.list_price-pt.standard_price as net_margin_per_qty,
+                    (pt.list_price-pt.standard_price) *sum(pol.qty) as total
+                from
+                    product_template as pt,
+                    product_product as pp,
+                    pos_order_line as pol,
+                    pos_order as po
+                where
+                    pol.product_id = pp.product_tmpl_id and
+                    pp.product_tmpl_id = pt.id and
+                    po.id = pol.order_id
+
+                group by
+                    pt.name,
+                    pt.list_price,
+                    pt.standard_price,
+                    po.user_id,
+                    to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::text
+
+                )
+        """)
+report_sales_by_margin_pos()
+
+class report_sales_by_margin_pos_month(osv.osv):
+    _name = "report.sales.by.margin.pos.month"
+    _description = "Sales by margin monthly"
+    _auto = False
+    _columns = {
+
+        'product_name':fields.char('Product Name', size=64, readonly=True),
+        'date_order': fields.date('Order Date',required=True, select=True),
+        'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
+        'qty': fields.float('Qty', readonly=True, select=True),
+        'net_margin_per_qty':fields.float('Net margin per Qty', readonly=True, select=True),
+        'total':fields.float('Margin', readonly=True, select=True),
+
+    }
+
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_sales_by_margin_pos_month')
+        cr.execute("""
+            create or replace view report_sales_by_margin_pos_month as (
+                select
+                    min(pol.id) as id,
+                    po.user_id as user_id,
+                    pt.name as product_name,
+                    to_char(date_trunc('month',po.date_order),'YYYY-MM-DD')::text as date_order,
+                    sum(pol.qty) as qty,
+                    pt.list_price-pt.standard_price as net_margin_per_qty,
+                    (pt.list_price-pt.standard_price) *sum(pol.qty) as total
+                from
+                    product_template as pt,
+                    product_product as pp,
+                    pos_order_line as pol,
+                    pos_order as po
+                where
+                    pol.product_id = pp.product_tmpl_id and
+                    pp.product_tmpl_id = pt.id and
+                    po.id = pol.order_id
+
+                group by
+                    pt.name,
+                    pt.list_price,
+                    pt.standard_price,
+                    po.user_id,
+                    to_char(date_trunc('month',po.date_order),'YYYY-MM-DD')::text
+
+                )
+        """)
+report_sales_by_margin_pos_month()
+
diff --git a/addons/point_of_sale/report/pos_receipt.rml b/addons/point_of_sale/report/pos_receipt.rml
index 1d2e6edc9d0..d615fc74534 100644
--- a/addons/point_of_sale/report/pos_receipt.rml
+++ b/addons/point_of_sale/report/pos_receipt.rml
@@ -103,7 +103,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">Shop : [[ o.shop_id.name ]]</para>
-        <para style="terp_default_Centre_9">Vendeur : [[ o.user_id1.name ]]</para>
+        <para style="terp_default_Centre_9">Vendeur : [[ o.user_salesman_id.name ]]</para>
         <para style="terp_default_Centre_9">Date : [[ formatLang(o.date_order,date = True) ]]</para>
         <para style="P4">
             <font color="white"> </font>
diff --git a/addons/point_of_sale/sale_wizard.xml b/addons/point_of_sale/sale_wizard.xml
deleted file mode 100644
index ca741e2c808..00000000000
--- a/addons/point_of_sale/sale_wizard.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-	<data>
-		<wizard string="Pos payment" model="sale.order" name="sale.pos_payment" id="pos_payment" />
-	</data>
-</openerp>
diff --git a/addons/point_of_sale/security/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv
index 0cfc0fae9b7..599df9581ee 100644
--- a/addons/point_of_sale/security/ir.model.access.csv
+++ b/addons/point_of_sale/security/ir.model.access.csv
@@ -13,7 +13,6 @@
 "access_sale_shop_pos_user","sale.shop pos_user","sale.model_sale_shop","point_of_sale.group_pos_user",1,0,0,0
 "access_pos_order_stock_worker","pos.order stock_worker","model_pos_order","stock.group_stock_user",1,0,0,0
 "access_stock_move_pos_user","stock.move pos_user","stock.model_stock_move","point_of_sale.group_pos_user",1,1,1,1
-"access_res_mode_contact","res.mode.contact","model_res_mode_contact","point_of_sale.group_pos_user",1,0,0,0
 "access_report_sales_by_user_pos","report.sales.by.user.pos","model_report_sales_by_user_pos","point_of_sale.group_pos_user",1,0,0,0
 "access_report_sales_by_user_pos_month","report.sales.by.user.pos.month","model_report_sales_by_user_pos_month","point_of_sale.group_pos_user",1,0,0,0
 "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
diff --git a/addons/point_of_sale/singer_statement_demo.xml b/addons/point_of_sale/singer_statement_demo.xml
index edc8299c609..68f889cddee 100644
--- a/addons/point_of_sale/singer_statement_demo.xml
+++ b/addons/point_of_sale/singer_statement_demo.xml
@@ -316,17 +316,6 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
 
-        <record id="base.main_company" model="res.company">
-            <field name="account_receivable" ref="account.a_recv"/>
-        </record>
-          <record id="point_of_sale.pos_order_posadvance" model="pos.order">
-      <field name="sale_journal" ref="sales_journal_comp2"/>
-    </record>
-
-
-        <record id="base.main_company" model="res.company">
-            <field name="account_receivable" ref="account.a_recv"/>
-        </record>
           <record id="point_of_sale.pos_order_posadvance" model="pos.order">
       <field name="sale_journal" ref="sales_journal_comp2"/>
     </record>
diff --git a/addons/point_of_sale/statement_data.xml b/addons/point_of_sale/statement_data.xml
index 947348a990d..67c94170666 100644
--- a/addons/point_of_sale/statement_data.xml
+++ b/addons/point_of_sale/statement_data.xml
@@ -21,19 +21,19 @@
 			<field eval="1" name="perm_create"/>
 			<field name="group_id" ref="point_of_sale.res_groups_posuser0"/>
 		</record>
-		<record id="ir_rule_group_bankstatementcompany0" model="ir.rule.group">
+		<record id="ir_rule_group_bankstatementcompany0" model="ir.rule">
 			<field name="model_id" ref="account.model_account_bank_statement"/>
 			<field eval="&quot;&quot;&quot;Bank Statement company&quot;&quot;&quot;" name="name"/>
 			<field eval="1" name="global"/>
 		</record>
 
-		<record id="ir_rule_group_bankstatementlinecompany0" model="ir.rule.group">
+		<record id="ir_rule_group_bankstatementlinecompany0" model="ir.rule">
 			<field name="model_id" ref="account.model_account_bank_statement_line"/>
 			<field eval="&quot;&quot;&quot;Bank Statement line Company&quot;&quot;&quot;" name="name"/>
 			<field eval="1" name="global"/>
 		</record>
 		<record id="point_of_sale.res_groups_posuser0" model="res.groups">
- 		<field eval="[(6,0,[ref('product.menu_config_product'),ref('product.menu_product_category_action_form'),ref('point_of_sale.menu_point_ofsale'),ref('point_of_sale.menu_point_config'),ref('point_of_sale.menu_statement_tree_all'),ref('stock.menu_stock_root'),ref('stock.menu_action_location_form'),ref('stock.menu_action_location_tree'),ref('stock.menu_picking_waiting'),ref('stock.menu_action_picking_tree3'),ref('stock.menu_action_picking_tree5'),ref('stock.menu_action_picking_form'),ref('stock.menu_action_picking_tree7'),ref('stock.menu_action_picking_tree8'),ref('stock.menu_action_picking_tree9'),ref('mrp.menu_mrp_procurement_action3'),ref('mrp.menu_mrp_procurement_new'),ref('mrp.next_id_77'),ref('mrp.menu_report_workcenter_load'),ref('mrp.menu_report_in_out_picking'),ref('base.menu_sales'),ref('sale.menu_action_shop_form'),ref('sale.menu_sale_order'),ref('sale.menu_action_order_tree'),ref('sale.menu_action_order_tree_all'),ref('sale.menu_action_order_tree2'),ref('sale.menu_action_order_tree3'),ref('sale.menu_action_order_tree7'),ref('sale.menu_action_order_tree8'),ref('sale.menu_action_order_line_tree1'),ref('delivery.menu_action_delivery_carrier_form'),ref('delivery.menu_action_delivery_grid_form'),ref('point_of_sale.menu_point_root')])]" name="menu_access"/>
+ 		<field eval="[(6,0,[ref('product.menu_config_product'),ref('product.menu_product_category_action_form'),ref('point_of_sale.menu_point_ofsale'),ref('point_of_sale.menu_point_config'),ref('point_of_sale.menu_statement_tree_all'),ref('stock.menu_stock_root'),ref('stock.menu_action_location_form'),ref('stock.menu_action_location_tree'),ref('stock.menu_picking_waiting'),ref('stock.menu_action_picking_tree3'),ref('stock.menu_action_picking_tree5'),ref('stock.menu_action_picking_form'),ref('stock.menu_action_picking_tree7'),ref('stock.menu_action_picking_tree8'),ref('stock.menu_action_picking_tree9'),ref('mrp_procurement.menu_mrp_procurement_action3'),ref('mrp_procurement.menu_mrp_procurement_new'),ref('mrp.next_id_77'),ref('mrp.menu_report_workcenter_load'),ref('mrp.menu_report_in_out_picking'),ref('base.menu_sales'),ref('sale.menu_action_shop_form'),ref('sale.menu_sale_order'),ref('sale.menu_action_order_tree'),ref('sale.menu_action_order_tree_all'),ref('sale.menu_action_order_tree2'),ref('sale.menu_action_order_tree3'),ref('sale.menu_action_order_tree7'),ref('sale.menu_action_order_tree8'),ref('sale.menu_action_order_line_tree1'),ref('delivery.menu_action_delivery_carrier_form'),ref('delivery.menu_action_delivery_grid_form'),ref('point_of_sale.menu_point_root')])]" name="menu_access"/>
 			<field eval="[(6,0,[ref('ir_rule_group_bankstatementcompany0'),ref('ir_rule_group_bankstatementlinecompany0'),ref('point_of_sale.ir_rule_group_point0'),ref('point_of_sale.ir_rule_group_poslinecompany0'),ref('point_of_sale.ir_rule_group_posreporting0')])]" name="rule_groups"/>
 			<field eval="&quot;&quot;&quot;POS_user&quot;&quot;&quot;" name="name"/>
 		</record>
diff --git a/addons/point_of_sale/statement_view.xml b/addons/point_of_sale/statement_view.xml
index 80b2b1ec756..cef2748b5e4 100644
--- a/addons/point_of_sale/statement_view.xml
+++ b/addons/point_of_sale/statement_view.xml
@@ -434,7 +434,11 @@
             string="Close Register"
             action="action_pos_close_statement"
             id="menu_close_statement" sequence="2" />
-
+       
+       <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"/>
             
 	</data>
 </openerp>
diff --git a/addons/point_of_sale/stock.py b/addons/point_of_sale/stock.py
index 95630569a7c..9d2b24d69b8 100644
--- a/addons/point_of_sale/stock.py
+++ b/addons/point_of_sale/stock.py
@@ -30,7 +30,6 @@ class stock_picking(osv.osv):
     _inherit = 'stock.picking'
     _columns = {
         'pos_order': fields.many2one('pos.order', 'Pos order'),
-     #   'company_id':fields.many2one('res.company', 'Company', required=True),
     }
 stock_picking()
 
diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index cdfd3f9fb20..d8a4b93e3a2 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -19,7 +19,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import wizard_return
+
 import pos_add_product
 import pos_confirm
 import pos_discount
@@ -39,6 +39,7 @@ import pos_payment_report_date
 import pos_payment_report
 import pos_payment
 import pos_scan_product
+import pos_return
 
 # 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 34769be78e9..5d88b75d7ff 100644
--- a/addons/point_of_sale/wizard/pos_add_product.py
+++ b/addons/point_of_sale/wizard/pos_add_product.py
@@ -61,7 +61,27 @@ class add_product(osv.osv_memory):
             'views': False,
             'type': 'ir.actions.act_window',
         }
+    def close_action(self, cr, uid, ids, context):
 
+        record_id = context and context.get('active_id', False)
+        order_obj= self.pool.get('pos.order')
+        order_line_obj= self.pool.get('pos.order.line')
+        obj=order_obj.browse(cr,uid, record_id)
+        order_obj.write(cr,uid,[record_id],{'state':'done'})
+        if obj.amount_total != obj.amount_paid:
+            return {
+            'name': _('Make Payment'),
+            'context ':context and context.get('active_id', False),
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'pos.make.payment',
+            'view_id': False,
+            'target': 'new',
+            'views': False,
+            'type': 'ir.actions.act_window',
+            
+            }
+        return {}   
 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
index 5d380624f0d..f465f97f097 100644
--- a/addons/point_of_sale/wizard/pos_add_product.xml
+++ b/addons/point_of_sale/wizard/pos_add_product.xml
@@ -12,8 +12,8 @@
 				    <group col="2" colspan="4">
 				    	<field name="product_id"/>
 				    	<field name="quantity"/>
-                		<button icon='gtk-cancel' special="cancel"
-                			string="Close" />
+                		<button icon='gtk-cancel' name="close_action"
+                			string="Close" type="object"  />
                 		<button name="select_product" string="Contiue"
                 			colspan="1" type="object" icon="gtk-ok" />
                 	</group>
diff --git a/addons/point_of_sale/wizard/pos_details.xml b/addons/point_of_sale/wizard/pos_details.xml
index 077e2ed89dc..bb62b94fb75 100644
--- a/addons/point_of_sale/wizard/pos_details.xml
+++ b/addons/point_of_sale/wizard/pos_details.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">{'record_id' : active_id}</field>
         </record>
 
         
diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index 8e25f3f0797..f59d814522c 100644
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -43,7 +43,8 @@ class pos_make_payment(osv.osv_memory):
          @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)  
+        
+        active_id = context and context.get('active_id',False)  
         j_obj = self.pool.get('account.journal')
         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)])
@@ -55,14 +56,14 @@ class pos_make_payment(osv.osv_memory):
         wf_service = netsvc.LocalService("workflow")
 
         order_obj=self.pool.get('pos.order')
-        order = order_obj.browse(cr, uid, record_id, context)
+        order = order_obj.browse(cr, uid, active_id, context)
         #get amount to pay
         amount = order.amount_total - order.amount_paid
         if amount <= 0.0:
             context.update({'flag': True})
-            order_obj.action_paid(cr, uid, [record_id], context)
+            order_obj.action_paid(cr, uid, [active_id], context)
         elif order.amount_paid > 0.0:
-            order_obj.write(cr, uid, [record_id], {'state': 'advance'})
+            order_obj.write(cr, uid, [active_id], {'state': 'advance'})
         invoice_wanted_checked = False
     
         current_date = time.strftime('%Y-%m-%d')
@@ -81,11 +82,11 @@ class pos_make_payment(osv.osv_memory):
         
     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)
+        active_id = context and context.get('active_id', False) or False        
+        order = self.pool.get('pos.order').browse(cr, uid, active_id)
         if not order.lines:
-                raise osv.except_osv('Error!','No order lines defined for this sale ')
-        True
+            raise osv.except_osv('Error!','No order lines defined for this sale ')
+        return True
     
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         """ 
@@ -99,22 +100,26 @@ class pos_make_payment(osv.osv_memory):
              @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)
-        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-print"/>
-                                </group>
-                            </form>
-                        """
-        return res
+     
+                
+        result = super(pos_make_payment, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
+        active_model = context.get('active_model')
+        active_id = context.get('active_id', False)
+        if not active_id or (active_model and active_model != 'pos.order'):
+            return result                  
+                 
+        order = self.pool.get('pos.order').browse(cr, uid, active_id)
+        if order.amount_total == order.amount_paid:
+            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-print"/>
+                            </group>
+                        </form>
+                    """                                   
+        return result
 
     def check(self, cr, uid, ids, context=None):
         
@@ -122,47 +127,48 @@ class pos_make_payment(osv.osv_memory):
         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)      
+        active_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)
+        order = order_obj.browse(cr, uid, active_id, context)
         amount = order.amount_total - order.amount_paid
         data =  self.read(cr, uid, ids)[0]
-
+        
         # 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)            
+            order_obj.write(cr, uid, [active_id], {'invoice_wanted': invoice_wanted})
+            order_obj.add_payment(cr, uid, active_id, data, context=context)            
         # Todo need to check
 #        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]):
+#            order_obj.action_paid(cr,uid,[active_id],context)
+        if order_obj.test_paid(cr, uid, [active_id]):
             if order.partner_id and order.invoice_wanted:
                 return self.create_invoice(cr,uid,ids,context)
             else:
-                order_obj.action_paid(cr,uid,[record_id],context)                
-                order_obj.write(cr, uid, [record_id],{'state':'paid'})                            
+                context.update({'flag': True})                
+                order_obj.action_paid(cr,uid,[active_id],context)                
+                order_obj.write(cr, uid, [active_id],{'state':'paid'})                            
                 return self.print_report(cr, uid, ids, context)  
         if order.amount_paid > 0.0:
             context.update({'flag': True})
             # Todo need to check
-            order_obj.action_paid(cr, uid, [record_id], context)            
-            self.pool.get('pos.order').write(cr, uid, [record_id],{'state':'advance'})
+            order_obj.action_paid(cr, uid, [active_id], context)            
+            self.pool.get('pos.order').write(cr, uid, [active_id],{'state':'advance'})
             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:
+        active_ids = [context and context.get('active_id',False)]      
+        for i in active_ids:
             wf_service.trg_validate(uid, 'pos.order', i, 'invoice', cr)
-        datas = {'ids' : context.get('active_ids', [])}        
+        datas = {'ids' : context.get('active_id', [])}        
         return { 
                 'type' : 'ir.actions.report.xml',
                 'report_name':'pos.invoice',
@@ -180,7 +186,8 @@ class pos_make_payment(osv.osv_memory):
          @param context: A standard dictionary 
          @return : retrun report
         """        
-        datas = {'ids' : context.get('active_ids',[])}
+        active_id=context.get('active_id',[])        
+        datas = {'ids' : [active_id]}
         res =  {}        
         datas['form'] = res
 
diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
new file mode 100644
index 00000000000..bdb6f46e71e
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -0,0 +1,351 @@
+# -*- 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
+import pos_box_entries
+import pos_add_product
+import pos_payment
+
+class pos_return(osv.osv_memory):
+    _name = 'pos.return'
+    _description = 'Point of sale return'
+
+    _columns = {
+                
+    }
+    
+    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(pos_return, self).default_get(cr, uid, fields, context=context)
+        order_obj = self.pool.get('pos.order')
+        active_ids = context.get('active_ids')
+        if not context:
+            context={}
+        for order in order_obj.browse(cr, uid, active_ids):
+            for line in order.lines:
+                if 'return%s'%(line.id) in fields:
+                    res['return%s'%(line.id)] = line.qty        
+        return res
+                   
+    def view_init(self, cr, uid, fields_list, context=None):
+        res = super(pos_return, self).view_init(cr, uid, fields_list, context=context)
+        order_obj=self.pool.get('pos.order')           
+        if not context:
+            context={}       
+        
+        active_ids=context.get('active_ids')            
+        for order in order_obj.browse(cr, uid, active_ids):            
+            for line in order.lines:    
+                if 'return%s'%(line.id) not in self._columns:
+                    self._columns['return%s'%(line.id)] = fields.float("Quantity")
+                             
+        return res   
+
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
+        result = super(pos_return, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)
+        if not context:
+            context={}
+        active_model = context.get('active_model')
+        if not active_model and active_model != 'pos.order':
+            return result
+        order_obj = self.pool.get('pos.order')
+        active_id = context.get('active_id', False)
+        if active_id:
+            _moves_arch_lst="""<?xml version="1.0"?>
+                            <form string="Return lines">
+                            <label string="Quantities you enter, match to products that will return to the stock." colspan="4"/>"""
+            _line_fields = result['fields']                
+            order=order_obj.browse(cr, uid, active_id)
+            for line in order.lines:    
+                quantity=line.qty    
+                _line_fields.update({
+                                         'return%s'%(line.id) : {
+                                        'string': line.product_id.name,
+                                        'type' : 'float',
+                                        'required': True,  
+                                        'default':quantity
+                                        },                                    
+                            })
+                _moves_arch_lst += """
+                        <field name="return%s"/>
+                         <newline/>      
+                """%(line.id)
+                                
+            _moves_arch_lst+="""
+                    <newline/>      
+                    <separator colspan="4"/>
+                   <button icon='gtk-cancel' special="cancel"
+                               string="Cancel" />
+                                   <button icon='gtk-ok' name= "create_returns"
+                       string="Return goods and Exchange" type="object"/>
+                                   <button icon='gtk-ok' name="create_returns2"
+                        string="Return without Refund" type="object"/>
+                </form>"""    
+                             
+            result['arch'] = _moves_arch_lst
+            result['fields'] = _line_fields   
+        return result    
+       
+       
+    def  create_returns(self, cr, uid, data, context):
+        return {
+                'name': _('Add Product'),
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'pos.add.product',
+                'view_id': False,
+                'target':'new',
+                'views': False,
+                'context': context,
+                'type': 'ir.actions.act_window',
+        }
+    def create_returns2(self, cr, uid, ids, context):
+        active_id = context.get('active_id', False)        
+        order_obj =self.pool.get('pos.order')
+        line_obj = self.pool.get('pos.order.line')
+        picking_obj = self.pool.get('stock.picking')
+        stock_move_obj = self.pool.get('stock.move')
+        property_obj= self.pool.get("ir.property")
+        uom_obj =self. pool.get('product.uom')
+        wf_service = netsvc.LocalService("workflow")
+        #Todo :Need to clean the code
+        if active_id:
+            picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in',[active_id]), ('state', '=', 'done')])
+            data=self.read(cr,uid,ids)[0]
+            clone_list = []
+            date_cur=time.strftime('%Y-%m-%d')
+
+            for order_id in order_obj.browse(cr, uid, [active_id], context=context):
+                prop_ids = property_obj.search(cr, uid,[('name', '=', 'property_stock_customer')])
+                val = property_obj.browse(cr, uid,prop_ids[0]).value_reference
+                cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
+                res=cr.fetchone()
+                location_id=res and res[0] or None
+                stock_dest_id = val.id
+                                    
+                new_picking=picking_obj.copy(cr, uid, order_id.last_out_picking.id, {'name':'%s (return)' % order_id.name,
+                                                                                    'move_lines':[], 'state':'draft', 'type':'in',
+                                                                                    'type':'in',
+                                                                                    'date':date_cur})
+                new_order=order_obj.copy(cr,uid,order_id.id, {'name': 'Refund %s'%order_id.name,
+                                                              'lines':[],
+                                                              'statement_ids':[],
+                                                              'last_out_picking':[]})
+                for line in order_id.lines:
+                    if line.id  and (data['return%s' %line.id]!=0.0):
+                        new_move=stock_move_obj.create(cr, uid,{
+                            'product_qty': data['return%s' %line.id],
+                            'product_uos_qty': uom_obj._compute_qty(cr, uid,data['return%s' %line.id] ,line.product_id.uom_id.id),
+                            'picking_id':new_picking,
+                            'product_uom':line.product_id.uom_id.id,
+                            'location_id':location_id,
+                            'product_id':line.product_id.id,
+                            'location_dest_id':stock_dest_id,
+                            'name':'%s (return)' %order_id.name,
+                            'date':date_cur,
+                            'date_planned':date_cur,})
+                        line_obj.copy(cr,uid,line.id,{'qty':-data['return%s' %line.id],
+                                                    'order_id': new_order,
+                        })
+                order_obj.write(cr,uid, new_order, {'state':'done'})
+                wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
+                picking_obj.force_assign(cr, uid, [new_picking], context)
+            act = {
+                'domain': "[('id', 'in', ["+str(new_order)+"])]",
+                'name': 'Refunded Orders',
+                'view_type': 'form',
+                'view_mode': 'form,tree',
+                'res_model': 'pos.order',
+                'auto_refresh':0,
+                'res_id':new_order,
+                'view_id': False,
+                'context':context,
+                'type': 'ir.actions.act_window'
+            }
+        return act
+    
+pos_return()
+class add_product(osv.osv_memory):
+    _inherit = 'pos.add.product'  
+    def select_product(self, cr, uid, ids, context):
+        """ 
+             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 adding more product
+        """               
+    
+        active_id=context.get('active_id', False)
+        data =  self.read(cr, uid, ids)[0] 
+        if active_id:               
+            order_obj = self.pool.get('pos.order')
+            lines_obj = self.pool.get('pos.order.line')
+            picking_obj = self.pool.get('stock.picking')
+            stock_move_obj = self.pool.get('stock.move')
+            move_obj = self.pool.get('stock.move')
+            property_obj= self.pool.get("ir.property")
+            invoice_obj= self.pool.get('account.invoice')
+            picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in',[active_id]), ('state', '=', 'done')])
+            clone_list = []
+            date_cur=time.strftime('%Y-%m-%d')
+            uom_obj = self.pool.get('product.uom')
+            prod_obj=self.pool.get('product.product')
+            wf_service = netsvc.LocalService("workflow")
+            return_boj=self.pool.get('pos.return')
+            order_obj.add_product(cr, uid, active_id,data['product_id'],data['quantity'], context=context)
+              
+            for order_id in order_obj.browse(cr, uid, [active_id], context=context):
+                prod=data['product_id']
+                qty=data['quantity']
+                prop_ids = property_obj.search(cr, uid,[('name', '=', 'property_stock_customer')])
+                val = property_obj.browse(cr, uid,prop_ids[0]).value_reference
+                cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
+                res=cr.fetchone()
+                location_id=res and res[0] or None
+                stock_dest_id = val.id
+        
+                prod_id=prod_obj.browse(cr,uid,prod)
+                new_picking=picking_obj.create(cr,uid,{
+                                        'name':'%s (Added)' %order_id.name,
+                                        'move_lines':[],
+                                        'state':'draft',
+                                        'type':'out',
+                                        'date':date_cur,   })
+                new_move=stock_move_obj.create(cr, uid,{
+                                'product_qty': qty,
+                                'product_uos_qty': uom_obj._compute_qty(cr, uid,prod_id.uom_id.id, qty, prod_id.uom_id.id),
+                                'picking_id':new_picking,
+                                'product_uom':prod_id.uom_id.id,
+                                'location_id':location_id,
+                                'product_id':prod_id.id,
+                                'location_dest_id':stock_dest_id,
+                                'name':'%s (return)' %order_id.name,
+                                'date':date_cur,
+                                'date_planned':date_cur,})
+        
+                wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
+                picking_obj.force_assign(cr, uid, [new_picking], context)
+                order_obj.write(cr,uid,active_id,{'last_out_picking':new_picking})
+                
+             
+        return {            
+                'name': _('Add Product'),
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'pos.add.product',
+                'view_id': False,
+                'target':'new',
+                'context':context,
+                'views': False,
+                'type': 'ir.actions.act_window',
+                }
+    
+    def close_action(self, cr, uid, ids, context):
+        active_ids=context.get('active_ids', False)         
+        order_obj = self.pool.get('pos.order')
+        lines_obj = self.pool.get('pos.order.line')
+        picking_obj = self.pool.get('stock.picking')
+        stock_move_obj = self.pool.get('stock.move')
+        move_obj = self.pool.get('stock.move')
+        property_obj= self.pool.get("ir.property")   
+        invoice_obj=self.pool.get('account.invoice')
+        picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in', active_ids), ('state', '=', 'done')])
+        clone_list = []
+        date_cur=time.strftime('%Y-%m-%d')
+        uom_obj = self.pool.get('product.uom')
+        return_boj=self.pool.get('pos.return')
+        return_id=return_boj.search(cr,uid,[])
+        data=return_boj.read(cr,uid,return_id,[])[0]
+                        
+        wf_service = netsvc.LocalService("workflow")
+        for order_id in order_obj.browse(cr, uid, active_ids, context=context):
+            prop_ids =property_obj.search(cr, uid,[('name', '=', 'property_stock_customer')])
+            val = property_obj.browse(cr, uid,prop_ids[0]).value_reference
+            cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
+            res=cr.fetchone()
+            location_id=res and res[0] or None
+            stock_dest_id = val.id
+    
+            order_obj.write(cr,uid,[order_id.id],{'type_rec':'Exchange'})
+            if order_id.invoice_id:
+                invoice_obj.refund(cr, uid, [order_id.invoice_id.id],time.strftime('%Y-%m-%d'), False, order_id.name)
+            new_picking=picking_obj.create(cr,uid,{
+                                    'name':'%s (return)' %order_id.name,
+                                    'move_lines':[], 'state':'draft',
+                                    'type':'in',
+                                    'date':date_cur})
+            for line in order_id.lines:
+                key=('return%s') %line.id
+                if line.id  and  data.has_key(key):
+                    new_move=stock_move_obj.create(cr, uid,{
+                        'product_qty': data['return%s' %line.id ],
+                        'product_uos_qty': uom_obj._compute_qty(cr, uid,data['return%s' %line.id] ,line.product_id.uom_id.id),
+                        'picking_id':new_picking,
+                        'product_uom':line.product_id.uom_id.id,
+                        'location_id':location_id,
+                        'product_id':line.product_id.id,
+                        'location_dest_id':stock_dest_id,
+                        'name':'%s (return)' %order_id.name,
+                        'date':date_cur,
+                        'date_planned':date_cur,})
+                    lines_obj.write(cr,uid,[line.id],{'qty_rfd':(line.qty or 0.0) + data['return%s' %line.id],
+                                                    'qty':line.qty-(data['return%s' %line.id] or 0.0)
+                    })
+            wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
+            picking_obj.force_assign(cr, uid, [new_picking], context)
+        obj=order_obj.browse(cr,uid, active_ids[0])    
+
+        if obj.amount_total != obj.amount_paid:
+            return {
+            'name': _('Make Payment'),
+            'context ':context,
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'pos.make.payment',
+            'view_id': False,
+            'target': 'new',
+            'views': False,
+            'type': 'ir.actions.act_window',
+            
+            }
+        return True                    
+                 
+add_product()        
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/pos_return_view.xml b/addons/point_of_sale/wizard/pos_return_view.xml
new file mode 100644
index 00000000000..0d01b3c6666
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_return_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>        
+		<record id="action_view_pos_return" model="ir.actions.act_window">
+			<field name="name">Return lines</field>
+			<field name="res_model">pos.return</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_return.py b/addons/point_of_sale/wizard/wizard_return.py
deleted file mode 100644
index 673610e8c2c..00000000000
--- a/addons/point_of_sale/wizard/wizard_return.py
+++ /dev/null
@@ -1,550 +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 pooler
-from tools.misc import UpdateableStr
-
-import netsvc
-import time
-
-from tools.translate import _
-from decimal import Decimal
-
-
-arch=UpdateableStr()
-fields={}
-
-
-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 :">
-    <field name="amount" />
-    <field name="journal"/>
-    <field name="payment_date" />
-    <field name="payment_name" />
-    <field name="invoice_wanted" />
-    <field name="num_sale" />
-</form>
-"""
-
-payment_fields = {
-    'amount': {'string': 'Amount', 'type': 'float', 'required': True},
-    '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.Cof', 'type': 'char', 'size': '32'},
-    }
-
-
-def _pre_init(self, cr, uid, data, context):
-    def _get_journal(pool, order):
-        j_obj = pool.get('account.journal')
-
-        journal_to_fetch = 'DEFAULT'
-        if order.amount_total < 0:
-            journal_to_fetch = 'GIFT'
-        else:
-            if order.amount_paid > 0:
-                journal_to_fetch = 'REBATE'
-
-        pos_config_journal = pool.get('pos.config.journal')
-        ids = pos_config_journal.search(cr, uid, [('code', '=', journal_to_fetch)])
-        objs = pos_config_journal.browse(cr, uid, ids)
-        journal=''
-        if objs:
-            journal = objs[0].journal_id.id
-        else:
-            existing = [payment.journal_id.id for payment in order.payments]
-            ids = j_obj.search(cr, uid, [('type', '=', 'cash')])
-            for i in ids:
-                if i not in existing:
-                    journal = i
-                    break
-            if not journal:
-                journal = ids and ids[0]
-        return journal
-    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:
-        pool.get('pos.order').action_paid(cr, uid, data['ids'], context)
-
-    # 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)
-    order_obj.test_order_lines(cr, uid, order, context=context)
-
-    action = 'ask_pay'
-    if order.state == 'paid':
-        if order.partner_id:
-            if order.invoice_wanted:
-                action = 'invoice'
-            else:
-                action = 'paid'
-        elif order.date_payment:
-            action = 'receipt'
-        else:
-            action='paid'
-
-    if order.amount_total == order.amount_paid:
-        order_obj.write(cr,uid,data['ids'],{'state':'done'})
-        action = 'receipt'
-
-    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 {}
-
-
-
-_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 make_default(val):
-    def fct(obj, cr, uid):
-        return val
-    return fct
-
-def _get_returns(self, cr, uid, data, context):
-
-    pool = pooler.get_pool(cr.dbname)
-    order_obj=pool.get('pos.order')
-    order=order_obj.browse(cr, uid, [data['id']])[0]
-    res={}
-    fields.clear()
-    arch_lst=['<?xml version="1.0"?>', '<form string="%s">' % _('Return lines'), '<label string="%s" colspan="4"/>' % _('Quantities you enter, match to products that will return to the stock.')]
-    for m in [line for line in order.lines]:
-        quantity=m.qty
-        arch_lst.append('<field name="return%s"/>\n<newline/>' % (m.id,))
-        fields['return%s' % m.id]={'string':m.product_id.name, 'type':'float', 'required':True, 'default':quantity}
-        res.setdefault('returns', []).append(m.id)
-    arch_lst.append('</form>')
-    arch.string='\n'.join(arch_lst)
-    return res
-
-def _create_returns(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    order_obj = pool.get('pos.order')
-    lines_obj = pool.get('pos.order.line')
-    picking_obj = pool.get('stock.picking')
-    stock_move_obj = pool.get('stock.move')
-    move_obj = pool.get('stock.move')
-    picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in', data['ids']), ('state', '=', 'done')])
-    clone_list = []
-    date_cur=time.strftime('%Y-%m-%d')
-    uom_obj = pool.get('product.uom')
-    wf_service = netsvc.LocalService("workflow")
-    for order_id in order_obj.browse(cr, uid, data['ids'], context=context):
-        prop_ids = pool.get("ir.property").search(cr, uid,[('name', '=', 'property_stock_customer')])
-        val = pool.get("ir.property").browse(cr, uid,prop_ids[0]).value
-        cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
-        res=cr.fetchone()
-        location_id=res and res[0] or None
-        stock_dest_id = int(val.split(',')[1])
-
-        order_obj.write(cr,uid,[order_id.id],{'type_rec':'Exchange'})
-        if order_id.invoice_id:
-            pool.get('account.invoice').refund(cr, uid, [order_id.invoice_id.id],time.strftime('%Y-%m-%d'), False, order_id.name)
-        new_picking=picking_obj.create(cr,uid,{
-                                'name':'%s (return)' %order_id.name,
-                                'move_lines':[], 'state':'draft',
-                                'type':'in',
-                                'date':date_cur,   })
-        for line in order_id.lines:
-            for r in data['form'].get('returns',[]):
-                if line.id==r and (data['form']['return%s' %r]!=0.0):
-                    new_move=stock_move_obj.create(cr, uid,{
-                        'product_qty': data['form']['return%s' %r],
-                        'product_uos_qty': uom_obj._compute_qty(cr, uid,data['form']['return%s' %r] ,line.product_id.uom_id.id),
-                        'picking_id':new_picking,
-                        'product_uom':line.product_id.uom_id.id,
-                        'location_id':location_id,
-                        'product_id':line.product_id.id,
-                        'location_dest_id':stock_dest_id,
-                        'name':'%s (return)' %order_id.name,
-                        'date':date_cur,
-                        'date_planned':date_cur,})
-                    lines_obj.write(cr,uid,[line.id],{'qty_rfd':(line.qty or 0.0) + data['form']['return%s' %r],
-                                                    'qty':line.qty-(data['form']['return%s' %r] or 0.0)
-                    })
-        wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
-        picking_obj.force_assign(cr, uid, [new_picking], context)
-    return res
-
-def _create_returns2(self, cr, uid, data, context):
-    act={}
-    pool = pooler.get_pool(cr.dbname)
-    order_obj = pool.get('pos.order')
-    line_obj = pool.get('pos.order.line')
-    picking_obj = pool.get('stock.picking')
-    stock_move_obj = pool.get('stock.move')
-    picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in', data['ids']), ('state', '=', 'done')])
-    clone_list = []
-    date_cur=time.strftime('%Y-%m-%d')
-    uom_obj = pool.get('product.uom')
-    wf_service = netsvc.LocalService("workflow")
-    for order_id in order_obj.browse(cr, uid, data['ids'], context=context):
-        prop_ids = pool.get("ir.property").search(cr, uid,[('name', '=', 'property_stock_customer')])
-        val = pool.get("ir.property").browse(cr, uid,prop_ids[0]).value
-        cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
-        res=cr.fetchone()
-        location_id=res and res[0] or None
-        stock_dest_id = int(val.split(',')[1])
-        if order_id.last_out_picking.id:
-            new_picking=picking_obj.copy(cr, uid, order_id.last_out_picking.id, {'name':'%s (return)' % order_id.name,
-                                                                                'move_lines':[], 'state':'draft', 'type':'in',
-                                                                                'type':'in',
-                                                                                'date':date_cur,   })
-            new_order=order_obj.copy(cr,uid,order_id.id, {'name': 'Refund %s'%order_id.name,
-                                                          'lines':[],
-                                                          'statement_ids':[],
-                                                          'last_out_picking':[]})
-            for line in order_id.lines:
-                for r in data['form'].get('returns',[]):
-                    if line.id==r and (data['form']['return%s' %r]!=0.0):
-                        new_move=stock_move_obj.create(cr, uid,{
-                            'product_qty': data['form']['return%s' %r],
-                            'product_uos_qty': uom_obj._compute_qty(cr, uid,data['form']['return%s' %r] ,line.product_id.uom_id.id),
-                            'picking_id':new_picking,
-                            'product_uom':line.product_id.uom_id.id,
-                            'location_id':location_id,
-                            'product_id':line.product_id.id,
-                            'location_dest_id':stock_dest_id,
-                            'name':'%s (return)' %order_id.name,
-                            'date':date_cur,
-                            'date_planned':date_cur,})
-                        line_obj.copy(cr,uid,line.id,{'qty':-data['form']['return%s' %r],
-                                                    'order_id': new_order,
-                        })
-            order_obj.write(cr,uid, new_order, {'state':'done'})
-            wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
-            picking_obj.force_assign(cr, uid, [new_picking], context)
-            act = {
-            'domain': "[('id', 'in', ["+str(new_order)+"])]",
-            'name': 'Refunded Orders',
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'pos.order',
-            'auto_refresh':0,
-            'res_id':new_order,
-            'view_id': False,
-            'type': 'ir.actions.act_window'
-                        }
-        else:         
-           raise wizard.except_wizard(_('Error'), _('Last out picking No find!'))
-
-    return act
-def test(self,cr,uid,data,context={}):
-  #  import pdb; pdb.set_trace()
-    data['id']=data['res_id']
-    return {'id':data['res_id']}
-
-#def _raise(self,cr,uid,data,context={}):
-#    return datas
-#    raise wizard.except_wizard(_('Message'),_('You can not exchange products more than total paid amount.'))
-
-
-#def _test_exist1(self,cr,uid,data,context={}):
-#    return 'choice'
-
-def _test_exist(self,cr,uid,data,context={}):
-#    order_obj= pooler.get_pool(cr.dbname).get('pos.order')
-#    order_line_obj= pooler.get_pool(cr.dbname).get('pos.order.line')
-#    obj=order_obj.browse(cr,uid, data['ids'])[0]
-#    am_tot=obj._amount_total(cr, uid, data['ids'])
-#    order_obj.write(cr,uid,data['ids'],{'state':'done'})
-#    if obj.amount_total == obj.amount_paid:
-#        return 'receipt'
-#    elif obj.amount_total > obj.amount_paid:
-#        sql = """select max(id) from pos_order_line where order_id = %d """%(obj.id)
-#        cr.execute(sql)
-#        res = cr.fetchone()
-#        cr.execute("delete from pos_order_line where id = %d"%(res[0]))
-#        cr.commit()
-#        return 'choice_raise'
-#    else:
-    return 'add_p'
-
-def _close(self,cr,uid,data,context={}):
-    order_obj= pooler.get_pool(cr.dbname).get('pos.order')
-    order_line_obj= pooler.get_pool(cr.dbname).get('pos.order.line')
-    obj=order_obj.browse(cr,uid, data['ids'])[0]
-    order_obj.write(cr,uid,data['ids'],{'state':'done'})
-    if obj.amount_total != obj.amount_paid:
-        return 'ask_pay'
-    else :
-        return 'receipt'
-
-
-
-
-def _add_pdct(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    order_obj = pool.get('pos.order')
-    line_obj = pool.get('pos.order.line')
-    picking_obj = pool.get('stock.picking')
-    wf_service = netsvc.LocalService("workflow")
-    prod_obj = pool.get('product.product')
-    stock_move_obj = pool.get('stock.move')
-    uom_obj = pool.get('product.uom')
-    date_cur=time.strftime('%Y-%m-%d')
-    order_obj.add_product(cr, uid, data['id'], data['form']['product'],
-                            data['form']['quantity'], context=context)
-    cr.commit()
-    for order_id in order_obj.browse(cr, uid, data['ids'], context=context):
-        prod=data['form']['product']
-        qty=data['form']['quantity']
-        prop_ids = pool.get("ir.property").search(cr, uid,[('name', '=', 'property_stock_customer')])
-        val = pool.get("ir.property").browse(cr, uid,prop_ids[0]).value
-        cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
-        res=cr.fetchone()
-        location_id=res and res[0] or None
-        stock_dest_id = int(val.split(',')[1])
-
-        prod_id=prod_obj.browse(cr,uid,prod)
-        new_picking=picking_obj.create(cr,uid,{
-                                'name':'%s (Added)' %order_id.name,
-                                'move_lines':[],
-                                'state':'draft',
-                                'type':'out',
-                                'date':date_cur,   })
-        new_move=stock_move_obj.create(cr, uid,{
-                        'product_qty': qty,
-                        'product_uos_qty': uom_obj._compute_qty(cr, uid,prod_id.uom_id.id, qty, prod_id.uom_id.id),
-                        'picking_id':new_picking,
-                        'product_uom':prod_id.uom_id.id,
-                        'location_id':location_id,
-                        'product_id':prod_id.id,
-                        'location_dest_id':stock_dest_id,
-                        'name':'%s (return)' %order_id.name,
-                        'date':date_cur,
-                        'date_planned':date_cur,})
-
-        wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
-        picking_obj.force_assign(cr, uid, [new_picking], context)
-       # order_obj.write(cr,uid,data['id'],{'state':'done','last_out_picking':new_picking})
-        order_obj.write(cr,uid,data['id'],{'last_out_picking':new_picking})
-    return {}
-
-
-
-
-class wizard_return_picking(wizard.interface):
-    states={
-        'init':{
-            'actions':[_get_returns],
-            'result':{'type':'form',
-                    'arch':arch,
-                    'fields':fields,
-                    'state':[('end','Cancel', 'gtk-cancel'),('return','Return goods and Exchange', 'gtk-ok'),('return_w','Return without Refund','gtk-ok')]
-                    }
-        },
-        'return':{
-            'actions':[],
-            'result':{ 'type': 'action',
-                       'action' : _create_returns,
-                       'state':'prod'}
-        },
-        'prod':{
-            'actions':[],
-            'result': {
-                'type': 'form',
-                'arch': _form,
-                'fields':_fields,
-                'state': [('close','Close'),('choice','Continue')]
-            }
-        },
-#        'choice1' : {
-#            'actions' : [_add_pdct],
-#            'result' : {'type' : 'choice', 'next_state': _test_exist1 }
-#        },
-        'choice' : {
-            'actions' : [],
-            'result' : {'type' : 'choice', 'next_state': _test_exist }
-        },
-#        'choice_raise':{
-#                        'actions':[],
-#            'result':{ 'type': 'action',
-#                       'action' : _raise,
-#                       'state':'end'}
-#        },
-        'add_p' :{
-            'actions':[],
-            'result':{
-            'type':'action',
-            'action': _add_pdct,
-            'state': 'prod'}
-        },
-#        'add_pp' :{
-#            'actions':[],
-#            'result':{
-#            'type':'action',
-#            'action': _add_pdct,
-#            'state': 'end'}
-#        },
-        'receipt':{
-            'result': {
-                'type': 'print',
-                'report': 'pos.receipt',
-                'state': 'end'
-            }
-        },
-        'return_w':{
-            'actions':[],
-            'result':{'type':'action', 'action':_create_returns2, 'state':'end'}
-        },
-
-        'close':{
-            'actions' : [],
-            'result' : {'type' : 'choice', 'next_state': _close }
-        },
-
-       'check': {
-            'actions': [],
-            'result': {
-                'type': 'choice',
-                'next_state': _check,
-            }
-        },
-
-        'ask_pay': {
-            'actions': [_pre_init],
-            'result': {
-                'type': 'form',
-                'arch': payment_form,
-                'fields': payment_fields,
-                'state': (('end', 'Cancel'), ('add_pay', 'Ma_ke payment', 'gtk-ok', True)
-                         )
-            }
-        },
-        'add_pay': {
-            'actions': [_add_pay],
-            'result': {
-                'type': 'state',
-                'state': "check",
-            }
-        },
-
-
-        'invoice': {
-            'actions': [create_invoice],
-            'result': {
-                'type': 'print',
-                'report': 'pos.invoice',
-                'state': 'end'
-            }
-        },
-        'receipt': {
-            'actions': [],
-            'result': {
-                'type': 'print',
-                'report': 'pos.receipt',
-                'state': 'end'
-            }
-        },
-        'paid': {
-            'actions': [],
-            'result': {
-                'type': 'state',
-                'state': 'end'
-            }
-        },
-
-    }
-wizard_return_picking('pos.return.picking')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py
index 4128e992c82..b3e18ced10a 100644
--- a/addons/product/__openerp__.py
+++ b/addons/product/__openerp__.py
@@ -49,13 +49,13 @@
     'update_xml': [
         'security/product_security.xml',
         'security/ir.model.access.csv',
+        'wizard/product_price_view.xml',
         'product_data.xml',
         'product_report.xml',
         'product_view.xml',
         'pricelist_view.xml',
         'partner_view.xml',
         'company_view.xml',
-        'product_wizard.xml',
         'process/product_process.xml'
     ],
     'installable': True,
diff --git a/addons/product/i18n/tr.po b/addons/product/i18n/tr.po
index bb924db644c..62e52d410d2 100644
--- a/addons/product/i18n/tr.po
+++ b/addons/product/i18n/tr.po
@@ -7,13 +7,13 @@ 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: 2010-02-27 08:20+0000\n"
-"Last-Translator: Oktay Altunergil <Unknown>\n"
+"PO-Revision-Date: 2010-05-10 16:32+0000\n"
+"Last-Translator: Angel Spy <melissadilara@yahoo.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-04-17 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-05-11 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -90,7 +90,7 @@ msgstr ""
 #. module: product
 #: field:product.packaging,width:0
 msgid "Width"
-msgstr "En/Genişlik"
+msgstr "Genişlik"
 
 #. module: product
 #: help:product.pricelist.item,product_tmpl_id:0
diff --git a/addons/product/partner_view.xml b/addons/product/partner_view.xml
index 66e4ba84c37..6b756eb8d7f 100644
--- a/addons/product/partner_view.xml
+++ b/addons/product/partner_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <page string="Sales &amp; Purchases" position="inside">
                     <newline/>
-                    <group col="2" colspan="2" name="sale_list">
+                    <group col="2" colspan="2">
                         <separator string="Sales Properties" colspan="2"/>
                         <field name="property_product_pricelist"/>
                     </group>
diff --git a/addons/product/product_wizard.xml b/addons/product/product_wizard.xml
deleted file mode 100644
index f226cd4e543..00000000000
--- a/addons/product/product_wizard.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/__init__.py b/addons/product/wizard/__init__.py
index fed1bcf3783..47f5f2641fc 100644
--- a/addons/product/wizard/__init__.py
+++ b/addons/product/wizard/__init__.py
@@ -18,7 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
-import wizard_price
+import product_price
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/product/wizard/product_price.py b/addons/product/wizard/product_price.py
new file mode 100644
index 00000000000..e5d73945c13
--- /dev/null
+++ b/addons/product/wizard/product_price.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 osv, fields
+from tools.translate import _
+  
+
+class product_price_list(osv.osv_memory):
+    _name = 'product.price_list'
+    _description = 'Product Price List'
+
+    _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'),
+    }
+    _defaults = {
+        'qty1': lambda *a: 0,
+        'qty2': lambda *a: 0,
+        'qty3': lambda *a: 0,
+        'qty4': lambda *a: 0,
+        'qty5': lambda *a: 0,
+    }
+
+    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 : return report
+        """
+        datas = {'ids': context.get('active_ids', [])}
+        res = self.read(cr, uid, ids, ['price_list','qty1', 'qty2','qty3','qty4','qty5'], context)
+        res = res and res[0] or {}
+        datas['form'] = res
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'product.pricelist',
+            'datas': datas,
+       }
+product_price_list()        
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/product/wizard/product_price_view.xml b/addons/product/wizard/product_price_view.xml
new file mode 100644
index 00000000000..17d9010ed43
--- /dev/null
+++ b/addons/product/wizard/product_price_view.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+    <!--   Product Price List -->
+
+		<record id="view_product_price_list" 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" />
+				    <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" />
+					<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>
+
+        <act_window id="action_product_price_list"
+    		key2="client_action_multi" name="Price List"
+    		res_model="product.price_list" src_model="product.product"
+    		view_mode="form" target="new" view_type="form" />
+
+</data>
+</openerp>
diff --git a/addons/product/wizard/wizard_price.py b/addons/product/wizard/wizard_price.py
deleted file mode 100644
index 12c810b802d..00000000000
--- a/addons/product/wizard/wizard_price.py
+++ /dev/null
@@ -1,59 +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
-
-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:
-
diff --git a/addons/purchase/__init__.py b/addons/purchase/__init__.py
index 41c673c0104..301e32ebca9 100644
--- a/addons/purchase/__init__.py
+++ b/addons/purchase/__init__.py
@@ -25,6 +25,7 @@ import stock
 import wizard
 import report
 import stock
+import company
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 6687b330b2c..909b785fe72 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -31,7 +31,7 @@
     """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['base', 'account', 'stock', 'process'],
+    'depends': ['base', 'account', 'stock', 'process', 'mrp_procurement'],
     'init_xml': [],
     'update_xml': [
                    
@@ -39,6 +39,7 @@
         'security/ir.model.access.csv',
         'purchase_workflow.xml',
         'purchase_sequence.xml',
+        'company_view.xml',
         'purchase_data.xml',
         'wizard/purchase_order_group_view.xml',
         'wizard/purchase_installer.xml',
diff --git a/addons/purchase/company.py b/addons/purchase/company.py
new file mode 100644
index 00000000000..2a01605782c
--- /dev/null
+++ b/addons/purchase/company.py
@@ -0,0 +1,36 @@
+# -*- 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
+
+class company(osv.osv):
+    _inherit = 'res.company'
+    _columns = {
+        'po_lead': fields.float('Purchase Lead Time', required=True,
+            help="This is the leads/security time for each purchase order."),
+    }
+    _defaults = {
+        'po_lead': lambda *a: 1.0,
+    }
+company()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/company_view.xml b/addons/purchase/company_view.xml
new file mode 100644
index 00000000000..d7707fe32c7
--- /dev/null
+++ b/addons/purchase/company_view.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+
+        <record id="mrp_company" model="ir.ui.view">
+            <field name="name">res.company.mrp.config</field>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="arch" type="xml">
+                <page string="Configuration" position="inside">
+                    <field name="po_lead"/>
+                </page>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 2bcc62c06ac..a7d69159873 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+from mx import DateTime
 from osv import fields
 from osv import osv
 import time
@@ -692,5 +693,86 @@ class purchase_order_line(osv.osv):
         return True    
 purchase_order_line()
 
+class mrp_procurement(osv.osv):
+    _inherit = 'mrp.procurement'
+    _columns = {
+        'purchase_id': fields.many2one('purchase.order', 'Purchase Order'),
+    }
+    
+    def action_po_assign(self, cr, uid, ids, context={}):
+        """ This is action which call from workflow to assign purchase order to procurements
+        @return: True
+        """
+        res = self.make_po(cr, uid, ids, context=context)
+        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={}):
+        """ 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 = 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 = 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 = 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)
+            newdate = newdate - procurement.product_id.seller_ids[0].delay
+
+            #Passing partner_id to context for purchase order line integrity of Line name
+            context.update({'lang': partner.lang, 'partner_id': partner_id})
+
+            product = prod_obj.browse(cr, uid, procurement.product_id.id, context=context)
+
+            line = {
+                'name': product.partner_ref,
+                'product_qty': qty,
+                'product_id': procurement.product_id.id,
+                'product_uom': uom_id,
+                'price_unit': price,
+                'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'),
+                'move_dest_id': res_id,
+                'notes': product.description_purchase,
+            }
+
+            taxes_ids = procurement.product_id.product_tmpl_id.supplier_taxes_id
+            taxes = acc_pos_obj.map_tax(cr, uid, partner.property_account_position, taxes_ids)
+            line.update({
+                'taxes_id': [(6,0,taxes)]
+            })
+            purchase_id = po_obj.create(cr, uid, {
+                'origin': procurement.origin,
+                'partner_id': partner_id,
+                'partner_address_id': address_id,
+                'location_id': procurement.location_id.id,
+                'pricelist_id': pricelist_id,
+                'order_line': [(0,0,line)],
+                '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 res
+mrp_procurement()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index c301116db2a..fe6fa0a5e80 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -322,7 +322,22 @@
             <field name="act_window_id" ref="purchase_line_form_action2"/>
         </record>
          <menuitem action="purchase_line_form_action2" id="menu_purchase_line_order_draft" parent="menu_procurement_management_invoice"/>
-
+		
+		<!-- 
+        	Procurements
+        -->
+         
+        <record id="view_procurement_form_inherit" model="ir.ui.view">
+        	<field name="name">mrp.procurement.form.inherit</field>
+        	<field name="model">mrp.procurement</field>
+        	<field name="inherit_id" ref="mrp_procurement.mrp_procurement_form_view"/>
+        	<field name="type">form</field>
+        	<field name="arch" type="xml">
+        		<xpath expr="/form/notebook/page/field[@name='close_move']" position="before">
+        			<field name="purchase_id"/>
+        		</xpath>
+        	</field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index 26f83d5a554..d7684be1875 100644
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -177,6 +177,33 @@
             <field name="act_from" ref="act_invoice_end"/>
             <field name="act_to" ref="act_done"/>
         </record>
+	
+	<!-- Procurement -->
+		<record id="act_buy" model="workflow.activity">
+            <field name="wkf_id" ref="mrp_procurement.wkf_procurement"/>
+            <field name="name">buy</field>
+            <field name="kind">subflow</field>
+            <field name="subflow_id" search="[('osv','=','purchase.order')]"/>
+            <field name="action">action_po_assign()</field>
+        </record>
+        
+        <record id="trans_confirm_mto_buy" model="workflow.transition">
+            <field name="act_from" ref="mrp_procurement.act_confirm_mto"/>
+            <field name="act_to" ref="act_buy"/>
+            <field name="condition">check_buy()</field>
+        </record>
+        
+        <record id="trans_buy_make_done" model="workflow.transition">
+            <field name="act_from" ref="act_buy"/>
+            <field name="act_to" ref="mrp_procurement.act_make_done"/>
+            <field name="signal">subflow.delivery_done</field>
+        </record>
+        
+        <record id="trans_buy_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_buy"/>
+            <field name="act_to" ref="mrp_procurement.act_cancel"/>
+            <field name="signal">subflow.cancel</field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index 8e4b4bc194c..14ff085a4c4 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -122,7 +122,7 @@ class purchase_order(osv.osv):
                     if order.id<>po.id:
                         wf_service = netsvc.LocalService("workflow")
                         wf_service.trg_validate(uid, 'purchase.order', order.id, 'purchase_cancel', cr)
-                    self.pool.get('purchase.requisition').write(cr, uid, [po.requisition_id.id], {'state':'close','date_end':time.strftime('%Y-%m-%d %H:%M:%S')})
+                    self.pool.get('purchase.requisition').write(cr, uid, [po.requisition_id.id], {'state':'done','date_end':time.strftime('%Y-%m-%d %H:%M:%S')})
 
         return res
 
diff --git a/addons/sale/__init__.py b/addons/sale/__init__.py
index ebc12a1089e..71f33623c55 100644
--- a/addons/sale/__init__.py
+++ b/addons/sale/__init__.py
@@ -26,9 +26,10 @@
 import sale
 import stock
 import product
-import mrp
+#import mrp
 import wizard
 import report
+import company
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index a6ff79b38cd..23e72c60775 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -42,13 +42,14 @@
     """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['product', 'stock', 'mrp', 'process'],
+    'depends': ['product', 'stock', 'mrp_procurement', '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',
+        'company_view.xml',
         'sale_workflow.xml',
         'sale_sequence.xml',
         'sale_data.xml',
@@ -56,7 +57,7 @@
         'report/sale_report_view.xml',
         'sale_report.xml',
         'stock_view.xml',
-        'process/sale_process.xml',
+#        'process/sale_process.xml',
     ],
     'demo_xml': ['sale_demo.xml'],
     'installable': True,
diff --git a/addons/sale/company.py b/addons/sale/company.py
new file mode 100644
index 00000000000..401a1a9c1d8
--- /dev/null
+++ b/addons/sale/company.py
@@ -0,0 +1,37 @@
+# -*- 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
+
+class company(osv.osv):
+    _inherit = 'res.company'
+    _columns = {
+        'security_lead': fields.float('Security Days', required=True,
+            help="This is the days added to what you promise to customers "\
+            "for security purpose"),
+    }
+    _defaults = {
+        'security_lead': lambda *a: 5.0,
+    }
+company()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/company_view.xml b/addons/sale/company_view.xml
new file mode 100644
index 00000000000..ead9128d6f3
--- /dev/null
+++ b/addons/sale/company_view.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+
+        <record id="mrp_company" model="ir.ui.view">
+            <field name="name">res.company.mrp.config</field>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="arch" type="xml">
+                <page string="Configuration" position="inside">
+                    <field name="security_lead"/>
+                </page>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index 5da1a96f8d4..58e4be14d84 100644
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -35,7 +35,7 @@
             <field eval="&quot;&quot;&quot;Sale Order Requisition&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Drives procurement orders for every sale order line.&quot;&quot;&quot;" name="note"/>
             <field name="subflow_id" ref="process_process_salesprocess0"/>
-            <field name="process_id" ref="mrp.process_process_procurementprocess0"/>
+            <field name="process_id" ref="mrp_procurement.process_process_procurementprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'waiting_date', 'manual', 'progress', 'shipping_except', 'invoice_except', 'done', 'cancel')&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
         </record>
@@ -63,12 +63,12 @@
         </record>
 
         <record id="process_node_saleprocurement0" model="process.node">
-            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
-            <field name="model_id" ref="mrp.model_mrp_procurement"/>
+            <field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
+            <field name="model_id" ref="mrp_procurement.model_mrp_procurement"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Procurement Order&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;One Procurement order for each sale order line and for each of the components.&quot;&quot;&quot;" name="note"/>
-            <field name="subflow_id" ref="mrp.process_process_procurementprocess0"/>
+            <field name="subflow_id" ref="mrp_procurement.process_process_procurementprocess0"/>
             <field name="process_id" ref="process_process_salesprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='confirmed'&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
@@ -202,7 +202,7 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Procurement of sold material&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;For every sale order line, a procurement order is created to supply the sold product.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="mrp.process_node_procureproducts0"/>
+            <field model="process.node" name="target_node_id" ref="mrp_procurement.process_node_procureproducts0"/>
             <field model="process.node" name="source_node_id" ref="process_node_saleorderprocurement0"/>
         </record>
 
diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index 259b5d75e39..d6ab6a7bc0c 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+    
+		<!--    
+	Resource: res.company
+	-->
+		<record id="res_company_shop_sale0" model="res.company">
+            <field eval="5.0" name="security_lead"/>
+            <field name="partner_id" ref="stock.res_partner_tinyshop0"/>
+            <field name="parent_id" ref="stock.res_company_shop0"/>
+            <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
+        </record>
 
         <!--
 	Resource: sale.order
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 0c5a1252d59..7a12e9dbad0 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -163,8 +163,8 @@
                                             <field groups="product.group_uos" name="product_uos"/>
                                             <field name="th_weight"/>
                                             <field name="address_allotment_id"/>
-                                            <separator colspan="4" string="Properties"/>
-                                            <field colspan="4" name="property_ids" nolabel="1"/>
+<!--                                            <separator colspan="4" string="Properties"/>-->
+<!--                                            <field colspan="4" name="property_ids" nolabel="1"/>-->
                                         </page>
                                         <page string="Notes">
                                             <field colspan="4" name="notes" nolabel="1"/>
@@ -188,7 +188,7 @@
                                 </tree>
                             </field>
                             <newline/>
-                            <group col="7" colspan="4">
+                            <group col="8" colspan="5">
                                 <field name="amount_untaxed" sum="Untaxed amount"/>
                                 <field name="amount_tax"/>
                                 <field name="amount_total" sum="Total amount"/>
@@ -395,9 +395,9 @@
                                     icon="gtk-cancel" />
                             </group>
                         </page>
-                        <page string="Properties" groups="base.group_extended">
-                            <field name="property_ids" nolabel="1"/>
-                        </page>
+<!--                        <page string="Properties" groups="base.group_extended">-->
+<!--                            <field name="property_ids" nolabel="1"/>-->
+<!--                        </page>-->
                         <page string="Notes">
                             <field colspan="4" name="notes" nolabel="1"/>
                         </page>
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 44ce9f7d1fa..7af8c1e74a7 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -11,10 +11,7 @@
 "access_account_analytic_account_salesman","account_analytic_account salesman","analytic.model_account_analytic_account","group_sale_user",1,1,1,1
 "access_stock_picking_salesman","stock_picking salesman","stock.model_stock_picking","group_sale_user",1,1,1,1
 "access_stock_move_salesman","stock_move salesman","stock.model_stock_move","group_sale_user",1,1,1,0
-"access_mrp_property_salesman","mrp.property salesman","mrp.model_mrp_property","group_sale_user",1,0,0,0
-"access_mrp_procurement_salesman","mrp.procurement salesman","mrp.model_mrp_procurement","group_sale_user",1,1,1,1
-"access_sale_order_mrp_user","sale.order mrp worker","model_sale_order","mrp.group_mrp_user",1,0,0,0
-"access_sale_order_line_mrp_user","sale.order.line mrp worker","model_sale_order_line","mrp.group_mrp_user",1,0,0,0
+"access_mrp_procurement_salesman","mrp.procurement salesman","mrp_procurement.model_mrp_procurement","group_sale_user",1,1,1,1
 "access_sale_order_stock_worker","sale.order stock worker","model_sale_order","stock.group_stock_user",1,1,0,0
 "access_sale_order_line_stock_worker","sale.order.line stock worker","model_sale_order_line","stock.group_stock_user",1,1,0,0
 "access_sale_order_manager","sale.order.manager","model_sale_order","group_sale_manager",1,1,1,1
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index d1ab1f2b577..20e0d30d8fb 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -62,6 +62,7 @@ Thanks to the double entry management, the inventory controlling is powerful and
         "product_data.xml",
         "product_view.xml",
         "partner_view.xml",
+        "report/report_stock_move_view.xml",
         "report/report_stock_view.xml",
         "report/report_stock_picking_view.xml",
         "security/stock_security.xml",
diff --git a/addons/stock/report/__init__.py b/addons/stock/report/__init__.py
index 6e0bc044d3e..a0a4bcb8ea5 100644
--- a/addons/stock/report/__init__.py
+++ b/addons/stock/report/__init__.py
@@ -27,6 +27,7 @@ import picking
 import lot_overview
 import lot_overview_all
 import report_stock
+import report_stock_move
 import report_stock_picking
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
new file mode 100755
index 00000000000..b5388b336e6
--- /dev/null
+++ b/addons/stock/report/report_stock_move.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 tools
+from osv import fields,osv
+
+
+class report_stock_move(osv.osv):
+    _name = "report.stock.move"
+    _description = "Stock Statistics"
+    _auto = False
+    _columns = {
+        'date': fields.date('Date', readonly=True),
+        'year': fields.char('Year', size=4, readonly=True),
+        'day': fields.char('Day', size=128, readonly=True),
+        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
+            ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
+            ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
+        'product_id':fields.many2one('product.product', 'Product', readonly=True),
+        'location_id':fields.many2one('stock.location', 'Location', readonly=True),
+        'product_qty':fields.integer('Qty',readonly=True),
+        'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True,
+                                  help='When the stock move is created it is in the \'Draft\' state.\n After that it is set to \'Confirmed\' state.\n If stock is available state is set to \'Avaiable\'.\n When the picking it done the state is \'Done\'.\
+                                  \nThe state is \'Waiting\' if the move is waiting for another one.'),
+
+    }
+    
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_stock_move')
+        cr.execute("""
+            create or replace view report_stock_move as (
+                select min(m.id) as id,
+                m.date as date,
+                to_char(date_trunc('day',m.date), 'YYYY') as year,
+                to_char(date_trunc('day',m.date), 'MM') as month,
+                to_char(date_trunc('day',m.date), 'YYYY-MM-DD') as day,
+                m.location_id as location_id,
+                m.product_id as product_id,
+                m.state as state,
+                sum(m.product_qty) as product_qty                  
+                from stock_move as m group by m.product_id, m.location_id, m.id, m.date, m.state
+            )
+        """)
+report_stock_move()
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
new file mode 100755
index 00000000000..79657da0fc7
--- /dev/null
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+    <record id="view_stock_tree" model="ir.ui.view">
+        <field name="name">report.stock.move.tree</field>
+        <field name="model">report.stock.move</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Stock Orders Statistics">
+                <field name="date"/>
+                <field name="year" invisible="1" />
+                <field name="month" invisible="1"/>
+                <field name="day" invisible="1"/>
+                <field name="product_id"/>
+                <field name="product_qty"/>
+                <field name="location_id"/>
+                <field name="state"/>
+           </tree>
+        </field>
+    </record>
+
+    <record id="view_stock_graph" model="ir.ui.view">
+         <field name="name">report.stock.move.graph</field>
+         <field name="model">report.stock.move</field>
+         <field name="type">graph</field>
+         <field name="arch" type="xml">
+             <graph string="Stock Moves Statistics" type="bar">
+                 <field name="product_id"/>
+                 <field name="product_qty"/>
+             </graph>
+         </field>
+    </record>
+
+    <record id="view_stock_search" model="ir.ui.view">
+        <field name="name">report.stock.move.search</field>
+        <field name="model">report.stock.move</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Stock Move">
+                <group>
+                <filter icon="terp-stock"
+                    string="This Year"
+                    domain="[('year','=',time.strftime('%%Y'))]"
+                    help="Stock Moves of the year"/>
+                <filter icon="terp-stock"
+                    string="This Month"
+                    domain="[('month','=',time.strftime('%%m'))]"
+                    help="Stock Moves of this month"/>
+	            <filter icon="terp-stock"
+                    string="Current Stock"
+                    separator="1"
+                    domain="[('date', '=', time.strftime('%%Y-%%m-%%d')]"
+                    help="Stock Moves of today"/>
+                <separator orientation="vertical"/>
+
+                <filter string="Waiting"
+                    	icon="terp-stock"
+                    	domain="[('state','=','waiting')]"
+                    	help = "Confirmed Stock-Moves"/>
+
+                <filter string="Available"
+                    	icon="terp-stock"
+                    	domain="[('state','=','assigned')]"
+                    	help = "Available Stock-Moves"/>
+
+                <filter string="Done"
+                    	icon="terp-stock"
+                    	domain="[('state','=','done')]"
+                    	help = "Completed Stock-Moves"/>
+                
+                <separator orientation="vertical"/>                                        
+                <field name="product_id" select="1" widget="selection"/>
+                <field name="location_id" select="1" widget="selection"/>
+                </group>
+                <newline/>
+                <group expand="1" string="Group By..." >
+                    <filter string="Product" icon="terp-stock" context="{'group_by':'product_id'}"/>
+                    <filter string="Location" icon="terp-stock" context="{'group_by':'location_id'}"/>
+                    <filter string="State" icon="terp-stock" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Day" icon="terp-stock" context="{'group_by':'day'}"/>
+                    <filter string="Month" icon="terp-stock" context="{'group_by':'date'}"/>
+                    <filter string="Year" icon="terp-stock" context="{'group_by':'year'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="action_stock_move_report" model="ir.actions.act_window">
+        <field name="name">Stock Moves</field>
+        <field name="res_model">report.stock.move</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,graph</field>
+ 		<field name="search_view_id"  ref="view_stock_search"/>
+ 	
+    </record>
+
+	<menuitem
+        id="stock.next_id_61"
+        name="Reporting"
+        parent="stock.menu_stock_root" groups="base.group_user"/>    
+
+	<menuitem action="action_stock_move_report" id="menu_action_stock_move_report" parent="next_id_61" sequence="5"/>
+	
+</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index d28effc83c0..3795351e03a 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -182,6 +182,7 @@ class stock_location(osv.osv):
         'stock_real_value': fields.function(_product_value, method=True, type='float', string='Real Stock Value', multi="stock"),
         'stock_virtual_value': fields.function(_product_value, method=True, type='float', string='Virtual Stock Value', multi="stock"),
         'company_id': fields.many2one('res.company', 'Company', required=True,select=1),
+        'scrap_location': fields.boolean('Scrap Location', help='Check this box if the current location is a place for destroyed items'),
     }
     _defaults = {
         'active': lambda *a: 1,
@@ -194,6 +195,7 @@ class stock_location(osv.osv):
         'posy': lambda *a: 0,
         'posz': lambda *a: 0,
         'icon': lambda *a: False,
+        'scrap_location': lambda *a: False,
     }
 
     def chained_location_get(self, cr, uid, location, partner=None, product=None, context={}):
@@ -1212,7 +1214,7 @@ class stock_move(osv.osv):
         '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'),
-        'scraped': fields.boolean('Scraped'),
+        'scraped': fields.related('location_dest_id','scrap_location',type='boolean',relation='stock.location',string='Scraped'),
     }
     _constraints = [
         (_check_tracking,
@@ -1249,8 +1251,8 @@ class stock_move(osv.osv):
         'location_dest_id': _default_location_destination,
         'state': lambda *a: 'draft',
         'priority': lambda *a: '1',
-        'scraped' : lambda *a:False,
         'product_qty': lambda *a: 1.0,
+        'scraped' : lambda *a: False,
         'date_planned': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.move', context=c)
diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index 704782eddd8..9b3bf1fb9d5 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -37,6 +37,11 @@
             <field name="usage">view</field>
             <field name="icon">terp-mrp</field>
         </record>
+        <record id="stock_location_scraped" model="stock.location">
+            <field name="name">Scraped</field>
+            <field name="location_id" ref="stock_location_locations_virtual"/>
+            <field name="scrap_location">True</field>
+        </record>
         
         <record id="location_inventory" model="stock.location">
             <field name="name">Inventory loss</field>
diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index de4eccdde55..806722cd24f 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -198,13 +198,9 @@
             <field eval="1" name="active"/>
         </record>
         <record id="res_company_shop0" model="res.company">
-            <field eval="5.0" name="security_lead"/>
             <field name="currency_id" ref="base.EUR"/>
-            <field eval="1.0" name="po_lead"/>
             <field name="partner_id" ref="res_partner_tinyshop0"/>
-            <field eval="1.0" name="manufacturing_lead"/>
             <field name="parent_id" ref="base.main_company"/>
-            <field eval="80.0" name="schedule_range"/>
             <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
         </record>
         <record id="res_partner_tinyshop1" model="res.partner">
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index ee0dfa9cd13..3c9f1d393ad 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -404,6 +404,7 @@
                     <field name="location_id"/>
                     <field name="address_id" context="{'contact_display':'partner'}"/>
                     <field name="icon"/>
+                    <field name="scrap_location"/>
                     <newline/>
                     <group col="2" colspan="2" groups="base.group_extended">
                         <separator string="Chained Locations" colspan="2"/>
@@ -605,7 +606,7 @@
                     <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}">
-                                <tree colors="grey:state in ('cancel');black:state not in ('cancel')" string="Stock Moves">
+                                <tree colors="grey:state in ('done','cancel');black:state not in ('cancel','done')" string="Stock Moves">
                                     <field name="name" string="Move Name"/>
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -755,7 +756,7 @@
                         <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}">
-                                <tree colors="grey:state in ('cancel');black:state not in ('cancel')" string="Stock Moves">
+                                <tree colors="grey:state in ('done','cancel');black:state not in ('cancel','done')" string="Stock Moves">
                                     <field name="name" string="Move Name"/>
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -933,7 +934,7 @@
                     <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}">
-                                <tree colors="grey:state in ('cancel');black:state not in ('cancel')" string="Stock Moves">
+                                <tree colors="grey:state in ('done','cancel');black:state not in ('cancel','done')" string="Stock Moves">
                                     <field name="name" string="Move Name"/>
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -951,7 +952,7 @@
                                            states="draft,waiting,confirmed,assigned" />
                                        <button
                                            name="%(stock.move_scrap)d"
-                                           string="D" type="action"
+                                           string="Scrap Products" type="action"
                                            icon="gtk-convert"
                                            states="draft,waiting,confirmed,assigned" />
                                 </tree>
@@ -1108,7 +1109,7 @@
                     <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}">
-                                <tree colors="grey:state in ('cancel');black:state not in ('cancel')" string="Stock Moves">
+                                <tree colors="grey:state in ('done','cancel');black:state not in ('cancel','done')" string="Stock Moves">
                                     <field name="product_id"/>
                                     <field name="product_qty"/>
                                     <field name="product_uom"/>
diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index 500b0bdc372..00b7b616aa5 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -86,9 +86,10 @@ 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})    
+            res.update({'product_qty': move.product_qty})
         if 'location_id' in fields:
             res.update({'location_id': move.location_id.id})
+        
         return res   
             
     def do_move_consume(self, cr, uid, ids, context={}):
@@ -121,9 +122,41 @@ class stock_move_scrap(osv.osv_memory):
     _inherit = "stock.move.consume"
     
     _defaults = {
-                 'location_id': lambda *x: False
+        'location_id': lambda *x: False
     }
 
+    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 of fields for default value 
+             @param context: A standard dictionary 
+             
+             @return: default values of fields
+        
+        """
+        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)
+        location_obj = self.pool.get('stock.location')
+        scrpaed_location_ids = location_obj.search(cr, uid, [('scrap_location','=',True)])
+        
+        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})
+        if 'location_id' in fields:
+            if scrpaed_location_ids:
+                res.update({'location_id': scrpaed_location_ids[0]})
+            else:
+                res.update({'location_id': False})
+        
+        return res
+        
     def move_scrap(self, cr, uid, ids, context={}):
         """ 
              To move scraped products
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 55fc8a6d8a7..5f58072f17a 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -40,7 +40,7 @@
                 <form string="Consume Move">
                 	<separator string="Consume Products" colspan="4"/>
 				    <field name="product_id" colspan="4" readonly="1"/>
-				    <field name="location_id" colspan="4"/>
+				    <field name="location_id" colspan="4" widget="selection"/>
 				    <field name="product_qty" colspan="2"/>
 				    <field name="product_uom" nolabel="1" readonly="1"/>
                 	<newline/>
@@ -73,7 +73,7 @@
                 <form string="Scrap Move">
                 	<separator string="Scrap Products" colspan="4"/>
 				    <field name="product_id" colspan="4" readonly="1"/>
-				    <field name="location_id" colspan="4" string="Dest. Location" domain="[('usage','&lt;&gt;','view')]"/>
+				    <field name="location_id" colspan="4" string="Dest. Location" domain="[('usage','&lt;&gt;','view'),('scrap_location','=',True)]" widget="selection"/>
 				    <field name="product_qty" colspan="2"/>
 				    <field name="product_uom" nolabel="1" readonly="1"/>
                 	<newline/>
diff --git a/addons/wiki/i18n/tr.po b/addons/wiki/i18n/tr.po
index 0fd7250c93c..3d518e67a0d 100644
--- a/addons/wiki/i18n/tr.po
+++ b/addons/wiki/i18n/tr.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-02-14 21:39+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-10 17:37+0000\n"
+"Last-Translator: Nurettin Ayarcı <nurettinx@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-04-17 04:18+0000\n"
+"X-Launchpad-Export-Date: 2010-05-11 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
@@ -25,7 +25,7 @@ msgstr ""
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "Nesne adı x_ ile başlamalı ve özel karakter içermemelidir!"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_groups_link
@@ -78,7 +78,7 @@ msgstr ""
 #. module: wiki
 #: field:wiki.wiki,text_area:0
 msgid "Content"
-msgstr ""
+msgstr "İçerik"
 
 #. module: wiki
 #: model:ir.ui.menu,name:wiki.menu_document_configuration
@@ -119,7 +119,7 @@ msgstr ""
 #. module: wiki
 #: view:wiki.groups:0
 msgid "Create a Menu"
-msgstr ""
+msgstr "Menü Oluştur"
 
 #. module: wiki
 #: field:wiki.groups,notes:0
@@ -195,7 +195,7 @@ msgstr "Görüntüleme mimarisi için Geçersiz XML"
 #. module: wiki
 #: field:wiki.wiki.history,text_area:0
 msgid "Text area"
-msgstr ""
+msgstr "Metin alanı"
 
 #. module: wiki
 #: wizard_field:wiki.create.menu,init,menu_parent_id:0
@@ -216,7 +216,7 @@ msgstr ""
 #: wizard_view:wiki.create.menu,init:0
 #: wizard_view:wiki.make.index,init:0
 msgid "Menu Information"
-msgstr ""
+msgstr "Menü Bilgisi"
 
 #. module: wiki
 #: field:wiki.groups,parent_id:0
@@ -228,12 +228,12 @@ msgstr ""
 #: field:wiki.wiki,summary:0
 #: field:wiki.wiki.history,summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Özet"
 
 #. module: wiki
 #: field:wiki.groups,create_date:0
 msgid "Created Date"
-msgstr ""
+msgstr "Oluşturulma Tarihi"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_history
@@ -259,12 +259,12 @@ msgstr ""
 #. module: wiki
 #: wizard_field:wiki.create.menu,init,menu_name:0
 msgid "Menu Name"
-msgstr ""
+msgstr "Menu İsmi"
 
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Modifications"
-msgstr ""
+msgstr "Değişiklikler"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_wiki_history
@@ -275,18 +275,18 @@ msgstr ""
 #: model:ir.ui.menu,name:wiki.menu_document
 #: view:wiki.wiki:0
 msgid "Wiki"
-msgstr ""
+msgstr "Wiki"
 
 #. module: wiki
 #: field:wiki.wiki,write_date:0
 msgid "Modification Date"
-msgstr ""
+msgstr "Değiştirilme Tarihi"
 
 #. module: wiki
 #: model:ir.actions.wizard,name:wiki.wizard_make_index
 #: wizard_button:wiki.make.index,init,yes:0
 msgid "Create Index"
-msgstr ""
+msgstr "dizin yarat"
 
 #. module: wiki
 #: field:wiki.wiki.history,minor_edit:0
@@ -299,12 +299,12 @@ msgstr ""
 #: wizard_button:wiki.create.menu,init,create_menu:0
 #: wizard_view:wiki.make.index,init:0
 msgid "Create Menu"
-msgstr ""
+msgstr "Menü Oluştur"
 
 #. module: wiki
 #: field:wiki.wiki,tags:0
 msgid "Tags"
-msgstr ""
+msgstr "Etiketler"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_groups
@@ -330,12 +330,12 @@ msgstr ""
 #: wizard_button:wiki.create.menu,init,end:0
 #: wizard_button:wiki.make.index,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Vazgeç"
 
 #. module: wiki
 #: field:wizard.wiki.history.show_diff,diff:0
 msgid "Diff"
-msgstr ""
+msgstr "Farklar"
 
 #. module: wiki
 #: field:wiki.wiki,review:0