openerp-dev-web team mailing list archive

[xrg <xrg@xxxxxxxxx>]

xrg has proposed merging lp:~openerp-dev/openobject-addons/6.0-bug-750246-xrg into lp:openobject-addons/6.0.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #750246 in OpenERP Addons: "all: Fix execute permission and shebang at files"
  https://bugs.launchpad.net/openobject-addons/+bug/750246

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-bug-750246-xrg/+merge/56156
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-bug-750246-xrg/+merge/56156
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/6.0-bug-750246-xrg.

=== modified file 'account/report/account_tax_code.py'
--- account/report/account_tax_code.py	2011-01-14 00:11:01 +0000
+++ account/report/account_tax_code.py	2011-04-04 13:11:26 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ##############################################################################
 #

=== modified file 'account/wizard/account_change_currency.py'
--- account/wizard/account_change_currency.py	2011-01-14 00:11:01 +0000
+++ account/wizard/account_change_currency.py	2011-04-04 13:11:26 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #

=== modified file 'base_report_designer/plugin/openerp_report_designer/bin/OOo_run.sh' (properties changed: -x to +x)
=== modified file 'document/odt2txt.py' (properties changed: -x to +x)
=== modified file 'document/test_cindex.py' (properties changed: -x to +x)
=== modified file 'document_ftp/ftpserver/ftpserver.py' (properties changed: -x to +x)
=== modified file 'document_webdav/test_davclient.py' (properties changed: -x to +x)
=== modified file 'email_template/html2text.py' (properties changed: -x to +x)
--- email_template/html2text.py	2011-01-14 00:11:01 +0000
+++ email_template/html2text.py	2011-04-04 13:11:26 +0000
@@ -444,11 +444,11 @@
             encoding = 'utf8'
             if len(sys.argv) > 2:
                 encoding = sys.argv[2]
-	    f = open(arg, 'r')
-	    try:
-		    data = f.read().decode(encoding)
-	    finally:
-		    f.close()
+            f = open(arg, 'r')
+            try:
+                    data = f.read().decode(encoding)
+            finally:
+                    f.close()
     else:
         data = sys.stdin.read().decode('utf8')
     wrapwrite(html2text(data, baseurl))

=== modified file 'fetchmail/__init__.py'
--- fetchmail/__init__.py	2011-01-14 00:11:01 +0000
+++ fetchmail/__init__.py	2011-04-04 13:11:26 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 ##############################################################################
 #

=== modified file 'fetchmail/__openerp__.py'
--- fetchmail/__openerp__.py	2011-01-17 10:26:16 +0000
+++ fetchmail/__openerp__.py	2011-04-04 13:11:26 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 ##############################################################################
 #

=== modified file 'hr_payroll/report/__init__.py'
--- hr_payroll/report/__init__.py	2011-01-14 00:11:01 +0000
+++ hr_payroll/report/__init__.py	2011-04-04 13:11:26 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 ##############################################################################

=== modified file 'hr_payroll/report/report_emp_salary_structure.py'
--- hr_payroll/report/report_emp_salary_structure.py	2011-01-14 00:11:01 +0000
+++ hr_payroll/report/report_emp_salary_structure.py	2011-04-04 13:11:26 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 ##############################################################################
@@ -89,10 +88,3 @@
 report_sxw.report_sxw('report.salary.structure', 'hr.employee', 'hr_payroll/report/report_emp_salary_structure.rml', parser=salary_structure_report)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
-
-
-
-
-
-

=== modified file 'hr_payroll/report/report_employees_detail.py'
--- hr_payroll/report/report_employees_detail.py	2011-01-14 00:11:01 +0000
+++ hr_payroll/report/report_employees_detail.py	2011-04-04 13:11:26 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 ##############################################################################
@@ -249,4 +248,3 @@
 report_sxw.report_sxw('report.employees.salary', 'hr.payslip', 'hr_payroll/report/report_employees_detail.rml', parser=employees_salary_report,header='internal landscape')
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

=== modified file 'hr_payroll/report/report_payroll_advice.py'
--- hr_payroll/report/report_payroll_advice.py	2011-01-14 00:11:01 +0000
+++ hr_payroll/report/report_payroll_advice.py	2011-04-04 13:11:26 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 ##############################################################################
@@ -78,4 +77,4 @@
 report_sxw.report_sxw('report.payroll.advice', 'hr.payroll.advice', 'hr_payroll/report/report_payroll_advice.rml', parser=payroll_advice_report)
 
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'hr_payroll/report/report_payroll_register.py'
--- hr_payroll/report/report_payroll_register.py	2011-01-14 00:11:01 +0000
+++ hr_payroll/report/report_payroll_register.py	2011-04-04 13:11:26 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 ##############################################################################
@@ -106,4 +105,4 @@
     parser=report_payroll_register
 )
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'hr_payroll/report/report_payslip.py'
--- hr_payroll/report/report_payslip.py	2011-01-14 00:11:01 +0000
+++ hr_payroll/report/report_payslip.py	2011-04-04 13:11:26 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 ##############################################################################

=== modified file 'hr_payroll/report/report_year_salary.py'
--- hr_payroll/report/report_year_salary.py	2011-01-14 00:11:01 +0000
+++ hr_payroll/report/report_year_salary.py	2011-04-04 13:11:26 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 ##############################################################################
@@ -119,4 +118,3 @@
 report_sxw.report_sxw('report.year.salary', 'hr.payslip', 'hr_payroll/report/report_year_report.rml', parser=year_salary_report,header='internal landscape')
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

=== modified file 'l10n_ch/readme.txt' (properties changed: +x to -x)
=== modified file 'l10n_ch/sample/README' (properties changed: +x to -x)
=== modified file 'l10n_ch/sample/sample.dta' (properties changed: +x to -x)
=== modified file 'l10n_ch/sample/sample.v11' (properties changed: +x to -x)
=== modified file 'l10n_ch/sample/zvr_besrtechdok_fr.pdf' (properties changed: +x to -x)
=== modified file 'l10n_de/i18n/pt_BR.po' (properties changed: +x to -x)
=== modified file 'l10n_de/i18n/zh_CN.po' (properties changed: +x to -x)
=== modified file 'l10n_de/i18n/zh_TW.po' (properties changed: +x to -x)
=== modified file 'mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py' (properties changed: -x to +x)
=== modified file 'sale_layout/i18n/fr.po' (properties changed: +x to -x)
=== modified file 'thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js' (properties changed: +x to -x)
=== modified file 'wiki/web/widgets/rss/feedparser.py' (properties changed: -x to +x)