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

[Matjaz Kalic]

[FIX] mrp_procurement_qty/wizard/mrp_procurement_qty.py (skip cancel picking if picking_id doesn't exists)
[MOD] m_web_api/static/src/js/core.js (show qty for mrp ordered from stock)

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

358. By Dušan Laznik (Mentis) on 2014-03-11

[FIX] mrp_procurement_qty/wizard/mrp_procurement_qty.py (skip cancel picking if picking_id doesn't exists)
[MOD] m_web_api/static/src/js/core.js (show qty for mrp ordered from stock)
[FIX] pekarna_reports/report/account_print_invoice.py (fixed total neto price)

=== modified file 'm_web_api/static/src/js/core.js'
--- m_web_api/static/src/js/core.js	2014-03-03 10:53:22 +0000
+++ m_web_api/static/src/js/core.js	2014-03-11 10:11:33 +0000
@@ -365,7 +365,7 @@
     //------------------------------------------------//
     
     //Prikaz podjetja in verzije
-    $("#podjetje").text('Podjetje: ' + document.getElementById("s1").options[so].text + ', Verzija: v.03.03');
+    $("#podjetje").text('Podjetje: ' + document.getElementById("s1").options[so].text + ', Verzija: v.03.06');
     
     openERP_user = '';
     if (document.getElementById("u").value == 'Testo-Polizdelki'){
@@ -939,7 +939,10 @@
     			
     			//Ce je narocilo iz OP
     			if (results[i].created_from_op == true)
-    				results[i].product_qty = 0
+    				if (vrstaIzdelka=='Izdelki'||vrstaIzdelka=='Dodelava')
+    					results[i].product_qty = '0('+results[i].product_qty+')';
+    				else
+    					results[i].product_qty = 0;
     				
     			if (vrstaIzdelka=='Polizdelki_testo'){
     				iDelo = parseInt(results[i].product_delo);

=== modified file 'mrp_procurement_qty/wizard/mrp_procurement_qty.py'
--- mrp_procurement_qty/wizard/mrp_procurement_qty.py	2014-02-17 15:12:21 +0000
+++ mrp_procurement_qty/wizard/mrp_procurement_qty.py	2014-03-11 10:11:33 +0000
@@ -180,7 +180,8 @@
             for mrp_order in man_order_obj.browse(cr, uid, ready_ids):
                 #0. Preverimo ali je bil delovni nalog sploh narejen/izveden - ce ne ga preklicemo
                 if mrp_order.produced == 0 and mrp_order.scrap == 0 and mrp_order.produced_phantom == 0:
-                    picking_obj.action_cancel(cr, uid, [mrp_order.picking_id.id], context) #najprej preklicemo picking
+                    if mrp_order.picking_id.id:
+                        picking_obj.action_cancel(cr, uid, [mrp_order.picking_id.id], context) #najprej preklicemo picking
                     man_order_obj.action_cancel(cr, uid, [mrp_order.id], context) #nato preklicemo manufacturing order
                     if mrp_order.move_prod_id.id:
                         move_obj.action_cancel(cr, uid, [mrp_order.move_prod_id.id], context) #preklicemo se stock move

=== modified file 'pekarna_reports/report/account_print_invoice.py'
--- pekarna_reports/report/account_print_invoice.py	2013-08-20 10:29:36 +0000
+++ pekarna_reports/report/account_print_invoice.py	2014-03-11 10:11:33 +0000
@@ -39,8 +39,14 @@
     
     def _get_total_net(self, invoice):
         value_total = 0
-        for line in invoice.invoice_line:
-            value_total += line.quantity * line.price_unit
+        tax_obj = self.pool.get('account.tax')
+        
+        for line2 in invoice.invoice_line:
+            value_total += tax_obj.compute_all(self.cr, self.uid, line2.invoice_line_tax_id, line2.price_unit, line2.quantity, product=line2.product_id, partner=line2.invoice_id.partner_id)['total']
+        
+#        for line in invoice.invoice_line:
+#            value_total += line.quantity * line.price_unit
+
         return value_total
 
 report_sxw.report_sxw('report.account.invoice.pekarna', 'account.invoice', 'pekarna_reports/report/account_print_invoice.rml', parser=account_invoice)