unifield-wm

Merge lp:~jfb-tempo-consulting/unifield-wm/us-679 into lp:unifield-wm

  1. us-679
  2. Merge into trunk
Proposed by jftempo
Status: Needs review
Proposed branch: lp:~jfb-tempo-consulting/unifield-wm/us-679
Merge into: lp:unifield-wm
Diff against target: 26 lines (+4/-1)
2 files modified
account_journal/account_journal.py (+3/-0)
account_period_closing_level/account_fiscalyear.py (+1/-1)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-wm/us-679
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+276263@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

2641. By jftempo

US-679 [FIX] Allow to create a new fiscal year if a journal code has changed

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_journal/account_journal.py'
2--- account_journal/account_journal.py 2015-08-06 10:14:22 +0000
3+++ account_journal/account_journal.py 2015-10-30 13:38:56 +0000
4@@ -206,6 +206,9 @@
5 'padding': 4,
6 'number_increment': 1
7 }
8+ # check if code exists
9+ if not self.pool.get('ir.sequence.type').search(cr, uid, [('code', '=' , code)], limit=1, context=context):
10+ self.pool.get('ir.sequence.type').create(cr, uid, {'name': code, 'code': code}, context=context)
11 sequence_id = self.pool.get('ir.sequence').create(cr, uid, seq)
12 if not main_sequence:
13 main_sequence = sequence_id
14
15=== modified file 'account_period_closing_level/account_fiscalyear.py'
16--- account_period_closing_level/account_fiscalyear.py 2015-05-28 13:01:57 +0000
17+++ account_period_closing_level/account_fiscalyear.py 2015-10-30 13:38:56 +0000
18@@ -119,7 +119,7 @@
19 # Then sequence creation on all journals
20 journal_ids = self.pool.get('account.journal').search(cr, uid, [('instance_id', '=', current_instance_id)])
21 for journal in self.pool.get('account.journal').browse(cr, uid, journal_ids, context=context):
22- self.pool.get('account.journal').create_fiscalyear_sequence(cr, uid, res, name, journal.code.lower(), vals['date_start'], journal.sequence_id and journal.sequence_id.id or False, context=context)
23+ self.pool.get('account.journal').create_fiscalyear_sequence(cr, uid, res, name, "journal_%s"%(journal.id), vals['date_start'], journal.sequence_id and journal.sequence_id.id or False, context=context)
24 return res
25
26 def uf_close_fy(self, cr, uid, ids, context=None):

Subscribers

People subscribed via source and target branches