From 8cd69ba5a97593811f7eefa37dce0dcf8230632d Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Mon, 15 Mar 2010 14:28:28 +0530 Subject: [PATCH] [Merge] stock_planing : Merge with https://code.launchpad.net/~grzechu.g/openobject-addons/x_trunk_stock_planning_new bzr revid: sbh@tinyerp.com-20100315085828-gmlgntpnl03wnpy3 --- addons/stock_planning/__terp__.py | 123 +- .../security/ir.model.access.csv | 5 +- addons/stock_planning/stock_planning.py | 1027 ++++++++++++++--- addons/stock_planning/stock_planning_view.xml | 441 +++++-- 4 files changed, 1283 insertions(+), 313 deletions(-) diff --git a/addons/stock_planning/__terp__.py b/addons/stock_planning/__terp__.py index 8deac6fe6ca..1ff4e8d0b10 100644 --- a/addons/stock_planning/__terp__.py +++ b/addons/stock_planning/__terp__.py @@ -20,17 +20,122 @@ { "name":"Master Procurement Schedule", - "version":"1.0", - "author":"Tiny", + "version":"1.1", + "author":"Tiny and Grzegorz Grzelak (Cirrus)", "category":"Custom", - "depends":["stock","sale"], + "depends":["hr","stock","sale"], "description": """ -This module allows you to manage the planning of procurements based on sales -forecasts, confirmed orders (customers and suppliers), stock movements, etc. -You can planify expected outputs and inputs for each warehouses. It also works -to manage all kind of procurements like purchase orders. That's why it is -called Master Procurement Schedule instead of the classic Master Production -Schedule therminology. +This module is based on original Tiny module stock_planning version 1.0 of the same name Master Procurement Schedule. + +Purpose of MPS is to allow create a manual procurement (requisition) apart of MRP scheduler (which works automatically on minimum stock rules). + +Terms used in the module: +- Stock and Sales Period - is the time (between Start Date and End Date) for which you plan Stock and Sales Forecast and make Procurement Planning. +- Stock and Sales Forecast - is the quantity of products you plan to sell in the Period. +- Stock Planning - is the quantity of products you plan to purchase or produce for the Period. + +Because we have another module sale_forecast which uses terms "Sales Forecast" and "Planning" as amount values we will use terms "Stock and Sales Forecast" and "Stock Planning" to emphasize that we use quantity values. + +Activity with this module is divided to three steps: +- Creating Periods. Mandatory step. +- Creating Sale Forecasts and entering quantities to them. Optional step but useful for farther planning. +- Creating Planning lines, entering quantities to them and making Procurement. Making procurement is the final step for the Period. + +Periods +======= +You have two menu items for Periods in "Sales Management - Configuration". There are: +- "Create Sales Periods" - Which automates creating daily, weekly or monthly periods. +- "Stock and sales Periods" - Which allows to create any type of periods, change the dates and change the State of period. + +Creating periods is the first step you have to do to use modules features. You can create custom periods using "New" button in "Stock and Sales Periods" form or view but it is recommended to use automating tool. + +Remarks: +- These periods (officially Stock and Sales Periods) are separated of Financial or other periods in the system. +- Periods are not assigned to companies (when you use multicompany feature at all). Module suppose that you use the same periods across companies. If you wish to use different periods for different companies define them as you wish (they can overlap). Later on in this text will be indications how to use such periods. +- When periods are created automatically their start and finish dates are with with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily periods they will have start date 31.01.2010 00:00:00 and end date 31.01.2010 23:59:00. It works only in automatic creation of periods. When you create periods manually you have to take care about hours because you can have incorrect values form sales or stock. +- If you use overlapping periods for the same product, warehouse and company results can be unpredictable. +- If current date doesn't belong to any period or you have holes between periods results can be unpredictable. + +Sales Forecasts +=============== +You have few menus for Sales forecast in "Sales Management - Sales Forecasts". +- "Create Sales Forecasts for Sales Periods" - which automates creating forecasts lines according to some parameters. +- "Sales Forecasts" - few menus for working with forecasts lists and forms. + +Menu "Create Sales Forecasts for Sales Periods" creates Forecasts for products from selected Category, for selected Period and for selected Warehouse. It is an option "Copy Last Forecast" to copy forecast and other settings of period before this one to created one. + +Remarks: +- This tool doesn't create lines if relevant lines (for the same Product, Period, Warehouse and validated or created by you) already exists. If you wish to create another forecast if relevant lines exists you have to do it manually using menus described bellow. +- When created lines are validated by someone else you can use this tool to create another lines for the same Period, Product and Warehouse. +- When you choose "Copy Last Forecast" created line takes quantity and some settings from your (validated by you or created by you if not validated yet) forecast which is for last period before period of created forecast. If there are few your forecasts for period before this one (it is possible) system takes one of them (no rule which of them). + + +Menus "Sales Forecasts" +On "Sales Forecast" form mainly you have to enter a forecast quantity in "Product Quantity". Farther calculation can work for draft forecasts. But validation can save your data against any accidental changes. You can click "Validate" button but it is not mandatory. + +Instead of forecast quantity you can enter amount of forecast sales in field "Product Amount". System will count quantity from amount according to Sale price of the Product. + +All values on the form are expressed in unit of measure selected on form. You can select one of unit of measure from default category or from second category. When you change unit of measure the quanities will be recalculated according to new UoM: editable values (blue fields) immediately, non edited fields after clicking of "Calculate Planning" button. + +To find proper value for Sale Forecast you can use "Sales History" table for this product. You have to enter parameters to the top and left of this table and system will count sale quantities according to these parameters. So you can select fe. your department (at the top) then (to the left): last period, period before last and period year ago. + +Remarks: + + +Procurement Planning +==================== +Menu for Planning you can find in "Warehouse - Stock Planning". +- "Create Stock Planning Lines" - allows you to automate creating planning lines according to some parameters. +- "Master Procurement Scheduler" - is the most important menu of the module which allows to create procurement. + +As Sales forecast is phase of planning sales. The Procurement Planning (Planning) is the phase of scheduling Purchasing or Producing. You can create Procurement Planning quickly using tool from menu "Create Stock Planning Lines", then you can review created planning and make procurement using menu "Master Procurement Schedule". + +Menu "Create Stock Planning Lines" allows you to create quickly Planning lines for products from selected Category, for selected Period, and for selected Warehouse. When you check option "All Products with Forecast" system creates lines for all products having forecast for selected Period and Warehouse. Selected Category will be ignored in this case. + +Under menu "Master Procurement Scheduler" you can generally change the values "Planned Out" and "Planned In" to observe the field "Stock Simulation" and decide if this value would be accurate for end of the Period. +"Planned Out" can be based on "Warehouse Forecast" which is the sum of all forecasts for Period and Warehouse. But your planning can be based on any other information you have. It is not necessary to have any forecast. +"Planned In" quantity is used to calculate field "Incoming Left" which is the quantity to be procured to make stock as indicated in "Stock Simulation" at the and of Period. You can compare "Stock Simulation" quantity to minimum stock rules visible on the form. But you can plan different quantity than in Minimum Stock Rules. Calculation is made for whole Warehouse by default. But if you want to see values for Stock location of calculated warehouse you can use check box "Stock Location Only". + +If after few tries you decide that you found correct quantities for "Planned Out" and "Planned In" and you are satisfied with end of period stock calculated in "Stock Simulation" you can click "Procure Incoming Left" button to procure quantity of field "Incoming Left" into the Warehouse. System creates appropriate Procurement Order. You can decide if procurement will be made to Stock or Input location of calculated Warehouse. + +If you don't want to Produce or Buy the product but just pick calculated quantity from another warehouse you can click "Supply from Another Warehouse" (instead of "Procure Incoming Left"). System creates pick list with move from selected source Warehouse to calculated Warehouse (as destination). You can also decide if this pick should be done from Stock or Output location of source warehouse. Destination location (Stock or Input) of destination warehouse will be used as set for "Procure Incoming Left". + +To see proper quantities in fields "Confirmed In", "Confirmed Out", "Confirmed In Before", "Planned Out Before" and "Stock Simulation" you have to click button "Calculate Planning". + +All values on the form are expressed in unit of measure selected on form. You can select one of unit of measure from default category or from second category. When you change unit of measure the quanities will be recalculated according to new UoM: editable values (blue fields) immediately, non edited fields after clicking of "Calculate Planning" button. + +How Stock Simulation field is calculated: +Generally Stock Simulation shows the stock for end of the calculated period according to some planned or confirmed stock moves. Calculation always starts with quantity of real stock of beginning of current period. Then calculation adds or subtracts quantities of calculated period or periods before calculated. +When you are in the same period (current period is the same as calculated) Stock Simulation is calculated as follows: +Stock Simulation = + Stock of beginning of current Period + - Planned Out + + Planned In + +When you calculate period next to current: +Stock Simulation = + Stock of beginning of current Period + - Planned Out of current Period + + Confirmed In of current Period (incl. Already In) + - Planned Out of calculated Period + + Planned In of calculated Period . + +As you see calculated Period is taken the same way like in case above. But calculation of current Period are made a little bit different. First you should note that system takes for current Period only Confirmed In moves. It means that you have to make planning and procurement for current Period before this calculation (for Period next to current). + +When you calculate Period ahead: +Stock Simulation = + Stock of beginning of current Period + - Sum of Planned Out of Periods before calculated + + Sum of Confirmed In of Periods before calculated (incl. Already In) + - Planned Out of calculated Period + + Planned In of calculated Period. + +Periods before calculated means periods starting from current till period before calculated. + +Remarks: +- Remember to make planning for all periods before calculated because omitting these quantities and procurements can cause wrong suggestions for procurements few periods ahead. +- If you made planning few periods ahead and you find that real Confirmed Out is bigger than Planned Out in some periods before you can repeat Planning and make another procurement. You should do it in the same planning line. If you create another planning line the suggestions can be wrong. +- When you wish to work with different periods for some part of products define two kinds of periods (fe. Weekly and Monthly) and use them for different products. Example: If you use always Weekly periods for Products A, and Monthly periods for Products B your all calculations will work correctly. You can also use different kind of periods for the same products from different warehouse or companies. But you cannot use overlapping periods for the same product, warehouse and company because results can be unpredictable. The same apply to Forecasts lines. """, "demo_xml":[], "update_xml":["security/ir.model.access.csv","stock_planning_view.xml"], diff --git a/addons/stock_planning/security/ir.model.access.csv b/addons/stock_planning/security/ir.model.access.csv index d08ea10a657..cfd8cc17c4c 100644 --- a/addons/stock_planning/security/ir.model.access.csv +++ b/addons/stock_planning/security/ir.model.access.csv @@ -1,5 +1,2 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_stock_planning","stock.planning","model_stock_planning","stock.group_stock_user",1,1,1,1 -"access_stock_planning_period","stock.planning.period","model_stock_planning_period","stock.group_stock_user",1,0,0,0 -"access_stock_period","stock.period","model_stock_period","stock.group_stock_user",1,0,0,0 -"access_stock_planning_sale_prevision","stock.planning.sale.prevision","model_stock_planning_sale_prevision","stock.group_stock_user",1,0,0,0 +"access_stock_planning","stock.planning","model_stock_planning","stock.group_stock_user",1,1,1,1 \ No newline at end of file diff --git a/addons/stock_planning/stock_planning.py b/addons/stock_planning/stock_planning.py index 421b18ee9e0..fa0bec2f5b1 100644 --- a/addons/stock_planning/stock_planning.py +++ b/addons/stock_planning/stock_planning.py @@ -30,14 +30,28 @@ import mx.DateTime from mx.DateTime import RelativeDateTime, now, DateTime, localtime from tools.translate import _ -class stock_planning_period(osv.osv_memory): - _name = "stock.planning.period" - _description = "Create Planning Period" - - def _get_latest_period(self,cr,uid,context={}): +def rounding(fl, round_value): + if not round_value: + return fl + return round(fl / round_value) * round_value + + +# Object creating periods quickly +# changed that stop_date is created with hour 23:59:00 when it was 00:00:00 stop date was excluded from period +class stock_period_createlines(osv.osv_memory): + _name = "stock.period.createlines" + + def _get_new_period_start(self,cr,uid,context={}): cr.execute("select max(date_stop) from stock_period") - result=cr.fetchone() - return result and result[0] or False + result=cr.fetchone() + last_date = result and result[0] or False + if last_date: + period_start = mx.DateTime.strptime(last_date,"%Y-%m-%d %H:%M:%S")+ RelativeDateTime(days=1) + period_start = period_start - RelativeDateTime(hours=period_start.hour, minutes=period_start.minute, seconds=period_start.second) + else: + period_start = mx.DateTime.today() + return period_start.strftime('%Y-%m-%d') + _columns = { 'name': fields.char('Period Name', size=64), @@ -46,7 +60,7 @@ class stock_planning_period(osv.osv_memory): 'period_ids': fields.one2many('stock.period', 'planning_id', 'Periods'), } _defaults={ - 'date_start':_get_latest_period, + 'date_start':_get_new_period_start, } def create_period_weekly(self,cr, uid, ids, context={}): @@ -63,11 +77,11 @@ class stock_planning_period(osv.osv_memory): dt = p.date_start ds = mx.DateTime.strptime(p.date_start, '%Y-%m-%d') while ds.strftime('%Y-%m-%d') val.product_id.uom_id.category_id.id: + coef = coef / val.product_id.uos_coeff + return val.product_id.uom_id.factor / coef + + def _from_default_uom_factor(self, cr, uid, val, uom_id, context): + uom_obj = self.pool.get('product.uom') + uom = uom_obj.browse(cr, uid, uom_id, context=context) + res = uom.factor + if uom.category_id.id <> val.product_id.uom_id.category_id.id: + res = res / val.product_id.uos_coeff + return res / val.product_id.uom_id.factor, uom.rounding + + def _sales_per_users(self, cr, uid, so, so_line, company, users): + cr.execute("SELECT sum(sol.product_uom_qty) FROM sale_order_line AS sol LEFT JOIN sale_order AS s ON (s.id = sol.order_id) " \ + "WHERE (sol.id IN (%s)) AND (s.state NOT IN (\'draft\',\'cancel\')) AND (s.id IN (%s)) AND (s.company_id=%s) " \ + "AND (s.user_id IN (%s)) " %(so_line, so, company, users)) + ret = cr.fetchone()[0] or 0.0 + return ret + + def _sales_per_warehouse(self, cr, uid, so, so_line, company, shops): + cr.execute("SELECT sum(sol.product_uom_qty) FROM sale_order_line AS sol LEFT JOIN sale_order AS s ON (s.id = sol.order_id) " \ + "WHERE (sol.id IN (%s)) AND (s.state NOT IN (\'draft\',\'cancel\')) AND (s.id IN (%s))AND (s.company_id=%s) " \ + "AND (s.shop_id IN (%s))" %(so_line, so, company, shops)) + ret = cr.fetchone()[0] or 0.0 + return ret + + def _sales_per_company(self, cr, uid, so, so_line, company, ): + cr.execute("SELECT sum(sol.product_uom_qty) FROM sale_order_line AS sol LEFT JOIN sale_order AS s ON (s.id = sol.order_id) " \ + "WHERE (sol.id IN (%s)) AND (s.state NOT IN (\'draft\',\'cancel\')) AND (s.id IN (%s)) AND (s.company_id=%s)"%(so_line, so, company)) + ret = cr.fetchone()[0] or 0.0 + return ret + + def calculate_sales_history(self, cr, uid, ids, context, *args): + sales=[[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],] + for obj in self.browse(cr, uid, ids): + periods =obj.analyzed_period1_id, obj.analyzed_period2_id, obj.analyzed_period3_id, obj.analyzed_period4_id, obj.analyzed_period5_id + so_obj = self.pool.get('sale.order') + so_line_obj= self.pool.get('sale.order.line') + so_line_product_ids = so_line_obj.search(cr, uid, [('product_id','=', obj.product_id.id)], context = context) + if so_line_product_ids: + so_line_product_set = ','.join(map(str,so_line_product_ids)) + if obj.analyzed_warehouse_id: + shops = self.pool.get('sale.shop').search(cr, uid,[('warehouse_id','=', obj.analyzed_warehouse_id.id)], context = context) + shops_set = ','.join(map(str,shops)) + else: + shops = False + if obj.analyzed_dept_id: + dept_obj = self.pool.get('hr.department') + dept_id = obj.analyzed_dept_id.id and [obj.analyzed_dept_id.id] or [] + dept_ids = dept_obj.search(cr,uid,[('parent_id','child_of',dept_id)]) + dept_ids_set = ','.join(map(str,dept_ids)) + cr.execute("SELECT user_id FROM hr_department_user_rel WHERE (department_id IN (%s))" %(dept_ids_set)) + dept_users = [x for x, in cr.fetchall()] + dept_users_set = ','.join(map(str,dept_users)) + else: + dept_users = False + factor, round_value = self._from_default_uom_factor(cr, uid, obj, obj.product_uom.id, context=context) + for i, period in enumerate(periods): + if period: + so_period_ids = so_obj.search(cr, uid, [('date_order','>=',period.date_start), ('date_order','<=',period.date_stop)], context = context) + if so_period_ids: + so_period_set = ','.join(map(str,so_period_ids)) + if obj.analyzed_user_id: + user_set = str(obj.analyzed_user_id.id) + sales[i][0] =self._sales_per_users(cr, uid, so_period_set, so_line_product_set, obj.company_id.id, user_set) + sales[i][0] *=factor + if dept_users: + sales[i][1]= self._sales_per_users(cr, uid, so_period_set, so_line_product_set, obj.company_id.id, dept_users_set) + sales[i][1]*=factor + if shops: + sales[i][2]= self._sales_per_warehouse(cr, uid, so_period_set, so_line_product_set, obj.company_id.id, shops_set) + sales[i][2]*=factor + if obj.analyze_company: + sales[i][3]= self._sales_per_company(cr, uid, so_period_set, so_line_product_set, obj.company_id.id, ) + sales[i][3]*=factor + self.write(cr, uid, ids, { + 'analyzed_period1_per_user':sales[0][0], + 'analyzed_period2_per_user':sales[1][0], + 'analyzed_period3_per_user':sales[2][0], + 'analyzed_period4_per_user':sales[3][0], + 'analyzed_period5_per_user':sales[4][0], + 'analyzed_period1_per_dept':sales[0][1], + 'analyzed_period2_per_dept':sales[1][1], + 'analyzed_period3_per_dept':sales[2][1], + 'analyzed_period4_per_dept':sales[3][1], + 'analyzed_period5_per_dept':sales[4][1], + 'analyzed_period1_per_warehouse':sales[0][2], + 'analyzed_period2_per_warehouse':sales[1][2], + 'analyzed_period3_per_warehouse':sales[2][2], + 'analyzed_period4_per_warehouse':sales[3][2], + 'analyzed_period5_per_warehouse':sales[4][2], + 'analyzed_period1_per_company':sales[0][3], + 'analyzed_period2_per_company':sales[1][3], + 'analyzed_period3_per_company':sales[2][3], + 'analyzed_period4_per_company':sales[3][3], + 'analyzed_period5_per_company':sales[4][3], + }) + return True + + +stock_sale_forecast() + +# Creates stock planning records for products from selected Product Category for selected 'Warehouse - Period' +# Object added by contributor in ver 1.1 +class stock_planning_createlines(osv.osv_memory): + _name = "stock.planning.createlines" + + def onchange_company(self, cr, uid, ids, company_id): + result = {} + if company_id: + result['warehouse_id2'] = False + return {'value': result} + + _columns = { + 'company_id': fields.many2one('res.company', 'Company', required = True), + 'period_id2': fields.many2one('stock.period' , 'Period', required=True, help = 'Period which planning will concern.'), + 'warehouse_id2': fields.many2one('stock.warehouse' , 'Warehouse', required=True, help = 'Warehouse which planning will concern.'), + 'product_categ_id2': fields.many2one('product.category' , 'Product Category', \ + help = 'Planning will be created for products from Product Category selected by this field. '\ + 'This field is ignored when you check \"All Forecasted Product\" box.' ), + 'forecasted_products': fields.boolean('All Products with Forecast', \ + help = "Check this box to create planning for all products having any forecast for selected Warehouse and Period. "\ + "Product Category field will be ignored."), + } + + _defaults = { + 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.planning', context=c), + } + + def create_planning(self,cr, uid, ids, context={}): + product_obj = self.pool.get('product.product') + planning_obj=self.pool.get('stock.planning') + + for f in self.browse(cr, uid, ids, context=context): + if f.forecasted_products: + cr.execute("SELECT product_id \ + FROM stock_sale_forecast \ + WHERE (period_id = %s) AND (warehouse_id = %s)", (f.period_id2.id, f.warehouse_id2.id)) + products_id1 = [x for x, in cr.fetchall()] + else: + prod_categ_obj=self.pool.get('product.category') + template_obj=self.pool.get('product.template') + categ_ids = f.product_categ_id2.id and [f.product_categ_id2.id] or [] + prod_categ_ids=prod_categ_obj.search(cr,uid,[('parent_id','child_of',categ_ids)]) + templates_ids = template_obj.search(cr,uid,[('categ_id','in',prod_categ_ids)]) + products_id1 = product_obj.search(cr,uid,[('product_tmpl_id','in',templates_ids)]) + if len(products_id1)==0: + raise osv.except_osv(_('Error !'), _('No forecasts for selected period or no products in selected category !')) + + for p in product_obj.browse(cr, uid, products_id1,context=context): + if len(planning_obj.search(cr, uid, [('product_id','=',p.id), + ('period_id','=',f.period_id2.id), + ('warehouse_id','=',f.warehouse_id2.id)]))== 0: + cr.execute("SELECT period.date_stop, planning.product_uom, planning.planned_outgoing, planning.to_procure, \ + planning.stock_only, planning.procure_to_stock, planning.confirmed_forecasts_only, \ + planning.supply_warehouse_id, planning.stock_supply_location \ + FROM stock_planning AS planning \ + LEFT JOIN stock_period AS period \ + ON planning.period_id = period.id \ + WHERE (planning.create_uid = %s OR planning.write_uid = %s) \ + AND planning.warehouse_id = %s AND planning.product_id = %s \ + AND period.date_stop < %s \ + ORDER BY period.date_stop DESC", + (uid, uid, f.warehouse_id2.id, p.id, f.period_id2.date_stop) ) + ret=cr.fetchone() +# forecast_qty = ret and ret[0] or 0.0 + if ret: +# raise osv.except_osv(_('Error !'), _('ret is %s %s %s %s %s %s')%(ret[0],ret[2],ret[3],ret[4],ret[5],ret[6],)) + prod_uom = ret[1] + planned_out = ret[2] + to_procure = ret[3] + stock_only = ret[4] + procure_to_stock = ret[5] + confirmed_forecasts_only = ret[6] + supply_warehouse_id = ret[7] + stock_supply_location = ret[8] + else: + prod_uom = p.uom_id.id + planned_out = False + to_procure = False + stock_only = False + procure_to_stock = False + confirmed_forecasts_only = False + supply_warehouse_id = False + stock_supply_location = False + prod_uos_categ = False + if p.uos_id: + prod_uos_categ = p.uos_id.category_id.id + planning_obj.create(cr, uid, { + 'company_id' : f.warehouse_id2.company_id.id, + 'period_id': f.period_id2.id, + 'warehouse_id' : f.warehouse_id2.id, + 'product_id': p.id, + 'product_uom' : prod_uom, + 'product_uom_categ' : p.uom_id.category_id.id, + 'product_uos_categ' : prod_uos_categ, + 'active_uom' : prod_uom, + 'planned_outgoing': planned_out, + 'to_procure': to_procure, + 'stock_only': stock_only, + 'procure_to_stock': procure_to_stock, + 'confirmed_forecasts_only': confirmed_forecasts_only, + 'supply_warehouse_id': supply_warehouse_id, + 'stock_supply_location': stock_supply_location, + + }) + return { + 'view_type': 'form', + "view_mode": 'tree', + 'res_model': 'stock.planning', + 'type': 'ir.actions.act_window', + } +stock_planning_createlines() + + +# The main Stock Planning object +# A lot of changes by contributor in ver 1.1 class stock_planning(osv.osv): _name = "stock.planning" - _description = "Stock Planning" - def _get_product_qty(self, cr, uid, ids, field_names, arg, context): - res = {} - if not context: - context = {} - mapping = { - 'incoming': { - 'field': "incoming_qty", - 'adapter': lambda x: x, - }, - 'outgoing': { - 'field': "outgoing_qty", - 'adapter': lambda x: -x, - }, + def _get_in_out(self, cr, uid, val, date_start, date_stop, direction, done, context): +# res = {} +# if not context: +# context = {} + mapping = {'in': { + 'field': "incoming_qty", + 'adapter': lambda x: x, + }, + 'out': { + 'field': "outgoing_qty", + 'adapter': lambda x: -x, + }, } + context['from_date'] = date_start + context['to_date'] = date_stop + locations = [val.warehouse_id.lot_stock_id.id,] + if not val.stock_only: + locations.extend([val.warehouse_id.lot_input_id.id, val.warehouse_id.lot_output_id.id]) + context['location'] = locations + context['compute_child'] = True + product_obj = self.pool.get('product.product') + prod_id = val.product_id.id + if done: + c1=context.copy() + c1.update({ 'states':('done',), 'what':(direction,) }) + prod_ids = [prod_id] + st = product_obj.get_product_available(cr,uid, prod_ids, context=c1) + res = mapping[direction]['adapter'](st.get(prod_id,0.0)) + else: + product=product_obj.read(cr, uid, prod_id,[], context) + product_qty = product[mapping[direction]['field']] + res = mapping[direction]['adapter'](product_qty) +# res[val.id] = product_obj['incoming_qty'] + return res - for val in self.browse(cr, uid, ids): - res[val.id] = {} - context['from_date'] = val.period_id.date_start - context['to_date'] = val.period_id.date_stop - context['warehouse'] = val.warehouse_id.id or False - product_obj = self.pool.get('product.product').read(cr, uid,val.product_id.id,[], context) - for fn in field_names: - product_qty = product_obj[mapping[fn]['field']] - res[val.id][fn] = mapping[fn]['adapter'](product_qty) + def _get_outgoing_before(self, cr, uid, val, date_start, date_stop, context): + cr.execute("SELECT sum(planning.planned_outgoing), planning.product_uom \ + FROM stock_planning AS planning \ + LEFT JOIN stock_period AS period \ + ON (planning.period_id = period.id) \ + WHERE (period.date_stop >= %s) AND (period.date_stop <= %s) \ + AND (planning.product_id = %s) AND (planning.company_id = %s) \ + GROUP BY planning.product_uom", \ + (date_start, date_stop, val.product_id.id, val.company_id.id,)) + planning_qtys = cr.fetchall() + res = self._to_planning_uom(cr, uid, val, planning_qtys, context) return res - - def _get_planned_sale(self, cr, uid, ids, field_name, arg, context): + + def _to_planning_uom(self, cr, uid, val, qtys, context): + res_qty = 0 + if qtys: + uom_obj = self.pool.get('product.uom') + for qty, prod_uom in qtys: + coef = self._to_default_uom_factor(cr, uid, val, prod_uom, context=context) + res_coef, round_value = self._from_default_uom_factor(cr, uid, val, val.product_uom.id, context=context) + coef = coef * res_coef + res_qty += rounding(qty * coef, round_value) + return res_qty + + + def _get_forecast(self, cr, uid, ids, field_names, arg, context): res = {} for val in self.browse(cr, uid, ids): - cr.execute('select sum(product_qty) from stock_planning_sale_prevision where product_id = %s and period_id = %s',(val.product_id.id,val.period_id.id)) - product_qty = cr.fetchall()[0][0] - res[val.id] = product_qty + res[val.id]={} + valid_part = val.confirmed_forecasts_only and " AND state = 'validated'" or "" + cr.execute('SELECT sum(product_qty), product_uom \ + FROM stock_sale_forecast \ + WHERE product_id = %s AND period_id = %s AND company_id = %s '+valid_part+ \ + 'GROUP BY product_uom', \ + (val.product_id.id,val.period_id.id, val.company_id.id)) + company_qtys = cr.fetchall() + res[val.id]['company_forecast'] = self._to_planning_uom(cr, uid, val, company_qtys, context) + + cr.execute('SELECT sum(product_qty), product_uom \ + FROM stock_sale_forecast \ + WHERE product_id = %s and period_id = %s AND warehouse_id = %s ' + valid_part + \ + 'GROUP BY product_uom', \ + (val.product_id.id,val.period_id.id, val.warehouse_id.id)) + warehouse_qtys = cr.fetchall() + res[val.id]['warehouse_forecast'] = self._to_planning_uom(cr, uid, val, warehouse_qtys, context) + res[val.id]['warehouse_forecast'] = rounding(res[val.id]['warehouse_forecast'], val.product_id.uom_id.rounding) return res - - def _get_stock_start(self, cr, uid, ids, field_name, arg, context): - res = {} - for val in self.browse(cr, uid, ids): - res[val.id] = 0.0 - context['from_date'] = val.period_id.date_start - context['to_date'] = val.period_id.date_stop - context['warehouse'] = val.warehouse_id.id or False - current_date = time.strftime('%Y-%m-%d') - product_obj = self.pool.get('product.product').browse(cr, uid,val.product_id.id,[], context) - if current_date > val.period_id.date_stop: - pass - elif current_date > val.period_id.date_start and current_date < val.period_id.date_stop: - res[val.id] = product_obj.qty_available - else: - res[val.id] = product_obj.qty_available + (val.to_procure - val.planned_outgoing) - return res - - def _get_value_left(self, cr, uid, ids, field_names, arg, context): - res = {} - for val in self.browse(cr, uid, ids): - res[val.id] = {} - if field_names[0] == 'incoming_left': - ret = val.to_procure-val.incoming - if field_names[0] == 'outgoing_left': - ret = val.planned_outgoing-val.outgoing - res[val.id][field_names[0]] = ret + + def _get_stock_start(self, cr, uid, val, date, context): + context['from_date'] = None + context['to_date'] = date + locations = [val.warehouse_id.lot_stock_id.id,] + if not val.stock_only: + locations.extend([val.warehouse_id.lot_input_id.id, val.warehouse_id.lot_output_id.id]) + context['location'] = locations + context['compute_child'] = True + product_obj = self.pool.get('product.product').read(cr, uid,val.product_id.id,[], context) + res = product_obj['qty_available'] # value for stock_start return res def _get_past_future(self, cr, uid, ids, field_names, arg, context): res = {} - for val in self.browse(cr, uid, ids): + for val in self.browse(cr, uid, ids, context=context): if val.period_id.date_stop < time.strftime('%Y-%m-%d'): res[val.id] = 'Past' else: res[val.id] = 'Future' return res - - def _get_period_id(self, cr, uid, context={}): -# cr.execute() - res = {} - return res + def _get_op(self, cr, uid, ids, field_names, arg, context): # op = OrderPoint + res = {} + for val in self.browse(cr, uid, ids, context=context): + res[val.id]={} + cr.execute("SELECT product_min_qty, product_max_qty, product_uom \ + FROM stock_warehouse_orderpoint \ + WHERE warehouse_id = %s AND product_id = %s AND active = 'TRUE'", (val.warehouse_id.id, val.product_id.id)) + ret = cr.fetchone() or [0.0,0.0,False] + coef = 1 + round_value = 1 + if ret[2]: + coef = self._to_default_uom_factor(cr, uid, val, ret[2], context) + res_coef, round_value = self._from_default_uom_factor(cr, uid, val, val.product_uom.id, context=context) + coef = coef * res_coef + res[val.id]['minimum_op'] = rounding(ret[0]*coef, round_value) + res[val.id]['maximum_op'] = ret[1]*coef + return res + + def onchange_company(self, cr, uid, ids, company_id): + result = {} + if company_id: + result['warehouse_id'] = False + return {'value': result} + + def onchange_uom(self, cr, uid, ids, product_uom, ): + if not product_uom: + return {} + ret={} + val1 = self.browse(cr, uid, ids) + val = val1[0] + coeff_uom2def = self._to_default_uom_factor(cr, uid, val, val.active_uom.id, {}) + coeff_def2uom, round_value = self._from_default_uom_factor( cr, uid, val, product_uom, {}) + coeff = coeff_uom2def * coeff_def2uom + ret['planned_outgoing'] = rounding(coeff * val.planned_outgoing, round_value) + ret['to_procure'] = rounding(coeff * val.to_procure, round_value) + ret['active_uom'] = product_uom + return {'value': ret} _columns = { - 'name' : fields.char('Name', size=64), + 'company_id': fields.many2one('res.company', 'Company', required = True), + 'history' : fields.text('Procurement History', readonly=True, help = "History of procurement or internal supply of this planning line."), 'state' : fields.selection([('draft','Draft'),('done','Done')],'State',readonly=True), - 'period_id': fields.many2one('stock.period' , 'Period', required=True), - 'product_id': fields.many2one('product.product' , 'Product', required=True), - 'product_uom' : fields.many2one('product.uom', 'UoM', required=True), - 'planned_outgoing' : fields.float('Forecast Out', required=True), - 'planned_sale': fields.function(_get_planned_sale, method=True, string='Sales Forecast'), - 'stock_start': fields.function(_get_stock_start, method=True, string='Stock Simulation'), - 'incoming': fields.function(_get_product_qty, method=True, type='float', string='Confirmed In', multi='incoming'), - 'outgoing': fields.function(_get_product_qty, method=True, type='float', string='Confirmed Out', multi='outgoing'), - 'incoming_left': fields.function(_get_value_left, method=True, string='Delta In', multi="stock_incoming_left"), - 'outgoing_left': fields.function(_get_value_left, method=True, string='Delta Out', multi="outgoing_left"), - 'to_procure': fields.float(string='Forecast In', required=True), - 'warehouse_id' : fields.many2one('stock.warehouse','Warehouse'), + 'period_id': fields.many2one('stock.period' , 'Period', required=True, \ + help = 'Period for this planning. Requisition will be created for beginning of the period.'), + 'warehouse_id' : fields.many2one('stock.warehouse','Warehouse', required=True), + 'product_id': fields.many2one('product.product' , 'Product', required=True, help = 'Product which this planning is created for.'), + 'product_uom_categ' : fields.many2one('product.uom.categ', 'Product UoM Category'), # Invisible field for product_uom domain + 'product_uom' : fields.many2one('product.uom', 'UoM', required=True, help = "Unit of Measure used to show the quanities of stock calculation." \ + "You can use units form default category or from second category (UoS category)."), + 'product_uos_categ' : fields.many2one('product.uom.categ', 'Product UoM Category'), # Invisible field for product_uos domain +# Field used in onchange_uom to check what uom was before change to recalculate quantities acording to old uom (active_uom) and new uom. + 'active_uom' :fields.many2one('product.uom', string = "Active UoM"), + 'planned_outgoing' : fields.float('Planned Out', required=True, \ + help = 'Enter planned outgoing quantity from selected Warehouse during the selected Period of selected Product. '\ + 'To plan this value look at Confirmed Out or Sales Forecasts. This value should be equal or greater than Confirmed Out.'), + 'company_forecast': fields.function(_get_forecast, method=True, string ='Company Forecast', multi = 'company', \ + help = 'All sales forecasts for whole company (for all Warehouses) of selected Product during selected Period.'), + 'warehouse_forecast': fields.function(_get_forecast, method=True, string ='Warehouse Forecast', multi = 'warehouse',\ + help = 'All sales forecasts for selected Warehouse of selected Product during selected Period.'), + 'stock_simulation': fields.float('Stock Simulation', readonly =True, \ + help = 'Stock simulation at the end of selected Period.\n For current period it is: \n' \ + 'Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n' \ + 'For periods ahead it is: \nInitial Stock - Planned Out Before + Incoming Before - Planned Out + Planned In.'), + 'incoming': fields.float('Confirmed In', readonly=True, \ + help = 'Quantity of all confirmed incoming moves in calculated Period.'), + 'outgoing': fields.float('Confirmed Out', readonly=True, \ + help = 'Quantity of all confirmed outgoing moves in calculated Period.'), + 'incoming_left': fields.float('Incoming Left', readonly=True, \ + help = 'Quantity left to Planned incoming quantity. This is calculated difference between Planned In and Confirmed In. ' \ + 'For current period Already In is also calculated. This value is used to create procurement for lacking quantity.'), + 'outgoing_left': fields.float('Expected Out', readonly=True, \ + help = 'Quantity expected to go out in selected period. As a difference between Planned Out and Confirmed Out. ' \ + 'For current period Already Out is also calculated'), + 'to_procure': fields.float(string='Planned In', required=True, \ + help = 'Enter quantity which (by your plan) should come in. Change this value and observe Stock simulation. ' \ + 'This value should be equal or greater than Confirmed In.'), 'line_time' : fields.function(_get_past_future, method=True,type='char', string='Past/Future'), + 'minimum_op' : fields.function(_get_op, method=True, type='float', string = 'Minimum Rule', multi= 'minimum', \ + help = 'Minimum quantity set in Minimum Stock Rules for this Warhouse'), + 'maximum_op' : fields.function(_get_op, method=True, type='float', string = 'Maximum Rule', multi= 'maximum', \ + help = 'Maximum quantity set in Minimum Stock Rules for this Warhouse'), + 'outgoing_before' : fields.float('Planned Out Before', readonly=True, \ + help= 'Planned Out in periods before calculated. '\ + 'Between start date of current period and one day before start of calculated period.'), + 'incoming_before': fields.float('Incoming Before', readonly = True, \ + help= 'Confirmed incoming in periods before calculated (Including Already In). '\ + 'Between start date of current period and one day before start of calculated period.'), + 'stock_start' : fields.float('Initial Stock', readonly=True, \ + help= 'Stock quantity one day before current period.'), + 'already_out' : fields.float('Already Out', readonly=True, \ + help= 'Quantity which is already dispatched out of this warehouse in current period.'), + 'already_in' : fields.float('Already In', readonly=True, \ + help= 'Quantity which is already picked up to this warehouse in current period.'), + 'stock_only' : fields.boolean("Stock Location Only", help = "Check to calculate stock location of selected warehouse only. " \ + "If not selected calculation is made for input, stock and output location of warehouse."), + "procure_to_stock" : fields.boolean("Procure To Stock Location", help = "Chect to make procurement to stock location of selected warehouse. " \ + "If not selected procurement will be made into input location of warehouse."), + "confirmed_forecasts_only" : fields.boolean("Validated Forecasts", help = "Check to take validated forecasts only. " \ + "If not checked system takes validated and draft forecasts."), + 'supply_warehouse_id' : fields.many2one('stock.warehouse','Source Warehouse', help = "Warehouse used as source in supply pick move created by 'Supply from Another Warhouse'."), + "stock_supply_location" : fields.boolean("Stock Supply Location", help = "Check to supply from Stock location of Supply Warehouse. " \ + "If not checked supply will be made from Output location of Supply Warehouse. Used in 'Supply from Another Warhouse' with Supply Warehouse."), + } + _defaults = { 'state': lambda *args: 'draft' , - 'period_id': _get_period_id + 'to_procure' : 0.0, + 'planned_outgoing' : 0.0, + 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.planning', context=c), } _order = 'period_id' + + def _to_default_uom_factor(self, cr, uid, val, uom_id, context): + uom_obj = self.pool.get('product.uom') + uom = uom_obj.browse(cr, uid, uom_id, context=context) + coef = uom.factor + if uom.category_id.id != val.product_id.uom_id.category_id.id: + coef = coef / val.product_id.uos_coeff + return val.product_id.uom_id.factor / coef + + + def _from_default_uom_factor(self, cr, uid, val, uom_id, context): + uom_obj = self.pool.get('product.uom') + uom = uom_obj.browse(cr, uid, uom_id, context=context) + res = uom.factor + if uom.category_id.id != val.product_id.uom_id.category_id.id: + res = res / val.product_id.uos_coeff + return res / val.product_id.uom_id.factor, uom.rounding + + def calculate_planning(self, cr, uid, ids, context, *args): + one_minute = RelativeDateTime(minutes=1) + current_date_beginning_c = mx.DateTime.today() + current_date_end_c = current_date_beginning_c + RelativeDateTime(days=1, minutes=-1) # to get hour 23:59:00 + current_date_beginning = current_date_beginning_c.strftime('%Y-%m-%d %H:%M:%S') + current_date_end = current_date_end_c.strftime('%Y-%m-%d %H:%M:%S') + for val in self.browse(cr, uid, ids, context=context): + day = mx.DateTime.strptime(val.period_id.date_start, '%Y-%m-%d %H:%M:%S') + dbefore = mx.DateTime.DateTime(day.year, day.month, day.day) - one_minute + day_before_calculated_period = dbefore.strftime('%Y-%m-%d %H:%M:%S') # one day before start of calculated period + cr.execute("SELECT date_start \ + FROM stock_period AS period \ + LEFT JOIN stock_planning AS planning \ + ON (planning.period_id = period.id) \ + WHERE (period.date_stop >= %s) AND (period.date_start <= %s) AND \ + planning.product_id = %s", (current_date_end, current_date_end, val.product_id.id,)) # + date = cr.fetchone() + start_date_current_period = date and date[0] or False + start_date_current_period = start_date_current_period or current_date_beginning + day = mx.DateTime.strptime(start_date_current_period, '%Y-%m-%d %H:%M:%S') + dbefore = mx.DateTime.DateTime(day.year, day.month, day.day) - one_minute + date_for_start = dbefore.strftime('%Y-%m-%d %H:%M:%S') # one day before current period + already_out = self._get_in_out(cr, uid, val, start_date_current_period, current_date_end, direction='out', done = True, context=context), + already_in = self._get_in_out(cr, uid, val, start_date_current_period, current_date_end, direction='in', done = True, context=context), + outgoing = self._get_in_out(cr, uid, val, val.period_id.date_start, val.period_id.date_stop, direction='out', done = False, context=context), + incoming = self._get_in_out(cr, uid, val, val.period_id.date_start, val.period_id.date_stop, direction='in', done = False, context=context), + outgoing_before = self._get_outgoing_before(cr, uid, val, start_date_current_period, day_before_calculated_period, context=context), + incoming_before = self._get_in_out(cr, uid, val, start_date_current_period, day_before_calculated_period, direction='in', done = False, context=context), + stock_start = self._get_stock_start(cr, uid, val, date_for_start, context=context), + if start_date_current_period == val.period_id.date_start: # current period is calculated + current=True + else: + current=False + factor, round_value = self._from_default_uom_factor(cr, uid, val, val.product_uom.id, context=context) + self.write(cr, uid, ids, { + 'already_out': rounding(already_out[0]*factor,round_value), + 'already_in': rounding(already_in[0]*factor,round_value), + 'outgoing': rounding(outgoing[0]*factor,round_value), + 'incoming': rounding(incoming[0]*factor,round_value), + 'outgoing_before' : rounding(outgoing_before[0]*factor,round_value), + 'incoming_before': rounding((incoming_before[0]+ (not current and already_in[0]))*factor,round_value), + 'outgoing_left': rounding(val.planned_outgoing - (outgoing[0] + (current and already_out[0]))*factor,round_value), + 'incoming_left': rounding(val.to_procure - (incoming[0] + (current and already_in[0]))*factor,round_value), + 'stock_start' : rounding(stock_start[0]*factor,round_value), + 'stock_simulation': rounding(val.to_procure - val.planned_outgoing + (stock_start[0]+ incoming_before[0] - outgoing_before[0] \ + + (not current and already_in[0]))*factor,round_value), + }) + return True + +# method below converts quantities and uoms to general OpenERP standard with UoM Qty, UoM, UoS Qty, UoS. +# from stock_planning standard where you have one Qty and one UoM (any from UoM or UoS category) +# so if UoM is from UoM category it is used as UoM in standard and if product has UoS the UoS will be calcualated. +# If UoM is from UoS category it is recalculated to basic UoS from product (in planning you can use any UoS from UoS category) +# and basic UoM is calculated. + def _qty_to_standard(self, cr, uid, val, context): + uos = False + uos_qty = 0.0 + if val.product_uom.category_id.id == val.product_id.uom_id.category_id.id: + uom_qty = val.incoming_left + uom = val.product_uom.id + if val.product_id.uos_id: + uos = val.product_id.uos_id.id + coeff_uom2def = self._to_default_uom_factor(cr, uid, val, val.product_uom.id, {}) + coeff_def2uom, round_value = self._from_default_uom_factor(cr, uid, val, uos, {}) + uos_qty = rounding(val.incoming_left * coeff_uom2def * coeff_def2uom, round_value) + elif val.product_uom.category_id.id == val.product_id.uos_id.category_id.id: + coeff_uom2def = self._to_default_uom_factor(cr, uid, val, val.product_uom.id, {}) + uos = val.product_id.uos_id.id + coeff_def2uom, round_value = self._from_default_uom_factor(cr, uid, val, uos, {}) + uos_qty = rounding(val.incoming_left * coeff_uom2def * coeff_def2uom, round_value) + uom = val.product_id.uom_id.id + coeff_def2uom, round_value = self._from_default_uom_factor(cr, uid, val, uom, {}) + uom_qty = rounding(val.incoming_left * coeff_uom2def * coeff_def2uom, round_value) + return uom_qty, uom, uos_qty, uos def procure_incomming_left(self, cr, uid, ids, context, *args): - result = {} for obj in self.browse(cr, uid, ids): - # source location is virtual procurement location for the product (will be mapped to supplier or - # production location by mrp workflow) - src_id = obj.product_id.property_stock_procurement and obj.product_id.property_stock_procurement.id - # target location is input location of selected warehouse - location_id = obj.warehouse_id and obj.warehouse_id.lot_input_id.id or False - if location_id and src_id: - move_id = self.pool.get('stock.move').create(cr, uid, { - 'name': obj.product_id.name[:64], - 'product_id': obj.product_id.id, - 'date_planned': obj.period_id.date_start, - 'product_qty': obj.incoming_left, - 'product_uom': obj.product_uom.id, - 'product_uos_qty': obj.incoming_left, - 'product_uos': obj.product_uom.id, - 'location_id': src_id, - 'location_dest_id': location_id, - 'state': 'waiting', - }) - proc_id = self.pool.get('mrp.procurement').create(cr, uid, { - 'name': _('Procure Delta In From MPS'), - 'origin': 'Stock Planning', - 'date_planned': obj.period_id.date_start, - 'product_id': obj.product_id.id, - 'product_qty': obj.incoming_left, - 'product_uom': obj.product_uom.id, - 'product_uos_qty': obj.incoming_left, - 'product_uos': obj.product_uom.id, - 'location_id': location_id, - 'procure_method': obj.product_id.product_tmpl_id.procure_method, - 'move_id': move_id, - }) - wf_service = netsvc.LocalService("workflow") - wf_service.trg_validate(uid, 'mrp.procurement', proc_id, 'button_confirm', cr) - self.write(cr, uid, obj.id,{'state':'done'}) - else: - raise osv.except_osv(_('Warning'), _('Please specify a warehouse to create the procurement')) + if obj.incoming_left <= 0: + raise osv.except_osv(_('Error !'), _('Incoming Left must be greater than 0 !')) + uom_qty, uom, uos_qty, uos = self._qty_to_standard(cr, uid, obj, context) + user = self.pool.get('res.users').browse(cr, uid, uid, context) + proc_id = self.pool.get('mrp.procurement').create(cr, uid, { + 'company_id' : obj.company_id.id, + 'name': _('Manual planning for ') + obj.period_id.name, + 'origin': _('MPS(') + str(user.login) +') '+ obj.period_id.name, + 'date_planned': obj.period_id.date_start, + 'product_id': obj.product_id.id, + 'product_qty': uom_qty, + 'product_uom': uom, + 'product_uos_qty': uos_qty, + 'product_uos': uos, + 'location_id': obj.procure_to_stock and obj.warehouse_id.lot_stock_id.id or obj.warehouse_id.lot_input_id.id, + 'procure_method': 'make_to_order', + 'note' : _("Procurement created in MPS by user: ") + str(user.login) + _(" Creation Date: ") + \ + time.strftime('%Y-%m-%d %H:%M:%S') + \ + _("\nFor period: ") + obj.period_id.name + _(" according to state:") + \ + _("\n Warehouse Forecast: ") + str(obj.warehouse_forecast) + \ + _("\n Initial Stock: ") + str(obj.stock_start) + \ + _("\n Planned Out: ") + str(obj.planned_outgoing) + _(" Planned In: ") + str(obj.to_procure) + \ + _("\n Already Out: ") + str(obj.already_out) + _(" Already In: ") + str(obj.already_in) + \ + _("\n Confirmed Out: ") + str(obj.outgoing) + _(" Confirmed In: ") + str(obj.incoming) + \ + _("\n Planned Out Before: ") + str(obj.outgoing_before) + _(" Confirmed In Before: ") + \ + str(obj.incoming_before) + \ + _("\n Expected Out: ") + str(obj.outgoing_left) + _(" Incoming Left: ") + str(obj.incoming_left) + \ + _("\n Stock Simulation: ") + str(obj.stock_simulation) + _(" Minimum stock: ") + str(obj.minimum_op), + + }, context=context) + wf_service = netsvc.LocalService("workflow") + wf_service.trg_validate(uid, 'mrp.procurement', proc_id, 'button_confirm', cr) + self.calculate_planning(cr, uid, ids, context) + prev_text = obj.history or "" + self.write(cr, uid, ids, { + 'history' : prev_text + _('Requisition (') + str(user.login) + ", " + time.strftime('%Y.%m.%d %H:%M) ') + str(obj.incoming_left) + \ + " " + obj.product_uom.name + "\n", + }) return True - - - def product_id_change(self, cr, uid, ids, product, uom=False): - if not product: - return {'value': { 'product_uom': False},'domain': {'product_uom': []}} - product_obj = self.pool.get('product.product').browse(cr, uid, product) - result = {} - if not uom: - result['product_uom'] = product_obj.uom_id.id - domain = {'product_uom': - [('category_id', '=', product_obj.uom_id.category_id.id)],} - return {'value': result} + + def internal_supply(self, cr, uid, ids, context, *args): + for obj in self.browse(cr, uid, ids): + if obj.incoming_left <= 0: + raise osv.except_osv(_('Error !'), _('Incoming Left must be greater than 0 !')) + if not obj.supply_warehouse_id: + raise osv.except_osv(_('Error !'), _('You must specify a Source Warehouse !')) + if obj.supply_warehouse_id.id == obj.warehouse_id.id: + raise osv.except_osv(_('Error !'), _('You must specify a Source Warehouse different than calculated (destination) Warehouse !')) + uom_qty, uom, uos_qty, uos = self._qty_to_standard(cr, uid, obj, context) + user = self.pool.get('res.users').browse(cr, uid, uid, context) + picking_id = self.pool.get('stock.picking').create(cr, uid, { + 'origin': _('MPS(') + str(user.login) +') '+ obj.period_id.name, + 'type': 'internal', + 'state': 'auto', + 'date' : obj.period_id.date_start, + 'move_type': 'direct', + 'invoice_state': 'none', + 'company_id': obj.company_id.id, + 'note': _("Pick created from MPS by user: ") + str(user.login) + _(" Creation Date: ") + \ + time.strftime('%Y-%m-%d %H:%M:%S') + \ + _("\nFor period: ") + obj.period_id.name + _(" according to state:") + \ + _("\n Warehouse Forecast: ") + str(obj.warehouse_forecast) + \ + _("\n Initial Stock: ") + str(obj.stock_start) + \ + _("\n Planned Out: ") + str(obj.planned_outgoing) + _(" Planned In: ") + str(obj.to_procure) + \ + _("\n Already Out: ") + str(obj.already_out) + _(" Already In: ") + str(obj.already_in) + \ + _("\n Confirmed Out: ") + str(obj.outgoing) + _(" Confirmed In: ") + str(obj.incoming) + \ + _("\n Planned Out Before: ") + str(obj.outgoing_before) + _(" Confirmed In Before: ") + \ + str(obj.incoming_before) + \ + _("\n Expected Out: ") + str(obj.outgoing_left) + _(" Incoming Left: ") + str(obj.incoming_left) + \ + _("\n Stock Simulation: ") + str(obj.stock_simulation) + _(" Minimum stock: ") + str(obj.minimum_op), + }) + + move_id = self.pool.get('stock.move').create(cr, uid, { + 'name': _('MPS(') + str(user.login) +') '+ obj.period_id.name, + 'picking_id': picking_id, + 'product_id': obj.product_id.id, + 'date_planned': obj.period_id.date_start, + 'product_qty': uom_qty, + 'product_uom': uom, + 'product_uos_qty': uos_qty, + 'product_uos': uos, + 'location_id': obj.stock_supply_location and obj.supply_warehouse_id.lot_stock_id.id or \ + obj.supply_warehouse_id.lot_output_id.id, + 'location_dest_id': obj.procure_to_stock and obj.warehouse_id.lot_stock_id.id or \ + obj.warehouse_id.lot_input_id.id, + 'tracking_id': False, + 'company_id': obj.company_id.id, + }) + wf_service = netsvc.LocalService("workflow") + wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr) + + self.calculate_planning(cr, uid, ids, context) + prev_text = obj.history or "" + pick_name = self.pool.get('stock.picking').browse(cr, uid, picking_id).name + self.write(cr, uid, ids, { + 'history' : prev_text + _('Pick List ')+ pick_name + " (" + str(user.login) + ", " + time.strftime('%Y.%m.%d %H:%M) ') \ + + str(obj.incoming_left) +" " + obj.product_uom.name + "\n", + }) + + return True + + def product_id_change(self, cr, uid, ids, product_id): + ret={} + if product_id: + product_rec = self.pool.get('product.product').browse(cr, uid, product_id) + ret['product_uom'] = product_rec.uom_id.id + ret['active_uom'] = product_rec.uom_id.id + ret['product_uom_categ'] = product_rec.uom_id.category_id.id + ret['product_uos_categ'] = product_rec.uos_id and product_rec.uos_id.category_id.id or False + else: + ret['product_uom'] = False + ret['product_uom_categ'] = False + ret['product_uos_categ'] = False + res = {'value': ret} + return res + stock_planning() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml index 509de0527b7..e90d68cf855 100644 --- a/addons/stock_planning/stock_planning_view.xml +++ b/addons/stock_planning/stock_planning_view.xml @@ -1,18 +1,23 @@ - - stock.planning.period.form - stock.planning.period + + + + + + stock.period.createlines.form + stock.period.createlines form -
- + + - -