Merge lp:~matjaz-6/openerpsl/openerpsl_02_17 into lp:openerpsl/7.0

[Matjaz Kalic]

[MOD] mrp_procurement_qty/wizard/procurement_order_move_stock.py (new wizard for moving stock), ....

[lp:~matjaz-6/openerpsl/openerpsl_02_17]

341. By Dušan Laznik (Mentis) on 2014-02-25

[MOD] mrp_procurement_qty/wizard/procurement_order_move_stock.py (new wizard for moving stock), ....

=== modified file 'm_web_api/m_web.py'
--- m_web_api/m_web.py	2014-02-22 14:28:38 +0000
+++ m_web_api/m_web.py	2014-02-25 17:17:51 +0000
@@ -75,7 +75,15 @@
         self.get_qty_delivery_available(cr,uid,line_id,False,False)      
         return True
     
-    def set_hladilnica_produced(self, cr, uid, line_id,kol1, status):
+    def set_hladilnica_produced(self, cr, uid, line_id, kol1, status):
+        for mrp_line in self.pool.get('mrp.production').browse(cr, uid, [line_id]):
+            if mrp_line.product_id.product_tmpl_id.categ_id.parent_id.id == 38: #izdelki
+                mrp_bom_ids = self.pool.get('mrp.production').search(cr, uid, [('product_id','=',mrp_line.product_with_bom_id),
+                                                                               ('state', 'in', ['ready', 'confirmed','in_production'])
+                                                                               ])
+                qty_P_ready = kol1 * mrp_line.product_with_bom_factor
+                self.pool.get('mrp.production').write(cr, uid, mrp_bom_ids, {'product_on_bom_qty_P_ready':qty_P_ready})
+        
         self.write(cr, uid, line_id, {'product_on_bom_qty_ready': kol1})
         cr.commit()
         self.get_qty_delivery_available(cr,uid,line_id,False,False)      
 
=== modified file 'm_web_api/static/src/js/core.js'
--- m_web_api/static/src/js/core.js	2014-02-24 21:25:06 +0000
+++ m_web_api/static/src/js/core.js	2014-02-25 17:17:51 +0000
@@ -883,7 +883,7 @@
     
     mrp.query(['id','product_id','product_qty','produced','scrap','produced_phantom','scrap_phantom','produced_stock',
                'product_on_bom_qty_available','product_on_bom_qty_stock','product_with_bom_name','product_on_bom_qty_ready',
-               'product_qty_onstock','created_from_op'])
+               'product_qty_onstock','created_from_op','product_on_bom_qty_P_ready'])
     	.filter([['product_cat','in',kategorije],[tStatus,'in',tStatusValue],['dressing','in',dressingT],['state','in',['ready','in_production','confirmed']]])
     	.order_by('product_id').all().then(function(results){		         
     		for(i=0;i<results.length;i++){
@@ -895,12 +895,16 @@
     			results[i].product_name = product_name;
     			results[i].product_code = product_code;
     			
-    			
+    			//Odstejemo nalozeno kolicino
+        		results[i].product_qty_onstock = results[i].product_qty_onstock - results[i].product_on_bom_qty_ready
     			
     			if (vrstaIzdelka=='Polizdelki_testo'){
     				results[i].produced=results[i].produced_phantom;
     				results[i].scrap=results[i].scrap_phantom;
-    				results[i].product_delo=(results[i].product_qty - results[i].produced_phantom + results[i].scrap_phantom - results[i].product_on_bom_qty_ready);
+    				results[i].product_delo=(results[i].product_qty - results[i].produced_phantom + results[i].scrap_phantom 
+    						- results[i].product_on_bom_qty_ready -results[i].product_on_bom_qty_P_ready);
+    				if (results[i].product_on_bom_qty_P_ready>0)
+    					results[i].product_on_bom_qty_ready = results[i].product_on_bom_qty_ready + '('+results[i].product_on_bom_qty_P_ready+')'
     			}
     			if (vrstaIzdelka=='Polizdelki'){
     				results[i].product_delo=(results[i].produced_phantom-results[i].scrap_phantom-results[i].produced);
@@ -917,9 +921,6 @@
     			if (results[i].created_from_op == true)
     				results[i].product_qty = 0
     				
-    			//Odstejemo nalozeno kolicino
-        		results[i].product_qty_onstock = results[i].product_qty_onstock - results[i].product_on_bom_qty_ready
-		     
     			if (vrstaIzdelka=='Polizdelki_testo'){
     				iDelo = parseInt(results[i].product_delo);
     				if (iDelo < 0) //if (sGotovo && (iDelo < 0))
@@ -1047,12 +1048,6 @@
 				.data('parent', 'fillPolIzdelek')
 				.dialog("open");
 		}
-		else if (from_OP == 'true' && kol1 == 0){
-			$("#label_value_warning").text("Izdelek je naročen na zalogo. Ali ga res ne želite premakniti v hladilnico?");
-			$("#dialog-value-warning")
-				.data('parent', 'fillPolIzdelek_OP')
-				.dialog("open");
-		}
 		else{
 			mrp.call('set_izdelek_produced',[id1,kol_skupaj,kol1,1]);
 			refreshRow(tip,'grid1',true,false,true,false,kol_skupaj,0,kol1,0);
@@ -1299,7 +1294,7 @@
 		mrp.call('set_hladilnica_produced',[id1,kol_skupaj,1]);
 		refreshRow_new('open','grid1',false,false,false,false,false,true,true,0,0,0,0,0,kol_skupaj,(kol_vdelu-kol));
 	}
-	else if (arg == 'fillPolIzdelek' || arg == 'fillPolIzdelek_OP'){
+	else if (arg == 'fillPolIzdelek'){
 		id1=$("#grid1").jqGrid('getCell',rId,0);
 		id1=parseInt(id1);
 		
 
=== modified file 'mrp_procurement_qty/__openerp__.py'
--- mrp_procurement_qty/__openerp__.py	2014-02-22 14:28:38 +0000
+++ mrp_procurement_qty/__openerp__.py	2014-02-25 17:17:51 +0000
@@ -49,6 +49,7 @@
 		'security/ir.model.access.csv',
         'mrp_production_view.xml',
         'wizard/procurement_order_from_op_view.xml',
+        'wizard/procurement_order_move_stock_view.xml',
         'bakery_production_view.xml',
         'res_config_view.xml',
     ],
 
=== modified file 'mrp_procurement_qty/bakery_production.py'
--- mrp_procurement_qty/bakery_production.py	2014-02-22 14:28:38 +0000
+++ mrp_procurement_qty/bakery_production.py	2014-02-25 17:17:51 +0000
@@ -32,12 +32,14 @@
         'duration': fields.char('Duration', size=8, readonly=True),
 		'user_id': fields.many2one('res.users', 'User', readonly=True),
 		'running': fields.boolean('Running'),
+        'misc': fields.char('Misc.', size=128, readonly=True),
 		'process': fields.selection([
                                           ('10','Confirm sale orders'),
                                           ('20','Procurement'),
                                           ('30','Procurement with OP'),
                                           ('40','Deliver delivery orders'),
-                                          ('50','Produce manufacturing orders')], 'Process', readonly=True),
+                                          ('50','Produce manufacturing orders'),
+                                          ('60','Stock moved')], 'Process', readonly=True),
     }
     _defaults = {
         'date_start': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
@@ -54,6 +56,8 @@
     def process_end(self, cr, uid, process, process_id, production_id, context=None):
         
         date_start = self.browse(cr, uid, [process_id])[0]['date_start']
+        stock_moved = self.pool.get('bakery.production').browse(cr, uid, [production_id])[0]['stock_moved']
+        
         d_diff = datetime.now()-datetime.strptime(date_start, ('%Y-%m-%d %H:%M:%S'))
         total_secs = d_diff.seconds
         secs = total_secs % 60
@@ -89,6 +93,9 @@
             self.pool.get('bakery.production').write(cr, uid, [production_id], {'manufactury_done':True,
                                                                                 'running':False,
                                                                                 'date_end':time.strftime('%Y-%m-%d %H:%M:%S')})
+        elif process == '60':
+            self.pool.get('bakery.production').write(cr, uid, [production_id], {'stock_moved':not stock_moved})
+            
         return {}
     
     def process_running(self, cr, uid, process, context=None):
@@ -118,6 +125,7 @@
         'procurement_done': fields.boolean('Procurement done'),
         'op_procurement_done': fields.boolean('OP procurement done'),
         'delivery_done': fields.boolean('Delivery done'),
+        'stock_moved': fields.boolean('Stock moved'),
         'manufactury_done': fields.boolean('Manufactury done'),
     }
     _defaults = {
@@ -136,11 +144,16 @@
             
         running_id = self.search(cr, uid, [], order='id desc', limit=1, context=context)
         for line in self.browse(cr, uid, running_id):
-            if line.running:
+            if line.running and line.stock_moved and process != '60' and process != '20':
+                res = _('Cannot run process. Stocks are moved!')
+                
+            elif line.running:
                 if process == '10'and line.delivery_done:
                     res = _('Cannot confirm Sale orders, since Delivery orders are already delivered!')
                 elif process == '20'and line.delivery_done:
-                    res = _('Cannot run Schedulers, since Delivery orders are already delivered!')
+                    res = _('Cannot run Scheduler, since Delivery orders are already delivered!')
+                elif process == '20'and not line.stock_moved:
+                    res = _('Cannot run Schedulers. You must first move the stock and orderpoints!')
                 elif process == '30' and not line.procurement_done:
                     res = _('Cannot run Scheduler from Orderpoint, since normal Scheduler has not been run yet!')
                 elif process == '40':
@@ -150,9 +163,26 @@
                         res = _('Cannot deliver Delivery orders since production start date (%s) is not older than today!') %(d_start)
                 elif process == '50'and not line.delivery_done:
                     res = _('Cannot finnish production, since Delivery orders have not been delivered yet!')
+                elif process == '60':
+                    if not line.sale_done:
+                        res = _('Sale not confirmed!')
+                    elif line.delivery_done:
+                        res = _('Delivery orders are delivered!')
+                    
             else:
                 running_id = []
                     
         return running_id, res
     
+    def is_stock_moved(self, cr, uid, process, context=None):
+        res = False
+        if context is None:
+            context = {'active_test':False}
+            
+        running_id = self.search(cr, uid, [], order='id desc', limit=1, context=context)
+        for line in self.browse(cr, uid, running_id):
+            if line.running and line.stock_moved:
+                res = True
+        return res
+    
 bakery_production()
 
=== modified file 'mrp_procurement_qty/bakery_production_view.xml'
--- mrp_procurement_qty/bakery_production_view.xml	2014-02-22 14:28:38 +0000
+++ mrp_procurement_qty/bakery_production_view.xml	2014-02-25 17:17:51 +0000
@@ -15,6 +15,7 @@
                 	<field name="op_procurement_done"/>
                 	<field name="delivery_done"/>
                 	<field name="manufactury_done"/>
+                	<field name="stock_moved"/>
                 	<field name="running"/>
                 </tree>
             </field>
@@ -28,6 +29,7 @@
                 <form string="Bakery production">
                     <group string="Status">
                         <field name="running"/>
+                        <field name="stock_moved"/>
                         <field name="date_start"/>
                         <field name="date_end"/>
                     </group>
@@ -66,6 +68,7 @@
                 	<field name="date_start"/>
                 	<field name="date_end"/>
                 	<field name="duration"/>
+                	<field name="misc"/>
                 	<field name="running"/>
                 </tree>
             </field>
@@ -83,6 +86,7 @@
                 		<field name="date_start"/>
                 		<field name="date_end"/>
                 		<field name="duration"/>
+                		<field name="misc"/>
                 		<field name="running"/>
                     </group>
                 </form>
 
=== modified file 'mrp_procurement_qty/mrp_production.py'
--- mrp_procurement_qty/mrp_production.py	2014-02-24 13:52:07 +0000
+++ mrp_procurement_qty/mrp_production.py	2014-02-25 17:17:51 +0000
@@ -52,7 +52,7 @@
         context['product_id'] = vals['product_id']
         stock_values = self.pool.get('stock.location')._product_value(cr, user, [loc_id], ['stock_real'], arg=None, context=context)
         
-        vals['product_qty_onstock'] = stock_values[loc_id]['stock_real']
+        vals['product_qty_onstock'] = int(stock_values[loc_id]['stock_real'])
         res = super(mrp_production, self).create(cr, user, vals, context=context)
         return res
     
@@ -151,7 +151,7 @@
                 if order_bom.produced != 0 and order_bom.product_with_bom_factor:
                     qty_reserved += (order_bom.produced*order_bom.product_with_bom_factor)
                     #qty_from_stock += (order_bom.product_on_bom_qty_ready/order_bom.product_with_bom_factor) #kar je dano iz hladilnice
-                qty_from_stock += (order_bom.product_on_bom_qty_ready) #kar je dano iz hladilnice
+                #qty_from_stock += (order_bom.product_on_bom_qty_ready) #ZADNJE
                     
             
             #Preveriti moram še ali je bilo kaj dano v košare
@@ -186,10 +186,11 @@
     _columns = {
         'created_from_op': fields.boolean('Created from orderpoint'),
         'product_qty_onstock': fields.float('Product qty on stock', digits=(6,2)),
-        'product_qty_available': fields.function(_get_prod_qty_available, string='Product quantity available'),
+        #'product_qty_available': fields.function(_get_prod_qty_available, string='Product quantity available'),
         'product_on_bom_qty_available': fields.function(_get_prod_on_bom_qty_available, string='Product on BOM quantity available', multi='prepare0'),
         'product_on_bom_qty_stock': fields.function(_get_prod_on_bom_qty_available, string='Product on BOM stock available', multi='prepare0'),
-        'product_on_bom_qty_ready': fields.float('Quantity from stock - make available', digits=(6,2)),
+        'product_on_bom_qty_ready': fields.float('Load O from stock', digits=(6,2)),
+        'product_on_bom_qty_P_ready': fields.float('Load P from stock', digits=(6,2)),
         'product_with_bom_factor': fields.function(_prepare_product_id, digits=(12,4), method=True, store=True,  string='BOM factor', multi='prepare1'),
         'product_with_bom_id': fields.function(_prepare_product_id, type='integer', method=True, store=True,  string='Product with BOM id', multi='prepare1'),
         'product_with_bom_relation': fields.function(_prepare_product_id, type='many2one', obj='product.product', method=True, store=True,  string='Product with BOM name', multi='prepare1'),
 
=== modified file 'mrp_procurement_qty/mrp_production_view.xml'
--- mrp_procurement_qty/mrp_production_view.xml	2014-02-05 10:02:52 +0000
+++ mrp_procurement_qty/mrp_production_view.xml	2014-02-25 17:17:51 +0000
@@ -20,7 +20,6 @@
 		                		<field name="status_testo" />
 		                	</group>
 		                	<group name="stock_st" string="Stock">
-		                		<field name="product_qty_available" />
 		                		<field name="product_on_bom_qty_available" />
 		                		<field name="product_with_bom_factor" />
 		                		<field name="product_with_bom_id" />
 
=== modified file 'mrp_procurement_qty/wizard/__init__.py'
--- mrp_procurement_qty/wizard/__init__.py	2014-02-17 15:12:21 +0000
+++ mrp_procurement_qty/wizard/__init__.py	2014-02-25 17:17:51 +0000
@@ -26,4 +26,5 @@
 import sale_order_journal
 import delivery_order_return
 import delivery_order_confirm
-import procurement_order_from_op
 \ No newline at end of file
+import procurement_order_from_op
+import procurement_order_move_stock
 \ No newline at end of file
 
=== modified file 'mrp_procurement_qty/wizard/procurement_order.py'
--- mrp_procurement_qty/wizard/procurement_order.py	2014-02-24 16:52:18 +0000
+++ mrp_procurement_qty/wizard/procurement_order.py	2014-02-25 17:17:51 +0000
@@ -115,18 +115,6 @@
         sale_override = self.browse(cr,uid,ids)[0].override
         proc_obj = self.pool.get('procurement.order')
         
-        #proc_jour_obj = self.pool.get('procurement.order.journal')
-        #Check if there is procurement already running for this day
-#        proc_jour_ids = proc_jour_obj.search(cr, uid, [('state', '=' , True)])
-#        if proc_jour_ids: #ce obstaja lansirana proizvodnja, preverimo ali je istega datuma
-#            for proc_jour_line in proc_jour_obj.browse(cr, uid, proc_jour_ids):
-#                if (proc_jour_line.date_start != time.strftime('%Y-%m-%d')):
-#                    raise osv.except_osv('Opozorilo!', u'Proizvodnja je že bila lansirana dne: %s.' % (proc_jour_line.date_start,))
-#        else:
-#            proc_jour_obj.create(cr, uid, {'date_start':time.strftime('%Y-%m-%d'),
-#                                           'state':True
-#                                           })
-
         #Preverimo ali obstaja aktiven zapis in nezakljucene dobavnice----------------------------------------
         production_id, production_status = self.pool.get('bakery.production').production_running(cr, uid, '20')
         if production_status: #dobavnice so ze potrjene
@@ -136,7 +124,7 @@
         else:
             production_id = production_id[0]
             
-        #Preverimo je lansiranje ze zagnano
+        #Preverimo ce je lansiranje ze zagnano
         process_status = self.pool.get('bakery.process').process_running(cr, uid, '20')
         if not sale_override and process_status:
             raise osv.except_osv(_('Warning!'),process_status)
@@ -145,6 +133,10 @@
         #------------------------------------------------------------------------------------------------------
         
         
+        ir_config_parameter = self.pool.get('ir.config_parameter')
+        ir_config_parameter.set_param(cr, uid, 'stock.empty_location_active', '1')
+        empty_location_id = safe_eval(ir_config_parameter.get_param(cr, uid, 'stock.empty_location', 'False'))
+        
         #Ce je stevilo ponovitev != 0 potem tolikokrat, drugace 4x
         repeat_number = self.browse(cr,uid,ids)[0].repeat_number
         if repeat_number == 0:
@@ -152,96 +144,25 @@
         elif repeat_number == -1:
             repeat_number = 0
         
-        
+        cr.commit()
+        new_cr = pooler.get_db(cr.dbname).cursor()
+        use_new_cursor = new_cr.dbname
         print(datetime.now().strftime("%Y-%m-%d %H:%M:%S") + ' - Start')
-
-        #Najdelo Tocke narocanja in jih umaknemo za navadno lansiranje
-        context['created_from_op'] = False
-        orderpoint_ids = self.pool.get('stock.warehouse.orderpoint').search(cr, uid, [('product_id.product_tmpl_id.categ_id.id','!=', 4),
-                                                                                      ('product_id.product_tmpl_id.categ_id.parent_id.id','!=', 4),
-                                                                                      ('product_min_qty','>',0)
-                                                                                      ])
-        for orderpoint in self.pool.get('stock.warehouse.orderpoint').browse(cr, uid, orderpoint_ids):
-            self.pool.get('stock.warehouse.orderpoint').write(cr, uid, [orderpoint.id], 
-                                                              {'temp_min_qty':orderpoint.product_min_qty,
-                                                               'temp_max_qty':orderpoint.product_max_qty,
-                                                               'product_min_qty':0,
-                                                               'product_max_qty':0,
-                                                               })
-        ir_config_parameter = self.pool.get('ir.config_parameter')
-        ir_config_parameter.set_param(cr, uid, 'stock.empty_location_active', '1')
-        empty_location_id = safe_eval(ir_config_parameter.get_param(cr, uid, 'stock.empty_location', 'False'))
-        
-        _sql_string0 = """UPDATE stock_move sm
-                            SET 
-                            location_id = 
-                                    case 
-                                    when location_id = 12 then """ + str(empty_location_id) + """ 
-                                    else location_id
-                                    end,
-                            location_dest_id = 
-                                    case 
-                                    when location_dest_id = 12 then """ + str(empty_location_id) + """
-                                    else location_dest_id
-                                    end     
-                            where 
-                            (
-                                    sm.location_id = 12 or location_dest_id = 12
-                            )
-                            and
-                            (
-                                    select 1 from product_template pt
-                                    inner join product_category pc on
-                                    pc.id = pt.categ_id and 
-                                    pc.parent_id in(34, 38)
-                                    where pt.id = sm.product_id
-                            ) = 1 and sm.basket_status <> 3"""
-        cr.execute(_sql_string0)
-        cr.commit() #Ker se ustvari nov kurzor moramo vse spremembe commitnit ---------------------------------------------------
-        _sql_string01 = """UPDATE stock_move
-                                SET 
-                                location_id = 
-                                        case 
-                                        when location_id = """ + str(empty_location_id) + """ then 12 
-                                        else location_id
-                                        end,
-                                location_dest_id = 
-                                        case 
-                                        when location_dest_id = """ + str(empty_location_id) + """ then 12 
-                                        else location_dest_id
-                                        end     
-                                where 
-                                (
-                                        location_id = """ + str(empty_location_id) + """ or location_dest_id = """ + str(empty_location_id) + """
-                                )"""
-        
-        
-        use_new_cursor = cr.dbname
-        new_cr = pooler.get_db(cr.dbname).cursor()
         for x in range(0, repeat_number):
             try:
-                #proc_obj.run_scheduler(new_cr, uid, automatic=False, use_new_cursor=new_cr.dbname, context=context)
                 produrement_ids = proc_obj.search(new_cr, uid, [('state', '=', 'confirmed'),
                                                             ('procure_method', '=', 'make_to_stock')])
                 proc_obj._procure_confirm(new_cr, uid, ids=produrement_ids, use_new_cursor=use_new_cursor, context=context)
                 proc_obj._procure_orderpoint_confirm(new_cr, uid, automatic=False, use_new_cursor=use_new_cursor, context=context)
+                
+                self.pool.get('bakery.process').write(new_cr, uid, [process_id], {'misc':str(x+1)})
+                
                 new_cr.commit() 
             except Exception, e:
                 new_cr.rollback()
                 new_cr.close()
-                #Tocko narocanja vrnemo nazaj
-                orderpoint_ids = self.pool.get('stock.warehouse.orderpoint').search(cr, uid, [('product_id.product_tmpl_id.categ_id.id','!=', 4),
-                                                                                              ('product_id.product_tmpl_id.categ_id.parent_id.id','!=', 4),
-                                                                                              ('temp_min_qty','>',0)
-                                                                                              ])
-                for orderpoint in self.pool.get('stock.warehouse.orderpoint').browse(cr, uid, orderpoint_ids):
-                    self.pool.get('stock.warehouse.orderpoint').write(cr, uid, [orderpoint.id], 
-                                                                      {'product_min_qty':orderpoint.temp_min_qty,
-                                                                       'product_max_qty':orderpoint.temp_max_qty,
-                                                                       })
-                cr.execute(_sql_string01) #zalogo postavimo nazaj na 12
-                cr.commit()
-                raise osv.except_osv('Opozorilo!', u'Napaka lansiranja v %s. krogu. Err: %s' % (str(x), str(e)))
+                
+                raise osv.except_osv('Opozorilo!', u'Napaka lansiranja v %s. krogu. Err: %s' % (str(x+1), str(e)))
                 return{}
             print(datetime.now().strftime("%Y-%m-%d %H:%M:%S") + ' - Close: ' + str(x+1))
         #------------------------------------------------------------------------------------------------------------------------
@@ -254,112 +175,6 @@
             raise osv.except_osv('Opozorilo!', 'Napaka pri zdruzevanju d.n.:' + str(e))
             return{}
         #-------------------------------------------------------------------------------------------
-        try:
-            orderpoint_ids = self.pool.get('stock.warehouse.orderpoint').search(new_cr, uid, [('product_id.product_tmpl_id.categ_id.id','!=', 4),
-                                                                                          ('product_id.product_tmpl_id.categ_id.parent_id.id','!=', 4),
-                                                                                          ('temp_min_qty','>',0)
-                                                                                          ])
-            for orderpoint in self.pool.get('stock.warehouse.orderpoint').browse(new_cr, uid, orderpoint_ids):
-                self.pool.get('stock.warehouse.orderpoint').write(new_cr, uid, [orderpoint.id], 
-                                                                  {'product_min_qty':orderpoint.temp_min_qty,
-                                                                   'product_max_qty':orderpoint.temp_max_qty,
-                                                                   'temp_min_qty':0,
-                                                                   'temp_max_qty':0,
-                                                                   })
-            new_cr.commit()
-        except Exception, e:
-            new_cr.rollback()
-            new_cr.close()
-            raise osv.except_osv('Opozorilo!', 'Napaka pri premiku orderpoint-a nazaj; ' + str(e))
-            return{}
-        #-------------------------------------------------------------------------------------------
-        #String napisal ze prej
-        try:
-            new_cr.execute(_sql_string01)
-            new_cr.commit() #Da si nalozimo sprememb
-        except Exception, e:
-            new_cr.rollback()
-            new_cr.close()
-            raise osv.except_osv('Opozorilo!', 'Napaka pri premiku lokacije nazaj; ' +str(e))
-            return{}
-        
-        #-------------------------------------------------------------------------------------------
-        _sql_string1 = """update mrp_production
-                            SET status_testo = 0, status_izdelki = 0
-                            WHERE status_testo = 3 or status_izdelki = 3;"""
-        try:
-            new_cr.execute(_sql_string1)
-            new_cr.commit()
-        except Exception, e:
-            new_cr.rollback()
-            new_cr.close()
-            raise osv.except_osv('Opozorilo!', 'Napaka pri zagonu query-ja: status_testo; ' +str(e))
-            return{}
-        #-------------------------------------------------------------------------------------------
-
-        _sql_string2 = """update stock_move
-                            SET basket_status = 2
-                            WHERE basket_status = 3 AND state = 'done';"""
-        
-        try:
-            new_cr.execute(_sql_string2)
-            new_cr.commit()
-        except Exception, e:
-            new_cr.rollback()
-            new_cr.close()
-            raise osv.except_osv('Opozorilo!', 'Napaka pri zagonu query-ja: basket_status_2_done; ' +str(e))
-            return{} 
-        #--------------------------------------------------------------------------------------------
-        
-        _sql_string2a = """update stock_move
-                            SET basket_status = 0
-                            WHERE basket_status = 3;"""
-        
-        try:
-            new_cr.execute(_sql_string2a)
-            new_cr.commit()
-        except Exception, e:
-            new_cr.rollback()
-            new_cr.close()
-            raise osv.except_osv('Opozorilo!', 'Napaka pri zagonu query-ja: basket_status_0; ' +str(e))
-            return{} 
-        #--------------------------------------------------------------------------------------------
-
-        _sql_string3 = """update stock_move upd 
-                                set basket_status = 2
-                                where 
-                                not upd.id in
-                                (
-                                
-                                    select id from stock_move mov
-                                    where mov.basket_status <> 2 and mov.location_id = 12
-                                    and exists(
-                                        select * from stock_picking pic 
-                                        where
-                                        pic.id = mov.picking_id and 
-                                        pic.type = 'out'
-                                    )
-
-                                ) and basket_status != 2;"""
-        try:
-            new_cr.execute(_sql_string3)
-            new_cr.commit()
-        except Exception, e:
-            new_cr.rollback()
-            new_cr.close()
-            raise osv.except_osv('Opozorilo!', 'Napaka pri zagonu query-ja: basket_status2; ' +str(e))
-            return{}            
-        #--------------------------------------------------------------------------------------------
-        try:            
-            self.pool.get('stock.move').get_qty_delivery_available(new_cr, uid)
-            new_cr.commit()
-        except Exception, e:
-            new_cr.rollback()  
-            new_cr.close() 
-            raise osv.except_osv('Opozorilo!', 'Napaka pri zagonu query-ja delivery_available' + str(e))
-        finally:
-            new_cr.close() 
-
         
         print(datetime.now().strftime("%Y-%m-%d %H:%M:%S") + ' - KONEC Lansiranja')
         self.pool.get('bakery.process').process_end(cr, uid, '20', process_id, production_id)
 
=== modified file 'mrp_procurement_qty/wizard/procurement_order_from_op_view.xml'
--- mrp_procurement_qty/wizard/procurement_order_from_op_view.xml	2014-02-17 15:12:21 +0000
+++ mrp_procurement_qty/wizard/procurement_order_from_op_view.xml	2014-02-25 17:17:51 +0000
@@ -30,6 +30,6 @@
             key2="client_action_multi"
             id="action_run_scheduler_orderpoint_multiple_times"/>    
 
-     	<menuitem action="action_run_scheduler_orderpoint_multiple_times" id="menu_run_scheduler_orderpoint_multiple_times" parent="procurement.menu_stock_sched" sequence="20"/>
+     	<menuitem action="action_run_scheduler_orderpoint_multiple_times" id="menu_run_scheduler_orderpoint_multiple_times" parent="procurement.menu_stock_sched" sequence="23"/>
     </data>
 </openerp>
 
=== added file 'mrp_procurement_qty/wizard/procurement_order_move_stock.py'
--- mrp_procurement_qty/wizard/procurement_order_move_stock.py	1970-01-01 00:00:00 +0000
+++ mrp_procurement_qty/wizard/procurement_order_move_stock.py	2014-02-25 17:17:51 +0000
@@ -0,0 +1,199 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Mentis d.o.o.
+#
+#    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
+#from openerp import pooler
+#from datetime import datetime
+#import time
+from tools.translate import _
+from openerp.tools.safe_eval import safe_eval
+
+class procurement_order_move_stock_wizard(osv.osv_memory):
+    _name = "procurement.order.move.stock.wizard"
+    _description = "Move stock and order points"
+    
+    def _get_status_move(self, cr, uid, context):
+        return self.pool.get('bakery.production').is_stock_moved(cr, uid, '60', context=None)
+    
+    def _get_status(self, cr, uid, context):
+        return self.pool.get('bakery.process').process_running(cr, uid, '60', context=None)
+    
+    _columns = {
+        'status_move': fields.boolean('Stock moved', readonly=True),        
+        'status': fields.char('Running status', size=128, readonly=True),
+        'override': fields.boolean('Override running process', help='Run the process, even if there is another one running'),
+    }
+    _defaults = {
+        'status_move': _get_status_move,
+        'status': _get_status,
+    }
+                
+        
+    def execute(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+            
+        sale_override = self.browse(cr,uid,ids)[0].override
+        
+        #Preverimo ali obstaja aktiven zapis ------------------------------------------------------------------
+        production_id, production_status = self.pool.get('bakery.production').production_running(cr, uid, '60')
+        if production_status: #dobavnice so ze potrjene
+            raise osv.except_osv(_('Warning!'),production_status)
+        if production_id == []: #se ne obstaja aktiven zapis
+            raise osv.except_osv(_('Warning!'),_('Sale orders have today not been confirmed yet!'))
+        else:
+            production_id = production_id[0]
+            
+        #Preverimo je lansiranje ze zagnano
+        process_status = self.pool.get('bakery.process').process_running(cr, uid, '60')
+        if not sale_override and process_status:
+            raise osv.except_osv(_('Warning!'),process_status)
+        else:
+            process_id = self.pool.get('bakery.process').process_start(cr, uid, '60')
+        cr.commit()
+        #------------------------------------------------------------------------------------------------------
+        
+        ir_config_parameter = self.pool.get('ir.config_parameter')
+        empty_location_id = safe_eval(ir_config_parameter.get_param(cr, uid, 'stock.empty_location', 'False'))
+        
+        stock_moved =  self.pool.get('bakery.production').is_stock_moved(cr, uid, '60', context=None)
+        if not stock_moved:
+            #1. Najdemo tocke narocanja in jih umaknemo za navadno lansiranje
+            orderpoint_ids = self.pool.get('stock.warehouse.orderpoint').search(cr, uid, [('product_id.product_tmpl_id.categ_id.id','!=', 4),
+                                                                                          ('product_id.product_tmpl_id.categ_id.parent_id.id','!=', 4),
+                                                                                          ('product_min_qty','>',0)
+                                                                                          ])
+            for orderpoint in self.pool.get('stock.warehouse.orderpoint').browse(cr, uid, orderpoint_ids):
+                self.pool.get('stock.warehouse.orderpoint').write(cr, uid, [orderpoint.id], 
+                                                                  {'temp_min_qty':orderpoint.product_min_qty,
+                                                                   'temp_max_qty':orderpoint.product_max_qty,
+                                                                   'product_min_qty':0,
+                                                                   'product_max_qty':0,
+                                                                   })
+        
+            #2. Premaknemo zalogo na zacasno lokacijo
+            
+        
+            _sql_string0 = """UPDATE stock_move sm
+                                SET 
+                                location_id = 
+                                        case 
+                                        when location_id = 12 then """ + str(empty_location_id) + """ 
+                                        else location_id
+                                        end,
+                                location_dest_id = 
+                                        case 
+                                        when location_dest_id = 12 then """ + str(empty_location_id) + """
+                                        else location_dest_id
+                                        end     
+                                where 
+                                (
+                                        sm.location_id = 12 or location_dest_id = 12
+                                )
+                                and
+                                (
+                                        select 1 from product_template pt
+                                        inner join product_category pc on
+                                        pc.id = pt.categ_id and 
+                                        pc.parent_id in(34, 38)
+                                        where pt.id = sm.product_id
+                                ) = 1 and sm.basket_status = 2"""
+            cr.execute(_sql_string0)
+            
+        else:
+            orderpoint_ids = self.pool.get('stock.warehouse.orderpoint').search(cr, uid, [('product_id.product_tmpl_id.categ_id.id','!=', 4),
+                                                                                          ('product_id.product_tmpl_id.categ_id.parent_id.id','!=', 4),
+                                                                                          ('temp_min_qty','>',0)
+                                                                                          ])
+            for orderpoint in self.pool.get('stock.warehouse.orderpoint').browse(cr, uid, orderpoint_ids):
+                self.pool.get('stock.warehouse.orderpoint').write(cr, uid, [orderpoint.id], 
+                                                                  {'product_min_qty':orderpoint.temp_min_qty,
+                                                                   'product_max_qty':orderpoint.temp_max_qty,
+                                                                   'temp_min_qty':0,
+                                                                   'temp_max_qty':0,
+                                                                   })
+            
+            _sql_string01 = """UPDATE stock_move
+                                SET 
+                                location_id = 
+                                        case 
+                                        when location_id = """ + str(empty_location_id) + """ then 12 
+                                        else location_id
+                                        end,
+                                location_dest_id = 
+                                        case 
+                                        when location_dest_id = """ + str(empty_location_id) + """ then 12 
+                                        else location_dest_id
+                                        end     
+                                where 
+                                (
+                                        location_id = """ + str(empty_location_id) + """ or location_dest_id = """ + str(empty_location_id) + """
+                                )"""
+        
+        
+            cr.execute(_sql_string01)
+            #-------------------------------------------------------------------------------------------
+        
+            _sql_string1 = """update mrp_production
+                            SET status_testo = 0, status_izdelki = 0
+                            WHERE status_testo = 3 or status_izdelki = 3;"""
+            cr.execute(_sql_string1)
+            #-------------------------------------------------------------------------------------------
+
+            _sql_string2 = """update stock_move
+                                SET basket_status = 2
+                                WHERE basket_status = 3 AND state = 'done';"""
+        
+            cr.execute(_sql_string2)
+            #--------------------------------------------------------------------------------------------
+        
+            _sql_string2a = """update stock_move
+                            SET basket_status = 0
+                            WHERE basket_status = 3;"""
+            cr.execute(_sql_string2a)
+            #--------------------------------------------------------------------------------------------
+
+            _sql_string3 = """update stock_move upd 
+                                set basket_status = 2
+                                where 
+                                not upd.id in
+                                (
+                                
+                                    select id from stock_move mov
+                                    where mov.basket_status <> 2 and mov.location_id = 12
+                                    and exists(
+                                        select * from stock_picking pic 
+                                        where
+                                        pic.id = mov.picking_id and 
+                                        pic.type = 'out'
+                                    )
+
+                                ) and basket_status != 2;"""
+            cr.execute(_sql_string3)
+            #--------------------------------------------------------------------------------------------
+            self.pool.get('stock.move').get_qty_delivery_available(cr, uid)
+
+        
+        self.pool.get('bakery.process').process_end(cr, uid, '60', process_id, production_id)
+        return{}
+        
+procurement_order_move_stock_wizard()
+
 
=== added file 'mrp_procurement_qty/wizard/procurement_order_move_stock_view.xml'
--- mrp_procurement_qty/wizard/procurement_order_move_stock_view.xml	1970-01-01 00:00:00 +0000
+++ mrp_procurement_qty/wizard/procurement_order_move_stock_view.xml	2014-02-25 17:17:51 +0000
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="multiple_move_stock_wizard_view" model="ir.ui.view">
+            <field name="name">Move stock and order points</field>
+            <field name="model">procurement.order.move.stock.wizard</field>
+            <field name="arch" type="xml">
+               <form string="Move stock and order points - view" version="7.0">
+               		<group>
+                    	<separator string="Status" colspan="4" />
+                    	<field name="status_move" />
+                    	<field name="status" />
+                    	<field name="override" />
+                    </group>
+                    <footer>
+                    	<button name="execute" string="Move stock" type="object" class="oe_highlight"/>
+                    	or
+                    	<button special="cancel" string="Cancel" class="oe_link"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+		
+        <act_window name="Move stock and order points"
+            res_model="procurement.order.move.stock.wizard"
+            src_model="procurement.order"
+            view_mode="form"
+            target="new"
+            key2="client_action_multi"
+            id="action_move_stock_order_points"/>    
+
+     	<menuitem action="action_move_stock_order_points" id="menu_move_stock_order_points" parent="procurement.menu_stock_sched" sequence="21"/>
+    </data>
+</openerp>
 
=== modified file 'mrp_procurement_qty/wizard/procurement_order_view.xml'
--- mrp_procurement_qty/wizard/procurement_order_view.xml	2014-02-17 15:12:21 +0000
+++ mrp_procurement_qty/wizard/procurement_order_view.xml	2014-02-25 17:17:51 +0000
@@ -30,6 +30,6 @@
             key2="client_action_multi"
             id="action_run_scheduler_multiple_times"/>    
 
-     	<menuitem action="action_run_scheduler_multiple_times" id="menu_run_scheduler_multiple_times" parent="procurement.menu_stock_sched" sequence="20"/>
+     	<menuitem action="action_run_scheduler_multiple_times" id="menu_run_scheduler_multiple_times" parent="procurement.menu_stock_sched" sequence="22"/>
     </data>
 </openerp>