Merge lp:~openerp-dev/openobject-addons/trunk-tax-search-jpr into lp:openobject-addons

Proposed by Jitendra Prajapati(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-tax-search-jpr
Merge into: lp:openobject-addons
Diff against target: 18 lines (+1/-7)
1 file modified
account/account.py (+1/-7)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-tax-search-jpr
Reviewer Review Type Date Requested Status
Jitendra Prajapati(OpenERP) (community) Needs Resubmitting
OpenERP Core Team Pending
Review via email: mp+200005@code.launchpad.net

Description of the change

Hello,

  I have improve tax search on both name and code in invoice line.

Thanks

To post a comment you must log in.
Revision history for this message
Thibault Delavallée (OpenERP) (tde-openerp) wrote :

Hello,

Actually, the bug about searching in description and name is already fixed in trunk. No need to go further in the code then. I set this branch as rejected as the bug is already fixed.

Thibault.

Revision history for this message
Jitendra Prajapati(OpenERP) (jitendra.prajapati-openerp) wrote :

Hello,

  I have checked latest trunk this mp related to given task "[accounting] quick search should be work on code field in tax object" in which task purpose was that for tax field, only the code is set but, if you enter code for searching tax, it is not working, you have to enter the name. we have done this work if you enter the name or the code, the quick search works on tax. In this branch it works as task defined. And in latest trunk quick search on tax will search only on name not on code.
Correct me if I am wrong.

Thanks.

review: Needs Resubmitting

Unmerged revisions

9028. By Jitendra Prajapati(OpenERP)

[MERGE]with lp:openobject-addons

9027. By Jitendra Prajapati(OpenERP)

[MERGE]with lp:openobject-addons

9026. By Jitendra Prajapati(OpenERP)

[IMP]account: improve code

9025. By Jitendra Prajapati(OpenERP)

[IMP]tax search: name and tax code(both)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/account.py'
2--- account/account.py 2013-12-09 10:50:31 +0000
3+++ account/account.py 2014-01-06 05:02:08 +0000
4@@ -1974,13 +1974,7 @@
5 args = []
6 if context is None:
7 context = {}
8- ids = []
9- if name:
10- ids = self.search(cr, user, [('description', '=', name)] + args, limit=limit, context=context)
11- if not ids:
12- ids = self.search(cr, user, [('name', operator, name)] + args, limit=limit, context=context)
13- else:
14- ids = self.search(cr, user, args, limit=limit, context=context or {})
15+ ids = self.search(cr, user, ['|',('name', operator, name),('description', operator, name)] + args, limit=limit, context=context)
16 return self.name_get(cr, user, ids, context=context)
17
18 def write(self, cr, uid, ids, vals, context=None):

Subscribers

People subscribed via source and target branches

to all changes: