Mentis

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

  1. openerpsl_02_17
  2. Merge into 7.0
Proposed by Matjaz Kalic
Status: Merged
Merged at revision: 370
Proposed branch: lp:~matjaz-6/openerpsl/openerpsl_02_17
Merge into: lp:openerpsl/7.0
Diff against target: 56 lines (+14/-7)
2 files modified
m_web_api/static/src/js/core.js (+12/-5)
mrp_procurement_qty/mrp_production.py (+2/-2)
To merge this branch: bzr merge lp:~matjaz-6/openerpsl/openerpsl_02_17
Reviewer Review Type Date Requested Status
Mentis Pending
Review via email: mp+211915@code.launchpad.net

Description of the change

[FIX] mrp_procurement_qty/mrp_production.py (sum ready_qty, substr id qty != qty_ordered)

To post a comment you must log in.
lp:~matjaz-6/openerpsl/openerpsl_02_17 updated
370. By Dušan Laznik (Mentis)

[FIX] mrp_procurement_qty/mrp_production.py (sum ready_qty, substr id qty != qty_ordered)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'm_web_api/static/src/js/core.js'
2--- m_web_api/static/src/js/core.js 2014-03-19 15:57:31 +0000
3+++ m_web_api/static/src/js/core.js 2014-03-20 12:10:48 +0000
4@@ -899,7 +899,7 @@
5 //product_name = results[i].product_is_product;
6
7 //alert(results[i].product_is_product);
8- product_name = results[i].product_is_product.toString().substring(results[i].product_is_product.toString().indexOf(',')+1);
9+ product_name = results[i].product_is_product.toString().substring(results[i].product_is_product.toString().indexOf(',')+1)+'~';
10 }
11
12 product_code = product_name.substring(0,product_name.indexOf(' '));
13@@ -931,10 +931,17 @@
14 if (vrstaIzdelka=='Izdelki'||vrstaIzdelka=='Dodelava'){
15 results[i].product_delo=results[i].product_on_bom_qty_available;
16 }
17- if (vrstaIzdelka=='Hladilnica')
18- results[i].product_qty = results[i].product_qty - results[i].product_qty_ordered;
19- //results[i].product_delo = (results[i].product_qty - results[i].product_qty_ordered);
20- //results[i].product_delo=results[i].product_qty_onstock;
21+ if (vrstaIzdelka=='Hladilnica'){
22+ //results[i].product_qty = results[i].product_qty - results[i].product_qty_ordered;
23+ //alert(results[i].product_qty + ' -- ' + results[i].product_qty_ordered);
24+ if (results[i].product_qty != results[i].product_qty_ordered)
25+ results[i].product_qty = results[i].product_qty - results[i].product_qty_ordered;
26+
27+ //old results[i].product_delo = results[i].product_qty;
28+
29+
30+ //old_old results[i].product_delo=results[i].product_qty_onstock;
31+ }
32
33 results[i].id1=results[i].id;
34
35
36=== modified file 'mrp_procurement_qty/mrp_production.py'
37--- mrp_procurement_qty/mrp_production.py 2014-03-19 15:57:31 +0000
38+++ mrp_procurement_qty/mrp_production.py 2014-03-20 12:10:48 +0000
39@@ -53,7 +53,7 @@
40 stock_values = self.pool.get('stock.location')._product_value(cr, user, [loc_id], ['stock_real'], arg=None, context=context)
41 vals['product_qty_onstock'] = int(stock_values[loc_id]['stock_real'])
42
43- #Koliko je bilo v resnici naroceno, polizdelek je lahko tudi narocen
44+ #Koliko je bilo v resnici naroceno, ce se naredi delovni za polizdelek zaradi izdelka potem je narocena kolicina 0
45 move_ids = self.pool.get('stock.move').search(cr, user, [('product_id','=',vals['product_id']),
46 ('basket_status','=',3)])
47 prod_ordered = 0
48@@ -181,7 +181,7 @@
49 if order_bom.produced != 0 and order_bom.product_with_bom_factor:
50 qty_reserved += (order_bom.produced*order_bom.product_with_bom_factor)
51 #qty_from_stock += (order_bom.product_on_bom_qty_ready/order_bom.product_with_bom_factor) #kar je dano iz hladilnice
52- qty_from_stock = order_bom.product_on_bom_qty_O_ready #Nalozena zaloga polizdelka na ta P_izdelek
53+ qty_from_stock += order_bom.product_on_bom_qty_O_ready #Nalozena zaloga polizdelka na ta P_izdelek
54
55
56 res_tmp = {}

Subscribers

People subscribed via source and target branches