Unifield Server

Merge lp:~unifield-team/unifield-server/uf_1198_server into lp:unifield-server

  1. uf_1198_server
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 3411
Proposed branch: lp:~unifield-team/unifield-server/uf_1198_server
Merge into: lp:unifield-server
Diff against target: 24 lines (+3/-3)
1 file modified
bin/addons/base/ir/ir_sequence.py (+3/-3)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/uf_1198_server
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+125140@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 'bin/addons/base/ir/ir_sequence.py'
2--- bin/addons/base/ir/ir_sequence.py 2011-07-04 07:00:20 +0000
3+++ bin/addons/base/ir/ir_sequence.py 2012-09-19 09:26:21 +0000
4@@ -58,7 +58,7 @@
5 'padding' : lambda *a : 0,
6 }
7
8- def _process(self, s):
9+ def _process(self, cr, uid, s):
10 return (s or '') % {
11 'year':time.strftime('%Y'),
12 'month': time.strftime('%m'),
13@@ -88,9 +88,9 @@
14 if res:
15 cr.execute('UPDATE ir_sequence SET number_next=number_next+number_increment WHERE id=%s AND active=true', (res['id'],))
16 if res['number_next']:
17- return self._process(res['prefix']) + '%%0%sd' % res['padding'] % res['number_next'] + self._process(res['suffix'])
18+ return self._process(cr, uid, res['prefix']) + '%%0%sd' % res['padding'] % res['number_next'] + self._process(cr, uid, res['suffix'])
19 else:
20- return self._process(res['prefix']) + self._process(res['suffix'])
21+ return self._process(cr, uid, res['prefix']) + self._process(cr, uid, res['suffix'])
22 return False
23
24 def get(self, cr, uid, code):

Subscribers

People subscribed via source and target branches

to all changes: