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

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

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