← Back to team overview

openerp-dev-web team mailing list archive

[Merge] lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3

 

Meera Trambadia (OpenERP) has proposed merging lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #600547 Invoice totals not updated when a line is moved (store={...} bug?)
  https://bugs.launchpad.net/bugs/600547
  #690895 copy account.move crash 
  https://bugs.launchpad.net/bugs/690895
  #694144 [6.0] sales manager dashboard - sales by month - sql query error, usabiliy
  https://bugs.launchpad.net/bugs/694144
  #695632 [RC1]Two same fields creating problem in web-client
  https://bugs.launchpad.net/bugs/695632
  #695960 [6.0RC1][hr_timesheet]Problems printing timesheet reports
  https://bugs.launchpad.net/bugs/695960
  #702805 an employee shouldn't be able to see expenses and holidays of others employee
  https://bugs.launchpad.net/bugs/702805
  #703836 [Trunk] hr_expense: Invoice button not working
  https://bugs.launchpad.net/bugs/703836
  #705766 Wrong Picked Widget in Sale Order in OpenERP v6.0.1
  https://bugs.launchpad.net/bugs/705766
  #707144 [6.0] hr_payroll 'C/D' versus 'D/C' 
  https://bugs.launchpad.net/bugs/707144
  #708603 Miscalculation of parent_store data when moving multiple records under same parent
  https://bugs.launchpad.net/bugs/708603
  #711533 v6 hr_attendance - time is rounded to hour
  https://bugs.launchpad.net/bugs/711533
  #712960 [Trunk] - increase size of col. date in payment order pdf
  https://bugs.launchpad.net/bugs/712960

For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1/+merge/48883

[FIX] account_payment: increased size of col.date in payment order report --fixes lp:712960 
-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1/+merge/48883
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.
=== modified file 'account_payment/report/order.rml'
--- account_payment/report/order.rml	2011-01-14 00:11:01 +0000
+++ account_payment/report/order.rml	2011-02-08 08:41:37 +0000
@@ -123,7 +123,7 @@
   <story>
   <pto>
   <pto_header>
-    <blockTable colWidths="112.0,86.0,106.0,63.0,85.0,75.0" style="Table3">
+    <blockTable colWidths="112.0,86.0,102.0,70.0,82.0,75.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Partner</para>
@@ -217,7 +217,7 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="112.0,86.0,106.0,63.0,85.0,75.0" style="Table3">
+    <blockTable colWidths="112.0,86.0,102.0,70.0,82.0,75.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Partner</para>
@@ -241,7 +241,7 @@
     </blockTable>
     <section>
       <para style="terp_default_2">[[repeatIn(o.line_ids, 'line') ]]</para>
-      <blockTable colWidths="112.0,86.0,106.0,64.0,85.0,75.0" style="Table4">
+      <blockTable colWidths="112.0,86.0,102.0,70.0,82.0,75.0" style="Table4">
         <tr>
           <td>
             <para style="terp_default_9">[[line.partner_id and line.partner_id.name or '-' ]]</para>

=== modified file 'account_payment/report/order.sxw'
Binary files account_payment/report/order.sxw	2011-01-14 00:11:01 +0000 and account_payment/report/order.sxw	2011-02-08 08:41:37 +0000 differ