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

[Matjaz Kalic]

[FIX] mrp_procurement_qty (merging man.orders + update procurement orders with new qty)
[FIX] m_web_api (login fixed, new izdelki logic)

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

259. By Dušan Laznik (Mentis) on 2014-01-11

[FIX] mrp_procurement_qty (merging man.orders + update procurement orders with new qty)
[FIX] m_web_api (login fixed, new izdelki logic)

=== modified file 'm_web_api/m_web.py'
--- m_web_api/m_web.py	2013-12-31 15:30:33 +0000
+++ m_web_api/m_web.py	2014-01-11 20:34:58 +0000
@@ -88,13 +88,40 @@
         self.get_qty_delivery_available(cr,uid,line_id,False,False)     
         return True
     
-    def set_izdelek_produced1(self, cr, uid, line_id,kol1,kol2,kol3,status):
+    def set_izdelek_produced1(self, cr, uid, line_id,kol1,kol2,kol3,status,vrstaIzdelka):
         
         commit = False
         old_produced = self.browse(cr, uid, [line_id])[0]['produced']
         produced_stock = self.browse(cr, uid, [line_id])[0]['produced_stock']
         scrap = self.browse(cr, uid, [line_id])[0]['scrap']
         current_qty_available = self.browse(cr, uid, [line_id])[0]['product_on_bom_qty_available']
+        product_bom_id = self.browse(cr, uid, [line_id])[0]['product_with_bom_id'] #Izdelek iz katerega je ta produkt narejen
+        current_status_izdelek = self.browse(cr, uid, [line_id])[0]['status_izdelki']
+        
+        
+        #Ce je izdelek v 'gotovo' in ga zelimo vrniti v 'delu' in je izdelano 0 in na voljo 0 prepreci premik
+        #Mora povecati kolicino ki je na voljo, da ga lahko premakne nazaj v delo
+        if (current_status_izdelek == 1) and (status == 0) and (old_produced == 0) and (current_qty_available == 0):
+            return 'must_not_move'
+        
+        
+        #Ce zakljucujemo in ni dodelava in nismo porabili vsega kar je na voljo
+        #moramo najti a so se kaki produkti ki imajo enako osnovo in jih se nismo zakljucili
+        if  (status == 1) and (vrstaIzdelka == 'Izdelki') and (current_qty_available - (float(kol1)-old_produced) >= 0):
+            same_base_ids = self.pool.get('mrp.production').search(cr, uid, [
+                                                                             ('product_with_bom_id', '=', product_bom_id),
+                                                                             ('id', '!=', line_id),
+                                                                             ('status_izdelki', '=', 0)
+                                                                             ])
+            
+            if (not same_base_ids): #ni vec izdelka z isto osnovo, torej moramo pri tem uporabiti celo osnovo
+                if (current_qty_available - (float(kol1)-old_produced) > 0):
+                    return 'not_all_consumed'
+            else:
+                #Se obstajajo produkti, torej ne sme porabiti celotne kolicine ki je na voljo
+                if ((float(kol1) - old_produced) >= current_qty_available):
+                    return 'must_not_consume_all'
+        
         
         if (float(kol1) > old_produced):
             if ((float(kol1) - old_produced) > current_qty_available):

=== modified file 'm_web_api/static/src/basket_delivery.html'
--- m_web_api/static/src/basket_delivery.html	2014-01-08 19:33:13 +0000
+++ m_web_api/static/src/basket_delivery.html	2014-01-11 20:34:58 +0000
@@ -34,8 +34,8 @@
 		                <option>Peka-Dodelava-Hladilnica</option>
 		                <option>Košare</option>
 		                <option>------------------</option>
-		                <option>administrator</option>
-		                <option>administrator_all</option>
+		                <option>Vodja</option>
+		                <option>Administrator</option>
     				</select></td>
     			</tr>
     			<tr>

=== modified file 'm_web_api/static/src/js/core.js'
--- m_web_api/static/src/js/core.js	2014-01-08 20:19:19 +0000
+++ m_web_api/static/src/js/core.js	2014-01-11 20:34:58 +0000
@@ -362,7 +362,7 @@
     //------------------------------------------------//
     
     //Prikaz podjetja in verzije
-    $("#podjetje").text('Podjetje: ' + document.getElementById("s1").options[so].text + ', Verzija: v.01.08');
+    $("#podjetje").text('Podjetje: ' + document.getElementById("s1").options[so].text + ', Verzija: v.01.11');
     
     openERP_user = '';
     if (document.getElementById("u").value == 'Testo-Polizdelki'){
@@ -433,10 +433,15 @@
     	$("#dv8").show();
     	$("#dhl1").hide();
 	}
-	else if (document.getElementById("u").value == 'administrator' || document.getElementById("u").value == 'administrator_all'){
-    	openERP_user = 'admin';
-    	if (document.getElementById("u").value == 'administrator_all')
+	else if (document.getElementById("u").value == 'Vodja' || document.getElementById("u").value == 'Administrator'){
+    	if (document.getElementById("u").value == 'Vodja'){
+    		openERP_user = '_vodja';
+    	}
+    	else if (document.getElementById("u").value == 'Administrator'){
+    		openERP_user = 'admin';
     		userID = 'mentis';
+    	}
+    		
     	$("#dn1").show();
     	$("#dn2").show();
     	$("#dn3").show();
@@ -729,8 +734,8 @@
  	    colModel:colm,
    	    multiselect: false,            
         viewrecords: true,
-        sortname: 'product_id',
-        sortorder: "desc",
+        sortname: 'product_name',
+        sortorder: "asc",
         grouping:useGrouping,
         hiddengrid:false,           
         onCellSelect:function(rowid,iCol){
@@ -812,7 +817,7 @@
           		//groupText : ["<b onclick='tClick(this.parentElement);return false;'> {1} - {0}                                         </b>"],
           	groupText : ["<b onclick=\"jQuery('#grid1').jqGrid('groupingToggle',this.parentElement.parentElement.id);return false; \">{1} - {0}                 </b>"],
           	groupCollapse : true,
-       		groupOrder: ['desc']        		    
+       		groupOrder: ['asc']        		    
         },
         caption: ""
 	});             
@@ -896,7 +901,7 @@
     					jQuery("#grid1").jqGrid('addRowData',i+1,results[i]); 
     			}
     		}
-    	$("#grid1").jqGrid('sortGrid','product_delo',true,'desc');
+    	$("#grid1").jqGrid('sortGrid','product_name',true,'asc');
      });	
 }
 /////////////////////////////////////////////////////////////////////////
@@ -1029,12 +1034,12 @@
 	}
 	
 	if (tip=="close"){
-		if ((kol_vdelu-kol > 0) && (vrstaIzdelka == "Izdelki")){
-			$("#label_general_warning").text("Pri zaključevanju morate speči celotno količino, ki je na voljo!");
-			$("#dialog-general-warning").dialog("option", "height", 260);
-			$("#dialog-general-warning").dialog("open");
-			return;
-		}
+//		if ((kol_vdelu-kol > 0) && (vrstaIzdelka == "Izdelki")){
+//			$("#label_general_warning").text("Pri zaključevanju morate speči celotno količino, ki je na voljo!");
+//			$("#dialog-general-warning").dialog("option", "height", 260);
+//			$("#dialog-general-warning").dialog("open");
+//			return;
+//		}
 		if (kol_skupaj < kol_narocena){
 			$("#label_value_warning").text("Vnesli ste količino, ki je MANJŠA od naročene, nadaljujem?");
 			$("#dialog-value-warning")
@@ -1042,8 +1047,26 @@
 				.dialog("open");
 		}
 		else{
-			mrp.call('set_izdelek_produced1',[id1,kol_skupaj,kol1,kol2,1]).then(function(result){
-				if (result == 'not_available'){
+			mrp.call('set_izdelek_produced1',[id1,kol_skupaj,kol1,kol2,1,vrstaIzdelka]).then(function(result){
+				if (result == 'must_not_consume_all'){
+					$("#label_general_warning").text("Pri zaključevanju ne morete porabiti celotno količino, ki je na voljo, ker obstajajo še drugi izdelki z enako osnovo!");
+					$("#dialog-general-warning").dialog("option", "height", 320);
+					$("#dialog-general-warning").dialog("open");
+					return;
+				}
+				else if (result == 'must_not_move'){
+					$("#label_general_warning").text("Izdelka ne morete premakniti nazaj v delo. Najprej povečajte razpoložljivo količino!");
+					$("#dialog-general-warning").dialog("option", "height", 260);
+					$("#dialog-general-warning").dialog("open");
+					return;
+				}
+				else if (result == 'not_all_consumed'){
+					$("#label_general_warning").text("Pri zaključevanju morate speči celotno količino, ki je na voljo!");
+					$("#dialog-general-warning").dialog("option", "height", 260);
+					$("#dialog-general-warning").dialog("open");
+					return;
+				}
+				else if (result == 'not_available'){
 					$("#label_general_warning").text("Ne morete speči več izdelkov kot je pripravljene osnove!");
 					$("#dialog-general-warning").dialog("option", "height", 260);
 					$("#dialog-general-warning").dialog("open");
@@ -1053,6 +1076,7 @@
 					$("#label_general_warning").text("Ne morete izdelati manjšo količino izdelkov, ker so nekateri že v košarah!");
 					$("#dialog-general-warning").dialog("option", "height", 300);
 					$("#dialog-general-warning").dialog("open");
+					return;
 				}
 				else
 					refreshRow_new(tip,'grid1',true,true,true,false,true,false,kol_skupaj,kol1,kol2,0,(kol_vdelu-kol),0);
@@ -1060,7 +1084,7 @@
 		}
 	}
 	else {
-		mrp.call('set_izdelek_produced1',[id1,kol_skupaj,kol1,kol2,0]).then(function(result){
+		mrp.call('set_izdelek_produced1',[id1,kol_skupaj,kol1,kol2,0,vrstaIzdelka]).then(function(result){
 			if (result == 'not_available'){
 				$("#label_general_warning").text("Ne morete speči več izdelkov kot je pripravljene osnove!");
 				$("#dialog-general-warning").dialog("option", "height", 260);
@@ -1236,8 +1260,26 @@
 		kol_izdelana = parseInt($("#grid1").jqGrid('getCell',rId,5));
 		kol_skupaj = kol+kol_izdelana;
 		
-		mrp.call('set_izdelek_produced1',[id1,kol_skupaj,kol1,kol2,1]).then(function(result){
-			if (result == 'not_available'){
+		mrp.call('set_izdelek_produced1',[id1,kol_skupaj,kol1,kol2,1,vrstaIzdelka]).then(function(result){
+			if (result == 'must_not_consume_all'){
+				$("#label_general_warning").text("Pri zaključevanju ne morete porabiti celotno količino, ki je na voljo, ker obstajajo še drugi izdelki z enako osnovo!");
+				$("#dialog-general-warning").dialog("option", "height", 320);
+				$("#dialog-general-warning").dialog("open");
+				return;
+			}
+			else if (result == 'must_not_move'){
+				$("#label_general_warning").text("Izdelka ne morete premakniti nazaj v delo. Najprej povečajte razpoložljivo količino!");
+				$("#dialog-general-warning").dialog("option", "height", 260);
+				$("#dialog-general-warning").dialog("open");
+				return;
+			}
+			else if (result == 'not_all_consumed'){
+				$("#label_general_warning").text("Pri zaključevanju morate speči celotno količino, ki je na voljo!");
+				$("#dialog-general-warning").dialog("option", "height", 260);
+				$("#dialog-general-warning").dialog("open");
+				return;
+			}
+			else if (result == 'not_available'){
 				$("#label_general_warning").text("Ne morete speči več izdelkov kot je pripravljene osnove!");
 				$("#dialog-general-warning").dialog("option", "height", 260);
 				$("#dialog-general-warning").dialog("open");

=== modified file 'mrp_procurement_qty/wizard/procurement_order.py'
--- mrp_procurement_qty/wizard/procurement_order.py	2013-12-26 12:00:30 +0000
+++ mrp_procurement_qty/wizard/procurement_order.py	2014-01-11 20:34:58 +0000
@@ -52,6 +52,7 @@
         
         man_order_obj = self.pool.get('mrp.production')
         picking_obj = self.pool.get('stock.picking')
+        procurement_obj = self.pool.get('procurement.order')
         
         ready_ids = man_order_obj.search(cr, uid, [
                                                    ('state', 'in', ['ready', 'confirmed']),
@@ -94,11 +95,16 @@
                                      'product_qty':qty_product_qty,
                                      'produced_stock':qty_produced_stock,
                                      'produced_phantom':qty_produced_phantom,
+                                     'status_izdelki':0,
+                                     'status_testo':0,
                                      })
                 
                 picking_obj.action_cancel(cr, uid, [order.picking_id.id], context) #najprej preklicemo picking
                 man_order_obj.action_cancel(cr, uid, [order.id], context) #nato preklicemo manufacturing order
-            
+                
+                #Spremenimo se kolicino na procurement_order
+                procurement_id = procurement_obj.search(cr, uid, [('production_id', '=', OR_ID)])
+                procurement_obj.write(cr, uid, procurement_id, {'product_qty':qty_product_qty})
             
         return 0
     
@@ -121,8 +127,8 @@
                                            })
         #----------------------------------------------------------
         
-        self._group_procurement_orders(cr, uid, context)
-        cr.commit()
+        #self._group_procurement_orders(cr, uid, context)
+        #cr.commit()
         #-----------------------------------------------
             
         repeat_number = self.browse(cr,uid,ids)[0].repeat_number
@@ -130,18 +136,51 @@
 
         #NOVI NACIN - za vsako iteracijo odpremo svoj kurzor, ki se po koncu commite-ne
         print(datetime.now().strftime("%Y-%m-%d %H:%M:%S") + ' - Start')
+        new_cr = pooler.get_db(cr.dbname).cursor()
         for x in range(0, repeat_number):
-            new_cr = pooler.get_db(cr.dbname).cursor()
             try:
                 proc_obj.run_scheduler(new_cr, uid, automatic=False, use_new_cursor=new_cr.dbname, context=context)
-            finally:
-                new_cr.close()
+                new_cr.commit()
+            except Exception:
+                new_cr.rollback()
+                raise osv.except_osv('Opozorilo!', u'Napaka v %s. krogu' % (str(x)))
+                return{}
             print(datetime.now().strftime("%Y-%m-%d %H:%M:%S") + ' - Close: ' + str(x+1))
         
-        #------------------------------------------------
-        #cr.commit()
-        #self._group_manufacturing_orders(cr, uid, context)
-        
+        try:
+            self._group_manufacturing_orders(new_cr, uid, context)
+            new_cr.commit()
+        except Exception:
+            new_cr.rollback()   
+            return{}
+
+        _sql_string = """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_string)
+        except Exception:
+            new_cr.rollback()   
+            return{}            
+
+        try:            
+            self.pool.get('stock.move').get_qty_delivery_available(new_cr, uid)
+        except Exception:
+            new_cr.rollback()   
+
         return{}
         
 procurement_order_run_wizard()