pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] Sale: sale bug for picked progress bar

Browse Source 
[MERGE] hr_payroll: typo on payroll advice report

bzr revid: mra@mra-laptop-20110125090844-j0up2utcshvie213
This commit is contained in:
Mustufa Rangwala
2011-01-25 14:38:44 +05:30
parent 3ac67d58d5 091b1b5d22
commit 390974ede8
2 changed files with 15 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_payroll/report/report_payroll_advice.rml
+1 -25
View File
@@ -126,30 +126,6 @@
</stylesheet>
<story>
<pto>
<pto_header>
<blockTable colWidths="61.0,166.0,84.0,82.0,111.0,35.0" style="Table4">
<tr>
<td>
<para style="terp_tblheader_Details">SI. No.</para>
</td>
<td>
<para style="terp_tblheader_Details">Name of the Employee</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Amount</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">By Salary</para>
</td>
<td>
<para style="terp_tblheader_Details">Bank Account</para>
</td>
<td>
<para style="terp_tblheader_Details">C/D</para>
</td>
</tr>
</blockTable>
</pto_header>
<para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
<blockTable colWidths="269.0,269.0" style="Table1">
<tr>
@@ -239,7 +215,7 @@
<para style="terp_tblheader_Details">Bank Account</para>
</td>
<td>
<para style="terp_tblheader_Details">C/D</para>
<para style="terp_tblheader_Details">D/C</para>
</td>
</tr>
</blockTable>
addons/sale/sale.py
+14 -8
View File
@@ -95,7 +95,7 @@ class sale_order(osv.osv):
for id in ids:
res[id] = [0.0, 0.0]
cr.execute('''SELECT
p.sale_id, sum(m.product_qty), mp.state as mp_state
p.sale_id, sum(m.product_qty), mp.state as mp_state, m.state as state, p.type as tp
FROM
stock_move m
LEFT JOIN
@@ -103,15 +103,21 @@ class sale_order(osv.osv):
LEFT JOIN
procurement_order mp on (mp.move_id=m.id)
WHERE
p.sale_id IN %s GROUP BY mp.state, p.sale_id''', (tuple(ids),))
for oid, nbr, mp_state in cr.fetchall():
if mp_state == 'cancel':
p.sale_id IN %s GROUP BY m.state, mp.state, p.sale_id, p.type''', (tuple(ids),))
for oid, nbr, state, move_state, type_pick in cr.fetchall():
if state == 'cancel':
continue
if mp_state == 'done':
res[oid][1] += nbr or 0.0
if state == 'done' or move_state == 'done':
res[oid][0] += nbr or 0.0
res[oid][1] += nbr or 0.0
else:
res[oid][1] += nbr or 0.0
if type_pick == 'in':#this is a returned picking
res[oid][1] -= 2*nbr or 0.0 # Deducting the return picking qty
if state == 'done' or move_state == 'done':
nbr += nbr
res[oid][0] -= nbr or 0.0
for r in res:
if not res[r][1]:
res[r] = 0.0