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

[gpa(OpenERP)]

changes in the stock_minimum_calculator module as client specification.

=== modified file 'stock_minimum_calculator/__init__.py'
--- stock_minimum_calculator/__init__.py	2010-06-15 06:50:37 +0000
+++ stock_minimum_calculator/__init__.py	2010-06-22 08:06:27 +0000
@@ -21,7 +21,6 @@
 ##############################################################################
 
 import stock_minimum_calculator
-import stock_order_point_calculator
 import supplier_cost_optimated_leadtimes
 import wizard
 

=== modified file 'stock_minimum_calculator/__terp__.py'
--- stock_minimum_calculator/__terp__.py	2010-06-15 06:50:37 +0000
+++ stock_minimum_calculator/__terp__.py	2010-06-22 08:06:27 +0000
@@ -29,7 +29,7 @@
     minimum stock rules based on real and virtual stock comparison so 
     we have proper re-order quentity for each products.
         """,
-    "depends": ['stock','mrp'],
+    "depends": ['stock','mrp',"sale"],
     "demo_xml": ["stock_minimum_calculator_demo.xml"],
     "update_xml": ['stock_minimum_calculator_view.xml',
                    "stock_minimujm_calculator_wizard.xml",

=== modified file 'stock_minimum_calculator/stock_minimum_calculator.py'
--- stock_minimum_calculator/stock_minimum_calculator.py	2010-06-15 06:50:37 +0000
+++ stock_minimum_calculator/stock_minimum_calculator.py	2010-06-22 08:06:27 +0000
@@ -65,18 +65,4 @@
                 }
 product_product()
 
-
-class stock_warehosue_orderpoint_period(osv.osv):
-    ### Add for percenatage of the period
-    _name = "stock.warehosue.orderpoint.period"
-    _columns = {
-                'name':fields.char("Name",size=64,required=True),
-                'product_id':fields.many2one('product.product', 'Product',required=True),
-                'partner_id':fields.many2one('res.partner','Partner',required=True),
-                'period_id' :fields.many2one('account.period',"Period",required=True),
-                'percentage':fields.float("Percenatage",required=True),
-                 }
-    
-stock_warehosue_orderpoint_period()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== modified file 'stock_minimum_calculator/stock_minimum_calculator_view.xml'
--- stock_minimum_calculator/stock_minimum_calculator_view.xml	2010-06-15 06:50:37 +0000
+++ stock_minimum_calculator/stock_minimum_calculator_view.xml	2010-06-22 08:06:27 +0000
@@ -102,46 +102,5 @@
 			</field>
 		</record>		
 		
-<!--		Add for percenatage of the period -->
-		<record id="stock_warehosue_orderpoint_period_tree_view" model="ir.ui.view">
-            <field name="name">stock.warehosue.orderpoint.period.tree</field>
-            <field name="model">stock.warehosue.orderpoint.period</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Period Percenatage">
-                    <field name="name"/>
-                    <field name="product_id"/>
-                    <field name="partner_id"/>
-                    <field name="period_id"/>
-                    <field name="percentage"/>
-                </tree>
-            </field>
-        </record>
-        
-        <record id="stock_warehosue_orderpoint_period_form_view" model="ir.ui.view">
-            <field name="name">stock.warehosue.orderpoint.period.form</field>
-            <field name="model">stock.warehosue.orderpoint.period</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Period Percenatage">
-                    <field name="name"/>
-                    <field name="product_id"/>
-                    <field name="partner_id"/>
-                    <field name="period_id"/>
-                    <field name="percentage"/> 
-                </form>
-            </field>
-        </record>
-        <record id="stock_warehosue_orderpoint_period_normal_action" model="ir.actions.act_window">
-            <field name="name">Period Percenatage</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">stock.warehosue.orderpoint.period</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="stock_warehosue_orderpoint_period_tree_view"/>
-        </record>
-        
-        <menuitem action="stock_warehosue_orderpoint_period_normal_action" id="menu_period_supplier" parent="stock.menu_stock_configuration"/>
-		
-			
     </data>
 </openerp>
\ No newline at end of file

=== modified file 'stock_minimum_calculator/supplier_cost_optimated_leadtimes.py'
--- stock_minimum_calculator/supplier_cost_optimated_leadtimes.py	2010-06-15 06:50:37 +0000
+++ stock_minimum_calculator/supplier_cost_optimated_leadtimes.py	2010-06-22 08:06:27 +0000
@@ -40,9 +40,8 @@
                  }
     
     def _compute(self, cr, uid, ids, context=None):
-        
+
         form = self.read(cr, uid, ids, [], context=context)[0]
-        
         analytic_account_obj = self.pool.get('account.analytic.account')
         analytic_line_obj = self.pool.get('account.analytic.line')
         stock_hold_rate_obj = self.pool.get("stock.holding.rate")
@@ -76,11 +75,15 @@
         stock_hold_id = stock_hold_rate_obj.browse(cr, uid, form['stock_holding_rate_id'])
         stock_hold_rate = stock_hold_id.stock_hold_rate
         
+        economic_numer_orders = 0.0
+        economic_lead_time = 0.0
+        
         if pur_balance and cost_balance:
-            for id in ids:
-                economic_numer_orders = (pur_balance * stock_hold_rate)/ (2 * cost_balance)
-                economic_lead_time = 360 / economic_numer_orders
-                self.write(cr, uid, [id],{'cost_per_del':cost_balance,'purchase_rev':pur_balance, 'economic_no_order':economic_numer_orders,'economic_lead_time':economic_lead_time})
+            economic_numer_orders = (pur_balance * stock_hold_rate)/ (2 * cost_balance)
+            economic_lead_time = 360 / economic_numer_orders
+
+        for id in ids:
+           self.write(cr, uid, [id],{'cost_per_del':cost_balance,'purchase_rev':pur_balance, 'economic_no_order':economic_numer_orders,'economic_lead_time':economic_lead_time})
             
         return True 
        

=== modified file 'stock_minimum_calculator/wizard/stock_order_point_calculator.py'
--- stock_minimum_calculator/wizard/stock_order_point_calculator.py	2010-06-15 06:50:37 +0000
+++ stock_minimum_calculator/wizard/stock_order_point_calculator.py	2010-06-22 08:06:27 +0000
@@ -24,7 +24,9 @@
 import time
 from tools.translate import _
 import mx.DateTime
-from mx.DateTime import RelativeDateTime, now, DateTime, localtime
+from mx.DateTime import RelativeDateTime, now, DateTime
+from tools import config
+import math
 
 orderpoint_calculator_form = """<?xml version="1.0"?>
 <form string="Order Point Calculator ">
@@ -89,17 +91,26 @@
                 },
             }
 
+_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>'''
+_message_fields = {
+    'message': {'string':'Message' ,'type':'text', 'readonly':True}
+                     }
+
 def _get_default(obj, cr, uid, data, context=None):
     pool = pooler.get_pool(cr.dbname)
 
     warehouse_id = pool.get('stock.warehouse').search(cr, uid, [])[0]
     location_id = pool.get('stock.location').search(cr, uid, [('name','=','Stock')])[0]
 
-    date = now().strftime('%Y-%m-%d')
-    date = mx.DateTime.strptime(date, '%Y-%m-%d') - RelativeDateTime(months=3)
-    date = date.strftime('%Y-%m-%d')
+    from_date = now().strftime('%Y-%m-%d')
+    from_date = mx.DateTime.strptime(from_date, '%Y-%m-%d') - RelativeDateTime(months=3)
+    from_date = from_date.strftime('%Y-%m-%d')
 
-    return {'warehouse_id': warehouse_id, 'location_id':location_id,'date_start':date}
+    return {'warehouse_id': warehouse_id, 'location_id':location_id,'date_start':from_date}
 
 def _do_calculate(self, cr, uid, data, context):
 
@@ -112,11 +123,6 @@
         supp_cost_opt_obj = pool.get('supplier.cost.opti.lead.time')
         min_rule_obj = pool.get('stock.warehouse.orderpoint')
 
-        stock_rule_ids = min_rule_obj.search(cr,uid,[('warehouse_id','=',data['form']['warehouse_id'])])
-        if data['form']['delactive']:
-            for stock_rule_id in min_rule_obj.browse(cr, uid, stock_rule_ids, context=context):
-                min_rule_obj.unlink(cr, uid, [stock_rule_id.id],context=context)
-        
         ##### Calculation of purchase lead time 
         purchase_lead_time = 0.0
         company = pool.get('res.users').browse(cr, uid, uid, context).company_id
@@ -129,21 +135,24 @@
             supplier_lead_time = 0.0
             if product_id:
                 for supp in product_id.seller_ids:
-                        sup = supp_obj.browse(cr, uid, supp.id, context)
-                        supplier_lead_time = sup.delay
-        
+                    sup = supp_obj.browse(cr, uid, supp.id, context)
+                    supplier_lead_time = sup.delay
+                    
             ###### Calculation of average_daily_consumption
             date_start = data['form']['date_start']
             date_stop = data['form']['date_stop']
             average_daily_consumption = 0.0
+            sale_line_obj = pool.get("sale.order.line")
             consum_qty = 0.0 
             sale_ids = sale_obj.search(cr,uid,[('date_order','>=',date_start),('date_order','<=',date_stop)])
             if sale_ids:
                 for sid in sale_ids:
-                    sale_data = sale_obj.browse(cr,uid,sid)
-                    for line in sale_data.order_line:
-                        consum_qty += line.product_uom_qty
-                
+                    sale_line_id = sale_line_obj.search(cr,uid,[('order_id','=',sid),('product_id','=',product_id.id)])
+                    for line_id in sale_line_id:
+                        sale_line_data= sale_line_obj.browse(cr,uid,line_id)
+                        consum_qty += sale_line_data.product_uom_qty
+                       ###here cosume quantity is total of selected produdct
+                        
             ##################calculation of date difference between first and last sale order
             sale_ids = sale_obj.search(cr,uid,[])
             if sale_ids:
@@ -161,18 +170,17 @@
             plan_average_daily_consumption = 0.0
             if product_id.plan_avg_consume:
                 plan_average_daily_consumption = product_id.plan_avg_consume
-                
             ########## calculation historical consumption of products and open sales orders“
             ### total sale qty with open state
             
             sale_qty = 0.0 
-            sale_ids = sale_obj.search(cr, uid, [('state','in',['manual','progress'])])
+            open_sale_ids = sale_obj.search(cr, uid, [('state','in',['manual','progress'])])
             if sale_ids:
-                for sale_id in sale_ids:
-                    sale_data = sale_obj.browse(cr,uid,sale_id)
-                    for line in sale_data.order_line:
-                        sale_qty += line.product_uom_qty 
-            
+                for sale_id in open_sale_ids:
+                    sale_open_line_ids= sale_line_obj.search(cr,uid,[('order_id','=',sale_id),('product_id','=',product_id.id)])
+                    for open_line_id in sale_open_line_ids:
+                        sale_line_data= sale_line_obj.browse(cr,uid,open_line_id)
+                        sale_qty += sale_line_data.product_uom_qty
             ###################
             purchase_ids = purchase_obj.search(cr,uid,[])
             if purchase_ids:
@@ -189,34 +197,60 @@
             product_max_qty = 0.0 
             product_min_qty = 0.0
             
+            
             if data['form']['method_qty_calculation'] == 'his_cons_with_product':
-                product_min_qty = average_daily_consumption *  (supplier_lead_time + purchase_lead_time)
+                product_min_qty = int(math.ceil(average_daily_consumption *  (supplier_lead_time + purchase_lead_time)))
                 product_max_qty = 2 * product_min_qty
-    
+            
             elif data['form']['method_qty_calculation'] == 'his_cons_without_product':
-                product_min_qty =  plan_average_daily_consumption * (supplier_lead_time + purchase_lead_time)
-                product_max_qty = 2 * product_min_qty 
-                
-            else:
-                product_min_qty =  (average_daily_consumption + sale_qty) / pur_diff_day * (supplier_lead_time + purchase_lead_time)
-                product_max_qty = 2 * product_min_qty
-            
-            max1 = 'max'
-            name =  pool.get('ir.sequence').get(cr, uid, 'stock.orderpoint.calculator')
-            pool.get('stock.warehouse.orderpoint').create(cr, uid, {
-                            'name': name,
-                            'active': True,
-                            'warehouse_id': data['form']['warehouse_id'],
-                            'location_id': product_id.property_stock_inventory.id,
-                            'product_id': id,
-                            'product_min_qty': product_min_qty,
-                            'product_max_qty': product_max_qty,
-                            'qty_multiple':1,
-                            'product_uom':product_id.uom_id.id,
-                            'logic':'max'
-                        } )
+                product_min_qty =  int(math.ceil(plan_average_daily_consumption * (supplier_lead_time + purchase_lead_time)))
+                product_max_qty = 2 * product_min_qty
+            
+            else:
+                try:
+                    product_min_qty =  int(math.ceil((consum_qty + sale_qty) / pur_diff_day * (supplier_lead_time + purchase_lead_time)))
+                except Exception,e:
+                     product_min_qty = 0.0
+                product_max_qty = 2 * product_min_qty
+            
+            if data['form']['delactive']:
+                stock_rule_ids = min_rule_obj.search(cr,uid,[('warehouse_id','=',data['form']['warehouse_id']),('product_id','=',product_id.id)])
+                for stock_rule_id in stock_rule_ids:
+                    min_rule_obj.unlink(cr, uid, [stock_rule_id],context=context)
+                    
+            mini_stock_rule_id = min_rule_obj.search(cr,uid,[('warehouse_id','=',data['form']['warehouse_id']),('product_id','=',product_id.id)])
+            if mini_stock_rule_id:
+                for stock_rule_id in mini_stock_rule_id:
+                    min_rule_obj.write(cr, uid, [stock_rule_id],{'product_min_qty':product_min_qty,'product_max_qty':product_max_qty,},context=context)
+            else:
+                name =  pool.get('ir.sequence').get(cr, uid, 'stock.orderpoint.calculator')
+                pool.get('stock.warehouse.orderpoint').create(cr, uid, {
+                                'name': name,
+                                'active': True,
+                                'warehouse_id': data['form']['warehouse_id'],
+                                'location_id': product_id.property_stock_inventory.id,
+                                'product_id': id,
+                                'product_min_qty': product_min_qty,
+                                'product_max_qty': product_max_qty,
+                                'qty_multiple':1,
+                                'product_uom':product_id.uom_id.id,
+                                'logic':'max'
+                            } )  
         
+
         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 = {
@@ -228,11 +262,20 @@
                     'state' : [('end', 'Cancel'),('calculation', 'Calculation') ]}
         },
          'calculation' : {
-            'actions' : [],
-            'result' : {'type' : 'action',
-                    'action' : _do_calculate,
-                    'state' : 'end'}
-            }
+            'actions' : [ _do_calculate ],
+            'result' : {'type' : 'state',
+                    'state' : 'end2'}
+            },
+       
+      'end2': {
+            'actions': [ _get_message ],
+            'result': {'type': 'form', 'arch': _messages_form,
+                'fields': _message_fields,
+                'state': (
+                    ('end', 'Close'),
+                )
+            },
+        }, 
     }
 orderpoint_calculator("orderpoint.calculator")