Merge lp:~julie-w/unifield-server/US-1868 into lp:unifield-server
- US-1868
- Merge into trunk
Proposed by
jftempo
Status: | Merged |
---|---|
Merged at revision: | 4028 |
Proposed branch: | lp:~julie-w/unifield-server/US-1868 |
Merge into: | lp:unifield-server |
Diff against target: |
156 lines (+41/-8) 6 files modified
bin/addons/account/account_move_line.py (+14/-3) bin/addons/account_mcdb/account_view.xml (+2/-0) bin/addons/account_override/account_move_line.py (+13/-2) bin/addons/account_reconciliation/account.py (+3/-0) bin/addons/account_reconciliation/account_move_line.py (+7/-1) bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv (+2/-2) |
To merge this branch: | bzr merge lp:~julie-w/unifield-server/US-1868 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
UniField Reviewer Team | Pending | ||
Review via email: mp+309280@code.launchpad.net |
Commit message
Description of the change
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/account_move_line.py' |
2 | --- bin/addons/account/account_move_line.py 2016-09-16 08:46:57 +0000 |
3 | +++ bin/addons/account/account_move_line.py 2016-11-04 08:23:09 +0000 |
4 | @@ -1138,10 +1138,21 @@ |
5 | unlink_ids += rec_ids |
6 | unlink_ids += part_rec_ids |
7 | if unlink_ids: |
8 | + # get all the JIs linked to the same reconciliations |
9 | + linked_aml = self.search(cr, uid, ['|', |
10 | + ('reconcile_id', 'in', unlink_ids), |
11 | + ('reconcile_partial_id', 'in', unlink_ids)], |
12 | + order='NO_ORDER', context=context) |
13 | + # first update reconciliation/unreconciliation dates and unreconcile_txt for all the JIs of the reconciliations |
14 | + for aml in linked_aml: |
15 | + obj_move_line.write(cr, uid, aml, { |
16 | + 'reconcile_date': False, # US-533 reset reconcilation date |
17 | + # US-1868 add unreconciliation date and unreconcile number |
18 | + 'unreconcile_date': time.strftime('%Y-%m-%d'), |
19 | + 'unreconcile_txt': obj_move_line.browse(cr, uid, aml, context=context, fields_to_fetch=['reconcile_txt']).reconcile_txt, |
20 | + }, context=context) |
21 | + # then delete the account.move.reconciles |
22 | obj_move_rec.unlink(cr, uid, unlink_ids) |
23 | - obj_move_line.write(cr, uid, move_ids, { |
24 | - 'reconcile_date': False, # US-533 reset reconcilation date |
25 | - }, context=context) |
26 | return True |
27 | |
28 | def check_unlink(self, cr, uid, ids, context=None): |
29 | |
30 | === modified file 'bin/addons/account_mcdb/account_view.xml' |
31 | --- bin/addons/account_mcdb/account_view.xml 2016-10-06 14:02:52 +0000 |
32 | +++ bin/addons/account_mcdb/account_view.xml 2016-11-04 08:23:09 +0000 |
33 | @@ -278,6 +278,8 @@ |
34 | <field name="functional_currency_id"/> |
35 | <field name="reconcile_total_partial_id"/> |
36 | <field name="reconcile_date" invisible="1"/> |
37 | + <field name="unreconcile_date" invisible="1"/> |
38 | + <field name="unreconcile_txt" invisible="1"/> |
39 | <field name="state"/> |
40 | </tree> |
41 | </field> |
42 | |
43 | === modified file 'bin/addons/account_override/account_move_line.py' |
44 | --- bin/addons/account_override/account_move_line.py 2016-10-14 15:15:37 +0000 |
45 | +++ bin/addons/account_override/account_move_line.py 2016-11-04 08:23:09 +0000 |
46 | @@ -155,13 +155,17 @@ |
47 | |
48 | def _get_reconciled_move_lines(self, cr, uid, ids, context=None): |
49 | res = [] |
50 | - for line in self.browse(cr, uid, ids): |
51 | + for line in self.browse(cr, uid, ids, context=context, |
52 | + fields_to_fetch=['reconcile_id', 'reconcile_partial_id', 'reconcile_txt']): |
53 | if line.reconcile_id: |
54 | for t in line.reconcile_id.line_id: |
55 | res.append(t.id) |
56 | elif line.reconcile_partial_id: |
57 | for p in line.reconcile_partial_id.line_partial_ids: |
58 | res.append(p.id) |
59 | + # when an "unreconciliation" is synchronized the reconcile_txt must be reset |
60 | + elif line.reconcile_txt and context.get('sync_update_execution'): |
61 | + res.append(line.id) |
62 | return res |
63 | |
64 | def _balance_currency(self, cr, uid, ids, name, arg, context=None): |
65 | @@ -498,7 +502,11 @@ |
66 | |
67 | def copy(self, cr, uid, aml_id, default=None, context=None): |
68 | """ |
69 | - When duplicate a JI, don't copy the link to register lines |
70 | + When duplicate a JI, don't copy: |
71 | + - the link to register lines |
72 | + - the reconciliation date |
73 | + - the unreconciliation date |
74 | + - the old reconciliation ref (unreconcile_txt) |
75 | """ |
76 | if context is None: |
77 | context = {} |
78 | @@ -506,6 +514,9 @@ |
79 | default = {} |
80 | default.update({ |
81 | 'imported_invoice_line_ids': [], |
82 | + 'reconcile_date': None, |
83 | + 'unreconcile_date': None, |
84 | + 'unreconcile_txt': '', |
85 | }) |
86 | return super(account_move_line, self).copy(cr, uid, aml_id, default, context=context) |
87 | |
88 | |
89 | === modified file 'bin/addons/account_reconciliation/account.py' |
90 | --- bin/addons/account_reconciliation/account.py 2016-10-14 10:06:21 +0000 |
91 | +++ bin/addons/account_reconciliation/account.py 2016-11-04 08:23:09 +0000 |
92 | @@ -42,6 +42,9 @@ |
93 | map(lambda x: x.id, rec.line_partial_ids), { |
94 | 'reconcile_id': rec.id, |
95 | 'reconcile_date': time.strftime('%Y-%m-%d'), # US-533 date of JI reconciliation |
96 | + # US-1868 reset unreconcilation date and unreconcile_txt |
97 | + 'unreconcile_date': False, |
98 | + 'unreconcile_tx': '', |
99 | } |
100 | ) |
101 | # @@@end |
102 | |
103 | === modified file 'bin/addons/account_reconciliation/account_move_line.py' |
104 | --- bin/addons/account_reconciliation/account_move_line.py 2016-10-14 13:21:00 +0000 |
105 | +++ bin/addons/account_reconciliation/account_move_line.py 2016-11-04 08:23:09 +0000 |
106 | @@ -35,6 +35,10 @@ |
107 | _columns = { |
108 | 'reconcile_date': fields.date('Reconcile date', |
109 | help="Date of reconciliation"), |
110 | + 'unreconcile_date': fields.date('Unreconcile date', |
111 | + help="Date of unreconciliation"), |
112 | + 'unreconcile_txt': fields.text(string='Unreconcile number', required=False, readonly=True, |
113 | + help="Store the old reconcile number when the entry has been unreconciled"), |
114 | } |
115 | |
116 | def search(self, cr, uid, args, offset=0, limit=None, order=None, |
117 | @@ -175,6 +179,8 @@ |
118 | # above (4, 0) |
119 | self.pool.get('account.move.line').write(cr, uid, merges+unmerge, { |
120 | 'reconcile_date': time.strftime('%Y-%m-%d'), |
121 | + 'unreconcile_date': False, |
122 | + 'unreconcile_txt': '', |
123 | }) |
124 | |
125 | # UF-2011: synchronize move lines (not "marked" after reconcile creation) |
126 | @@ -289,7 +295,7 @@ |
127 | # bypass orm methods: for specific lines: |
128 | # - US-1766 FXA AJI should not be recomputed |
129 | # - US-1682 yealry REV JI have a dedicated rate |
130 | - cr.execute('update account_move_line set reconcile_date=%s where id in %s', |
131 | + cr.execute("UPDATE account_move_line SET reconcile_date=%s, unreconcile_date=NULL, unreconcile_txt='' WHERE id IN %s", |
132 | (time.strftime('%Y-%m-%d'), tuple(ids)) |
133 | ) |
134 | |
135 | |
136 | === modified file 'bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv' |
137 | --- bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv 2016-09-30 09:15:44 +0000 |
138 | +++ bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv 2016-11-04 08:23:09 +0000 |
139 | @@ -70,7 +70,7 @@ |
140 | msf_sync_data_server.account_move_reconcile,TRUE,TRUE,TRUE,FALSE,bidirectional,Bidirectional,[],"['name', 'type', 'is_multi_instance', 'multi_instance_level_creation', 'instance_id']",OC,account.move.reconcile,,Account Move Reconcile,Valid,,410 |
141 | msf_sync_data_server.register_line_deleted,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,"[('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')]))]","['statement_id/id', 'sequence','instance_id/id']",MISSION,account.bank.statement.line.deleted,instance_id,Register Deleted Line,Valid,,405 |
142 | msf_sync_data_server.account_move,TRUE,TRUE,TRUE,FALSE,bidirectional,Bidirectional-Private,[],"['date', 'document_date', 'imported', 'journal_id/id', 'name', 'narration', 'period_id/id', 'ref', 'statement_line_ids/id', 'to_check','instance_id/id','status','employee_id/id','transfer_journal_id/id','manual_currency_id/id','block_manual_currency_id','partner_id2/id','analytic_distribution_id/id', 'register_line_id/id']",OC,account.move,instance_id,Account Move,Valid,,411 |
143 | -msf_sync_data_server.account_move_line,TRUE,TRUE,TRUE,FALSE,bidirectional,Bidirectional-Private,[],"['account_id/id', 'accrual', 'analytic_account_id/id', 'analytic_distribution_id/id', 'blocked', 'cheque_number','corrected', 'credit', 'credit_currency', 'currency_id/id', 'date_created', 'date_maturity', 'debit', 'debit_currency', 'document_date', 'employee_id/id', 'have_an_historic', 'instance_id/id', 'is_addendum_line', 'is_counterpart', 'is_transfer_with_change', 'is_write_off', 'journal_id/id', 'last_cor_was_only_analytic', 'move_id/id', 'name', 'partner_id/id','partner_txt','period_id/id', 'reconcile_id/id', 'reconcile_partial_id/id', 'ref', 'reversal', 'source_date', 'statement_id/id', 'reference', 'state','transfer_journal_id/id', 'transfer_amount', 'is_downpayment', 'reconcile_date', 'is_revaluated_ok']",OC,account.move.line,instance_id,Account Move Line,Valid,,412 |
144 | +msf_sync_data_server.account_move_line,TRUE,TRUE,TRUE,FALSE,bidirectional,Bidirectional-Private,[],"['account_id/id', 'accrual', 'analytic_account_id/id', 'analytic_distribution_id/id', 'blocked', 'cheque_number','corrected', 'credit', 'credit_currency', 'currency_id/id', 'date_created', 'date_maturity', 'debit', 'debit_currency', 'document_date', 'employee_id/id', 'have_an_historic', 'instance_id/id', 'is_addendum_line', 'is_counterpart', 'is_transfer_with_change', 'is_write_off', 'journal_id/id', 'last_cor_was_only_analytic', 'move_id/id', 'name', 'partner_id/id','partner_txt','period_id/id', 'reconcile_id/id', 'reconcile_partial_id/id', 'ref', 'reversal', 'source_date', 'statement_id/id', 'reference', 'state','transfer_journal_id/id', 'transfer_amount', 'is_downpayment', 'reconcile_date', 'is_revaluated_ok', 'unreconcile_date', 'unreconcile_txt']",OC,account.move.line,instance_id,Account Move Line,Valid,,412 |
145 | msf_sync_data_server.account_move_line_correction,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,"[('move_id','in',('account.move','id',[('state','=','posted')]))]","['corrected_line_id/id', 'instance_id/id', 'reversal_line_id/id']",OC,account.move.line,instance_id,Account Move Line Correction,Valid,,413 |
146 | msf_sync_data_server.account_move_line_register_line,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,[],"['corrected_st_line_id/id', 'instance_id/id']",MISSION,account.move.line,instance_id,Account Move Line / Register Line,Valid,,414 |
147 | msf_sync_data_server.register_line_account_move_line,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,"[('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')])),('statement_id','in',('account.bank.statement','id',[('state','!=','draft')])),'!',('state','=','draft')]","['direct_invoice_move_id/id', 'first_move_line_id/id', 'from_import_cheque_id/id', 'imported_invoice_line_ids/id','instance_id/id', 'cash_return_move_line_id/id']",MISSION,account.bank.statement.line,instance_id,Register Line / Account Move Line,Valid,,415 |
148 | @@ -177,7 +177,7 @@ |
149 | msf_usb_sync_data_server.cp_gl_journals_registers,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,"['|',('type', '=', 'cash'),('type', '=', 'cheque')]","['bank_journal_id/id','analytic_journal_id/id', 'code', 'currency/id', 'default_credit_account_id/id', 'default_debit_account_id/id', 'name', 'type','instance_id/id']",USB,account.journal,,[MASTER] GL Journals - Registers,Valid,,1507 |
150 | msf_usb_sync_data_server.cp_account_move_reconcile,TRUE,TRUE,TRUE,TRUE,cp_to_rw,Bidirectional,[],"['name', 'type']",USB,account.move.reconcile,,[MASTER] Account Move Reconcile,Valid,,1510 |
151 | msf_usb_sync_data_server.cp_account_move,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['date', 'document_date', 'imported', 'journal_id/id', 'name', 'narration', 'period_id/id', 'ref', 'statement_line_ids/id', 'to_check','instance_id/id','status','employee_id/id','transfer_journal_id/id','manual_currency_id/id','block_manual_currency_id','partner_id2/id','analytic_distribution_id/id']",USB,account.move,,[MASTER] Account Move,Valid,,1520 |
152 | -msf_usb_sync_data_server.cp_account_move_line,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['account_id/id', 'accrual', 'analytic_account_id/id', 'analytic_distribution_id/id', 'blocked', 'cheque_number','corrected', 'credit', 'credit_currency', 'currency_id/id', 'date', 'date_created', 'date_maturity', 'debit', 'debit_currency', 'document_date', 'employee_id/id', 'have_an_historic', 'instance_id/id', 'is_addendum_line', 'is_counterpart', 'is_transfer_with_change', 'is_write_off', 'journal_id/id', 'last_cor_was_only_analytic', 'move_id/id', 'move_state', 'name', 'partner_id/id','partner_txt','period_id/id', 'reconcile_id/id', 'ref', 'reversal', 'source_date', 'statement_id/id', 'reference', 'state','transfer_journal_id/id', 'transfer_amount', 'is_downpayment', 'reconcile_date']",USB,account.move.line,,[MASTER] Account Move Line,Valid,,1521 |
153 | +msf_usb_sync_data_server.cp_account_move_line,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['account_id/id', 'accrual', 'analytic_account_id/id', 'analytic_distribution_id/id', 'blocked', 'cheque_number','corrected', 'credit', 'credit_currency', 'currency_id/id', 'date', 'date_created', 'date_maturity', 'debit', 'debit_currency', 'document_date', 'employee_id/id', 'have_an_historic', 'instance_id/id', 'is_addendum_line', 'is_counterpart', 'is_transfer_with_change', 'is_write_off', 'journal_id/id', 'last_cor_was_only_analytic', 'move_id/id', 'move_state', 'name', 'partner_id/id','partner_txt','period_id/id', 'reconcile_id/id', 'ref', 'reversal', 'source_date', 'statement_id/id', 'reference', 'state','transfer_journal_id/id', 'transfer_amount', 'is_downpayment', 'reconcile_date', 'unreconcile_date', 'unreconcile_txt']",USB,account.move.line,,[MASTER] Account Move Line,Valid,,1521 |
154 | msf_usb_sync_data_server.cp_account_move_line_correction,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,"[('move_id','in',('account.move','id',[('state','=','posted')]))]","['corrected_line_id/id', 'instance_id/id', 'reversal_line_id/id']",USB,account.move.line,,[MASTER] Account Move Line Correction,Valid,,1522 |
155 | msf_usb_sync_data_server.cp_account_move_line_register_line,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['corrected_st_line_id/id', 'instance_id/id']",USB,account.move.line,,[MASTER] Account Move Line / Register Line,Valid,,1523 |
156 | msf_usb_sync_data_server.cp_register_line_account_move_line,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,"[('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')])),('statement_id','in',('account.bank.statement','id',[('state','!=','draft')])),'!',('state','=','draft')]","['first_move_line_id/id', 'instance_id/id']",USB,account.bank.statement.line,,[MASTER] Register Line / Account Move Line,Valid,,1530 |