Merge lp:~openerp-dev/openobject-addons/trunk-bug-1185039-pooja into lp:openobject-addons

Proposed by Nimesh Contractor(Open ERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-1185039-pooja
Merge into: lp:openobject-addons
Diff against target: 60 lines (+7/-8)
3 files modified
account_asset/report/account_asset_report.py (+3/-4)
base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py (+2/-2)
l10n_lu/wizard/pdf_ext.py (+2/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-1185039-pooja
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+166444@code.launchpad.net

Description of the change

Hello,

Fix indentation problem in asset_asset_report.py, l10n_lu/wizard/pdf_ext.py and base_report_designer/openerp_sxw2rml.py.

Thank You.

To post a comment you must log in.

Unmerged revisions

8730. By Pooja Zankhariya(OpenERP)

[FIX] indentation problem.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_asset/report/account_asset_report.py'
2--- account_asset/report/account_asset_report.py 2013-04-15 10:23:49 +0000
3+++ account_asset/report/account_asset_report.py 2013-05-30 06:29:28 +0000
4@@ -44,9 +44,9 @@
5 }
6
7 def init(self, cr):
8- tools.drop_view_if_exists(cr, 'asset_asset_report')
9- cr.execute("""
10- create or replace view asset_asset_report as (
11+ tools.drop_view_if_exists(cr, 'asset_asset_report')
12+ cr.execute("""
13+ create or replace view asset_asset_report as (
14 select
15 min(dl.id) as id,
16 dl.name as name,
17@@ -81,6 +81,5 @@
18 a.purchase_date, dl.move_check, a.state, a.category_id, a.partner_id, a.company_id,
19 a.purchase_value, a.id, a.salvage_value
20 )""")
21-
22
23 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
24
25=== modified file 'base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py'
26--- base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py 2013-05-14 10:31:13 +0000
27+++ base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py 2013-05-30 06:29:28 +0000
28@@ -140,7 +140,7 @@
29 if self.styles_dom.getElementsByTagName("style:page-master").__len__()<>0:
30 self.page_master = self.styles_dom.getElementsByTagName("style:page-master")[0]
31 if self.styles_dom.getElementsByTagName("style:page-layout").__len__()<>0 :
32- self.page_master = self.styles_dom.getElementsByTagName("style:page-layout")[0]
33+ self.page_master = self.styles_dom.getElementsByTagName("style:page-layout")[0]
34 self.document = self.content_dom.getElementsByTagName("office:document-content")[0]
35
36 def buildStylePropertiesDict(self):
37@@ -353,7 +353,7 @@
38 z = zipfile.ZipFile(fname,"r")
39 mimetype = z.read('mimetype')
40 if mimetype.split('/')[-1] == 'vnd.oasis.opendocument.text' :
41- xsl_file = 'normalized_odt2rml.xsl'
42+ xsl_file = 'normalized_odt2rml.xsl'
43 xsl = file(os.path.join(os.getcwd(), os.path.dirname(sys.argv[0]), xsl_file)).read()
44 result = sxw2rml(f, xsl, output=opt.output, save_pict=False)
45
46
47=== modified file 'l10n_lu/wizard/pdf_ext.py'
48--- l10n_lu/wizard/pdf_ext.py 2012-12-06 14:56:32 +0000
49+++ l10n_lu/wizard/pdf_ext.py 2013-05-30 06:29:28 +0000
50@@ -83,8 +83,8 @@
51 def write_fields(out, fields):
52 out.write(HEAD)
53 for key in fields:
54- value = fields[key]
55- write_field(out, key, value)
56+ value = fields[key]
57+ write_field(out, key, value)
58 out.write(TAIL)
59
60 def extract_keys_from_pdf(filename):

Subscribers

People subscribed via source and target branches

to all changes: