OCA / OCB / 843

pending completion

Build # 843

Build Type

push

travis-ci

Committed by

OCA-git-bot

Commit Message

Merge remote-tracking branch 'odoo/8.0' into 8.0

Conflicts:
	addons/membership/membership_view.xml

Different but similar bugfix for https://github.com/odoo/odoo/issues/6703
replacing
https://github.com/OCA/OCB/commit/72a6edf89
by upstream
https://github.com/odoo/odoo/commit/d566558a6

Run Details

52 of 52 new or added lines in 9 files covered. (100.0%)

58970 of 175303 relevant lines covered (33.64%)

3.01 hits per line

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

16.67

/addons/website_sale/models/sale_order.py

# -*- coding: utf-8 -*-
import random

from openerp import SUPERUSER_ID
from openerp.osv import osv, orm, fields
from openerp.addons.web.http import request
from openerp.tools.translate import _


class sale_order(osv.Model):
    _inherit = "sale.order"

    def _cart_qty(self, cr, uid, ids, field_name, arg, context=None):
        res = dict()
        for order in self.browse(cr, uid, ids, context=context):
            res[order.id] = int(sum(l.product_uom_qty for l in (order.website_order_line or [])))
        return res

    _columns = {
        'website_order_line': fields.one2many(
            'sale.order.line', 'order_id',
            string='Order Lines displayed on Website', readonly=True,
            help='Order Lines to be displayed on the website. They should not be used for computation purpose.',
        ),
        'cart_quantity': fields.function(_cart_qty, type='integer', string='Cart Quantity'),
        'payment_acquirer_id': fields.many2one('payment.acquirer', 'Payment Acquirer', on_delete='set null', copy=False),
        'payment_tx_id': fields.many2one('payment.transaction', 'Transaction', on_delete='set null', copy=False),
    }

    def _get_errors(self, cr, uid, order, context=None):
        return []

    def _get_website_data(self, cr, uid, order, context):
        return {
            'partner': order.partner_id.id,
            'order': order
        }

    def _cart_find_product_line(self, cr, uid, ids, product_id=None, line_id=None, context=None, **kwargs):
        for so in self.browse(cr, uid, ids, context=context):
            domain = [('order_id', '=', so.id), ('product_id', '=', product_id)]
            if line_id:
                domain += [('id', '=', line_id)]
            return self.pool.get('sale.order.line').search(cr, SUPERUSER_ID, domain, context=context)

    def _website_product_id_change(self, cr, uid, ids, order_id, product_id, qty=0, line_id=None, context=None):
        so = self.pool.get('sale.order').browse(cr, uid, order_id, context=context)

        values = self.pool.get('sale.order.line').product_id_change(cr, SUPERUSER_ID, [],
            pricelist=so.pricelist_id.id,
            product=product_id,
            partner_id=so.partner_id.id,
            fiscal_position=so.fiscal_position.id,
            qty=qty,
            context=context
        )['value']

        if line_id:
            line = self.pool.get('sale.order.line').browse(cr, SUPERUSER_ID, line_id, context=context)
            values['name'] = line.name
        else:
            product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
            values['name'] = product.description_sale and "%s\n%s" % (product.display_name, product.description_sale) or product.display_name

        values['product_id'] = product_id
        values['order_id'] = order_id
        if values.get('tax_id') != None:
            values['tax_id'] = [(6, 0, values['tax_id'])]
        return values

    def _cart_update(self, cr, uid, ids, product_id=None, line_id=None, add_qty=0, set_qty=0, context=None, **kwargs):
        """ Add or set product quantity, add_qty can be negative """
        sol = self.pool.get('sale.order.line')

        quantity = 0
        for so in self.browse(cr, uid, ids, context=context):
            if so.state != 'draft':
                request.session['sale_order_id'] = None
                raise osv.except_osv(_('Error!'), _('It is forbidden to modify a sale order which is not in draft status'))
            if line_id != False:
                line_ids = so._cart_find_product_line(product_id, line_id, context=context, **kwargs)
                if line_ids:
                    line_id = line_ids[0]

            # Create line if no line with product_id can be located
            if not line_id:
                values = self._website_product_id_change(cr, uid, ids, so.id, product_id, qty=1, context=context)
                line_id = sol.create(cr, SUPERUSER_ID, values, context=context)
                if add_qty:
                    add_qty -= 1

            # compute new quantity
            if set_qty:
                quantity = set_qty
            elif add_qty != None:
                quantity = sol.browse(cr, SUPERUSER_ID, line_id, context=context).product_uom_qty + (add_qty or 0)

            # Remove zero of negative lines
            if quantity <= 0:
                sol.unlink(cr, SUPERUSER_ID, [line_id], context=context)
            else:
                # update line
                values = self._website_product_id_change(cr, uid, ids, so.id, product_id, qty=quantity, line_id=line_id, context=context)
                values['product_uom_qty'] = quantity
                sol.write(cr, SUPERUSER_ID, [line_id], values, context=context)

        return {'line_id': line_id, 'quantity': quantity}

    def _cart_accessories(self, cr, uid, ids, context=None):
        for order in self.browse(cr, uid, ids, context=context):
            s = set(j.id for l in (order.website_order_line or []) for j in (l.product_id.accessory_product_ids or []))
            s -= set(l.product_id.id for l in order.order_line)
            product_ids = random.sample(s, min(len(s),3))
            return self.pool['product.product'].browse(cr, uid, product_ids, context=context)

class website(orm.Model):
    _inherit = 'website'

    _columns = {
        'pricelist_id': fields.related('user_id','partner_id','property_product_pricelist',
            type='many2one', relation='product.pricelist', string='Default Pricelist'),
        'currency_id': fields.related('pricelist_id','currency_id',
            type='many2one', relation='res.currency', string='Default Currency'),
    }

    def sale_product_domain(self, cr, uid, ids, context=None):
        return [("sale_ok", "=", True)]

    def sale_get_order(self, cr, uid, ids, force_create=False, code=None, update_pricelist=None, context=None):
        sale_order_obj = self.pool['sale.order']
        sale_order_id = request.session.get('sale_order_id')
        sale_order = None
        # create so if needed
        if not sale_order_id and (force_create or code):  
            # TODO cache partner_id session
            partner = self.pool['res.users'].browse(cr, SUPERUSER_ID, uid, context=context).partner_id

            for w in self.browse(cr, uid, ids):
                values = {
                    'user_id': w.user_id.id,
                    'partner_id': partner.id,
                    'pricelist_id': partner.property_product_pricelist.id,
                    'section_id': self.pool.get('ir.model.data').get_object_reference(cr, uid, 'website', 'salesteam_website_sales')[1],
                }
                sale_order_id = sale_order_obj.create(cr, SUPERUSER_ID, values, context=context)
                values = sale_order_obj.onchange_partner_id(cr, SUPERUSER_ID, [], partner.id, context=context)['value']
                sale_order_obj.write(cr, SUPERUSER_ID, [sale_order_id], values, context=context)
                request.session['sale_order_id'] = sale_order_id
        if sale_order_id:
            # TODO cache partner_id session
            partner = self.pool['res.users'].browse(cr, SUPERUSER_ID, uid, context=context).partner_id

            sale_order = sale_order_obj.browse(cr, SUPERUSER_ID, sale_order_id, context=context)
            if not sale_order.exists():
                request.session['sale_order_id'] = None
                return None

            # check for change of pricelist with a coupon
            if code and code != sale_order.pricelist_id.code:
                pricelist_ids = self.pool['product.pricelist'].search(cr, SUPERUSER_ID, [('code', '=', code)], context=context)
                if pricelist_ids:
                    pricelist_id = pricelist_ids[0]
                    request.session['sale_order_code_pricelist_id'] = pricelist_id
                    update_pricelist = True

            pricelist_id = request.session.get('sale_order_code_pricelist_id') or partner.property_product_pricelist.id

            # check for change of partner_id ie after signup
            if sale_order.partner_id.id != partner.id and request.website.partner_id.id != partner.id:
                flag_pricelist = False
                if pricelist_id != sale_order.pricelist_id.id:
                    flag_pricelist = True
                fiscal_position = sale_order.fiscal_position and sale_order.fiscal_position.id or False

                values = sale_order_obj.onchange_partner_id(cr, SUPERUSER_ID, [sale_order_id], partner.id, context=context)['value']
                if values.get('fiscal_position'):
                    order_lines = map(int,sale_order.order_line)
                    values.update(sale_order_obj.onchange_fiscal_position(cr, SUPERUSER_ID, [],
                        values['fiscal_position'], [[6, 0, order_lines]], context=context)['value'])

                values['partner_id'] = partner.id
                sale_order_obj.write(cr, SUPERUSER_ID, [sale_order_id], values, context=context)

                if flag_pricelist or values.get('fiscal_position', False) != fiscal_position:
                    update_pricelist = True

            # update the pricelist
            if update_pricelist:
                values = {'pricelist_id': pricelist_id}
                values.update(sale_order.onchange_pricelist_id(pricelist_id, None)['value'])
                sale_order.write(values)
                for line in sale_order.order_line:
                    if line.exists():
                        sale_order._cart_update(product_id=line.product_id.id, line_id=line.id, add_qty=0)

            # update browse record
            if (code and code != sale_order.pricelist_id.code) or sale_order.partner_id.id !=  partner.id:
                sale_order = sale_order_obj.browse(cr, SUPERUSER_ID, sale_order.id, context=context)

        return sale_order

    def sale_get_transaction(self, cr, uid, ids, context=None):
        transaction_obj = self.pool.get('payment.transaction')
        tx_id = request.session.get('sale_transaction_id')
        if tx_id:
            tx_ids = transaction_obj.search(cr, SUPERUSER_ID, [('id', '=', tx_id), ('state', 'not in', ['cancel'])], context=context)
            if tx_ids:
                return transaction_obj.browse(cr, SUPERUSER_ID, tx_ids[0], context=context)
            else:
                request.session['sale_transaction_id'] = False
        return False

    def sale_reset(self, cr, uid, ids, context=None):
        request.session.update({
            'sale_order_id': False,
            'sale_transaction_id': False,
            'sale_order_code_pricelist_id': False,
        })



1	# -- coding: utf-8 --
2	import random	4✔
3
4	from openerp import SUPERUSER_ID	4✔
5	from openerp.osv import osv, orm, fields	4✔
6	from openerp.addons.web.http import request	4✔
7	from openerp.tools.translate import _	4✔
8
9
10	class sale_order(osv.Model):	4✔
11	_inherit = "sale.order"	4✔
12
13	def _cart_qty(self, cr, uid, ids, field_name, arg, context=None):	4✔
14	res = dict()	×
15	for order in self.browse(cr, uid, ids, context=context):	×
16	res[order.id] = int(sum(l.product_uom_qty for l in (order.website_order_line or [])))	×
17	return res	×
18
19	_columns = {	4✔
20	'website_order_line': fields.one2many(
21	'sale.order.line', 'order_id',
22	string='Order Lines displayed on Website', readonly=True,
23	help='Order Lines to be displayed on the website. They should not be used for computation purpose.',
24	),
25	'cart_quantity': fields.function(_cart_qty, type='integer', string='Cart Quantity'),
26	'payment_acquirer_id': fields.many2one('payment.acquirer', 'Payment Acquirer', on_delete='set null', copy=False),
27	'payment_tx_id': fields.many2one('payment.transaction', 'Transaction', on_delete='set null', copy=False),
28	}
29
30	def _get_errors(self, cr, uid, order, context=None):	4✔
31	return []	×
32
33	def _get_website_data(self, cr, uid, order, context):	4✔
34	return {	×
35	'partner': order.partner_id.id,
36	'order': order
37	}
38
39	def _cart_find_product_line(self, cr, uid, ids, product_id=None, line_id=None, context=None, **kwargs):	4✔
40	for so in self.browse(cr, uid, ids, context=context):	×
41	domain = [('order_id', '=', so.id), ('product_id', '=', product_id)]	×
42	if line_id:	×
43	domain += [('id', '=', line_id)]	×
44	return self.pool.get('sale.order.line').search(cr, SUPERUSER_ID, domain, context=context)	×
45
46	def _website_product_id_change(self, cr, uid, ids, order_id, product_id, qty=0, line_id=None, context=None):	4✔
47	so = self.pool.get('sale.order').browse(cr, uid, order_id, context=context)	×
48
49	values = self.pool.get('sale.order.line').product_id_change(cr, SUPERUSER_ID, [],	×
50	pricelist=so.pricelist_id.id,
51	product=product_id,
52	partner_id=so.partner_id.id,
53	fiscal_position=so.fiscal_position.id,
54	qty=qty,
55	context=context
56	)['value']
57
58	if line_id:	×
59	line = self.pool.get('sale.order.line').browse(cr, SUPERUSER_ID, line_id, context=context)	×
60	values['name'] = line.name	×
61	else:
62	product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)	×
63	values['name'] = product.description_sale and "%s\n%s" % (product.display_name, product.description_sale) or product.display_name	×
64
65	values['product_id'] = product_id	×
66	values['order_id'] = order_id	×
67	if values.get('tax_id') != None:	×
68	values['tax_id'] = [(6, 0, values['tax_id'])]	×
69	return values	×
70
71	def _cart_update(self, cr, uid, ids, product_id=None, line_id=None, add_qty=0, set_qty=0, context=None, **kwargs):	4✔
72	""" Add or set product quantity, add_qty can be negative """
73	sol = self.pool.get('sale.order.line')	×
74
75	quantity = 0	×
76	for so in self.browse(cr, uid, ids, context=context):	×
77	if so.state != 'draft':	×
78	request.session['sale_order_id'] = None	×
79	raise osv.except_osv(_('Error!'), _('It is forbidden to modify a sale order which is not in draft status'))	×
80	if line_id != False:	×
81	line_ids = so._cart_find_product_line(product_id, line_id, context=context, **kwargs)	×
82	if line_ids:	×
83	line_id = line_ids[0]	×
84
85	# Create line if no line with product_id can be located
86	if not line_id:	×
87	values = self._website_product_id_change(cr, uid, ids, so.id, product_id, qty=1, context=context)	×
88	line_id = sol.create(cr, SUPERUSER_ID, values, context=context)	×
89	if add_qty:	×
90	add_qty -= 1	×
91
92	# compute new quantity
93	if set_qty:	×
94	quantity = set_qty	×
95	elif add_qty != None:	×
96	quantity = sol.browse(cr, SUPERUSER_ID, line_id, context=context).product_uom_qty + (add_qty or 0)	×
97
98	# Remove zero of negative lines
99	if quantity <= 0:	×
100	sol.unlink(cr, SUPERUSER_ID, [line_id], context=context)	×
101	else:
102	# update line
103	values = self._website_product_id_change(cr, uid, ids, so.id, product_id, qty=quantity, line_id=line_id, context=context)	×
104	values['product_uom_qty'] = quantity	×
105	sol.write(cr, SUPERUSER_ID, [line_id], values, context=context)	×
106
107	return {'line_id': line_id, 'quantity': quantity}	×
108
109	def _cart_accessories(self, cr, uid, ids, context=None):	4✔
110	for order in self.browse(cr, uid, ids, context=context):	×
111	s = set(j.id for l in (order.website_order_line or []) for j in (l.product_id.accessory_product_ids or []))	×
112	s -= set(l.product_id.id for l in order.order_line)	×
113	product_ids = random.sample(s, min(len(s),3))	×
114	return self.pool['product.product'].browse(cr, uid, product_ids, context=context)	×
115
116	class website(orm.Model):	4✔
117	_inherit = 'website'	4✔
118
119	_columns = {	4✔
120	'pricelist_id': fields.related('user_id','partner_id','property_product_pricelist',
121	type='many2one', relation='product.pricelist', string='Default Pricelist'),
122	'currency_id': fields.related('pricelist_id','currency_id',
123	type='many2one', relation='res.currency', string='Default Currency'),
124	}
125
126	def sale_product_domain(self, cr, uid, ids, context=None):	4✔
127	return [("sale_ok", "=", True)]	×
128
129	def sale_get_order(self, cr, uid, ids, force_create=False, code=None, update_pricelist=None, context=None):	4✔
130	sale_order_obj = self.pool['sale.order']	×
131	sale_order_id = request.session.get('sale_order_id')	×
132	sale_order = None	×
133	# create so if needed
134	if not sale_order_id and (force_create or code):	×
135	# TODO cache partner_id session
136	partner = self.pool['res.users'].browse(cr, SUPERUSER_ID, uid, context=context).partner_id	×
137
138	for w in self.browse(cr, uid, ids):	×
139	values = {	×
140	'user_id': w.user_id.id,
141	'partner_id': partner.id,
142	'pricelist_id': partner.property_product_pricelist.id,
143	'section_id': self.pool.get('ir.model.data').get_object_reference(cr, uid, 'website', 'salesteam_website_sales')[1],
144	}
145	sale_order_id = sale_order_obj.create(cr, SUPERUSER_ID, values, context=context)	×
146	values = sale_order_obj.onchange_partner_id(cr, SUPERUSER_ID, [], partner.id, context=context)['value']	×
147	sale_order_obj.write(cr, SUPERUSER_ID, [sale_order_id], values, context=context)	×
148	request.session['sale_order_id'] = sale_order_id	×
149	if sale_order_id:	×
150	# TODO cache partner_id session
151	partner = self.pool['res.users'].browse(cr, SUPERUSER_ID, uid, context=context).partner_id	×
152
153	sale_order = sale_order_obj.browse(cr, SUPERUSER_ID, sale_order_id, context=context)	×
154	if not sale_order.exists():	×
155	request.session['sale_order_id'] = None	×
156	return None	×
157
158	# check for change of pricelist with a coupon
159	if code and code != sale_order.pricelist_id.code:	×
160	pricelist_ids = self.pool['product.pricelist'].search(cr, SUPERUSER_ID, [('code', '=', code)], context=context)	×
161	if pricelist_ids:	×
162	pricelist_id = pricelist_ids[0]	×
163	request.session['sale_order_code_pricelist_id'] = pricelist_id	×
164	update_pricelist = True	×
165
166	pricelist_id = request.session.get('sale_order_code_pricelist_id') or partner.property_product_pricelist.id	×
167
168	# check for change of partner_id ie after signup
169	if sale_order.partner_id.id != partner.id and request.website.partner_id.id != partner.id:	×
170	flag_pricelist = False	×
171	if pricelist_id != sale_order.pricelist_id.id:	×
172	flag_pricelist = True	×
173	fiscal_position = sale_order.fiscal_position and sale_order.fiscal_position.id or False	×
174
175	values = sale_order_obj.onchange_partner_id(cr, SUPERUSER_ID, [sale_order_id], partner.id, context=context)['value']	×
176	if values.get('fiscal_position'):	×
177	order_lines = map(int,sale_order.order_line)	×
178	values.update(sale_order_obj.onchange_fiscal_position(cr, SUPERUSER_ID, [],	×
179	values['fiscal_position'], [[6, 0, order_lines]], context=context)['value'])
180
181	values['partner_id'] = partner.id	×
182	sale_order_obj.write(cr, SUPERUSER_ID, [sale_order_id], values, context=context)	×
183
184	if flag_pricelist or values.get('fiscal_position', False) != fiscal_position:	×
185	update_pricelist = True	×
186
187	# update the pricelist
188	if update_pricelist:	×
189	values = {'pricelist_id': pricelist_id}	×
190	values.update(sale_order.onchange_pricelist_id(pricelist_id, None)['value'])	×
191	sale_order.write(values)	×
192	for line in sale_order.order_line:	×
193	if line.exists():	×
194	sale_order._cart_update(product_id=line.product_id.id, line_id=line.id, add_qty=0)	×
195
196	# update browse record
197	if (code and code != sale_order.pricelist_id.code) or sale_order.partner_id.id != partner.id:	×
198	sale_order = sale_order_obj.browse(cr, SUPERUSER_ID, sale_order.id, context=context)	×
199
200	return sale_order	×
201
202	def sale_get_transaction(self, cr, uid, ids, context=None):	4✔
203	transaction_obj = self.pool.get('payment.transaction')	×
204	tx_id = request.session.get('sale_transaction_id')	×
205	if tx_id:	×
206	tx_ids = transaction_obj.search(cr, SUPERUSER_ID, [('id', '=', tx_id), ('state', 'not in', ['cancel'])], context=context)	×
207	if tx_ids:	×
208	return transaction_obj.browse(cr, SUPERUSER_ID, tx_ids[0], context=context)	×
209	else:
210	request.session['sale_transaction_id'] = False	×
211	return False	×
212
213	def sale_reset(self, cr, uid, ids, context=None):	4✔
214	request.session.update({	×
215	'sale_order_id': False,
216	'sale_transaction_id': False,
217	'sale_order_code_pricelist_id': False,
218	})
219
220

OCA / OCB / 843

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