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

[Matjaz Kalic]

[MOD] m_web_api/static/src/js/core.js (load from stock for base products)

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

345. By Dušan Laznik (Mentis) on 2014-02-27

[MOD] m_web_api/static/src/js/core.js (load from stock for base products)

=== modified file 'm_web_api/static/src/js/core.js'
--- m_web_api/static/src/js/core.js	2014-02-26 17:54:56 +0000
+++ m_web_api/static/src/js/core.js	2014-02-27 11:13:17 +0000
@@ -337,8 +337,8 @@
 	if (event.data.kat=='Izdelki'||event.data.kat=='Izdelki1'||event.data.kat=='Dodelava')
 		kategorije=izdelki;
 	else if (event.data.kat=='Hladilnica')
-		//kategorije=polizdelki.concat(izdelki);
-		kategorije=polizdelki;
+		kategorije=polizdelki.concat(izdelki);
+		//kategorije=polizdelki;
 	else 
 		kategorije=polizdelki;
 	$("#select1").attr('class','Closed');	
@@ -365,7 +365,7 @@
     //------------------------------------------------//
     
     //Prikaz podjetja in verzije
-    $("#podjetje").text('Podjetje: ' + document.getElementById("s1").options[so].text + ', Verzija: v.02.24');
+    $("#podjetje").text('Podjetje: ' + document.getElementById("s1").options[so].text + ', Verzija: v.02.27');
     
     openERP_user = '';
     if (document.getElementById("u").value == 'Testo-Polizdelki'){
@@ -881,29 +881,23 @@
     	tStatusValue=['0','1'];
     }
     
-    If (vrstaIzdelka=='Hladilnica')
-        {mrp.query(['id','product_id','product_qty','produced','scrap','produced_phantom','scrap_phantom','produced_stock',
+        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_on_bom_qty_P_ready','product_with_bom_id'])
-    	.filter(['|',['product_cat','in',kategorije],['product_on_bom_qty_stock','!=',0],[tStatus,'in',tStatusValue],['dressing','in',dressingT],['state','in',['ready','in_production','confirmed']]])
-    	.order_by('product_id').all().then(functionResults(results);}
-    else
-        {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_on_bom_qty_P_ready','product_with_bom_id'])
-    	.filter([['product_cat','in',kategorije],[tStatus,'in',tStatusValue],['dressing','in',dressingT],['state','in',['ready','in_production','confirmed']]])
-    	.order_by('product_id').all().then(functionResults(results);}
-    
-    function functionResults(results) {		         
+               'product_qty_onstock','created_from_op','product_on_bom_qty_P_ready','product_is_product','product_on_bom_qty_O_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++){
-    			if (vrstaIzdelka=='Hladilnica' && results[i].product_on_bom_qty_stock!=0)
-   			 {
-   				results[i].product_qty_onstock=results[i].product_on_bom_qty_stock;
-       			results[i].product_id = results[i].product_with_bom_id;
-       			
-   			 }
-   				
+    			
     			product_name = results[i].product_id.toString().substring(results[i].product_id.toString().indexOf(',')+1);
+
+    			if (vrstaIzdelka=='Hladilnica' && results[i].product_is_product != ''){
+    				//results[i].product_name = results[i].product_with_bom_name;
+      				//results[i].product_code = '';
+    				results[i].product_qty_onstock=results[i].product_on_bom_qty_stock;
+      				results[i].product_on_bom_qty_ready = results[i].product_on_bom_qty_O_ready;
+      				product_name = results[i].product_is_product;
+      			}
     			
     			product_code = product_name.substring(0,product_name.indexOf(' '));
     			product_name = product_name.substring(product_name.indexOf(' ')+1);
@@ -911,6 +905,7 @@
     			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
     			

=== modified file 'mrp_procurement_qty/mrp_production.py'
--- mrp_procurement_qty/mrp_production.py	2014-02-26 17:54:56 +0000
+++ mrp_procurement_qty/mrp_production.py	2014-02-27 11:13:17 +0000
@@ -136,7 +136,7 @@
                                               ('product_id', '=', order.product_with_bom_relation.id)])
             for order_ready in self.browse(cr, uid, ready_prod_ids, context=context):
                 qty_produced += order_ready.produced - order_ready.scrap - order_ready.produced_stock
-                qty_produced += order_ready.product_on_bom_qty_ready
+                qty_produced += order_ready.product_on_bom_qty_ready #nalozeni izdelki direktno za ta produkt
                 
             
             #Po delovnih nalogih kjer je produkt product_with_bom_id produkt
@@ -148,7 +148,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) #ZADNJE
+                qty_from_stock = order_bom.product_on_bom_qty_O_ready #Nalozena zaloga polizdelka na ta P_izdelek
                     
             
             res_tmp = {}
@@ -162,16 +162,25 @@
             
             #-------------------------------------------------------------------------------------
             #Pogledamo se ali je polizdelek in se kupuje ali pa je izdelek - potem zracunamo zalogo
-            if (order.product_with_bom_relation.product_tmpl_id.categ_id.parent_id.id != 38 and order.product_with_bom_relation.product_tmpl_id.supply_method == 'buy') or order.product_with_bom_relation.product_tmpl_id.categ_id.parent_id.id == 38:
-                context['product_id'] = order.product_with_bom_relation.id
-                
-                stock_values = self.pool.get('stock.location')._product_value(cr, uid, [12], ['stock_real'], arg=None, context=context)
-                #stock_sandi = self.pool.get('product.product').qty_available_location(cr, uid, [order.product_with_bom_relation.id], [12], context=context)
-                res_tmp['product_on_bom_qty_stock'] = int(stock_values[12]['stock_real'])
-                
-            
-            
-            
+            if order.product_with_bom_relation:
+                if (order.product_with_bom_relation.product_tmpl_id.categ_id.parent_id.id == 34 and order.product_with_bom_relation.product_tmpl_id.supply_method == 'buy') or order.product_with_bom_relation.product_tmpl_id.categ_id.parent_id.id == 38:
+                    context['product_id'] = order.product_with_bom_relation.id
+                    
+                    stock_values = self.pool.get('stock.location')._product_value(cr, uid, [12], ['stock_real'], arg=None, context=context)
+                    #stock_sandi = self.pool.get('product.product').qty_available_location(cr, uid, [order.product_with_bom_relation.id], [12], context=context)
+                    res_tmp['product_on_bom_qty_stock'] = int(stock_values[12]['stock_real'])
+                else:
+                    res_tmp['product_on_bom_qty_stock'] = 0
+            else:
+                res_tmp['product_on_bom_qty_stock'] = 0
+                
+            if order.product_id.product_tmpl_id.categ_id.parent_id.id == 38:
+                if order.product_with_bom_relation:
+                    res_tmp['product_is_product'] = '[' + order.product_with_bom_relation.default_code + '] >'+ order.product_with_bom_relation.name_template + ' - ' + order.product_with_bom_relation.variants
+                else:
+                    res_tmp['product_is_product'] = '[' + order.product_id.default_code + '] <'+ order.product_id.name_template + '[Osnova] - ' + order.product_id.variants
+            else:
+                res_tmp['product_is_product'] = ''
             
             #res_tmp['product_on_bom_qty_stock'] = int(qty_available_sandi) - qty_from_stock
             
@@ -187,10 +196,12 @@
         '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_on_bom_qty_available': fields.function(_get_prod_on_bom_qty_available, string='Product on BOM quantity available'),
-        'product_on_bom_qty_stock': fields.function(_get_prod_on_bom_qty_available, string='Product on BOM stock available'),
-        'product_on_bom_qty_ready': fields.float('Load O from stock', digits=(6,2)),
+        'product_is_product': fields.function(_get_prod_on_bom_qty_available, string='Product is product', multi='prepare0'),
+        '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('Load from stock', digits=(6,2)),
         'product_on_bom_qty_P_ready': fields.float('Load P from stock', digits=(6,2)),
+        'product_on_bom_qty_O_ready': fields.float('Load O 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/wizard/delivery_order_confirm.py'
--- mrp_procurement_qty/wizard/delivery_order_confirm.py	2014-02-22 14:28:38 +0000
+++ mrp_procurement_qty/wizard/delivery_order_confirm.py	2014-02-27 11:13:17 +0000
@@ -44,8 +44,12 @@
 
         if context is None:
             context = {}
-            
-        sale_override = self.browse(cr,uid,ids)[0].override
+        
+        sale_override = False
+        #for self_line in self.browse(cr,uid,ids):
+        #    sale_override = self_line.override
+        
+        #sale_override = self.browse(cr,uid,ids)[0].override
         move_obj = self.pool.get('stock.move')
         picking_obj = self.pool.get('stock.picking')
         

=== modified file 'mrp_procurement_qty/wizard/procurement_order.py'
--- mrp_procurement_qty/wizard/procurement_order.py	2014-02-26 12:24:55 +0000
+++ mrp_procurement_qty/wizard/procurement_order.py	2014-02-27 11:13:17 +0000
@@ -170,7 +170,7 @@
                 new_cr.rollback()
                 new_cr.close()
                 
-                raise osv.except_osv('Opozorilo!', u'Napaka lansiranja v %s. krogu. Err: %s' % (str(x+1), str(e)+';'+err))
+                raise osv.except_osv('Opozorilo!', u'Napaka lansiranja v %s. krogu. Err: %s' % (str(x+1), str(e)+';'+str(err)))
                 return{}
             print(datetime.now().strftime("%Y-%m-%d %H:%M:%S") + ' - Close: ' + str(x+1))
         #------------------------------------------------------------------------------------------------------------------------