2775

pending completion

Build # 2775

Build Type

push

travis-ci

Committed by

web-flow

Commit Message

<a href="https://github.com/OCA/account-invoicing/commit/<a class=hub.com/OCA/account-invoicing/commit/<a class="double-link" href="https://git"><a class=hub.com/OCA/account-invoicing/commit/<a class="double-link" href="https://git"><a class=hub.com/OCA/account-invoicing/commit/<a class="double-link" href="https://git"><a class=hub.com/OCA/account-invoicing/commit/8c0de8e990e2cdf175ef0e33a8592715942f7b13">8c0de8e99">&lt;a href=&quot;https://github.com/OCA/account-invoicing/commit/</a><a class="double-link" href="https://github.com/OCA/account-invoicing/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/OCA/account-invoicing/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/OCA/account-invoicing/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/OCA/account-invoicing/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/OCA/account-invoicing/commit/8c0de8e990e2cdf175ef0e33a8592715942f7b13">8c0de8e99</a><a href="https://github.com/OCA/account-invoicing/commit/8c0de8e990e2cdf175ef0e33a8592715942f7b13">&quot;&gt;&amp;lt;a href=&amp;quot;https://github.com/OCA/account-invoicing/commit/&lt;/a&gt;&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/OCA/account-invoicing/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/OCA/account-invoicing/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/OCA/account-invoicing/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/OCA/account-invoicing/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/OCA/account-invoicing/commit/8c0de8e990e2cdf175ef0e33a8592715942f7b13&quot;&gt;8c0de8e99&lt;/a&gt;&lt;a href=&quot;https://github.com/OCA/account-invoicing/commit/8c0de8e990e2cdf175ef0e33a8592715942f7b13&quot;&gt;&amp;quot;&amp;gt;&amp;amp;lt;a href=&amp;amp;quot;https://github.com/OCA/account-invoicing/commit/&amp;lt;/a&amp;gt;&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp... (continued)

Run Details

93 of 93 new or added lines in 1 file covered. (100.0%)

1047 of 1175 relevant lines covered (89.11%)

1.78 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

82.35

/account_invoice_merge/models/account_invoice.py

# -*- coding: utf-8 -*-
# Copyright 2004-2010 Tiny SPRL (http://tiny.be).
# Copyright 2010-2011 Elico Corp.
# Copyright 2016 Acsone (https://www.acsone.eu/)
# Copyright 2017 Eficent Business and IT Consulting Services S.L.
#   (http://www.eficent.com)
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).

from odoo import api, models
from odoo.osv.orm import browse_record, browse_null
from odoo.tools import float_is_zero


class AccountInvoice(models.Model):
    _inherit = "account.invoice"

    @api.model
    def _get_invoice_key_cols(self):
        return [
            'partner_id', 'user_id', 'type', 'account_id', 'currency_id',
            'journal_id', 'company_id', 'partner_bank_id',
        ]

    @api.model
    def _get_invoice_line_key_cols(self):
        fields = [
            'name', 'origin', 'discount', 'invoice_line_tax_ids', 'price_unit',
            'product_id', 'account_id', 'account_analytic_id',
            'uom_id'
        ]
        for field in ['sale_line_ids']:
            if field in self.env['account.invoice.line']._fields:
                fields.append(field)
        return fields

    @api.model
    def _get_first_invoice_fields(self, invoice):
        return {
            'origin': '%s' % (invoice.origin or '',),
            'partner_id': invoice.partner_id.id,
            'journal_id': invoice.journal_id.id,
            'user_id': invoice.user_id.id,
            'currency_id': invoice.currency_id.id,
            'company_id': invoice.company_id.id,
            'type': invoice.type,
            'account_id': invoice.account_id.id,
            'state': 'draft',
            'reference': '%s' % (invoice.reference or '',),
            'name': '%s' % (invoice.name or '',),
            'fiscal_position_id': invoice.fiscal_position_id.id,
            'payment_term_id': invoice.payment_term_id.id,
            'invoice_line_ids': {},
            'partner_bank_id': invoice.partner_bank_id.id,
        }

    @api.multi
    def do_merge(self, keep_references=True, date_invoice=False,
                 remove_empty_invoice_lines=True):
        """
        To merge similar type of account invoices.
        Invoices will only be merged if:
        * Account invoices are in draft
        * Account invoices belong to the same partner
        * Account invoices are have same company, partner, address, currency,
          journal, currency, salesman, account, type
        Lines will only be merged if:
        * Invoice lines are exactly the same except for the quantity and unit

         @param self: The object pointer.
         @param keep_references: If True, keep reference of original invoices

         @return: new account invoice id

        """

        def make_key(br, fields):
            list_key = []
            for field in fields:
                field_val = getattr(br, field)
                if field in ('product_id', 'account_id'):
                    if not field_val:
                        field_val = False
                if (isinstance(field_val, browse_record) and
                        field != 'invoice_line_tax_ids' and
                        field != 'sale_line_ids'):
                    field_val = field_val.id
                elif isinstance(field_val, browse_null):
                    field_val = False
                elif (isinstance(field_val, list) or
                        field == 'invoice_line_tax_ids' or
                        field == 'sale_line_ids'):
                    field_val = ((6, 0, tuple([v.id for v in field_val])),)
                list_key.append((field, field_val))
            list_key.sort()
            return tuple(list_key)

        # compute what the new invoices should contain
        new_invoices = {}
        draft_invoices = [invoice
                          for invoice in self
                          if invoice.state == 'draft']
        seen_origins = {}
        seen_client_refs = {}

        for account_invoice in draft_invoices:
            invoice_key = make_key(
                account_invoice, self._get_invoice_key_cols())
            new_invoice = new_invoices.setdefault(invoice_key, ({}, []))
            origins = seen_origins.setdefault(invoice_key, set())
            client_refs = seen_client_refs.setdefault(invoice_key, set())
            new_invoice[1].append(account_invoice.id)
            invoice_infos = new_invoice[0]
            if not invoice_infos:
                invoice_infos.update(
                    self._get_first_invoice_fields(account_invoice))
                origins.add(account_invoice.origin)
                client_refs.add(account_invoice.reference)
                if not keep_references:
                    invoice_infos.pop('name')
            else:
                if account_invoice.name and keep_references:
                    invoice_infos['name'] = \
                        (invoice_infos['name'] or '') + ' ' + \
                        account_invoice.name
                if account_invoice.origin and \
                        account_invoice.origin not in origins:
                    invoice_infos['origin'] = \
                        (invoice_infos['origin'] or '') + ' ' + \
                        account_invoice.origin
                    origins.add(account_invoice.origin)
                if account_invoice.reference \
                        and account_invoice.reference not in client_refs:
                    invoice_infos['reference'] = \
                        (invoice_infos['reference'] or '') + ' ' + \
                        account_invoice.reference
                    client_refs.add(account_invoice.reference)

            for invoice_line in account_invoice.invoice_line_ids:
                line_key = make_key(
                    invoice_line, self._get_invoice_line_key_cols())

                o_line = invoice_infos['invoice_line_ids'].\
                    setdefault(line_key, {})

                if o_line:
                    # merge the line with an existing line
                    o_line['quantity'] += invoice_line.quantity
                else:
                    # append a new "standalone" line
                    o_line['quantity'] = invoice_line.quantity

        allinvoices = []
        allnewinvoices = []
        invoices_info = {}
        qty_prec = self.env['decimal.precision'].precision_get(
            'Product Unit of Measure')
        for invoice_key, (invoice_data, old_ids) in new_invoices.iteritems():
            # skip merges with only one invoice
            if len(old_ids) < 2:
                allinvoices += (old_ids or [])
                continue
            # cleanup invoice line data
            for key, value in invoice_data['invoice_line_ids'].iteritems():
                value.update(dict(key))

            if remove_empty_invoice_lines:
                invoice_data['invoice_line_ids'] = [
                    (0, 0, value) for value in
                    invoice_data['invoice_line_ids'].itervalues() if
                    not float_is_zero(
                        value['quantity'], precision_digits=qty_prec)]
            else:
                invoice_data['invoice_line_ids'] = [
                    (0, 0, value) for value in
                    invoice_data['invoice_line_ids'].itervalues()]

            if date_invoice:
                invoice_data['date_invoice'] = date_invoice

            # create the new invoice
            newinvoice = self.with_context(is_merge=True).create(invoice_data)
            invoices_info.update({newinvoice.id: old_ids})
            allinvoices.append(newinvoice.id)
            allnewinvoices.append(newinvoice)
            # cancel old invoices
            old_invoices = self.env['account.invoice'].browse(old_ids)
            old_invoices.with_context(is_merge=True).action_invoice_cancel()

        # Make link between original sale order
        # None if sale is not installed
        invoice_line_obj = self.env['account.invoice.line']
        for new_invoice_id in invoices_info:
            if 'sale.order' in self.env.registry:
                sale_todos = old_invoices.mapped(
                    'invoice_line_ids.sale_line_ids.order_id')
                for org_so in sale_todos:
                    for so_line in org_so.order_line:
                        invoice_line = invoice_line_obj.search(
                            [('id', 'in', so_line.invoice_lines.ids),
                             ('invoice_id', '=', new_invoice_id)])
                        if invoice_line:
                            so_line.write(
                                {'invoice_lines': [(6, 0, invoice_line.ids)]})

        # recreate link (if any) between original analytic account line
        # (invoice time sheet for example) and this new invoice
        anal_line_obj = self.env['account.analytic.line']
        if 'invoice_id' in anal_line_obj._fields:
            for new_invoice_id in invoices_info:
                anal_todos = anal_line_obj.search(
                    [('invoice_id', 'in', invoices_info[new_invoice_id])])
                anal_todos.write({'invoice_id': new_invoice_id})

        for new_invoice in allnewinvoices:
            new_invoice.compute_taxes()

        return invoices_info

1	# -- coding: utf-8 --
2	# Copyright 2004-2010 Tiny SPRL (http://tiny.be).
3	# Copyright 2010-2011 Elico Corp.
4	# Copyright 2016 Acsone (https://www.acsone.eu/)
5	# Copyright 2017 Eficent Business and IT Consulting Services S.L.
6	# (http://www.eficent.com)
7	# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
8
9	from odoo import api, models	2✔
10	from odoo.osv.orm import browse_record, browse_null	2✔
11	from odoo.tools import float_is_zero	2✔
12
13
14	class AccountInvoice(models.Model):	2✔
15	_inherit = "account.invoice"	2✔
16
17	@api.model	2✔
18	def _get_invoice_key_cols(self):
19	return [	2✔
20	'partner_id', 'user_id', 'type', 'account_id', 'currency_id',
21	'journal_id', 'company_id', 'partner_bank_id',
22	]
23
24	@api.model	2✔
25	def _get_invoice_line_key_cols(self):
26	fields = [	2✔
27	'name', 'origin', 'discount', 'invoice_line_tax_ids', 'price_unit',
28	'product_id', 'account_id', 'account_analytic_id',
29	'uom_id'
30	]
31	for field in ['sale_line_ids']:	2✔
32	if field in self.env['account.invoice.line']._fields:	2✔
33	fields.append(field)	2✔
34	return fields	2✔
35
36	@api.model	2✔
37	def _get_first_invoice_fields(self, invoice):
38	return {	2✔
39	'origin': '%s' % (invoice.origin or '',),
40	'partner_id': invoice.partner_id.id,
41	'journal_id': invoice.journal_id.id,
42	'user_id': invoice.user_id.id,
43	'currency_id': invoice.currency_id.id,
44	'company_id': invoice.company_id.id,
45	'type': invoice.type,
46	'account_id': invoice.account_id.id,
47	'state': 'draft',
48	'reference': '%s' % (invoice.reference or '',),
49	'name': '%s' % (invoice.name or '',),
50	'fiscal_position_id': invoice.fiscal_position_id.id,
51	'payment_term_id': invoice.payment_term_id.id,
52	'invoice_line_ids': {},
53	'partner_bank_id': invoice.partner_bank_id.id,
54	}
55
56	@api.multi	2✔
57	def do_merge(self, keep_references=True, date_invoice=False,	2✔
58	remove_empty_invoice_lines=True):
59	"""
60	To merge similar type of account invoices.
61	Invoices will only be merged if:
62	* Account invoices are in draft
63	* Account invoices belong to the same partner
64	* Account invoices are have same company, partner, address, currency,
65	journal, currency, salesman, account, type
66	Lines will only be merged if:
67	* Invoice lines are exactly the same except for the quantity and unit
68
69	@param self: The object pointer.
70	@param keep_references: If True, keep reference of original invoices
71
72	@return: new account invoice id
73
74	"""
75
76	def make_key(br, fields):	2✔
77	list_key = []	2✔
78	for field in fields:	2✔
79	field_val = getattr(br, field)	2✔
80	if field in ('product_id', 'account_id'):	2✔
81	if not field_val:	2✔
82	field_val = False	×
83	if (isinstance(field_val, browse_record) and	2✔
84	field != 'invoice_line_tax_ids' and
85	field != 'sale_line_ids'):
86	field_val = field_val.id	2✔
87	elif isinstance(field_val, browse_null):	2✔
88	field_val = False	2✔
89	elif (isinstance(field_val, list) or	2✔
90	field == 'invoice_line_tax_ids' or
91	field == 'sale_line_ids'):
92	field_val = ((6, 0, tuple([v.id for v in field_val])),)	×
93	list_key.append((field, field_val))	2✔
94	list_key.sort()	2✔
95	return tuple(list_key)	2✔
96
97	# compute what the new invoices should contain
98	new_invoices = {}	2✔
99	draft_invoices = [invoice	2✔
100	for invoice in self
101	if invoice.state == 'draft']
102	seen_origins = {}	2✔
103	seen_client_refs = {}	2✔
104
105	for account_invoice in draft_invoices:	2✔
106	invoice_key = make_key(	2✔
107	account_invoice, self._get_invoice_key_cols())
108	new_invoice = new_invoices.setdefault(invoice_key, ({}, []))	2✔
109	origins = seen_origins.setdefault(invoice_key, set())	2✔
110	client_refs = seen_client_refs.setdefault(invoice_key, set())	2✔
111	new_invoice[1].append(account_invoice.id)	2✔
112	invoice_infos = new_invoice[0]	2✔
113	if not invoice_infos:	2✔
114	invoice_infos.update(	2✔
115	self._get_first_invoice_fields(account_invoice))
116	origins.add(account_invoice.origin)	2✔
117	client_refs.add(account_invoice.reference)	2✔
118	if not keep_references:	2✔
119	invoice_infos.pop('name')	×
120	else:
121	if account_invoice.name and keep_references:	2✔
122	invoice_infos['name'] = \	2✔
123	(invoice_infos['name'] or '') + ' ' + \
124	account_invoice.name
125	if account_invoice.origin and \	2✔
126	account_invoice.origin not in origins:
127	invoice_infos['origin'] = \	×
128	(invoice_infos['origin'] or '') + ' ' + \
129	account_invoice.origin
130	origins.add(account_invoice.origin)	×
131	if account_invoice.reference \	2✔
132	and account_invoice.reference not in client_refs:
133	invoice_infos['reference'] = \	×
134	(invoice_infos['reference'] or '') + ' ' + \
135	account_invoice.reference
136	client_refs.add(account_invoice.reference)	×
137
138	for invoice_line in account_invoice.invoice_line_ids:	2✔
139	line_key = make_key(	2✔
140	invoice_line, self._get_invoice_line_key_cols())
141
142	o_line = invoice_infos['invoice_line_ids'].\	2✔
143	setdefault(line_key, {})
144
145	if o_line:	2✔
146	# merge the line with an existing line
147	o_line['quantity'] += invoice_line.quantity	2✔
148	else:
149	# append a new "standalone" line
150	o_line['quantity'] = invoice_line.quantity	2✔
151
152	allinvoices = []	2✔
153	allnewinvoices = []	2✔
154	invoices_info = {}	2✔
155	qty_prec = self.env['decimal.precision'].precision_get(	2✔
156	'Product Unit of Measure')
157	for invoice_key, (invoice_data, old_ids) in new_invoices.iteritems():	2✔
158	# skip merges with only one invoice
159	if len(old_ids) < 2:	2✔
160	allinvoices += (old_ids or [])	×
161	continue	×
162	# cleanup invoice line data
163	for key, value in invoice_data['invoice_line_ids'].iteritems():	2✔
164	value.update(dict(key))	2✔
165
166	if remove_empty_invoice_lines:	2✔
167	invoice_data['invoice_line_ids'] = [	2✔
168	(0, 0, value) for value in
169	invoice_data['invoice_line_ids'].itervalues() if
170	not float_is_zero(
171	value['quantity'], precision_digits=qty_prec)]
172	else:
173	invoice_data['invoice_line_ids'] = [	×
174	(0, 0, value) for value in
175	invoice_data['invoice_line_ids'].itervalues()]
176
177	if date_invoice:	2✔
178	invoice_data['date_invoice'] = date_invoice	×
179
180	# create the new invoice
181	newinvoice = self.with_context(is_merge=True).create(invoice_data)	2✔
182	invoices_info.update({newinvoice.id: old_ids})	2✔
183	allinvoices.append(newinvoice.id)	2✔
184	allnewinvoices.append(newinvoice)	2✔
185	# cancel old invoices
186	old_invoices = self.env['account.invoice'].browse(old_ids)	2✔
187	old_invoices.with_context(is_merge=True).action_invoice_cancel()	2✔
188
189	# Make link between original sale order
190	# None if sale is not installed
191	invoice_line_obj = self.env['account.invoice.line']	2✔
192	for new_invoice_id in invoices_info:	2✔
193	if 'sale.order' in self.env.registry:	2✔
194	sale_todos = old_invoices.mapped(	2✔
195	'invoice_line_ids.sale_line_ids.order_id')
196	for org_so in sale_todos:	2✔
197	for so_line in org_so.order_line:	×
198	invoice_line = invoice_line_obj.search(	×
199	[('id', 'in', so_line.invoice_lines.ids),
200	('invoice_id', '=', new_invoice_id)])
201	if invoice_line:	×
202	so_line.write(	×
203	{'invoice_lines': [(6, 0, invoice_line.ids)]})
204
205	# recreate link (if any) between original analytic account line
206	# (invoice time sheet for example) and this new invoice
207	anal_line_obj = self.env['account.analytic.line']	2✔
208	if 'invoice_id' in anal_line_obj._fields:	2✔
209	for new_invoice_id in invoices_info:	×
210	anal_todos = anal_line_obj.search(	×
211	[('invoice_id', 'in', invoices_info[new_invoice_id])])
212	anal_todos.write({'invoice_id': new_invoice_id})	×
213
214	for new_invoice in allnewinvoices:	2✔
215	new_invoice.compute_taxes()	2✔
216
217	return invoices_info	2✔

OCA / account-invoicing / 2775

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous