[Merge]: Merge from report team addons branch.

bzr revid: rch@tinyerp.com-20101116115552-a1h087t6ccjacmpm

diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index 528d986..bcedc3f 100644 (file)
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -49,7 +49,7 @@
                         </child1>
                         <child2>
                             <action colspan="4" height="220" name="%(action_treasory_graph)d" string="Treasury"/>
-                            <action colspan="4" height="220" name="%(action_aged_receivable)d" string="Aged receivables"/>
+                            <action colspan="4" height="220" name="%(action_aged_receivable)d" string="Aged Receivables"/>
                             <!--  <action colspan="4" height="220" name="%(action_aged_income)d" string="Aged income"/> -->
                         </child2>
                     </hpaned>

diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml
index c605762..6e67879 100644 (file)
--- a/addons/account/report/account_print_invoice.rml
+++ b/addons/account/report/account_print_invoice.rml
@@ -130,6 +130,31 @@
     <images/>
   </stylesheet>
   <story>
+  <pto>
+  <pto_header>
+    <blockTable colWidths="202.0,87.0,71.0,57.0,42.0,71.0" style="Table7">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Description</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Taxes</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Quantity</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Unit Price </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Disc.(%)</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Price</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
     <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
     <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
     <blockTable colWidths="297.0,233.0" style="Table_Partner_Address">
@@ -378,5 +403,6 @@
     <para style="terp_default_2">
       <font color="white"> </font>
     </para>
+  </pto>
   </story>
 </document>
\ No newline at end of file

diff --git a/addons/account/report/account_print_overdue.rml b/addons/account/report/account_print_overdue.rml
index 61533a2..4dfe08c 100644 (file)
--- a/addons/account/report/account_print_overdue.rml
+++ b/addons/account/report/account_print_overdue.rml
@@ -89,6 +89,37 @@
     <images/>
   </stylesheet>
   <story>
+  <pto>
+  <pto_header>
+    <blockTable colWidths="57.0,136.0,51.0,72.0,54.0,56.0,66.0,18.0" style="Table1">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Description</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Ref</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Maturity date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Due</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Paid</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Maturity</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Li.</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
     <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
     <para style="terp_default_8">[[ setLang(o.lang) ]]</para>
     <blockTable colWidths="286.0,224.0" style="Tableau2">
@@ -253,5 +284,6 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
+  </pto>
   </story>
 </document>
\ No newline at end of file

diff --git a/addons/account/report/account_voucher_print.rml b/addons/account/report/account_voucher_print.rml
index f5f944b..1d8f237 100644 (file)
--- a/addons/account/report/account_voucher_print.rml
+++ b/addons/account/report/account_voucher_print.rml
@@ -162,6 +162,22 @@
     <images/>
   </stylesheet>
   <story>
+  <pto>
+  <pto_header>
+    <blockTable colWidths="313.0,107.0,105.0" style="Heading1">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Particulars</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Debit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Credit</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
     <para style="P8">[[ repeatIn(objects,'voucher') ]]</para>
     <blockTable colWidths="524.0" style="Table6">
       <tr>
@@ -449,5 +465,6 @@
     <para style="P1">
       <font color="white"> </font>
     </para>
+  </pto>
   </story>
 </document>

diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.rml b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
index 1eac328..7841a3a 100644 (file)
--- a/addons/account_invoice_layout/report/report_account_invoice_layout.rml
+++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
@@ -174,6 +174,28 @@
     <images/>
   </stylesheet>
   <story>
+  <pto>
+  <pto_header>
+    <blockTable colWidths="283.0,71.0,57.0,57.0,71.0" style="Tableau6">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Description / Taxes</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Quantity</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Unit Price</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Disc. (%)</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Price</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
     <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
     <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
     <blockTable colWidths="302.0,237.0" style="Tableau2">
@@ -469,5 +491,6 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
+  </pto>
   </story>
 </document>
\ No newline at end of file

diff --git a/addons/account_invoice_layout/report/special_message_invoice.rml b/addons/account_invoice_layout/report/special_message_invoice.rml
index 282dce2..ab7f02f 100644 (file)
--- a/addons/account_invoice_layout/report/special_message_invoice.rml
+++ b/addons/account_invoice_layout/report/special_message_invoice.rml
@@ -178,6 +178,28 @@
     <images/>
   </stylesheet>
   <story>
+  <pto>
+  <pto_header>
+    <blockTable colWidths="283.0,71.0,57.0,57.0,71.0" style="Tableau6">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Description / Taxes</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Quantity</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Unit Price</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Disc. (%)</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Price</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
     <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
     <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
     <blockTable colWidths="302.0,237.0" style="Tableau2">
@@ -487,5 +509,6 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
+  </pto>
   </story>
 </document>
\ No newline at end of file

diff --git a/addons/account_payment/report/order.rml b/addons/account_payment/report/order.rml
index cf280c8..e47691f 100644 (file)
--- a/addons/account_payment/report/order.rml
+++ b/addons/account_payment/report/order.rml
@@ -121,6 +121,31 @@
     <images/>
   </stylesheet>
   <story>
+  <pto>
+  <pto_header>
+    <blockTable colWidths="112.0,86.0,106.0,63.0,85.0,75.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Partner</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Bank Account</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Invoice Ref</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Value Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Amount</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Currency</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
     <para style="terp_default_8">[[ repeatIn(objects, 'o') ]]</para>
     <para style="terp_default_8">
       <font color="white"> </font>
@@ -260,5 +285,6 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
+  </pto>
   </story>
 </document>
\ No newline at end of file

diff --git a/addons/delivery/report/shipping.rml b/addons/delivery/report/shipping.rml
index 8ba9342..42fcd71 100644 (file)
--- a/addons/delivery/report/shipping.rml
+++ b/addons/delivery/report/shipping.rml
@@ -105,6 +105,22 @@
     <images/>
   </stylesheet>
   <story>
+  <pto>
+  <pto_header>
+    <blockTable colWidths="370.0,85.0,82.0" repeatRows="1" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Description</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Lot</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Quantity</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
     <para style="terp_default_9">[[repeatIn(objects,'o')]]</para>
     <para style="terp_default_8">
       <font color="white"> </font>
@@ -208,5 +224,6 @@
         <font color="white"> </font>
       </para>
     </section>
+  </pto>
   </story>
 </document>
\ No newline at end of file

diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml
index dbc3c09..b129715 100644 (file)
--- a/addons/hr_expense/report/expense.rml
+++ b/addons/hr_expense/report/expense.rml
@@ -111,6 +111,31 @@
     <images/>
   </stylesheet>
   <story>
+  <pto>
+  <pto_header>
+    <blockTable colWidths="49.0,204.0,45.0,80.0,53.0,91.0" style="Table_hr_expense_line_header">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Name</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Ref.</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Unit Price</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Qty</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Total Price</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
     <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
     <para style="terp_default_8">
       <font color="white"> </font>
@@ -272,5 +297,6 @@
       <font color="white"> </font>
     </para>
     <para style="terp_default_9">This document must be dated and signed for reimbursement</para>
+  </pto>
   </story>
 </document>

diff --git a/addons/hr_payroll/report/payroll_register.rml b/addons/hr_payroll/report/payroll_register.rml
index 7ad99b4..e47a7bf 100644 (file)
--- a/addons/hr_payroll/report/payroll_register.rml
+++ b/addons/hr_payroll/report/payroll_register.rml
@@ -88,6 +88,37 @@
     <images/>
   </stylesheet>
   <story>
+  <pto>
+  <pto_header>
+      <blockTable colWidths="26.0,106.0,66.0,66.0,66.0,66.0,66.0,66.0" style="Table6">
+        <tr>
+          <td>
+            <para style="terp_tblheader_details_center">#</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_details">Employee Name</para>
+          </td>
+          <td>
+            <para style="terp_tbleheader_details_right">Basic</para>
+          </td>
+          <td>
+            <para style="terp_tbleheader_details_right">Others </para>
+          </td>
+          <td>
+            <para style="terp_tbleheader_details_right">Allowances </para>
+          </td>
+          <td>
+            <para style="terp_tbleheader_details_right">Gross Sal.</para>
+          </td>
+          <td>
+            <para style="terp_tbleheader_details_right">Deduction </para>
+          </td>
+          <td>
+            <para style="terp_tbleheader_details_right">Net Sal.</para>
+          </td>
+        </tr>
+      </blockTable>
+  </pto_header>
     <para style="terp_default_8">[[ repeatIn(objects, 'o') ]]</para>
     <para style="terp_header_center">Salary Payment Register</para>
     <para style="terp_default_9_bold_center">[[o.name]]</para>
@@ -226,5 +257,6 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
+  </pto>
   </story>
 </document>
\ No newline at end of file

diff --git a/addons/hr_payroll/report/report_emp_salary_structure.rml b/addons/hr_payroll/report/report_emp_salary_structure.rml
index da3dfbb..27ff2fc 100644 (file)
--- a/addons/hr_payroll/report/report_emp_salary_structure.rml
+++ b/addons/hr_payroll/report/report_emp_salary_structure.rml
@@ -262,6 +262,25 @@
     <images/>
   </stylesheet>
   <story>
+  <pto>
+  <pto_header>
+        <blockTable colWidths="34.0,341.0,80.0,83.0" style="Table5">
+          <tr>
+            <td>
+              <para style="terp_tblheader_Details">Code</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">Name</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details_Right">Amount</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">Amount Type</para>
+            </td>
+          </tr>
+        </blockTable>
+  </pto_header>
     <para style="terp_default_8">[[repeatIn(objects,'employee')]]</para>
     <para style="terp_default_1">
       <font color="white"> </font>
@@ -554,5 +573,6 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
+  </pto>
   </story>
 </document>

diff --git a/addons/hr_payroll/report/report_payroll_advice.rml b/addons/hr_payroll/report/report_payroll_advice.rml
index 18f56cc..bd1b0c6 100644 (file)
--- a/addons/hr_payroll/report/report_payroll_advice.rml
+++ b/addons/hr_payroll/report/report_payroll_advice.rml
@@ -125,6 +125,31 @@
     <images/>
   </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>
@@ -334,5 +359,6 @@
     <para>
       <seqReset id="L1"/>
     </para>
+  </pto>
   </story>
 </document>
\ No newline at end of file

diff --git a/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml b/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml
index 792ea34..96d91ef 100644 (file)
--- a/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml
+++ b/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml
@@ -68,7 +68,7 @@
             <field name="inherit_id" ref="hr.board_hr_manager_form"/>
             <field name="arch" type="xml">
                 <xpath expr="/form/hpaned/child1" position="inside">
-                    <action colspan="4" height="220" name="%(action_timesheet_uninvoiced_line)d" string="Uninvoice lines with billing rate" />
+                    <action colspan="4" height="220" name="%(action_timesheet_uninvoiced_line)d" string="Uninvoice Lines With Billing Rate" />
                 </xpath>
             </field>
         </record>

diff --git a/addons/lunch/report/order.rml b/addons/lunch/report/order.rml
index ba66dcd..05a1b69 100644 (file)
--- a/addons/lunch/report/order.rml
+++ b/addons/lunch/report/order.rml
@@ -71,6 +71,25 @@
     <images/>
   </stylesheet>
   <story>
+  <pto>
+  <pto_header>
+    <blockTable colWidths="149.0,114.0,201.0,63.0" style="Table5">
+      <tr>
+        <td>
+          <para style="terp_tbl_detail_header">Name/Date</para>
+        </td>
+        <td>
+          <para style="terp_tbl_detail_header">Order</para>
+        </td>
+        <td>
+          <para style="terp_tbl_detail_header">Description</para>
+        </td>
+        <td>
+          <para style="terp_tbl_detail_header_right">Unit Price</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
@@ -163,5 +182,6 @@
     <para style="terp_default_2">
       <font color="white"> </font>
     </para>
+  </pto>
   </story>
 </document>
\ No newline at end of file

diff --git a/addons/mrp/report/order.rml b/addons/mrp/report/order.rml
index e07966f..feb1515 100644 (file)
--- a/addons/mrp/report/order.rml
+++ b/addons/mrp/report/order.rml
@@ -173,6 +173,25 @@
     <images/>
   </stylesheet>
   <story>
+  <pto>
+  <pto_header>
+    <blockTable colWidths="256.0,61.0,107.0,104.0" style="Table8">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Product </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Quantity</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Source Location</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Destination Location</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
     <para style="terp_default_8">[[repeatIn(objects,'o')]] </para>
     <para style="terp_default_8">
       <font color="white"> </font>
@@ -368,5 +387,6 @@
         <font color="white"> </font>
       </para>
     </section>
+  </pto>
   </story>
 </document>
\ No newline at end of file

diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml
index cafadca..b0f197a 100644 (file)
--- a/addons/mrp_repair/report/order.rml
+++ b/addons/mrp_repair/report/order.rml
@@ -161,6 +161,28 @@
   </stylesheet>
   <images/>
   <story>
+  <pto>
+  <pto_header>
+    <blockTable colWidths="254.0,100.0,60.0,60.0,60.0" repeatRows="1" style="Table4">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Description</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">VAT</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Quantity</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Unit Price</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Price</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
     <para style="P12">[[ repeatIn(objects,'o') ]]</para>
     <blockTable colWidths="265.0,51.0,225.0" style="Table1">
       <tr>
@@ -390,5 +412,6 @@
     <para style="P24">
       <font color="white"> </font>
     </para>
+  </pto>
   </story>
 </document>

diff --git a/addons/point_of_sale/report/account_statement.rml b/addons/point_of_sale/report/account_statement.rml
index ebdc554..c61d034 100644 (file)
--- a/addons/point_of_sale/report/account_statement.rml
+++ b/addons/point_of_sale/report/account_statement.rml
@@ -136,6 +136,22 @@
     <images/>
   </stylesheet>
   <story>
+  <pto>
+  <pto_header>
+    <blockTable colWidths="131.0,292.0,97.0" style="Table9">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Name</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Partner</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Amount </para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
     <para style="terp_default_8">[[ repeatIn(objects,'statement') ]]</para>
     <para style="terp_header_Centre">Statement</para>
     <blockTable colWidths="130.0,130.0,130.0,130.0" style="Table1">
@@ -264,5 +280,6 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
+  </pto>
   </story>
 </document>
\ No newline at end of file

diff --git a/addons/product/report/product_pricelist.rml b/addons/product/report/product_pricelist.rml
index 5d3a39e..40ae456 100644 (file)
--- a/addons/product/report/product_pricelist.rml
+++ b/addons/product/report/product_pricelist.rml
@@ -127,6 +127,32 @@
     <images/>
   </stylesheet>
   <story>
+  <pto>
+  <pto_header>
+    <blockTable colWidths="255.0,57.0,57.0,57.0,57.0,57.0" style="Table7">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Description</para>
+          <para style="terp_default_1">[[repeatIn(get_titles(data['form']), 'k')]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9_Bold">[[ (k.has_key('qty1') and k['qty1']) or '' ]] </para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9_Bold">[[ (k.has_key('qty2') and k['qty2']) or '' ]] </para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9_Bold">[[ (k.has_key('qty3') and k['qty3']) or '' ]] </para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9_Bold">[[ (k.has_key('qty4') and k['qty4']) or '' ]] </para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9_Bold">[[ (k.has_key('qty5') and k['qty5']) or '' ]] </para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
@@ -235,5 +261,6 @@
         </para>
       </section>
     </section>
+  </pto>
   </story>
 </document>
\ No newline at end of file

diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml
index 0ca1a8d..f9782ed 100644 (file)
--- a/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.rml
@@ -129,6 +129,31 @@
     <images/>
   </stylesheet>
   <story>
+  <pto>
+  <pto_header>
+    <blockTable colWidths="180.0,85.0,71.0,71.0,57.0,71.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Description</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Taxes</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Date Req.</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Qty</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Unit Price</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Net Price</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
     <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
     <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
     <para style="terp_default_9">
@@ -357,5 +382,6 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
+  </pto>
   </story>
 </document>
\ No newline at end of file

diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml
index edc8208..27e4ac3 100644 (file)
--- a/addons/purchase/report/request_quotation.rml
+++ b/addons/purchase/report/request_quotation.rml
@@ -69,6 +69,22 @@
     <images/>
   </stylesheet>
   <story>
+  <pto>
+  <pto_header>
+    <blockTable colWidths="371.0,98.0,61.0" repeatRows="1" style="Table_Product_Header_Title">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Description</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Expected Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Qty</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
     <para style="terp_default_9">[[repeatIn(objects,'order')]]</para>
     <para style="terp_default_9">[[ setLang(order.partner_id.lang) ]]</para>
     <blockTable colWidths="250.0,59.0,221.0" style="Table_Address_Detail">
@@ -162,5 +178,6 @@
       <font color="white"> </font>
     </para>
     <para style="terp_default_9">[[ user.signature or '' ]]</para>
+  </pto>
   </story>
 </document>
\ No newline at end of file

diff --git a/addons/purchase_requisition/report/purchase_requisition.rml b/addons/purchase_requisition/report/purchase_requisition.rml
index e7734ce..da9ec19 100644 (file)
--- a/addons/purchase_requisition/report/purchase_requisition.rml
+++ b/addons/purchase_requisition/report/purchase_requisition.rml
@@ -112,6 +112,22 @@
     <images/>
   </stylesheet>
   <story>
+  <pto>
+  <pto_header>
+    <blockTable colWidths="375.0,71.0,84.0" style="Table4">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Description [[ requisition.line_ids==[] and removeParentNode('blockTable') ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Qty</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Product UoM</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
     <para style="terp_default_8">[[ repeatIn(objects,'requisition') ]]</para>
     <para style="terp_default_8">
       <font color="white"> </font>
@@ -218,5 +234,6 @@
         </tr>
       </blockTable>
     </section>
+  </pto>
   </story>
 </document>
\ No newline at end of file

diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index 515aa9f..5f5e84f 100644 (file)
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -126,6 +126,31 @@
     <images/>
   </stylesheet>
   <story>
+  <pto>
+  <pto_header>
+    <blockTable colWidths="202.0,94.0,68.0,59.0,50.0,63.0" repeatRows="1" style="Table4">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Description</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">VAT</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Quantity</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Unit Price</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Disc.(%)</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Price</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
     <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
     <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
     <blockTable colWidths="265.0,51.0,225.0" style="Table1">
@@ -360,5 +385,6 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
+  </pto>
   </story>
 </document>

diff --git a/addons/sale_crm/board_sale_crm_view.xml b/addons/sale_crm/board_sale_crm_view.xml
index 58ebdc0..486ffa2 100644 (file)
--- a/addons/sale_crm/board_sale_crm_view.xml
+++ b/addons/sale_crm/board_sale_crm_view.xml
@@ -62,14 +62,14 @@
             </field>
         </record>
 
-         <record model="ir.ui.view" id="board_crm_form_inherit_child2">
-            <field name="name">board.crm.form.inherit.child2</field>
+      <record model="ir.ui.view" id="board_crm_form_inherit_replace1">
+            <field name="name">board.crm.form.inherit.replace1</field>
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="crm.board_crm_form"/>
             <field name="arch" type="xml">
-                   <xpath expr="/form/hpaned/child2/action[@name='%(crm.act_sales_pipeline)d']" position="after">
-                           <action
+                   <xpath expr="/form/hpaned/child2/action[@name='%(crm.act_sales_pipeline)d']" position="replace">
+                       <action
                                string="Monthly Turnover"
                                name="%(action_turnover_by_month)d"
                                colspan="4"/>
@@ -77,17 +77,6 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="board_crm_form_inherit_replace1">
-            <field name="name">board.crm.form.inherit.replace1</field>
-            <field name="model">board.board</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="crm.board_crm_form"/>
-            <field name="arch" type="xml">
-                   <xpath expr="/form/hpaned/child2/action[@name='%(crm.act_sales_pipeline)d']" position="replace">
-                   </xpath>
-            </field>
-        </record>
-
         <record model="ir.ui.view" id="board_crm_form_inherit_replace2">
             <field name="name">board.crm.form.inherit.replace2</field>
             <field name="model">board.board</field>

diff --git a/addons/sale_layout/report/report_sale_layout.rml b/addons/sale_layout/report/report_sale_layout.rml
index e203ae5..fd9cbe9 100755 (executable)
--- a/addons/sale_layout/report/report_sale_layout.rml
+++ b/addons/sale_layout/report/report_sale_layout.rml
@@ -133,6 +133,31 @@
     <images/>
   </stylesheet>
   <story>
+  <pto>
+  <pto_header>
+    <blockTable colWidths="198.0,85.0,71.0,57.0,57.0,71.0" style="Table7">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Description</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">VAT</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Quantity</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Unit Price</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Disc.(%)</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Price</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
     <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
     <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
     <blockTable colWidths="260.0,64.0,215.0" style="Tableau2">
@@ -371,5 +396,6 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
+  </pto>
   </story>
 </document>
\ No newline at end of file

diff --git a/addons/stock/report/lot_overview.rml b/addons/stock/report/lot_overview.rml
index 2d2b7e8..d68010b 100644 (file)
--- a/addons/stock/report/lot_overview.rml
+++ b/addons/stock/report/lot_overview.rml
@@ -88,6 +88,28 @@
     <images/>
   </stylesheet>
   <story>
+  <pto>
+  <pto_header>
+    <blockTable colWidths="248.0,91.0,62.0,59.0,67.0" style="Table6">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Location / Product</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Variants</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Quantity</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Unit Price</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Value</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
@@ -200,5 +222,6 @@
     <para style="terp_default_2">
       <font color="white"> </font>
     </para>
+  </pto>
   </story>
 </document>
\ No newline at end of file

diff --git a/addons/stock/report/lot_overview_all.rml b/addons/stock/report/lot_overview_all.rml
index cb159ca..e46a296 100644 (file)
--- a/addons/stock/report/lot_overview_all.rml
+++ b/addons/stock/report/lot_overview_all.rml
@@ -88,6 +88,28 @@
     <images/>
   </stylesheet>
   <story>
+  <pto>
+  <pto_header>
+    <blockTable colWidths="253.0,65.0,63.0,63.0,78.0" style="Table6">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Location / Product</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Variants</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Quantity</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Unit Price</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Value</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
@@ -200,5 +222,6 @@
     <para style="terp_default_2">
       <font color="white"> </font>
     </para>
+  </pto>
   </story>
 </document>
\ No newline at end of file

diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index cc6923a..94bf694 100644 (file)
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -123,6 +123,28 @@
     <images/>
   </stylesheet>
   <story>
+  <pto>
+  <pto_header>
+    <blockTable colWidths="256.0,73.0,59.0,59.0,71.0" repeatRows="1" style="Move_Line_Header">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Description</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Lot</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">State</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Location</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Quantity</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
     <para style="terp_default_8">[[repeatIn(objects,'picking')]] </para>
     <para style="terp_default_9">
       <font color="white"> </font>
@@ -285,5 +307,6 @@
     <para style="terp_default_2">
       <font color="white"> </font>
     </para>
+  </pto>
   </story>
 </document>
\ No newline at end of file

diff --git a/addons/stock/report/stock_inventory_move.rml b/addons/stock/report/stock_inventory_move.rml
index a6f8971..d7bbc2c 100755 (executable)
--- a/addons/stock/report/stock_inventory_move.rml
+++ b/addons/stock/report/stock_inventory_move.rml
@@ -104,6 +104,25 @@
     <images/>
   </stylesheet>
   <story>
+  <pto>
+  <pto_header>
+    <blockTable colWidths="70.0,103.0,256.0,109.0" style="Table4">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Location</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Production Lot</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Product </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Quantity</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
     <para style="terp_default_8">[[ repeatIn(objects,'o') ]] </para>
     <blockTable colWidths="539.0" style="Table3">
       <tr>
@@ -197,5 +216,6 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
+  </pto>
   </story>
 </document>
\ No newline at end of file