Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/6.0-bug-750246-xrg into lp:openobject-addons/6.0

  1. 6.0-bug-750246-xrg
  2. Merge into 6.0
Proposed by xrg
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/6.0-bug-750246-xrg
Merge into: lp:openobject-addons/6.0
Diff against target: 172 lines (+7/-27)
12 files modified
account/report/account_tax_code.py (+0/-1)
account/wizard/account_change_currency.py (+0/-1)
email_template/html2text.py (+5/-5)
fetchmail/__init__.py (+0/-1)
fetchmail/__openerp__.py (+0/-1)
hr_payroll/report/__init__.py (+0/-1)
hr_payroll/report/report_emp_salary_structure.py (+0/-8)
hr_payroll/report/report_employees_detail.py (+0/-2)
hr_payroll/report/report_payroll_advice.py (+1/-2)
hr_payroll/report/report_payroll_register.py (+1/-2)
hr_payroll/report/report_payslip.py (+0/-1)
hr_payroll/report/report_year_salary.py (+0/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.0-bug-750246-xrg
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+56156@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/report/account_tax_code.py'
2--- account/report/account_tax_code.py 2011-01-14 00:11:01 +0000
3+++ account/report/account_tax_code.py 2011-04-04 13:13:30 +0000
4@@ -1,4 +1,3 @@
5-#!/usr/bin/env python
6 # -*- coding: utf-8 -*-
7 ##############################################################################
8 #
9
10=== modified file 'account/wizard/account_change_currency.py'
11--- account/wizard/account_change_currency.py 2011-01-14 00:11:01 +0000
12+++ account/wizard/account_change_currency.py 2011-04-04 13:13:30 +0000
13@@ -1,4 +1,3 @@
14-#!/usr/bin/env python
15 # -*- encoding: utf-8 -*-
16 ##############################################################################
17 #
18
19=== modified file 'base_report_designer/plugin/openerp_report_designer/bin/OOo_run.sh' (properties changed: -x to +x)
20=== modified file 'document/odt2txt.py' (properties changed: -x to +x)
21=== modified file 'document/test_cindex.py' (properties changed: -x to +x)
22=== modified file 'document_ftp/ftpserver/ftpserver.py' (properties changed: -x to +x)
23=== modified file 'document_webdav/test_davclient.py' (properties changed: -x to +x)
24=== modified file 'email_template/html2text.py' (properties changed: -x to +x)
25--- email_template/html2text.py 2011-01-14 00:11:01 +0000
26+++ email_template/html2text.py 2011-04-04 13:13:30 +0000
27@@ -444,11 +444,11 @@
28 encoding = 'utf8'
29 if len(sys.argv) > 2:
30 encoding = sys.argv[2]
31- f = open(arg, 'r')
32- try:
33- data = f.read().decode(encoding)
34- finally:
35- f.close()
36+ f = open(arg, 'r')
37+ try:
38+ data = f.read().decode(encoding)
39+ finally:
40+ f.close()
41 else:
42 data = sys.stdin.read().decode('utf8')
43 wrapwrite(html2text(data, baseurl))
44
45=== modified file 'fetchmail/__init__.py'
46--- fetchmail/__init__.py 2011-01-14 00:11:01 +0000
47+++ fetchmail/__init__.py 2011-04-04 13:13:30 +0000
48@@ -1,4 +1,3 @@
49-#!/usr/bin/env python
50 #-*- coding:utf-8 -*-
51 ##############################################################################
52 #
53
54=== modified file 'fetchmail/__openerp__.py'
55--- fetchmail/__openerp__.py 2011-01-17 10:26:16 +0000
56+++ fetchmail/__openerp__.py 2011-04-04 13:13:30 +0000
57@@ -1,4 +1,3 @@
58-#!/usr/bin/env python
59 #-*- coding:utf-8 -*-
60 ##############################################################################
61 #
62
63=== modified file 'hr_payroll/report/__init__.py'
64--- hr_payroll/report/__init__.py 2011-01-14 00:11:01 +0000
65+++ hr_payroll/report/__init__.py 2011-04-04 13:13:30 +0000
66@@ -1,4 +1,3 @@
67-#!/usr/bin/env python
68 #-*- coding:utf-8 -*-
69
70 ##############################################################################
71
72=== modified file 'hr_payroll/report/report_emp_salary_structure.py'
73--- hr_payroll/report/report_emp_salary_structure.py 2011-01-14 00:11:01 +0000
74+++ hr_payroll/report/report_emp_salary_structure.py 2011-04-04 13:13:30 +0000
75@@ -1,4 +1,3 @@
76-#!/usr/bin/env python
77 #-*- coding:utf-8 -*-
78
79 ##############################################################################
80@@ -89,10 +88,3 @@
81 report_sxw.report_sxw('report.salary.structure', 'hr.employee', 'hr_payroll/report/report_emp_salary_structure.rml', parser=salary_structure_report)
82
83 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
84-
85-
86-
87-
88-
89-
90-
91
92=== modified file 'hr_payroll/report/report_employees_detail.py'
93--- hr_payroll/report/report_employees_detail.py 2011-01-14 00:11:01 +0000
94+++ hr_payroll/report/report_employees_detail.py 2011-04-04 13:13:30 +0000
95@@ -1,4 +1,3 @@
96-#!/usr/bin/env python
97 #-*- coding:utf-8 -*-
98
99 ##############################################################################
100@@ -249,4 +248,3 @@
101 report_sxw.report_sxw('report.employees.salary', 'hr.payslip', 'hr_payroll/report/report_employees_detail.rml', parser=employees_salary_report,header='internal landscape')
102
103 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
104-
105
106=== modified file 'hr_payroll/report/report_payroll_advice.py'
107--- hr_payroll/report/report_payroll_advice.py 2011-01-14 00:11:01 +0000
108+++ hr_payroll/report/report_payroll_advice.py 2011-04-04 13:13:30 +0000
109@@ -1,4 +1,3 @@
110-#!/usr/bin/env python
111 #-*- coding:utf-8 -*-
112
113 ##############################################################################
114@@ -78,4 +77,4 @@
115 report_sxw.report_sxw('report.payroll.advice', 'hr.payroll.advice', 'hr_payroll/report/report_payroll_advice.rml', parser=payroll_advice_report)
116
117
118-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
119\ No newline at end of file
120+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
121
122=== modified file 'hr_payroll/report/report_payroll_register.py'
123--- hr_payroll/report/report_payroll_register.py 2011-01-14 00:11:01 +0000
124+++ hr_payroll/report/report_payroll_register.py 2011-04-04 13:13:30 +0000
125@@ -1,4 +1,3 @@
126-#!/usr/bin/env python
127 #-*- coding:utf-8 -*-
128
129 ##############################################################################
130@@ -106,4 +105,4 @@
131 parser=report_payroll_register
132 )
133
134-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
135\ No newline at end of file
136+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
137
138=== modified file 'hr_payroll/report/report_payslip.py'
139--- hr_payroll/report/report_payslip.py 2011-01-14 00:11:01 +0000
140+++ hr_payroll/report/report_payslip.py 2011-04-04 13:13:30 +0000
141@@ -1,4 +1,3 @@
142-#!/usr/bin/env python
143 #-*- coding:utf-8 -*-
144
145 ##############################################################################
146
147=== modified file 'hr_payroll/report/report_year_salary.py'
148--- hr_payroll/report/report_year_salary.py 2011-01-14 00:11:01 +0000
149+++ hr_payroll/report/report_year_salary.py 2011-04-04 13:13:30 +0000
150@@ -1,4 +1,3 @@
151-#!/usr/bin/env python
152 #-*- coding:utf-8 -*-
153
154 ##############################################################################
155@@ -119,4 +118,3 @@
156 report_sxw.report_sxw('report.year.salary', 'hr.payslip', 'hr_payroll/report/report_year_report.rml', parser=year_salary_report,header='internal landscape')
157
158 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
159-
160
161=== modified file 'l10n_ch/readme.txt' (properties changed: +x to -x)
162=== modified file 'l10n_ch/sample/README' (properties changed: +x to -x)
163=== modified file 'l10n_ch/sample/sample.dta' (properties changed: +x to -x)
164=== modified file 'l10n_ch/sample/sample.v11' (properties changed: +x to -x)
165=== modified file 'l10n_ch/sample/zvr_besrtechdok_fr.pdf' (properties changed: +x to -x)
166=== modified file 'l10n_de/i18n/pt_BR.po' (properties changed: +x to -x)
167=== modified file 'l10n_de/i18n/zh_CN.po' (properties changed: +x to -x)
168=== modified file 'l10n_de/i18n/zh_TW.po' (properties changed: +x to -x)
169=== modified file 'mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py' (properties changed: -x to +x)
170=== modified file 'sale_layout/i18n/fr.po' (properties changed: +x to -x)
171=== modified file 'thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js' (properties changed: +x to -x)
172=== modified file 'wiki/web/widgets/rss/feedparser.py' (properties changed: -x to +x)