Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/7.0-opw-603987-ado into lp:openobject-addons/7.0

  1. 7.0-opw-603987-ado
  2. Merge into 7.0
Proposed by Amit Dodiya (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/7.0-opw-603987-ado
Merge into: lp:openobject-addons/7.0
Diff against target: 237 lines (+20/-20)
20 files modified
account/report/account_aged_partner_balance.rml (+1/-1)
account/report/account_general_ledger_landscape.rml (+1/-1)
account_bank_statement_extensions/report/bank_statement_balance_report.rml (+1/-1)
account_check_writing/report/check_print_bottom.rml (+1/-1)
account_check_writing/report/check_print_middle.rml (+1/-1)
account_check_writing/report/check_print_top.rml (+1/-1)
account_test/report/account_test.rml (+1/-1)
l10n_be/wizard/l10n_be_partner_vat_listing.rml (+1/-1)
l10n_be/wizard/l10n_be_vat_intra_print.rml (+1/-1)
l10n_fr_hr_payroll/report/fiche_paye.rml (+1/-1)
l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml (+1/-1)
l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml (+1/-1)
l10n_in_hr_payroll/report/report_payroll_advice.rml (+1/-1)
l10n_in_hr_payroll/report/report_payslip_details.rml (+1/-1)
mrp_operations/report/mrp_code_barcode.rml (+1/-1)
mrp_operations/report/mrp_wc_barcode.rml (+1/-1)
point_of_sale/report/pos_receipt.rml (+1/-1)
purchase/report/request_quotation.rml (+1/-1)
stock/report/picking.rml (+1/-1)
stock/report/stock_inventory_move.rml (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/7.0-opw-603987-ado
Reviewer Review Type Date Requested Status
Naresh(OpenERP) Pending
Review via email: mp+205716@code.launchpad.net

Description of the change

Hello,

rml report changes : removed pageSize parameter from rml <template> tag as the paper format size is taken from the "Report Footer Configuration" of company

Regards,
Amit

To post a comment you must log in.

Unmerged revisions

9827. By Amit Dodiya (OpenERP)

[FIX] rml reports: removed pageSize from rml <template> tag as the paper format size is taken from the Report Footer Configuration of company

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'account/report/account_aged_partner_balance.rml'
--- account/report/account_aged_partner_balance.rml 2013-06-14 21:36:02 +0000
+++ account/report/account_aged_partner_balance.rml 2014-02-11 08:58:18 +0000
@@ -1,6 +1,6 @@
1<?xml version="1.0"?>1<?xml version="1.0"?>
2<document filename="Aged Trial Balance.pdf">2<document filename="Aged Trial Balance.pdf">
3 <template pageSize="(842.0,595.0)" title="Aged Trial Balance" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">3 <template title="Aged Trial Balance" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
4 <pageTemplate id="first">4 <pageTemplate id="first">
5 <frame id="first" x1="28.0" y1="57.0" width="772" height="481"/>5 <frame id="first" x1="28.0" y1="57.0" width="772" height="481"/>
6 </pageTemplate>6 </pageTemplate>
77
=== modified file 'account/report/account_general_ledger_landscape.rml'
--- account/report/account_general_ledger_landscape.rml 2013-06-14 21:36:02 +0000
+++ account/report/account_general_ledger_landscape.rml 2014-02-11 08:58:18 +0000
@@ -1,6 +1,6 @@
1<?xml version="1.0"?>1<?xml version="1.0"?>
2<document filename="General Ledger.pdf">2<document filename="General Ledger.pdf">
3 <template pageSize="(842.0,595.0)" title="General Ledger" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">3 <template title="General Ledger" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
4 <pageTemplate id="first">4 <pageTemplate id="first">
5 <frame id="first" x1="28.0" y1="28.0" width="786" height="525"/>5 <frame id="first" x1="28.0" y1="28.0" width="786" height="525"/>
6 </pageTemplate>6 </pageTemplate>
77
=== modified file 'account_bank_statement_extensions/report/bank_statement_balance_report.rml'
--- account_bank_statement_extensions/report/bank_statement_balance_report.rml 2011-12-23 10:36:37 +0000
+++ account_bank_statement_extensions/report/bank_statement_balance_report.rml 2014-02-11 08:58:18 +0000
@@ -1,5 +1,5 @@
1<document filename="test.pdf">1<document filename="test.pdf">
2 <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">2 <template title="Test" author="Martin Simon" allowSplitting="20">
3 <pageTemplate id="first">3 <pageTemplate id="first">
4 <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>4 <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
5 </pageTemplate>5 </pageTemplate>
66
=== modified file 'account_check_writing/report/check_print_bottom.rml'
--- account_check_writing/report/check_print_bottom.rml 2012-11-29 22:26:45 +0000
+++ account_check_writing/report/check_print_bottom.rml 2014-02-11 08:58:18 +0000
@@ -1,6 +1,6 @@
1<?xml version="1.0"?>1<?xml version="1.0"?>
2<document filename="test.pdf">2<document filename="test.pdf">
3 <template pageSize="(595, 842)" title="Test" author="Martin Simon" allowSplitting="20">3 <template title="Test" author="Martin Simon" allowSplitting="20">
4 <pageTemplate id="first">4 <pageTemplate id="first">
5 <frame id="first" x1="13.0" y1="0.0" width="567" height="765"/>5 <frame id="first" x1="13.0" y1="0.0" width="567" height="765"/>
6 </pageTemplate>6 </pageTemplate>
77
=== modified file 'account_check_writing/report/check_print_middle.rml'
--- account_check_writing/report/check_print_middle.rml 2012-11-29 22:26:45 +0000
+++ account_check_writing/report/check_print_middle.rml 2014-02-11 08:58:18 +0000
@@ -1,6 +1,6 @@
1<?xml version="1.0"?>1<?xml version="1.0"?>
2<document filename="test.pdf">2<document filename="test.pdf">
3 <template pageSize="(595, 842)" title="Test" author="Martin Simon" allowSplitting="20">3 <template title="Test" author="Martin Simon" allowSplitting="20">
4 <!-- Letter 612.0, 792.0 A4 595, 842 -->4 <!-- Letter 612.0, 792.0 A4 595, 842 -->
5 <pageTemplate id="first">5 <pageTemplate id="first">
6 <frame id="first" x1="13.0" y1="0.0" width="567" height="785"/>6 <frame id="first" x1="13.0" y1="0.0" width="567" height="785"/>
77
=== modified file 'account_check_writing/report/check_print_top.rml'
--- account_check_writing/report/check_print_top.rml 2012-11-29 22:26:45 +0000
+++ account_check_writing/report/check_print_top.rml 2014-02-11 08:58:18 +0000
@@ -1,6 +1,6 @@
1<?xml version="1.0"?>1<?xml version="1.0"?>
2<document filename="test.pdf">2<document filename="test.pdf">
3 <template pageSize="(595, 842)" title="Test" author="Martin Simon" allowSplitting="20">3 <template title="Test" author="Martin Simon" allowSplitting="20">
4 <pageTemplate id="first">4 <pageTemplate id="first">
5 <frame id="first" x1="13.0" y1="0.0" width="567" height="841"/>5 <frame id="first" x1="13.0" y1="0.0" width="567" height="841"/>
6 </pageTemplate>6 </pageTemplate>
77
=== modified file 'account_test/report/account_test.rml'
--- account_test/report/account_test.rml 2012-10-23 11:13:01 +0000
+++ account_test/report/account_test.rml 2014-02-11 08:58:18 +0000
@@ -1,6 +1,6 @@
1<?xml version="1.0"?>1<?xml version="1.0"?>
2<document filename="test.pdf">2<document filename="test.pdf">
3 <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">3 <template title="Test" author="Martin Simon" allowSplitting="20">
4 <pageTemplate id="first">4 <pageTemplate id="first">
5 <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>5 <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
6 </pageTemplate>6 </pageTemplate>
77
=== modified file 'l10n_be/wizard/l10n_be_partner_vat_listing.rml'
--- l10n_be/wizard/l10n_be_partner_vat_listing.rml 2012-02-15 13:18:16 +0000
+++ l10n_be/wizard/l10n_be_partner_vat_listing.rml 2014-02-11 08:58:18 +0000
@@ -1,5 +1,5 @@
1<document filename="test.pdf">1<document filename="test.pdf">
2 <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">2 <template title="Test" author="Martin Simon" allowSplitting="20">
3 <pageTemplate id="first">3 <pageTemplate id="first">
4 <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>4 <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
5 </pageTemplate>5 </pageTemplate>
66
=== modified file 'l10n_be/wizard/l10n_be_vat_intra_print.rml'
--- l10n_be/wizard/l10n_be_vat_intra_print.rml 2013-12-19 14:55:28 +0000
+++ l10n_be/wizard/l10n_be_vat_intra_print.rml 2014-02-11 08:58:18 +0000
@@ -1,6 +1,6 @@
1<?xml version="1.0"?>1<?xml version="1.0"?>
2<document filename="Partner VAT Intra.pdf">2<document filename="Partner VAT Intra.pdf">
3 <template pageSize="(595.0,842.0)" title="Partner VAT Intra" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">3 <template title="Partner VAT Intra" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
4 <pageTemplate id="first">4 <pageTemplate id="first">
5 <frame id="first" x1="34.0" y1="28.0" width="530" height="786"/>5 <frame id="first" x1="34.0" y1="28.0" width="530" height="786"/>
6 </pageTemplate>6 </pageTemplate>
77
=== modified file 'l10n_fr_hr_payroll/report/fiche_paye.rml'
--- l10n_fr_hr_payroll/report/fiche_paye.rml 2013-03-06 15:22:16 +0000
+++ l10n_fr_hr_payroll/report/fiche_paye.rml 2014-02-11 08:58:18 +0000
@@ -1,6 +1,6 @@
1<?xml version="1.0"?>1<?xml version="1.0"?>
2<document filename="test.pdf">2<document filename="test.pdf">
3 <template pageSize="(595.0,842.0)" title="Fiche de paye" author="Yannick Buron" allowSplitting="20">3 <template title="Fiche de paye" author="Yannick Buron" allowSplitting="20">
4 <pageTemplate id="first">4 <pageTemplate id="first">
5 <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>5 <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
6 </pageTemplate>6 </pageTemplate>
77
=== modified file 'l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml'
--- l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml 2012-10-03 07:14:21 +0000
+++ l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml 2014-02-11 08:58:18 +0000
@@ -1,6 +1,6 @@
1<?xml version="1.0"?>1<?xml version="1.0"?>
2<document filename="yearly salary report.pdf">2<document filename="yearly salary report.pdf">
3 <template pageSize="(620.0,842.0)" title="Yearly Salary Report" author="OpenERP" allowSplitting="50">3 <template title="Yearly Salary Report" author="OpenERP" allowSplitting="50">
4 <pageTemplate id="first">4 <pageTemplate id="first">
5 <frame id="first" x1="28.0" y1="28.0" width="539" height="772"/>5 <frame id="first" x1="28.0" y1="28.0" width="539" height="772"/>
6 </pageTemplate>6 </pageTemplate>
77
=== modified file 'l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml'
--- l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml 2012-10-03 07:14:21 +0000
+++ l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml 2014-02-11 08:58:18 +0000
@@ -1,6 +1,6 @@
1<?xml version="1.0"?>1<?xml version="1.0"?>
2<document filename="hr_yearly_salary_detail_report.pdf">2<document filename="hr_yearly_salary_detail_report.pdf">
3 <template pageSize="(842.0,595.0)" title="hr_yearly_salary_detail_report" author="Openerp S.A." allowSplitting="20">3 <template title="hr_yearly_salary_detail_report" author="Openerp S.A." allowSplitting="20">
4 <pageTemplate id="first">4 <pageTemplate id="first">
5 <frame id="first" x1="28.0" y1="57.0" width="786" height="481"/>5 <frame id="first" x1="28.0" y1="57.0" width="786" height="481"/>
6 </pageTemplate>6 </pageTemplate>
77
=== modified file 'l10n_in_hr_payroll/report/report_payroll_advice.rml'
--- l10n_in_hr_payroll/report/report_payroll_advice.rml 2012-10-01 11:08:02 +0000
+++ l10n_in_hr_payroll/report/report_payroll_advice.rml 2014-02-11 08:58:18 +0000
@@ -1,6 +1,6 @@
1<?xml version="1.0"?>1<?xml version="1.0"?>
2<document filename="test.pdf">2<document filename="test.pdf">
3 <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">3 <template title="Test" author="Martin Simon" allowSplitting="20">
4 <pageTemplate id="first">4 <pageTemplate id="first">
5 <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>5 <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
6 </pageTemplate>6 </pageTemplate>
77
=== modified file 'l10n_in_hr_payroll/report/report_payslip_details.rml'
--- l10n_in_hr_payroll/report/report_payslip_details.rml 2012-10-02 14:45:47 +0000
+++ l10n_in_hr_payroll/report/report_payslip_details.rml 2014-02-11 08:58:18 +0000
@@ -1,6 +1,6 @@
1<?xml version="1.0"?>1<?xml version="1.0"?>
2<document filename="test.pdf">2<document filename="test.pdf">
3 <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">3 <template title="Test" author="Martin Simon" allowSplitting="20">
4 <pageTemplate id="first">4 <pageTemplate id="first">
5 <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>5 <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
6 </pageTemplate>6 </pageTemplate>
77
=== modified file 'mrp_operations/report/mrp_code_barcode.rml'
--- mrp_operations/report/mrp_code_barcode.rml 2011-01-14 00:11:01 +0000
+++ mrp_operations/report/mrp_code_barcode.rml 2014-02-11 08:58:18 +0000
@@ -1,6 +1,6 @@
1<?xml version="1.0"?>1<?xml version="1.0"?>
2<document filename="test.pdf">2<document filename="test.pdf">
3<template pageSize="(550,280)" title="Code Barcode" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">3<template title="Code Barcode" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
4<pageTemplate id="first">4<pageTemplate id="first">
5 <frame id="first" x1="0.1cm" y1="0.1cm" width="530" height="240"/>5 <frame id="first" x1="0.1cm" y1="0.1cm" width="530" height="240"/>
6</pageTemplate>6</pageTemplate>
77
=== modified file 'mrp_operations/report/mrp_wc_barcode.rml'
--- mrp_operations/report/mrp_wc_barcode.rml 2011-01-14 00:11:01 +0000
+++ mrp_operations/report/mrp_wc_barcode.rml 2014-02-11 08:58:18 +0000
@@ -1,6 +1,6 @@
1<?xml version="1.0"?>1<?xml version="1.0"?>
2<document filename="test.pdf">2<document filename="test.pdf">
3<template pageSize="(550,280)" title="WC" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">3<template title="WC" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
4<pageTemplate id="first">4<pageTemplate id="first">
5 <frame id="first" x1="0.1cm" y1="0.1cm" width="530" height="240"/>5 <frame id="first" x1="0.1cm" y1="0.1cm" width="530" height="240"/>
6</pageTemplate>6</pageTemplate>
77
=== modified file 'point_of_sale/report/pos_receipt.rml'
--- point_of_sale/report/pos_receipt.rml 2012-11-29 22:26:45 +0000
+++ point_of_sale/report/pos_receipt.rml 2014-02-11 08:58:18 +0000
@@ -1,6 +1,6 @@
1<?xml version="1.0"?>1<?xml version="1.0"?>
2<document filename="test.pdf">2<document filename="test.pdf">
3 <template pageSize="(204.0,842.0)" title="Receipt" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">3 <template title="Receipt" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
4 <pageTemplate id="first">4 <pageTemplate id="first">
5 <frame id="first" x1="0.0" y1="0.0" width="204" height="800"/>5 <frame id="first" x1="0.0" y1="0.0" width="204" height="800"/>
6 </pageTemplate>6 </pageTemplate>
77
=== modified file 'purchase/report/request_quotation.rml'
--- purchase/report/request_quotation.rml 2013-05-28 08:19:55 +0000
+++ purchase/report/request_quotation.rml 2014-02-11 08:58:18 +0000
@@ -1,6 +1,6 @@
1<?xml version="1.0"?>1<?xml version="1.0"?>
2<document filename="requestforquotation.pdf">2<document filename="requestforquotation.pdf">
3 <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">3 <template title="Test" author="Martin Simon" allowSplitting="20">
4 <pageTemplate id="first">4 <pageTemplate id="first">
5 <frame id="first" x1="23.0" y1="43.0" width="530" height="799"/>5 <frame id="first" x1="23.0" y1="43.0" width="530" height="799"/>
6 </pageTemplate>6 </pageTemplate>
77
=== modified file 'stock/report/picking.rml'
--- stock/report/picking.rml 2013-06-19 08:59:39 +0000
+++ stock/report/picking.rml 2014-02-11 08:58:18 +0000
@@ -1,6 +1,6 @@
1<?xml version="1.0"?>1<?xml version="1.0"?>
2<document filename="Packing List.pdf">2<document filename="Packing List.pdf">
3 <template pageSize="(595.0,842.0)" title="Packing List" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">3 <template title="Packing List" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
4 <pageTemplate id="first">4 <pageTemplate id="first">
5 <frame id="first" x1="0.0" y1="57.0" width="538" height="728"/>5 <frame id="first" x1="0.0" y1="57.0" width="538" height="728"/>
6 </pageTemplate>6 </pageTemplate>
77
=== modified file 'stock/report/stock_inventory_move.rml'
--- stock/report/stock_inventory_move.rml 2012-12-09 10:55:27 +0000
+++ stock/report/stock_inventory_move.rml 2014-02-11 08:58:18 +0000
@@ -1,6 +1,6 @@
1<?xml version="1.0"?>1<?xml version="1.0"?>
2<document filename="Stock Inventory.pdf">2<document filename="Stock Inventory.pdf">
3 <template pageSize="(595.0,842.0)" title="Stock Inventory" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">3 <template title="Stock Inventory" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
4 <pageTemplate id="first">4 <pageTemplate id="first">
5 <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>5 <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
6 </pageTemplate>6 </pageTemplate>