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

[gpa(OpenERP)]

Added change as new specification

=== modified file 'stock_minimum_calculator/__init__.py'
--- stock_minimum_calculator/__init__.py	2010-06-09 14:36:04 +0000
+++ stock_minimum_calculator/__init__.py	2010-06-15 07:09:25 +0000
@@ -21,6 +21,8 @@
 ##############################################################################
 
 import stock_minimum_calculator
+import stock_order_point_calculator
+import supplier_cost_optimated_leadtimes
 import wizard
-import stock_order_point_calculator
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== modified file 'stock_minimum_calculator/__terp__.py'
--- stock_minimum_calculator/__terp__.py	2010-06-11 07:42:16 +0000
+++ stock_minimum_calculator/__terp__.py	2010-06-15 07:09:25 +0000
@@ -30,11 +30,11 @@
     we have proper re-order quentity for each products.
         """,
     "depends": ['stock','mrp'],
-    "demo_xml": [],
+    "demo_xml": ["stock_minimum_calculator_demo.xml"],
     "update_xml": ['stock_minimum_calculator_view.xml',
                    "stock_minimujm_calculator_wizard.xml",
-                   "stock_order_point_calculator_view.xml",
-                   "stock_minimum_calculator_sequence.xml"
+                   "stock_minimum_calculator_sequence.xml",
+                   "supplier_cost_optimated_leadtimes_view.xml",
                     ],
     "license": "GPL-3",
     "active": False,

=== modified file 'stock_minimum_calculator/stock_minimujm_calculator_wizard.xml'
--- stock_minimum_calculator/stock_minimujm_calculator_wizard.xml	2010-06-09 14:36:04 +0000
+++ stock_minimum_calculator/stock_minimujm_calculator_wizard.xml	2010-06-15 07:09:25 +0000
@@ -7,5 +7,12 @@
             name="set_seasonal.trend"
             menu="True"
             id="id_set_seasonal_trend"/>
+     <wizard
+            string="Order Point Cacluator"
+            model="product.product"
+            name="orderpoint.calculator"
+            menu="True"
+            id="id_order_point_cacluator"/>
+                   
     </data>
 </openerp>

=== modified file 'stock_minimum_calculator/stock_minimum_calculator.py'
--- stock_minimum_calculator/stock_minimum_calculator.py	2010-06-11 06:02:15 +0000
+++ stock_minimum_calculator/stock_minimum_calculator.py	2010-06-15 07:09:25 +0000
@@ -36,7 +36,6 @@
     }
 stock_holding_rate()
 
-
 class supplier_product(osv.osv):
     _name = 'supplier.product'
     _rec_name = 'partner_id'
@@ -48,63 +47,6 @@
     
 supplier_product()
 
-class res_partner(osv.osv):
-    _inherit = "res.partner"
-    _columns = {
-                'stock_holding_rate_id':fields.many2one("stock.holding.rate",'Holding Rate'),
-                }
-res_partner()
-
-
-class supplier_cost_opti_lead_time(osv.osv):
-    _name = "supplier.cost.opti.lead.time"
-    _columns = {
-        'supp_cost_id':fields.char("ID",size=64, required=True),
-        'name':fields.char("Name of the rule",size=64, required=True),
-        'partner_id': fields.many2one('res.partner', 'Suplier'),
-        'date_start': fields.date('Date', required=True),
-        'active': fields.boolean('Active'),
-        'yrl_purchase_rev':fields.float("YRL Purchase Revenue",required=True),
-        'economic_no_order':fields.float("Economic Number of orders",readonly=True),
-        'cost_per_del':fields.float("Cost Per Delivery",required=True),
-        'economic_lead_time':fields.float("Economic Lead Time",readonly=True),
-        'stock_holding_rate_id':fields.many2one("stock.holding.rate",'Holding Rate',required=True),
-        'staus': fields.selection([
-            ('draft','Draft'),
-            ('valid','Valid'),
-            ('cancel','Cancel'),
-            ],'Status',readonly=True),
-    }
-    _defaults = {
-        'date_start': lambda *a: time.strftime('%Y-%m-%d'),
-        }
-    
-    def action_compute(self, cr, uid, ids, context={}):
-        for id in ids:
-            cost_op = self.browse(cr, uid,id,context=context)
-            economic_numer_orders = (cost_op.yrl_purchase_rev * cost_op.stock_holding_rate_id.stock_hold_rate)/ (2*cost_op.cost_per_del)
-            economic_lead_time = 360 / economic_numer_orders
-            self.write(cr, uid, [id],{'economic_lead_time':economic_lead_time,'economic_no_order':economic_numer_orders})
-        return True  
-    
-    def action_cancel(self, cr, uid, ids, context={}):
-        for o in self.browse(cr, uid, ids):
-            self.write(cr, uid, [o.id], {'staus': 'cancel'})
-        return True  
-        
-    def action_validate(self, cr, uid, ids, context={}):
-        for o in self.browse(cr, uid, ids):
-            already_id = self_obj.search(cr, uid, [('partner_id','=',o.partner_id.id),('id', 'not in', ids),('staus','=','valid')])
-            if already_id:
-                old_partner_id = self.browse(cr, uid, already_id[0])
-                if o.partner_id.id == old_partner_id.partner_id.id:
-                    raise osv.except_osv(_('Error !'),
-                                      _('You can not this partner becasue this partner aleready with valid entry'))
-            self.write(cr, uid, [o.id], {'staus': 'valid'}) 
-        return True             
-        
-supplier_cost_opti_lead_time()
-
 class product_seasonal(osv.osv):
     _name = 'product.seasonal'
     _columns = {

=== added file 'stock_minimum_calculator/stock_minimum_calculator_demo.xml'
--- stock_minimum_calculator/stock_minimum_calculator_demo.xml	1970-01-01 00:00:00 +0000
+++ stock_minimum_calculator/stock_minimum_calculator_demo.xml	2010-06-15 07:09:25 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+        <record id="product_seasonal_id1" model="product.seasonal">
+            <field name="name">Normal Seasonal</field>
+            <field name="code">main</field>
+            <field name="seasonal_factor">1.0</field>
+        </record>
+        <record id="product_seasonal_id2" model="product.seasonal">
+            <field name="name">Christmas Seasonal</field>
+            <field name="code">christmas</field>
+            <field name="seasonal_factor">1.12</field>
+        </record>
+        
+    </data>
+</openerp>

=== modified file 'stock_minimum_calculator/stock_minimum_calculator_sequence.xml'
--- stock_minimum_calculator/stock_minimum_calculator_sequence.xml	2010-06-11 07:42:16 +0000
+++ stock_minimum_calculator/stock_minimum_calculator_sequence.xml	2010-06-15 07:09:25 +0000
@@ -3,12 +3,12 @@
     <data noupdate="1">
         <!-- Sequences for stock.orderpoint.step2 -->
         <record id="sequence_stock_op_point" model="ir.sequence.type">
-            <field name="name">Stock orderpoint step2</field>
-            <field name="code">stock.orderpoint.step2</field>
+            <field name="name">Stock orderpoint Calculator</field>
+            <field name="code">stock.orderpoint.calculator</field>
         </record>
     	<record id="sequence_stock_op" model="ir.sequence">
-            <field name="name">Stock orderpoint step2</field>
-            <field name="code">stock.orderpoint.step2</field>
+            <field name="name">stock orderpoint Calculator</field>
+            <field name="code">stock.orderpoint.calculator</field>
             <field name="prefix">OP/</field>
             <field name="padding">5</field>
             <field name="number_increment">1</field>

=== modified file 'stock_minimum_calculator/stock_minimum_calculator_view.xml'
--- stock_minimum_calculator/stock_minimum_calculator_view.xml	2010-06-10 06:28:31 +0000
+++ stock_minimum_calculator/stock_minimum_calculator_view.xml	2010-06-15 07:09:25 +0000
@@ -2,7 +2,7 @@
 <openerp>
     <data>
     
-	   	<record id="stock_holding_rate_tree_view" model="ir.ui.view">
+    	<record id="stock_holding_rate_tree_view" model="ir.ui.view">
             <field name="name">stock.holding.rate.tree</field>
             <field name="model">stock.holding.rate</field>
             <field name="type">tree</field>
@@ -52,69 +52,8 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="stock_holding_rate_tree_view"/>
         </record>
+        
         <menuitem action="stock_holding_rate_tree_view_normal_action" id="menu_stock_holding_rate" parent="stock.menu_stock_configuration"/>
-    
-    	<record id="supplier_cost_opti_lead_time_tree_view" model="ir.ui.view">
-            <field name="name">supplier.cost.opti.lead.time.tree</field>
-            <field name="model">supplier.cost.opti.lead.time</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Supplier Cost Optimated Lead Times">
-                    <field name="supp_cost_id"/>
-                    <field name="name"/>	
-                    <field name="partner_id"/>
-                    <field name="date_start"/>
-                    <field name="yrl_purchase_rev"/>
-                    <field name="economic_no_order"/>
-                    <field name="cost_per_del"/>
-                    <field name="economic_lead_time"/>
-                    <field name="stock_holding_rate_id"/>
-                    <field name="staus"/>
-                </tree>
-            </field>
-        </record>
-        
-        <record id="supplier_cost_opti_lead_time_form_view" model="ir.ui.view">
-            <field name="name">supplier.cost.opti.lead.time.form</field>
-            <field name="model">supplier.cost.opti.lead.time</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Supplier Cost Optimated Lead Times">
-	                <group colspan="6" col="6">
-	                	<field name="name"/>	
-	                    <field name="supp_cost_id"/>
-	                    <field name="active"/>
-	                    <field name="partner_id"/>
-	                    <field name="date_start"/>
-	                </group>
-	                <group colspan="2" col="2">
-	                	<separator colspan="4" string="Automatic Declaration"/>   
-	                	<field name="yrl_purchase_rev"/>
-	                	<field name="cost_per_del"/>
-	                	<field name="stock_holding_rate_id"/>
-	                </group>
-	                <group colspan="2" col="2">
-	                <separator colspan="4" string="Economic Number of orders"/>
-	                	<field name="economic_no_order"/>
-	                	<field name="economic_lead_time"/>
-	                	<button name="action_compute" string="Calculate Lead Time" type="object"/>
-	                </group>
-	                <field name="staus"/>
-	                <button name="action_cancel" string="Cancel" type="object"/>
-	                <button name="action_validate" string="Valid" type="object"/>
-                </form>
-            </field>
-        </record>
-        <record id="supplier_cost_opti_lead_time_normal_action" model="ir.actions.act_window">
-            <field name="name">Supplier Cost Optimated Lead Times</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">supplier.cost.opti.lead.time</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="supplier_cost_opti_lead_time_tree_view"/>
-        </record>
-        <menuitem action="supplier_cost_opti_lead_time_normal_action" id="menu_supplier_cost_opti_lead_time" parent="stock.menu_stock_configuration"/>	
-		
-		
 		
 		<record id="product_seasonal_tree_view" model="ir.ui.view">
             <field name="name">product.seasonal.tree</field>
@@ -150,17 +89,6 @@
         </record>
         <menuitem action="product_seasonal_normal_action" id="menu_product_seasonal" parent="stock.menu_stock_configuration"/>	
     
-   	    <record model="ir.ui.view" id="view_supplier_holding_rate_form1">
-			<field name="name">res.partner.form</field>
-			<field name="model">res.partner</field>
-			<field name="inherit_id" ref="stock.view_partner_property_form"/>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<field name="property_stock_supplier" position="after">
-						<field name="stock_holding_rate_id" />
-				</field>
-			</field>
-		</record>	
 		<record model="ir.ui.view" id="view_supplier_holding_rate_form">
 			<field name="name">product.product.form</field>
 			<field name="model">product.product</field>

=== removed file 'stock_minimum_calculator/stock_order_point_calculator.py'
--- stock_minimum_calculator/stock_order_point_calculator.py	2010-06-11 07:42:16 +0000
+++ stock_minimum_calculator/stock_order_point_calculator.py	1970-01-01 00:00:00 +0000
@@ -1,217 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-from osv import fields, osv
-import time 
-from tools.translate import _
-
-class stock_orderpoint_step1(osv.osv_memory):
-    
-    _name="stock.orderpoint.step1"
-    _columns = {
-                'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse',required=True),
-                'deactive': fields.boolean('Deactive Existing Rules'),
-                'delactive': fields.boolean('Delete Exiting Rules(for this warehosue)'),
-                 }
-    
-    def _de_next(self, cr, uid, ids, context=None):
-        
-        mod_obj = self.pool.get('ir.model.data')
-        product_obj = self.pool.get('product.product')
-        min_rule_obj = self.pool.get('stock.warehouse.orderpoint')
-        form = self.read(cr, uid, ids, [])[0]
-
-        stock_rule_ids = min_rule_obj.search(cr,uid,[('warehouse_id','=',form['warehouse_id'])])
-
-        if form['deactive']:
-            for stock_rule_id in min_rule_obj.browse(cr, uid, stock_rule_ids, context=context):
-                min_rule_obj.write(cr, uid, [stock_rule_id.id], {'active':False}, context=context)
-
-        elif 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)
-            
-        
-        model_data_ids = mod_obj.search(cr, uid,[('model','=','ir.ui.view'),('name','=','view_stock_orderpoint_step2')], context=context)
-        resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-        return {
-                'name': _('Stock Orderpoint Step2'),
-                'context': context,
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'stock.orderpoint.step2',
-                'views': [(resource_id,'form')],
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-            }
-stock_orderpoint_step1()
-
-
-class stock_orderpoint_step2(osv.osv_memory):
-
-    _name="stock.orderpoint.step2"
-    _columns = {
-                'min_qty_calculation': fields.selection([('optimal_stock_coverage', 'Optimal Stock Coverage'),
-                                   ('normal_stock_coverage', 'Normal Stock Coverage'),
-                                   ], 'Method Calculation Minimum Qty',required=True),
-                'max_qty_calculation': fields.selection([('optimal_stock_coverage', 'Optimal Stock Coverage'),
-                                   ('normal_stock_coverage', 'Normal Stock Coverage'),
-                                   ], 'Method Calculation Maximum Qty',required=True),                  
-                 }
-    _defaults = {
-                 'min_qty_calculation': lambda *a: 'optimal_stock_coverage', 
-                 'max_qty_calculation': lambda *a: 'optimal_stock_coverage',
-                 }
-    
-    def _next_calculate(self, cr, uid, ids, context=None):
-       
-        purchase_obj = self.pool.get('purchase.order')
-        sale_obj = self.pool.get('sale.order')
-        product_obj = self.pool.get('product.product')
-        supp_obj = self.pool.get("product.supplierinfo")
-        supp_cost_opt_obj = self.pool.get("supplier.cost.opti.lead.time")
-        wizard_obj = self.pool.get("stock.orderpoint.step1") 
-        min_rule_obj = self.pool.get('stock.warehouse.orderpoint')
-        order_period_obj = self.pool.get("stock.warehosue.orderpoint.period")
-        
-        form = self.read(cr, uid, ids, [])[0]
-
-        purchase_ids = purchase_obj.search(cr,uid,[])
-        start_pur_id = min(purchase_ids)
-        last_pur_id =  max(purchase_ids)
-        
-        ############# Calculation of purchase Quantity upto today
-        purchase_qty = 0.0
-        if purchase_ids:
-            for pur_id in purchase_ids:
-                purchase_data = purchase_obj.browse(cr,uid,pur_id)
-                for line in purchase_data.order_line:
-                    purchase_qty += line.product_qty
-
-        
-        ##### Calculation of sale order Quantity of open orders
-        sale_qty = 0.0 
-        sale_ids = self.pool.get('sale.order').search(cr, uid, [('state','in',['manual','progress'])])
-        if sale_ids:
-            for sale_id in sale_ids:
-                sale_data = self.pool.get('sale.order').browse(cr,uid,sale_id)
-                for line in sale_data.order_line:
-                    sale_qty += line.product_uom_qty
-                
-        
-        ##################calculation of date difference between first and last purchase order
-        first_purchase_date = purchase_obj.browse(cr,uid,start_pur_id).date_order
-        last_purchase_date = purchase_obj.browse(cr,uid,last_pur_id).date_order
-        first_date = time.mktime(time.strptime(first_purchase_date,'%Y-%m-%d'))
-        last_date = time.mktime(time.strptime(last_purchase_date,'%Y-%m-%d'))
-        diff_day = (last_date-first_date)/(3600*24)
-        
-        ##### Calculation of purchase lead time 
-        purchase_lead_time = 0.0
-        company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
-        purchase_lead_time = company.po_lead
-        
-        ##### Calculation of supplier lead time 
-        product_id = product_obj.browse(cr, uid, context['id'], context)
-        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
-                    
-                    
-         ##### Calculation of average_daily_consumption
-        average_daily_consumption = 0.0  
-        if purchase_ids and diff_day > 0.0:
-            average_daily_consumption = (sale_qty + purchase_qty )/diff_day
-        else:
-            plan_consume = product_id.plan_avg_consume    
-            average_daily_consumption = plan_consume
-        ######### calculation of safety stock
-        safety_stock = purchase_qty / len(purchase_ids)
-        
-        ### calculation of Economic lead time (days)
-        cost_op_id = supp_cost_opt_obj.search(cr, uid, [('partner_id','=',sup.name.id)])
-        economic_lead_days = 0.0
-        economic_numer_orders = 0.0
-        economic_lead_time = 0.0
-        if cost_op_id:
-            cost_op = supp_cost_opt_obj.browse(cr, uid,cost_op_id[0])
-            economic_numer_orders = cost_op.economic_no_order
-            economic_lead_time = cost_op.economic_lead_time
-            economic_lead_days = economic_lead_time * 30 #Economic leaddays: field economic leadtime  from  supplier.leadtimes * 30
-        
-        ### Calculation of the percentage of this days period
-        future_seasonal_fac = 0.0
-        periods = self.pool.get('account.period').find(cr, uid)
-        for period in periods:
-            trend_id = order_period_obj.search(cr, uid, [('period_id','=',period)])
-            if trend_id:
-                per = order_period_obj.browse(cr, uid,trend_id[0]).percentage
-                future_seasonal_fac =  economic_lead_days + purchase_lead_time / per
-        
-        #### Calculation of seasonal Factor
-
-        #??????seasonal factor = percentage of product.seasonaltrend  for future period of follwing date: 
-        #today + economic lead days + purchase lead time / "percentage of this days period"
-        seasonal_fac = 0.0
-        seasonal_fac = product_id.seasonal_id.seasonal_factor
-
-        
-        ### Calculation for minimum quantity 
-        optimal_stock_coverage = 0.0 
-        normal_stock_coverage = 0.0
-        if form['min_qty_calculation'] == 'optimal_stock_coverage':
-            optimal_stock_coverage = average_daily_consumption * seasonal_fac * (economic_lead_days + purchase_lead_time) / safety_stock
-        else:
-            normal_stock_coverage = average_daily_consumption * (supplier_lead_time + purchase_lead_time)/safety_stock
-        
-        
-        ### Calculation for maximum quantity
-        optimal_stock_coverage_max = 0.0 
-        normal_stock_coverage_max = 0.0 
-        if form['max_qty_calculation'] == 'optimal_stock_coverage':
-             optimal_stock_coverage_max = (average_daily_consumption *  seasonal_fac * (economic_lead_days + purchase_lead_time))
-        else:
-            normal_stock_coverage_max = average_daily_consumption * (supplier_lead_time + purchase_lead_time)
-        
-        ids = wizard_obj.search(cr, uid, [])
-        
-        wizz_id = wizard_obj.browse(cr, uid, ids[0])
-        max1 = 'max'
-        name =  self.pool.get('ir.sequence').get(cr, uid, 'stock.orderpoint.step2')
-        
-        self.pool.get('stock.warehouse.orderpoint').create(cr, uid, {
-                        'name': name,
-                        'active': True,
-                        'warehouse_id': wizz_id.warehouse_id.id,
-                        'location_id': product_id.property_stock_inventory.id,
-                        'product_id': context['id'],
-                        'product_min_qty': optimal_stock_coverage or normal_stock_coverage,
-                        'product_max_qty': optimal_stock_coverage_max or normal_stock_coverage_max,
-                        'qty_multiple':1,
-                        'product_uom':product_id.uom_id.id,
-                        'logic':'max'
-                    } )
-        return {}  
-        
-stock_orderpoint_step2()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== removed file 'stock_minimum_calculator/stock_order_point_calculator_view.xml'
--- stock_minimum_calculator/stock_order_point_calculator_view.xml	2010-06-09 14:36:04 +0000
+++ stock_minimum_calculator/stock_order_point_calculator_view.xml	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-    	<record id="view_account_invoice_pay" model="ir.ui.view">
-            <field name="name">stock.orderpoint.step1.form</field>
-            <field name="model">stock.orderpoint.step1</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Wizard Order Point Calculator Step1 - Choose Warehouse and Updating Settings">
-                	<group colspan="4" >
-						<field name="warehouse_id"/>
-					    <field name="deactive"/>
-					    <field name="delactive"/>
-                	</group>
-                    <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-execute" string="Next Step" name="_de_next" type="object"/>
-                   </group>
-               </form>
-            </field>
-        </record>
-
-		<act_window name="Orderpoint Calculator"
-				res_model="stock.orderpoint.step1"
-				src_model="product.product"
-				view_mode="form"
-				target="new"
-				context="{'id': active_id}"
-			id="action_view_stock_orderpoint_step1"/>
-
-		<record id="view_stock_orderpoint_step2" model="ir.ui.view">
-            <field name="name">stock.orderpoint.step2.form</field>
-            <field name="model">stock.orderpoint.step2</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Wizard Order Point Calculator Step2 - Choose Method">
-					<field name="min_qty_calculation"/>
-    				<field name="max_qty_calculation" />
-                    <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-execute" string="Next Step" name="_next_calculate" type="object"/>
-                   </group>
-               </form>
-            </field>
-        </record>
-
-
-	</data>
-</openerp>
\ No newline at end of file

=== added file 'stock_minimum_calculator/supplier_cost_optimated_leadtimes.py'
--- stock_minimum_calculator/supplier_cost_optimated_leadtimes.py	1970-01-01 00:00:00 +0000
+++ stock_minimum_calculator/supplier_cost_optimated_leadtimes.py	2010-06-15 07:09:25 +0000
@@ -0,0 +1,89 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields, osv
+import time 
+from tools.translate import _
+from mx import DateTime
+
+class supplier_cost_optimated_leadtimes(osv.osv_memory):
+    
+    _name="supplier.cost.optimated.leadtimes"
+    _columns = {
+                'partner_id': fields.many2one('res.partner', 'Suplier'),
+                'account_purchase_rev': fields.many2one('account.analytic.account', 'Acc. Purchase Revenues', required=True),
+                'account_cost_pre_del': fields.many2one('account.analytic.account', 'Acc. Delivery Cost'),
+                'date_start': fields.date('From Period', required=True),
+                'date_stop': fields.date('To Period', required=True),
+                'purchase_rev':fields.float("Purchase Revenue",readonly=True,),
+                'economic_no_order':fields.float("Economic Number of orders",readonly=True),
+                'cost_per_del':fields.float("Cost Per Delivery",readonly=True),
+                'economic_lead_time':fields.float("Economic Lead Time", readonly=True),
+                'stock_holding_rate_id':fields.many2one("stock.holding.rate",'Holding Rate',required=True),
+                 }
+    
+    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")
+        
+        date_start = form['date_start']
+        date_stop = form['date_stop']
+        
+        pur_balance = 0.0 
+        pur_analytic_id = form['account_purchase_rev']
+        
+        pur_analytic_line_id = analytic_line_obj.search(cr,uid,[('account_id','=',pur_analytic_id), ('date','>=',date_start),('date','<=',date_stop)])
+
+        if pur_analytic_line_id:
+            for pur_analytic_id in pur_analytic_line_id:
+                pur_analytic_amount = analytic_line_obj.browse(cr, uid, pur_analytic_id, context)
+                balance = pur_analytic_amount.amount 
+                pur_balance += balance
+        
+                
+        cost_del_analytic_id = form['account_cost_pre_del']
+        cost_balance = 0.0
+        
+        cost_del_analytic_line_id = analytic_line_obj.search(cr,uid,[('account_id','=',cost_del_analytic_id), ('date','>=',date_start),('date','<=',date_stop)])
+
+        if cost_del_analytic_line_id:
+            for cost_analytic_id in cost_del_analytic_line_id:
+                cost_analytic_amount = analytic_line_obj.browse(cr, uid, cost_analytic_id, context)
+                balance = cost_analytic_amount.amount 
+                cost_balance += balance
+
+        stock_hold_id = stock_hold_rate_obj.browse(cr, uid, form['stock_holding_rate_id'])
+        stock_hold_rate = stock_hold_id.stock_hold_rate
+        
+        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})
+            
+        return True 
+       
+supplier_cost_optimated_leadtimes()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'stock_minimum_calculator/supplier_cost_optimated_leadtimes_view.xml'
--- stock_minimum_calculator/supplier_cost_optimated_leadtimes_view.xml	1970-01-01 00:00:00 +0000
+++ stock_minimum_calculator/supplier_cost_optimated_leadtimes_view.xml	2010-06-15 07:09:25 +0000
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_supplier_cost_optimated_leadtimes" model="ir.ui.view">
+            <field name="name">supplier.cost.optimated.leadtimes.form</field>
+            <field name="model">supplier.cost.optimated.leadtimes</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Wizard to Calculate Cost Optimized Lead Times">
+                	<group colspan="4" >
+					    <field name="partner_id"/>
+					    <field name="stock_holding_rate_id"/>
+					    <field name="date_start"/>
+					    <field name="account_purchase_rev"/>
+					    <field name="date_stop"/>
+					    <field name="account_cost_pre_del"/>
+					    <separator colspan="4" string="Result of Calculation"/>
+					    <field name="purchase_rev"/>
+					    <field name="economic_no_order"/>
+					    <field name="cost_per_del"/>
+					    <field name="economic_lead_time"/>
+                	</group>
+                    
+                    <group colspan="4" col="4">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-execute" string="Calculate Lead Time" name="_compute" type="object"/>
+                   </group>
+               </form>
+            </field>
+        </record>
+
+		<record id="action_supplier_cost_optimated_leadtimes" model="ir.actions.act_window">
+            <field name="name">Supplier Cost Optimated Leadtimes</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">supplier.cost.optimated.leadtimes</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_supplier_cost_optimated_leadtimes"/>
+            <field name="target">new</field>
+        </record>
+	    <menuitem action="action_supplier_cost_optimated_leadtimes"
+                  id="menu_action_supplier_cost_optimated_leadtimesy"
+                  parent="stock.next_id_61"/>
+
+	</data>
+</openerp>
\ No newline at end of file

=== modified file 'stock_minimum_calculator/wizard/__init__.py'
--- stock_minimum_calculator/wizard/__init__.py	2010-06-09 14:36:04 +0000
+++ stock_minimum_calculator/wizard/__init__.py	2010-06-15 07:09:25 +0000
@@ -21,6 +21,7 @@
 ##############################################################################
 
 import seasonal_trend_set
+import stock_order_point_calculator
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

=== removed file 'stock_minimum_calculator/wizard/seasonal_trend_set_view.xml'
--- stock_minimum_calculator/wizard/seasonal_trend_set_view.xml	2010-06-09 14:36:04 +0000
+++ stock_minimum_calculator/wizard/seasonal_trend_set_view.xml	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-    
-    	<record id="view_stock_order_rule" model="ir.ui.view">
-            <field name="name">product.seasonal.trend.form</field>
-            <field name="model">product.seasonal.trend</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Set Seasonal Trend">
-                    <field name="trend_seasonal_id" />
-					<field name="active" />
-					<group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-execute" string="OK" name="_set_seasonal" type="object"/>
-                   </group>	 
-               </form>
-            </field>
-        </record>
-        
-        <act_window
-            res_model = "product.seasonal.trend"
-	        src_model = "product.product"
-	        view_type = "form"
-	        view_mode = "form"
-	        name= "Set Seasonal Trend"
-	        target="new"
-	        context="{'id': active_id}"
-	        id="action_product_seasonal_trend"/>   
-	        
-	</data>
-</openerp>
\ No newline at end of file

=== added file 'stock_minimum_calculator/wizard/stock_order_point_calculator.py'
--- stock_minimum_calculator/wizard/stock_order_point_calculator.py	1970-01-01 00:00:00 +0000
+++ stock_minimum_calculator/wizard/stock_order_point_calculator.py	2010-06-15 07:09:25 +0000
@@ -0,0 +1,241 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import wizard
+import pooler
+import time
+from tools.translate import _
+import mx.DateTime
+from mx.DateTime import RelativeDateTime, now, DateTime, localtime
+
+orderpoint_calculator_form = """<?xml version="1.0"?>
+<form string="Order Point Calculator ">
+    <field name="warehouse_id"/>
+    <field name="location_id"/>      
+    <field name="seasonal_id"/>
+    <field name="delactive"/>
+    <field name="method_qty_calculation" colspan="4"/>
+    <group attrs="{'invisible':[('method_qty_calculation','=','his_cons_without_product')]}" colspan="4">
+        <separator string="Configuration of Base Consumptions Periods" colspan="4"/>
+        <field name="date_start"/>
+        <field name="date_stop"/>
+    </group>
+</form>"""
+
+orderpoint_calculator_fields = {
+            'warehouse_id': {
+                 'string': 'Warehouse', 
+                 'type': 'many2one', 
+                 'relation': 'stock.warehouse', 
+                 'required': True
+                     },
+                     
+            'delactive': {
+                    'string':'Delete Exiting Rules(for this warehosue)', 
+                    'type':'boolean'
+                    },
+                    
+            'location_id': {
+                    'string': 'Location', 
+                    'type': 'many2one', 
+                    'relation': 'stock.location', 
+                    'required': True
+                        },
+                        
+            'seasonal_id': {
+                    'string': 'Season of Consumption', 
+                    'type': 'many2one', 
+                    'relation': 'product.seasonal', 
+                    'required': True
+                    },
+                        
+            'date_start': {
+                    'string':'From Date', 
+                    'type':'date'
+                        },
+                        
+            'date_stop': {
+                    'string':'To Date', 
+                    'type':'date',
+                    'default': lambda *a: time.strftime('%Y-%m-%d')
+                          },
+                          
+            'method_qty_calculation':{
+                    'string':"Method Calculation",
+                    'type':'selection',
+                    'selection':[('his_cons_with_product', 'Calculate with historical consumptions of products'),
+                                   ('his_cons_without_product', 'Calculate with Out historical consumptions of product'),
+                                   ('hist_cons_and_open_sale', 'Calculate with historical consumptions of product and Open sales orders'),
+                                   ],'required': True,
+                    'default': lambda *a:'his_cons_with_product'
+                },
+            }
+
+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')
+
+    return {'warehouse_id': warehouse_id, 'location_id':location_id,'date_start':date}
+
+def _do_calculate(self, cr, uid, data, context):
+
+        pool = pooler.get_pool(cr.dbname)
+
+        purchase_obj = pool.get('purchase.order')
+        sale_obj = pool.get('sale.order')
+        product_obj = pool.get('product.product')
+        supp_obj = pool.get('product.supplierinfo')
+        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
+        purchase_lead_time = company.po_lead
+        
+        ##### Calculation of supplier lead time
+
+        for id in data['ids']:
+            product_id = product_obj.browse(cr, uid, id, context)
+            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
+        
+            ###### Calculation of average_daily_consumption
+            date_start = data['form']['date_start']
+            date_stop = data['form']['date_stop']
+            average_daily_consumption = 0.0
+            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
+                
+            ##################calculation of date difference between first and last sale order
+            sale_ids = sale_obj.search(cr,uid,[])
+            if sale_ids:
+                start_sale_id = min(sale_ids)
+                last_sale_id =  max(sale_ids)
+                first_sale_date = sale_obj.browse(cr,uid,start_sale_id).date_order
+                last_sale_date = sale_obj.browse(cr,uid,last_sale_id).date_order
+                first_date = time.mktime(time.strptime(first_sale_date,'%Y-%m-%d'))
+                last_date = time.mktime(time.strptime(last_sale_date,'%Y-%m-%d'))
+                diff_day = (last_date-first_date)/(3600*24)
+                if diff_day > 0:
+                    average_daily_consumption = consum_qty / diff_day
+            
+            ###### Calculation of plan_average_daily_consumption
+            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'])])
+            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 
+            
+            ###################
+            purchase_ids = purchase_obj.search(cr,uid,[])
+            if purchase_ids:
+                start_pur_id = min(purchase_ids)
+                last_pur_id =  max(purchase_ids)
+            
+            ##################calculation of date difference between first and last purchase order
+                first_purchase_date = purchase_obj.browse(cr,uid,start_pur_id).date_order
+                last_purchase_date = purchase_obj.browse(cr,uid,last_pur_id).date_order
+                first_date = time.mktime(time.strptime(first_purchase_date,'%Y-%m-%d'))
+                last_date = time.mktime(time.strptime(last_purchase_date,'%Y-%m-%d'))
+                pur_diff_day = (last_date-first_date)/(3600*24)
+                        
+            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_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'
+                        } )
+        
+        return {}
+    
+class orderpoint_calculator(wizard.interface):
+    states = {
+        'init' : {
+            'actions' : [_get_default],
+            'result' : {'type' : 'form',
+                    'arch' : orderpoint_calculator_form,
+                    'fields' : orderpoint_calculator_fields,
+                    'state' : [('end', 'Cancel'),('calculation', 'Calculation') ]}
+        },
+         'calculation' : {
+            'actions' : [],
+            'result' : {'type' : 'action',
+                    'action' : _do_calculate,
+                    'state' : 'end'}
+            }
+    }
+orderpoint_calculator("orderpoint.calculator")
+
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file