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
=== modified file 'account_asset/report/account_asset_report.py'
--- account_asset/report/account_asset_report.py 2013-04-15 10:23:49 +0000
+++ account_asset/report/account_asset_report.py 2013-05-30 06:29:28 +0000
@@ -44,9 +44,9 @@
44 }44 }
45 45
46 def init(self, cr):46 def init(self, cr):
47 tools.drop_view_if_exists(cr, 'asset_asset_report')47 tools.drop_view_if_exists(cr, 'asset_asset_report')
48 cr.execute("""48 cr.execute("""
49 create or replace view asset_asset_report as (49 create or replace view asset_asset_report as (
50 select 50 select
51 min(dl.id) as id,51 min(dl.id) as id,
52 dl.name as name,52 dl.name as name,
@@ -81,6 +81,5 @@
81 a.purchase_date, dl.move_check, a.state, a.category_id, a.partner_id, a.company_id,81 a.purchase_date, dl.move_check, a.state, a.category_id, a.partner_id, a.company_id,
82 a.purchase_value, a.id, a.salvage_value82 a.purchase_value, a.id, a.salvage_value
83 )""")83 )""")
84
8584
86# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:85# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
8786
=== modified file 'base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py'
--- base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py 2013-05-14 10:31:13 +0000
+++ base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py 2013-05-30 06:29:28 +0000
@@ -140,7 +140,7 @@
140 if self.styles_dom.getElementsByTagName("style:page-master").__len__()<>0:140 if self.styles_dom.getElementsByTagName("style:page-master").__len__()<>0:
141 self.page_master = self.styles_dom.getElementsByTagName("style:page-master")[0]141 self.page_master = self.styles_dom.getElementsByTagName("style:page-master")[0]
142 if self.styles_dom.getElementsByTagName("style:page-layout").__len__()<>0 :142 if self.styles_dom.getElementsByTagName("style:page-layout").__len__()<>0 :
143 self.page_master = self.styles_dom.getElementsByTagName("style:page-layout")[0]143 self.page_master = self.styles_dom.getElementsByTagName("style:page-layout")[0]
144 self.document = self.content_dom.getElementsByTagName("office:document-content")[0]144 self.document = self.content_dom.getElementsByTagName("office:document-content")[0]
145145
146 def buildStylePropertiesDict(self):146 def buildStylePropertiesDict(self):
@@ -353,7 +353,7 @@
353 z = zipfile.ZipFile(fname,"r")353 z = zipfile.ZipFile(fname,"r")
354 mimetype = z.read('mimetype')354 mimetype = z.read('mimetype')
355 if mimetype.split('/')[-1] == 'vnd.oasis.opendocument.text' :355 if mimetype.split('/')[-1] == 'vnd.oasis.opendocument.text' :
356 xsl_file = 'normalized_odt2rml.xsl'356 xsl_file = 'normalized_odt2rml.xsl'
357 xsl = file(os.path.join(os.getcwd(), os.path.dirname(sys.argv[0]), xsl_file)).read()357 xsl = file(os.path.join(os.getcwd(), os.path.dirname(sys.argv[0]), xsl_file)).read()
358 result = sxw2rml(f, xsl, output=opt.output, save_pict=False)358 result = sxw2rml(f, xsl, output=opt.output, save_pict=False)
359359
360360
=== modified file 'l10n_lu/wizard/pdf_ext.py'
--- l10n_lu/wizard/pdf_ext.py 2012-12-06 14:56:32 +0000
+++ l10n_lu/wizard/pdf_ext.py 2013-05-30 06:29:28 +0000
@@ -83,8 +83,8 @@
83def write_fields(out, fields):83def write_fields(out, fields):
84 out.write(HEAD)84 out.write(HEAD)
85 for key in fields:85 for key in fields:
86 value = fields[key]86 value = fields[key]
87 write_field(out, key, value)87 write_field(out, key, value)
88 out.write(TAIL)88 out.write(TAIL)
8989
90def extract_keys_from_pdf(filename):90def extract_keys_from_pdf(filename):

Subscribers

People subscribed via source and target branches

to all changes: