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
1=== modified file 'account/report/account_aged_partner_balance.rml'
2--- account/report/account_aged_partner_balance.rml 2013-06-14 21:36:02 +0000
3+++ account/report/account_aged_partner_balance.rml 2014-02-11 08:58:18 +0000
4@@ -1,6 +1,6 @@
5 <?xml version="1.0"?>
6 <document filename="Aged Trial Balance.pdf">
7- <template pageSize="(842.0,595.0)" title="Aged Trial Balance" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
8+ <template title="Aged Trial Balance" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
9 <pageTemplate id="first">
10 <frame id="first" x1="28.0" y1="57.0" width="772" height="481"/>
11 </pageTemplate>
12
13=== modified file 'account/report/account_general_ledger_landscape.rml'
14--- account/report/account_general_ledger_landscape.rml 2013-06-14 21:36:02 +0000
15+++ account/report/account_general_ledger_landscape.rml 2014-02-11 08:58:18 +0000
16@@ -1,6 +1,6 @@
17 <?xml version="1.0"?>
18 <document filename="General Ledger.pdf">
19- <template pageSize="(842.0,595.0)" title="General Ledger" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
20+ <template title="General Ledger" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
21 <pageTemplate id="first">
22 <frame id="first" x1="28.0" y1="28.0" width="786" height="525"/>
23 </pageTemplate>
24
25=== modified file 'account_bank_statement_extensions/report/bank_statement_balance_report.rml'
26--- account_bank_statement_extensions/report/bank_statement_balance_report.rml 2011-12-23 10:36:37 +0000
27+++ account_bank_statement_extensions/report/bank_statement_balance_report.rml 2014-02-11 08:58:18 +0000
28@@ -1,5 +1,5 @@
29 <document filename="test.pdf">
30- <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
31+ <template title="Test" author="Martin Simon" allowSplitting="20">
32 <pageTemplate id="first">
33 <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
34 </pageTemplate>
35
36=== modified file 'account_check_writing/report/check_print_bottom.rml'
37--- account_check_writing/report/check_print_bottom.rml 2012-11-29 22:26:45 +0000
38+++ account_check_writing/report/check_print_bottom.rml 2014-02-11 08:58:18 +0000
39@@ -1,6 +1,6 @@
40 <?xml version="1.0"?>
41 <document filename="test.pdf">
42- <template pageSize="(595, 842)" title="Test" author="Martin Simon" allowSplitting="20">
43+ <template title="Test" author="Martin Simon" allowSplitting="20">
44 <pageTemplate id="first">
45 <frame id="first" x1="13.0" y1="0.0" width="567" height="765"/>
46 </pageTemplate>
47
48=== modified file 'account_check_writing/report/check_print_middle.rml'
49--- account_check_writing/report/check_print_middle.rml 2012-11-29 22:26:45 +0000
50+++ account_check_writing/report/check_print_middle.rml 2014-02-11 08:58:18 +0000
51@@ -1,6 +1,6 @@
52 <?xml version="1.0"?>
53 <document filename="test.pdf">
54- <template pageSize="(595, 842)" title="Test" author="Martin Simon" allowSplitting="20">
55+ <template title="Test" author="Martin Simon" allowSplitting="20">
56 <!-- Letter 612.0, 792.0 A4 595, 842 -->
57 <pageTemplate id="first">
58 <frame id="first" x1="13.0" y1="0.0" width="567" height="785"/>
59
60=== modified file 'account_check_writing/report/check_print_top.rml'
61--- account_check_writing/report/check_print_top.rml 2012-11-29 22:26:45 +0000
62+++ account_check_writing/report/check_print_top.rml 2014-02-11 08:58:18 +0000
63@@ -1,6 +1,6 @@
64 <?xml version="1.0"?>
65 <document filename="test.pdf">
66- <template pageSize="(595, 842)" title="Test" author="Martin Simon" allowSplitting="20">
67+ <template title="Test" author="Martin Simon" allowSplitting="20">
68 <pageTemplate id="first">
69 <frame id="first" x1="13.0" y1="0.0" width="567" height="841"/>
70 </pageTemplate>
71
72=== modified file 'account_test/report/account_test.rml'
73--- account_test/report/account_test.rml 2012-10-23 11:13:01 +0000
74+++ account_test/report/account_test.rml 2014-02-11 08:58:18 +0000
75@@ -1,6 +1,6 @@
76 <?xml version="1.0"?>
77 <document filename="test.pdf">
78- <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
79+ <template title="Test" author="Martin Simon" allowSplitting="20">
80 <pageTemplate id="first">
81 <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
82 </pageTemplate>
83
84=== modified file 'l10n_be/wizard/l10n_be_partner_vat_listing.rml'
85--- l10n_be/wizard/l10n_be_partner_vat_listing.rml 2012-02-15 13:18:16 +0000
86+++ l10n_be/wizard/l10n_be_partner_vat_listing.rml 2014-02-11 08:58:18 +0000
87@@ -1,5 +1,5 @@
88 <document filename="test.pdf">
89- <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
90+ <template title="Test" author="Martin Simon" allowSplitting="20">
91 <pageTemplate id="first">
92 <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
93 </pageTemplate>
94
95=== modified file 'l10n_be/wizard/l10n_be_vat_intra_print.rml'
96--- l10n_be/wizard/l10n_be_vat_intra_print.rml 2013-12-19 14:55:28 +0000
97+++ l10n_be/wizard/l10n_be_vat_intra_print.rml 2014-02-11 08:58:18 +0000
98@@ -1,6 +1,6 @@
99 <?xml version="1.0"?>
100 <document filename="Partner VAT Intra.pdf">
101- <template pageSize="(595.0,842.0)" title="Partner VAT Intra" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
102+ <template title="Partner VAT Intra" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
103 <pageTemplate id="first">
104 <frame id="first" x1="34.0" y1="28.0" width="530" height="786"/>
105 </pageTemplate>
106
107=== modified file 'l10n_fr_hr_payroll/report/fiche_paye.rml'
108--- l10n_fr_hr_payroll/report/fiche_paye.rml 2013-03-06 15:22:16 +0000
109+++ l10n_fr_hr_payroll/report/fiche_paye.rml 2014-02-11 08:58:18 +0000
110@@ -1,6 +1,6 @@
111 <?xml version="1.0"?>
112 <document filename="test.pdf">
113- <template pageSize="(595.0,842.0)" title="Fiche de paye" author="Yannick Buron" allowSplitting="20">
114+ <template title="Fiche de paye" author="Yannick Buron" allowSplitting="20">
115 <pageTemplate id="first">
116 <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
117 </pageTemplate>
118
119=== modified file 'l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml'
120--- l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml 2012-10-03 07:14:21 +0000
121+++ l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml 2014-02-11 08:58:18 +0000
122@@ -1,6 +1,6 @@
123 <?xml version="1.0"?>
124 <document filename="yearly salary report.pdf">
125- <template pageSize="(620.0,842.0)" title="Yearly Salary Report" author="OpenERP" allowSplitting="50">
126+ <template title="Yearly Salary Report" author="OpenERP" allowSplitting="50">
127 <pageTemplate id="first">
128 <frame id="first" x1="28.0" y1="28.0" width="539" height="772"/>
129 </pageTemplate>
130
131=== modified file 'l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml'
132--- l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml 2012-10-03 07:14:21 +0000
133+++ l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml 2014-02-11 08:58:18 +0000
134@@ -1,6 +1,6 @@
135 <?xml version="1.0"?>
136 <document filename="hr_yearly_salary_detail_report.pdf">
137- <template pageSize="(842.0,595.0)" title="hr_yearly_salary_detail_report" author="Openerp S.A." allowSplitting="20">
138+ <template title="hr_yearly_salary_detail_report" author="Openerp S.A." allowSplitting="20">
139 <pageTemplate id="first">
140 <frame id="first" x1="28.0" y1="57.0" width="786" height="481"/>
141 </pageTemplate>
142
143=== modified file 'l10n_in_hr_payroll/report/report_payroll_advice.rml'
144--- l10n_in_hr_payroll/report/report_payroll_advice.rml 2012-10-01 11:08:02 +0000
145+++ l10n_in_hr_payroll/report/report_payroll_advice.rml 2014-02-11 08:58:18 +0000
146@@ -1,6 +1,6 @@
147 <?xml version="1.0"?>
148 <document filename="test.pdf">
149- <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
150+ <template title="Test" author="Martin Simon" allowSplitting="20">
151 <pageTemplate id="first">
152 <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
153 </pageTemplate>
154
155=== modified file 'l10n_in_hr_payroll/report/report_payslip_details.rml'
156--- l10n_in_hr_payroll/report/report_payslip_details.rml 2012-10-02 14:45:47 +0000
157+++ l10n_in_hr_payroll/report/report_payslip_details.rml 2014-02-11 08:58:18 +0000
158@@ -1,6 +1,6 @@
159 <?xml version="1.0"?>
160 <document filename="test.pdf">
161- <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
162+ <template title="Test" author="Martin Simon" allowSplitting="20">
163 <pageTemplate id="first">
164 <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
165 </pageTemplate>
166
167=== modified file 'mrp_operations/report/mrp_code_barcode.rml'
168--- mrp_operations/report/mrp_code_barcode.rml 2011-01-14 00:11:01 +0000
169+++ mrp_operations/report/mrp_code_barcode.rml 2014-02-11 08:58:18 +0000
170@@ -1,6 +1,6 @@
171 <?xml version="1.0"?>
172 <document filename="test.pdf">
173-<template pageSize="(550,280)" title="Code Barcode" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
174+<template title="Code Barcode" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
175 <pageTemplate id="first">
176 <frame id="first" x1="0.1cm" y1="0.1cm" width="530" height="240"/>
177 </pageTemplate>
178
179=== modified file 'mrp_operations/report/mrp_wc_barcode.rml'
180--- mrp_operations/report/mrp_wc_barcode.rml 2011-01-14 00:11:01 +0000
181+++ mrp_operations/report/mrp_wc_barcode.rml 2014-02-11 08:58:18 +0000
182@@ -1,6 +1,6 @@
183 <?xml version="1.0"?>
184 <document filename="test.pdf">
185-<template pageSize="(550,280)" title="WC" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
186+<template title="WC" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
187 <pageTemplate id="first">
188 <frame id="first" x1="0.1cm" y1="0.1cm" width="530" height="240"/>
189 </pageTemplate>
190
191=== modified file 'point_of_sale/report/pos_receipt.rml'
192--- point_of_sale/report/pos_receipt.rml 2012-11-29 22:26:45 +0000
193+++ point_of_sale/report/pos_receipt.rml 2014-02-11 08:58:18 +0000
194@@ -1,6 +1,6 @@
195 <?xml version="1.0"?>
196 <document filename="test.pdf">
197- <template pageSize="(204.0,842.0)" title="Receipt" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
198+ <template title="Receipt" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
199 <pageTemplate id="first">
200 <frame id="first" x1="0.0" y1="0.0" width="204" height="800"/>
201 </pageTemplate>
202
203=== modified file 'purchase/report/request_quotation.rml'
204--- purchase/report/request_quotation.rml 2013-05-28 08:19:55 +0000
205+++ purchase/report/request_quotation.rml 2014-02-11 08:58:18 +0000
206@@ -1,6 +1,6 @@
207 <?xml version="1.0"?>
208 <document filename="requestforquotation.pdf">
209- <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
210+ <template title="Test" author="Martin Simon" allowSplitting="20">
211 <pageTemplate id="first">
212 <frame id="first" x1="23.0" y1="43.0" width="530" height="799"/>
213 </pageTemplate>
214
215=== modified file 'stock/report/picking.rml'
216--- stock/report/picking.rml 2013-06-19 08:59:39 +0000
217+++ stock/report/picking.rml 2014-02-11 08:58:18 +0000
218@@ -1,6 +1,6 @@
219 <?xml version="1.0"?>
220 <document filename="Packing List.pdf">
221- <template pageSize="(595.0,842.0)" title="Packing List" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
222+ <template title="Packing List" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
223 <pageTemplate id="first">
224 <frame id="first" x1="0.0" y1="57.0" width="538" height="728"/>
225 </pageTemplate>
226
227=== modified file 'stock/report/stock_inventory_move.rml'
228--- stock/report/stock_inventory_move.rml 2012-12-09 10:55:27 +0000
229+++ stock/report/stock_inventory_move.rml 2014-02-11 08:58:18 +0000
230@@ -1,6 +1,6 @@
231 <?xml version="1.0"?>
232 <document filename="Stock Inventory.pdf">
233- <template pageSize="(595.0,842.0)" title="Stock Inventory" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
234+ <template title="Stock Inventory" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
235 <pageTemplate id="first">
236 <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
237 </pageTemplate>