Merge lp:~openbig/bigconsulting/stock_min_cal_bug into lp:bigconsulting

[gpa(OpenERP)]

Solved the bug of stock_min_calculator.

[lp:~openbig/bigconsulting/stock_min_cal_bug]

95. By gpa(OpenERP) on 2010-09-13

solve the bug of the stock_minimum_calculator

96. By gpa(OpenERP) on 2010-09-13

solve the bug of the stock_minimum_calculator

Unmerged revisions

=== modified file 'stock_minimum_calculator/wizard/stock_order_point_calculator.py'
--- stock_minimum_calculator/wizard/stock_order_point_calculator.py	2010-09-07 13:16:30 +0000
+++ stock_minimum_calculator/wizard/stock_order_point_calculator.py	2010-09-13 05:37:47 +0000
@@ -77,7 +77,6 @@
         'string':"Method Calculation",
         'type':'selection',
         'selection':[('his_cons_with_product', 'Calculate with planning values'),
-                     ('his_cons_without_product', 'Calculate with Out historical consumptions of product'),
                      ('hist_cons_and_open_sale', 'Calculate with historical values'),
                     ],'required': True,
         'default': lambda *a:'his_cons_with_product'
@@ -85,14 +84,11 @@
 }
 
 _messages_form = '''<?xml version="1.0"?>
-<form string="Warning">
-    <label string="Information Regarding Method of Calculation" colspan="4"/>
-    <field name="message" colspan="4" nolabel="1"/>
+<form string="Message">
+    <label string="Calculations successfully done !" colspan="4"/>
 </form>'''
 
-_message_fields = {
-    'message': {'string':'Message' ,'type':'text', 'readonly':True}
-}
+_message_fields = {}
 
 def _get_default(obj, cr, uid, data, context=None):
     pool = pooler.get_pool(cr.dbname)
@@ -315,10 +311,6 @@
                     product_min_qty = int(math.ceil(average_daily_consumption *  (supplier_lead_time + purchase_lead_time) * seasonal_factor))
                     product_max_qty = max_qty_factor * product_min_qty
     
-                elif data['form']['method_qty_calculation'] == 'his_cons_without_product':
-                    product_min_qty =  int(math.ceil(plan_average_daily_consumption * (supplier_lead_time + purchase_lead_time) * seasonal_factor))
-                    product_max_qty = max_qty_factor * product_min_qty
-    
                 else:
                     try:
                         product_min_qty =  int(math.ceil((consum_qty + open_sale_qty) / pur_diff_day * (supplier_lead_time + purchase_lead_time) * seasonal_factor))
@@ -354,18 +346,6 @@
                                            
         return {}
 
-def _get_message(self, cr, uid, data, context):
-
-    if data['form']['method_qty_calculation'] == 'his_cons_with_product':
-        data['form']['message'] = _("Are your sure that you have enough historical data to calculate stock orderpoint rules with this methodology, Otherwise you should try the other options, \n Calculate without historical consumption of products or ,Calculate with historical consumption of products and sales orders")
-    elif data['form']['method_qty_calculation'] == 'his_cons_without_product':
-        data['form']['message'] = _("Your calculation is based on the field plan average daily consumption.\n Are your sure not to calculate with the method , Calculate with historical consumption of products")
-    else:
-        data['form']['message'] = _("Are your sure that you have really not enough historical data to calculate stock orderpoint rules? \n Otherwise you should prefer the options , Calculate with historical consumption of products. This results may calculate better results than calculation with this methodology.")
-    return data['form']
-
-
-
 class orderpoint_calculator(wizard.interface):
     states = {
         'init' : {
@@ -382,7 +362,7 @@
             },
 
       'end2': {
-            'actions': [ _get_message ],
+            'actions': [],
             'result': {'type': 'form', 'arch': _messages_form,
                 'fields': _message_fields,
                 'state': (