Unifield Server

Merge lp:~unifield-team/unifield-server/us-857 into lp:unifield-server

  1. us-857
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 3896
Proposed branch: lp:~unifield-team/unifield-server/us-857
Merge into: lp:unifield-server
Diff against target: 41 lines (+9/-1)
1 file modified
bin/addons/account_hq_entries/wizard/hq_entries_validation.py (+9/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-857
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+300723@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/account_hq_entries/wizard/hq_entries_validation.py'
2--- bin/addons/account_hq_entries/wizard/hq_entries_validation.py 2016-05-27 10:19:09 +0000
3+++ bin/addons/account_hq_entries/wizard/hq_entries_validation.py 2016-07-21 08:31:25 +0000
4@@ -220,6 +220,7 @@
5 od_journal_id = od_journal_ids[0]
6 all_lines = set()
7 pure_ad_cor_ji_ids = []
8+ original_aji_ids = []
9
10 # Split lines into 2 groups:
11 #+ original ones
12@@ -255,7 +256,7 @@
13 new_expense_ml_ids = new_res_move.values()
14 pure_ad_cor_ji_ids += new_expense_ml_ids
15 corr_name = 'COR1 - ' + original_move.name
16- aml_obj.write(cr, uid, new_expense_ml_ids, {'corrected_line_id': original_ml_result, 'name': corr_name }, context=context, check=False, update_check=False)
17+ aml_obj.write(cr, uid, new_expense_ml_ids, {'corrected_line_id': original_ml_result, 'name': corr_name, 'have_an_historic': True, }, context=context, check=False, update_check=False)
18
19 # get the move_id
20 corr_moves = aml_obj.browse(cr, uid, new_expense_ml_ids, context=context)
21@@ -281,6 +282,7 @@
22
23 # create the analytic lines as a reversed copy of the original
24 initial_ana_ids = ana_line_obj.search(cr, uid, [('move_id.move_id', '=', move_id)]) # original move_id
25+ original_aji_ids += initial_ana_ids
26 res_reverse = ana_line_obj.reverse(cr, uid, initial_ana_ids, posting_date=line.date)
27 acor_journal_ids = self.pool.get('account.analytic.journal').search(cr, uid, [('type', '=', 'correction'), ('is_current_instance', '=', True)])
28 if not acor_journal_ids:
29@@ -312,6 +314,12 @@
30 osv.osv.write(aml_obj, cr, uid, list(set(pure_ad_cor_ji_ids)),
31 {'last_cor_was_only_analytic': True,})
32
33+ # US-857: mark splitted original lines as reallocated
34+ # (like any corrected AJI)
35+ if original_aji_ids:
36+ osv.osv.write(ana_line_obj, cr, uid, original_aji_ids,
37+ { 'is_reallocated': True, })
38+
39 # Mark ALL lines as user_validated
40 self.pool.get('hq.entries').write(cr, uid, list(all_lines), {'user_validated': True}, context=context)
41 return original_move_ids

Subscribers

People subscribed via source and target branches

to all changes: