From 8fdc2693a56c08f8c47cb03fc82ba6978e847e45 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Mon, 24 Jan 2011 11:11:30 +0530
Subject: [PATCH 1/2] [FIX] sale:picked progressbar now shows the
 amount(percentage) of picking done

lp bug: https://launchpad.net/bugs/705766 fixed

bzr revid: mtr@mtr-20110124054130-uegp9am6no347f6v
---
 addons/sale/sale.py | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 6e64c6589e9..7773c5d6d7d 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -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

From c65210bf098b895b23e21c2a9415467acbb1b444 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Tue, 25 Jan 2011 12:35:16 +0530
Subject: [PATCH 2/2] [FIX] hr_payroll:removed extra table from report and
 changed the label

lp bug: https://launchpad.net/bugs/707144 fixed

bzr revid: mtr@mtr-20110125070516-4ochldcpbbywi201
---
 .../report/report_payroll_advice.rml          | 26 +------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/addons/hr_payroll/report/report_payroll_advice.rml b/addons/hr_payroll/report/report_payroll_advice.rml
index 3e0aa3c0af1..4d110fa5aa1 100644
--- a/addons/hr_payroll/report/report_payroll_advice.rml
+++ b/addons/hr_payroll/report/report_payroll_advice.rml
@@ -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>