Unifield Server

Merge lp:~dorian-kemps/unifield-server/US-2681 into lp:unifield-server

  1. US-2681
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4444
Proposed branch: lp:~dorian-kemps/unifield-server/US-2681
Merge into: lp:unifield-server
Diff against target: 45 lines (+9/-6)
2 files modified
bin/addons/specific_rules/report/report_stock_inventory_xls.mako (+4/-4)
bin/addons/stock_override/wizard/stock_card_wizard.py (+5/-2)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-2681
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+327112@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/specific_rules/report/report_stock_inventory_xls.mako'
2--- bin/addons/specific_rules/report/report_stock_inventory_xls.mako 2017-01-26 13:48:32 +0000
3+++ bin/addons/specific_rules/report/report_stock_inventory_xls.mako 2017-07-10 15:05:16 +0000
4@@ -164,8 +164,8 @@
5 <Cell ss:StyleID="sumline"><Data ss:Type="String"></Data></Cell>
6 <Cell ss:StyleID="sumline"><Data ss:Type="String"></Data></Cell>
7 <Cell ss:StyleID="sumline"><Data ss:Type="String"></Data></Cell>
8- <Cell ss:StyleID="sumline"><Data ss:Type="Number">${(prd['sum_qty'])|x}</Data></Cell>
9- <Cell ss:StyleID="sumline"><Data ss:Type="Number">${(prd['sum_value'])|x}</Data></Cell>
10+ <Cell ss:StyleID="sumline"><Data ss:Type="Number">${(round(prd['sum_qty'], 2))|x}</Data></Cell>
11+ <Cell ss:StyleID="sumline"><Data ss:Type="Number">${(round(prd['sum_value'], 2))|x}</Data></Cell>
12 </Row>
13 % for line in prd['lines'].itervalues():
14 % if line['qty']:
15@@ -179,8 +179,8 @@
16 % else:
17 <Cell ss:StyleID="line"><Data ss:Type="String"></Data></Cell>
18 % endif
19- <Cell ss:StyleID="line"><Data ss:Type="Number">${(line['qty'])|x}</Data></Cell>
20- <Cell ss:StyleID="line"><Data ss:Type="Number">${(line['value'])|x}</Data></Cell>
21+ <Cell ss:StyleID="line"><Data ss:Type="Number">${(round(line['qty'], 2))|x}</Data></Cell>
22+ <Cell ss:StyleID="line"><Data ss:Type="Number">${(round(line['value'], 2))|x}</Data></Cell>
23 <Cell ss:StyleID="line"><Data ss:Type="String"></Data></Cell>
24 <Cell ss:StyleID="line"><Data ss:Type="String"></Data></Cell>
25 </Row>
26
27=== modified file 'bin/addons/stock_override/wizard/stock_card_wizard.py'
28--- bin/addons/stock_override/wizard/stock_card_wizard.py 2016-01-13 15:11:37 +0000
29+++ bin/addons/stock_override/wizard/stock_card_wizard.py 2017-07-10 15:05:16 +0000
30@@ -166,10 +166,13 @@
31
32 in_qty, out_qty = 0.00, 0.00
33 move_location = False
34+ to_unit = False
35+ if move.product_uom.id != move.product_id.uom_id.id:
36+ to_unit = move.product_id.uom_id.id
37 qty = uom_obj._compute_qty(cr, uid, move.product_uom.id,
38 move.product_qty,
39- move.product_id.uom_id.id)
40-
41+ to_unit)
42+
43 if location_ids:
44 if move.location_dest_id.id in location_ids:
45 in_qty = qty

Subscribers

People subscribed via source and target branches