Skip to content

Commit c7a7fcb

Browse files
author
Cédric Pigeon
committed
[8.0] add date invoice on merge wizard
1 parent f781f8d commit c7a7fcb

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

account_invoice_merge/invoice.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def _get_first_invoice_fields(self, invoice):
5656
}
5757

5858
@api.multi
59-
def do_merge(self, keep_references=True):
59+
def do_merge(self, keep_references=True, date_invoice=False):
6060
"""
6161
To merge similar type of account invoices.
6262
Invoices will only be merged if:
@@ -165,6 +165,8 @@ def make_key(br, fields):
165165
invoice_data['invoice_line'] = [
166166
(0, 0, value) for value in
167167
invoice_data['invoice_line'].itervalues()]
168+
if date_invoice:
169+
invoice_data['date_invoice'] = date_invoice
168170
# create the new invoice
169171
newinvoice = self.with_context(is_merge=True).create(invoice_data)
170172
invoices_info.update({newinvoice.id: old_ids})

account_invoice_merge/wizard/invoice_merge.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ class invoice_merge(models.TransientModel):
2929
keep_references = fields.Boolean('Keep references'
3030
' from original invoices',
3131
default=True)
32+
date_invoice = fields.Date('Invoice Date')
3233

3334
@api.model
3435
def _dirty_check(self):
@@ -99,7 +100,8 @@ def merge_invoices(self):
99100
aw_obj = self.env['ir.actions.act_window']
100101
ids = self.env.context.get('active_ids', [])
101102
invoices = inv_obj.browse(ids)
102-
allinvoices = invoices.do_merge(keep_references=self.keep_references)
103+
allinvoices = invoices.do_merge(keep_references=self.keep_references,
104+
date_invoice=self.date_invoice)
103105
xid = {
104106
'out_invoice': 'action_invoice_tree1',
105107
'out_refund': 'action_invoice_tree3',

account_invoice_merge/wizard/invoice_merge_view.xml

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Lines will only be merged if:<br/>
2222
</group>
2323
<group name="options">
2424
<field name="keep_references"/>
25+
<field name="date_invoice"/>
2526
</group>
2627
<footer>
2728
<button name="merge_invoices" string="Merge Invoices"

0 commit comments

Comments
 (0)