Merge lp:~openerp-dev/openobject-addons/6.1-opw-573692-skh into lp:openobject-addons/6.1

Proposed by Somesh Khare
Status: Approved
Approved by: Vinay Rana (OpenERP)
Approved revision: 6783
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-573692-skh
Merge into: lp:openobject-addons/6.1
Diff against target: 43 lines (+4/-3)
3 files modified
account/i18n/account.pot (+1/-0)
account/report/account_financial_report.rml (+2/-2)
account/report/common_report_header.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-573692-skh
Reviewer Review Type Date Requested Status
Vinay Rana (OpenERP) (community) Approve
Naresh(OpenERP) Pending
Review via email: mp+103221@code.launchpad.net

Description of the change

Hello Sir,

[Fix]: Partner Balance report did not translate the "No Filters" on the report.

This branch fixes this issue.

Thanks,
Somesh Khare

To post a comment you must log in.
6755. By nel

[FIX] stock: check if the move exists to avoid the key error

6756. By nel

[FIX] stock: small important fix

6757. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

6758. By nel

[FIX] stock: check if currency on product or picking exists

6759. By Olivier Laurent (Open ERP)

[FIX] l10n_multilang should be certified since it's a dependancy for a certified module (l10n_ch)

6760. By Olivier Laurent (Open ERP)

[FIX] raise clear except_osv instead of traceback

6761. By Olivier Laurent (Open ERP)

[FIX] added missing certificate number

6762. By Olivier Dony (Odoo)

[MERGE] crm: multiple bugfixes for mass-conversion wizards

6763. By Olivier Dony (Odoo)

[MERGE] crm.lead: bugfixes for saleman allocation and convert to opportunity

6764. By Quentin (OpenERP) <email address hidden>

[MERGE] some fixes in constraints in account_coda

6765. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

6766. By Xavier ALT

[MERGE] server action: fix missing active_model in context when calling server action run()

6767. By Xavier ALT

[MERGE] project_gtd: fix UnicodeDecodeError on GTD Task search view when user language is different than English

6768. By Xavier ALT

[MERGE] OPW 573248: crm: do not round localized user value as this will display NaN of kanban view (ex: decimal separator <> '.')

6769. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

6770. By Xavier ALT

[MERGE] share: fix error on user creation, missing 'company_ids' raising constraint ValidationError

6771. By Xavier ALT

[MERGE] OPW 573134: wiki: fix 'wikijs' support of syntax: h1, h2, h3, img, attach

6772. By Olivier Dony (Odoo)

[FIX] mail.thread: fix SMTP headers when forwarding messages

mail.message.Message has case-insensitive behavior
for headers, but setting the header value *adds* a
new header even if the same header already exists.
This caused multiple issues when forwarding, because
the forwarded mail kept the original To: header.
Also changed the code to use capitalized header
names at all times, just for consistency.
Also removed unused variable ``mail_message``.

6773. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

6774. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

6775. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

6776. By Olivier Dony (Odoo)

[FIX] account,sale,purchase: avoid white text in email notifications due to broken mail clients

Some strange mail client implementations seem to
selectively strip the background-color CSS in emails,
making a white-on-black button become white-on-white
invisible text. Replaced #FFF with #DDD in order
to more gracefully degrade in those cases.
Reproduced with Lotus Notes 8.

6777. By Olivier Dony (Odoo)

[FIX] account,sale,purchase: translations were not enabled for mail notifications

6778. By Xavier ALT

[MERGE] OPW 572907: account: account.financial.report balance should respect report sign

6779. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

6780. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

6781. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

6782. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

6783. By Somesh Khare

[FIX] Partner Balance Report: Improved the Partner Balance report

Revision history for this message
Vinay Rana (OpenERP) (vra-openerp) wrote :

The propose fix will solve the translation issue, po file changes will maintain through translation team.

review: Approve
Revision history for this message
Naresh(OpenERP) (nch-openerp) wrote :

Hello,

This bug was qualified as Confirmed on Trunk (means still existing and reproducible). A Merge Proposal for trunk was created to fix it. Here is the link to follow the MP on Launchpad and be informed once it's been merged in trunk: ... If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Revision history for this message
Naresh(OpenERP) (nch-openerp) wrote :

Unmerged revisions

6783. By Somesh Khare

[FIX] Partner Balance Report: Improved the Partner Balance report

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/i18n/account.pot'
2--- account/i18n/account.pot 2012-02-08 01:08:30 +0000
3+++ account/i18n/account.pot 2012-05-04 11:06:18 +0000
4@@ -3367,6 +3367,7 @@
5 #: selection:account.vat.declaration,filter:0
6 #: selection:accounting.report,filter:0
7 #: selection:accounting.report,filter_cmp:0
8+#: report:account.partner.balance:0
9 msgid "No Filters"
10 msgstr ""
11
12
13=== modified file 'account/report/account_financial_report.rml'
14--- account/report/account_financial_report.rml 2012-02-13 10:49:37 +0000
15+++ account/report/account_financial_report.rml 2012-05-04 11:06:18 +0000
16@@ -170,12 +170,12 @@
17 <tr>
18 <td><para style="terp_tblheader_General_Centre">Chart of Accounts</para></td>
19 <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
20- <td><para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
21+ <td><para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filters' and get_filter(data) ]]</para></td>
22 </tr>
23 <tr>
24 <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
25 <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para></td>
26- <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
27+ <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filters' and get_filter(data) or removeParentNode('para') ]] </para>
28 <blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
29 <tr>
30 <td><para style="terp_tblheader_General_Centre">Start Date</para></td>
31
32=== modified file 'account/report/common_report_header.py'
33--- account/report/common_report_header.py 2011-12-19 16:54:40 +0000
34+++ account/report/common_report_header.py 2012-05-04 11:06:18 +0000
35@@ -97,7 +97,7 @@
36 return 'Date'
37 elif data['form']['filter'] == 'filter_period':
38 return 'Periods'
39- return 'No Filter'
40+ return self._translate('No Filters')
41
42 def _sum_debit_period(self, period_id, journal_id=None):
43 journals = journal_id or self.journal_ids