%s
%s
' % ( + return '%s
%s
' % ( _('Add a new expense,'), _('or send receipts by email to %s.') % (link),) return super(HrExpense, self).get_empty_list_help(help_message) @@ -211,6 +211,25 @@ class HrExpense(models.Model): # Business # ---------------------------------------- + @api.multi + def _prepare_move_values(self): + """ + This function prepares move values related to an expense + """ + self.ensure_one() + journal = self.sheet_id.bank_journal_id if self.payment_mode == 'company_account' else self.sheet_id.journal_id + account_date = self.sheet_id.accounting_date or self.date + move_values = { + 'journal_id': journal.id, + 'company_id': self.env.user.company_id.id, + 'date': account_date, + 'ref': self.sheet_id.name, + # force the name to the default value, to avoid an eventual 'default_name' in the context + # to set it to '' which cause no number to be given to the account.move when posted. + 'name': '/', + } + return move_values + @api.multi def _get_account_move_by_sheet(self): """ Return a mapping between the expense sheet of current expense and its account move @@ -219,18 +238,8 @@ class HrExpense(models.Model): move_grouped_by_sheet = {} for expense in self: # create the move that will contain the accounting entries - account_date = expense.sheet_id.accounting_date or expense.date if expense.sheet_id.id not in move_grouped_by_sheet: - journal = expense.sheet_id.bank_journal_id if expense.payment_mode == 'company_account' else expense.sheet_id.journal_id - move = self.env['account.move'].create({ - 'journal_id': journal.id, - 'company_id': self.env.user.company_id.id, - 'date': account_date, - 'ref': expense.sheet_id.name, - # force the name to the default value, to avoid an eventual 'default_name' in the context - # to set it to '' which cause no number to be given to the account.move when posted. - 'name': '/', - }) + move = self.env['account.move'].create(expense._prepare_move_values()) move_grouped_by_sheet[expense.sheet_id.id] = move else: move = move_grouped_by_sheet[expense.sheet_id.id] diff --git a/addons/hr_holidays/models/hr.py b/addons/hr_holidays/models/hr.py index 6a0dae5d5a2..2a8a5506217 100644 --- a/addons/hr_holidays/models/hr.py +++ b/addons/hr_holidays/models/hr.py @@ -206,8 +206,8 @@ class Employee(models.Model): hr_vals['manager_id'] = values['parent_id'] if values.get('department_id') is not None: hr_vals['department_id'] = values['department_id'] - holidays = self.env['hr.leave'].search(['|',('state', 'in', ['draft', 'confirm']),('date_from', '>', today_date), ('employee_id', 'in', self.ids)]) + holidays = self.env['hr.leave'].sudo().search(['|',('state', 'in', ['draft', 'confirm']),('date_from', '>', today_date), ('employee_id', 'in', self.ids)]) holidays.write(hr_vals) - allocations = self.env['hr.leave.allocation'].search([('state', 'in', ['draft', 'confirm']), ('employee_id', 'in', self.ids)]) + allocations = self.env['hr.leave.allocation'].sudo().search([('state', 'in', ['draft', 'confirm']), ('employee_id', 'in', self.ids)]) allocations.write(hr_vals) return res diff --git a/addons/hr_holidays/models/hr_leave.py b/addons/hr_holidays/models/hr_leave.py index 3ae7d554205..01c19561b34 100644 --- a/addons/hr_holidays/models/hr_leave.py +++ b/addons/hr_holidays/models/hr_leave.py @@ -13,6 +13,7 @@ from odoo import api, fields, models, tools, SUPERUSER_ID from odoo.addons.resource.models.resource import float_to_time, HOURS_PER_DAY from odoo.exceptions import AccessError, UserError, ValidationError from odoo.tools import float_compare +from odoo.tools.float_utils import float_round from odoo.tools.translate import _ _logger = logging.getLogger(__name__) @@ -147,6 +148,8 @@ class HolidaysRequest(models.Model): number_of_hours_display = fields.Float( 'Duration in hours', compute='_compute_number_of_hours_display', copy=False, readonly=True, help='Number of hours of the time off request according to your working schedule. Used for interface.') + duration_display = fields.Char('Requested (Days/Hours)', compute='_compute_duration_display', + help="Field allowing to see the leave request duration in days or hours depending on the leave_type_request_unit") # details # details meeting_id = fields.Many2one('calendar.event', string='Meeting') parent_id = fields.Many2one('hr.leave', string='Parent', copy=False) @@ -356,11 +359,17 @@ class HolidaysRequest(models.Model): self.mode_company_id = False self.department_id = False + @api.multi + def _sync_employee_details(self): + for holiday in self: + holiday.manager_id = holiday.employee_id.parent_id.id + if holiday.employee_id: + holiday.department_id = holiday.employee_id.department_id + @api.onchange('employee_id') def _onchange_employee_id(self): - self.manager_id = self.employee_id.parent_id.id - if self.employee_id: - self.department_id = self.employee_id.department_id + self._sync_employee_details() + self.holiday_status_id = False @api.onchange('date_from', 'date_to', 'employee_id') def _onchange_leave_dates(self): @@ -386,6 +395,16 @@ class HolidaysRequest(models.Model): else: holiday.number_of_hours_display = 0 + @api.multi + @api.depends('number_of_hours_display', 'number_of_days_display') + def _compute_duration_display(self): + for leave in self: + leave.duration_display = '%g %s' % ( + (float_round(leave.number_of_hours_display, precision_digits=2) + if leave.leave_type_request_unit == 'hour' + else float_round(leave.number_of_days_display, precision_digits=2)), + _('hour(s)') if leave.leave_type_request_unit == 'hour' else _('day(s)')) + @api.multi @api.depends('state', 'employee_id', 'department_id') def _compute_can_reset(self): @@ -414,7 +433,7 @@ class HolidaysRequest(models.Model): def _check_date(self): for holiday in self: domain = [ - ('date_from', '<=', holiday.date_to), + ('date_from', '<', holiday.date_to), ('date_to', '>', holiday.date_from), ('employee_id', '=', holiday.employee_id.id), ('id', '!=', holiday.id), @@ -457,7 +476,10 @@ class HolidaysRequest(models.Model): res = [] for leave in self: if self.env.context.get('short_name'): - res.append((leave.id, _("%s : %.2f day(s)") % (leave.name or leave.holiday_status_id.name, leave.number_of_days))) + if leave.leave_type_request_unit == 'hour': + res.append((leave.id, _("%s : %.2f hour(s)") % (leave.name or leave.holiday_status_id.name, leave.number_of_hours_display))) + else: + res.append((leave.id, _("%s : %.2f day(s)") % (leave.name or leave.holiday_status_id.name, leave.number_of_days))) else: if leave.holiday_type == 'company': target = leave.mode_company_id.name @@ -467,11 +489,18 @@ class HolidaysRequest(models.Model): target = leave.category_id.name else: target = leave.employee_id.name - res.append( - (leave.id, - _("%s on %s :%.2f day(s)") % - (target, leave.holiday_status_id.name, leave.number_of_days)) - ) + if leave.leave_type_request_unit == 'hour': + res.append( + (leave.id, + _("%s on %s : %.2f hour(s)") % + (target, leave.holiday_status_id.name, leave.number_of_hours_display)) + ) + else: + res.append( + (leave.id, + _("%s on %s : %.2f day(s)") % + (target, leave.holiday_status_id.name, leave.number_of_days)) + ) return res @api.multi @@ -512,7 +541,7 @@ class HolidaysRequest(models.Model): if holiday.validation_type == 'hr': holiday.message_subscribe(partner_ids=(holiday.employee_id.parent_id.user_id.partner_id | holiday.employee_id.leave_manager_id.partner_id).ids) if employee_id: - holiday._onchange_employee_id() + holiday._sync_employee_details() if 'number_of_days' not in values and ('date_from' in values or 'date_to' in values): holiday._onchange_leave_dates() if leave_type.validation_type == 'no_validation': @@ -551,7 +580,7 @@ class HolidaysRequest(models.Model): for holiday in self: if employee_id: holiday.add_follower(employee_id) - holiday._onchange_employee_id() + self._sync_employee_details() if 'number_of_days' not in values and ('date_from' in values or 'date_to' in values): holiday._onchange_leave_dates() return result diff --git a/addons/hr_holidays/models/hr_leave_allocation.py b/addons/hr_holidays/models/hr_leave_allocation.py index 1a1bacbb83b..50ab5127021 100644 --- a/addons/hr_holidays/models/hr_leave_allocation.py +++ b/addons/hr_holidays/models/hr_leave_allocation.py @@ -207,7 +207,10 @@ class HolidaysAllocation(models.Model): @api.depends('number_of_days', 'employee_id') def _compute_number_of_hours_display(self): for allocation in self: - allocation.number_of_hours_display = allocation.number_of_days * (allocation.employee_id.resource_calendar_id.hours_per_day or HOURS_PER_DAY) + if allocation.parent_id and allocation.parent_id.type_request_unit == "hour": + allocation.number_of_hours_display = allocation.number_of_days * HOURS_PER_DAY + else: + allocation.number_of_hours_display = allocation.number_of_days * (allocation.employee_id.resource_calendar_id.hours_per_day or HOURS_PER_DAY) @api.multi @api.depends('number_of_hours_display', 'number_of_days_display') diff --git a/addons/hr_holidays/tests/test_leave_requests.py b/addons/hr_holidays/tests/test_leave_requests.py index 9f32d96e6c6..f15f9cfb9e5 100644 --- a/addons/hr_holidays/tests/test_leave_requests.py +++ b/addons/hr_holidays/tests/test_leave_requests.py @@ -158,9 +158,9 @@ class TestLeaveRequests(TestHrHolidaysBase): self.employee_hrmanager.write({'department_id': self.hr_dept.id}) self.assertFalse(self.env['hr.leave'].search([('employee_id', 'in', self.hr_dept.member_ids.ids)])) leave_form = Form(self.env['hr.leave'].sudo(self.user_hrmanager)) - leave_form.holiday_status_id = self.holidays_type_1 leave_form.holiday_type = 'department' leave_form.department_id = self.hr_dept + leave_form.holiday_status_id = self.holidays_type_1 leave = leave_form.save() leave.action_approve() member_ids = self.hr_dept.member_ids.ids diff --git a/addons/hr_holidays/views/hr_leave_views.xml b/addons/hr_holidays/views/hr_leave_views.xml index 5ff1739f107..e137648e758 100644 --- a/addons/hr_holidays/views/hr_leave_views.xml +++ b/addons/hr_holidays/views/hr_leave_views.xml @@ -313,7 +313,7 @@
Lunch Overdraft
+
}
*/
getOdoobotID: function () {
return this._ODOOBOT_ID;
diff --git a/addons/mail/static/src/js/services/mail_notification_manager.js b/addons/mail/static/src/js/services/mail_notification_manager.js
index 75754f375d8..caf0c3c4e12 100644
--- a/addons/mail/static/src/js/services/mail_notification_manager.js
+++ b/addons/mail/static/src/js/services/mail_notification_manager.js
@@ -471,12 +471,11 @@ MailManager.include({
*
* @private
* @param {Object} data
- * @param {string} data.author_id
*/
_handlePartnerTransientMessageNotification: function (data) {
var lastMessage = _.last(this._messages);
data.id = (lastMessage ? lastMessage.getID() : 0) + 0.01;
- data.author_id = data.author_id || this.getOdoobotID();
+ data.author_id = this.getOdoobotID();
this.addMessage(data);
},
/**
diff --git a/addons/mail/static/src/js/services/mail_status_manager.js b/addons/mail/static/src/js/services/mail_status_manager.js
index 4a2df2af94f..7891461c9af 100644
--- a/addons/mail/static/src/js/services/mail_status_manager.js
+++ b/addons/mail/static/src/js/services/mail_status_manager.js
@@ -30,6 +30,9 @@ MailManager.include({
getImStatus: function (data) {
var self = this;
var partnerID = data.partnerID;
+ if (partnerID === this.getOdoobotID()[0]) {
+ return 'bot';
+ }
if (!this._imStatus[partnerID]) {
// Add to list to call it in next bus update or _fetchMissingImStatus
this._imStatus[partnerID] = undefined;
@@ -84,9 +87,10 @@ MailManager.include({
return Promise.resolve();
}
return this._rpc({
- model: 'res.partner',
- method: 'read',
- args: [partnerIDs, ['id', 'im_status']],
+ route: '/longpolling/im_status',
+ params: { partner_ids: partnerIDs },
+ }, {
+ shadow: true,
}).then( function (results) {
self.updateImStatus(results);
});
diff --git a/addons/mail/static/tests/mail_status_manager_tests.js b/addons/mail/static/tests/mail_status_manager_tests.js
index be769e8d0b0..f21cefdec9e 100644
--- a/addons/mail/static/tests/mail_status_manager_tests.js
+++ b/addons/mail/static/tests/mail_status_manager_tests.js
@@ -39,7 +39,7 @@ QUnit.test('simple set im_status', function (assert) {
});
QUnit.test('multi get_im_status', async function (assert) {
- assert.expect(9);
+ assert.expect(8);
var readCount = 0;
var parent = testUtils.createParent({
//data: this.data,
@@ -48,9 +48,8 @@ QUnit.test('multi get_im_status', async function (assert) {
if (route === '/mail/init_messaging') {
return this._super.apply(this, arguments);
}
- if (args.method === 'read' && args.model === 'res.partner') {
- assert.deepEqual(args.args[0], [2,3]);
- assert.deepEqual(args.args[1], ['id', 'im_status']);
+ if (route === '/longpolling/im_status') {
+ assert.deepEqual(args.partner_ids, [2,3]);
readCount++;
return Promise.resolve([
{id: 2, im_status: 'away'},
@@ -85,7 +84,7 @@ QUnit.test('multi get_im_status', async function (assert) {
});
QUnit.test('update loop', async function (assert) {
- assert.expect(12);
+ assert.expect(10);
var readCount = 0;
var parent = testUtils.createParent({
services: this.services,
@@ -93,9 +92,8 @@ QUnit.test('update loop', async function (assert) {
if (route === '/mail/init_messaging') {
return this._super.apply(this, arguments);
}
- if (args.method === 'read' && args.model === 'res.partner') {
- assert.deepEqual(args.args[0], [1, 2]);
- assert.deepEqual(args.args[1], ['id', 'im_status']);
+ if (route === '/longpolling/im_status') {
+ assert.deepEqual(args.partner_ids, [1, 2]);
readCount++;
return Promise.resolve([
{"id": 1, "im_status": "online"},
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 46ec87060cf..95ae6372c41 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -387,6 +387,7 @@ class MailComposer(models.TransientModel):
values = self.generate_email_for_composer(template_id, [res_id])[res_id]
# transform attachments into attachment_ids; not attached to the document because this will
# be done further in the posting process, allowing to clean database if email not send
+ attachment_ids = []
Attachment = self.env['ir.attachment']
for attach_fname, attach_datas in values.pop('attachments', []):
data_attach = {
@@ -397,7 +398,9 @@ class MailComposer(models.TransientModel):
'res_id': 0,
'type': 'binary', # override default_type from context, possibly meant for another model!
}
- values.setdefault('attachment_ids', list()).append(Attachment.create(data_attach).id)
+ attachment_ids.append(Attachment.create(data_attach).id)
+ if values.get('attachment_ids', []) or attachment_ids:
+ values['attachment_ids'] = [(5,)] + values.get('attachment_ids', []) + attachment_ids
else:
default_values = self.with_context(default_composition_mode=composition_mode, default_model=model, default_res_id=res_id).default_get(['composition_mode', 'model', 'res_id', 'parent_id', 'partner_ids', 'subject', 'body', 'email_from', 'reply_to', 'attachment_ids', 'mail_server_id'])
values = dict((key, default_values[key]) for key in ['subject', 'body', 'partner_ids', 'email_from', 'reply_to', 'attachment_ids', 'mail_server_id'] if key in default_values)
diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py
index 2c48732e933..a00538f04a2 100644
--- a/addons/mass_mailing/models/mass_mailing.py
+++ b/addons/mass_mailing/models/mass_mailing.py
@@ -457,7 +457,7 @@ class MassMailing(models.Model):
return res
active = fields.Boolean(default=True)
- subject = fields.Char('Subject', help='Subject of emails to send', required=True)
+ subject = fields.Char('Subject', help='Subject of emails to send', required=True, translate=True)
email_from = fields.Char(string='From', required=True,
default=lambda self: self.env['mail.message']._get_default_from())
sent_date = fields.Datetime(string='Sent Date', oldname='date', copy=False)
diff --git a/addons/mass_mailing/wizard/test_mailing.py b/addons/mass_mailing/wizard/test_mailing.py
index 8389ce269ef..7f2459d4a07 100644
--- a/addons/mass_mailing/wizard/test_mailing.py
+++ b/addons/mass_mailing/wizard/test_mailing.py
@@ -27,7 +27,7 @@ class TestMassMailing(models.TransientModel):
'email_from': mailing.email_from,
'reply_to': mailing.reply_to,
'email_to': test_mail,
- 'subject': mailing.name,
+ 'subject': mailing.subject,
'body_html': mass_mail_layout.render({'body': body}, engine='ir.qweb', minimal_qcontext=True),
'notification': True,
'mailing_id': mailing.id,
diff --git a/addons/mrp/models/mrp_production.py b/addons/mrp/models/mrp_production.py
index 12002b3b25a..858b6705d1c 100644
--- a/addons/mrp/models/mrp_production.py
+++ b/addons/mrp/models/mrp_production.py
@@ -487,6 +487,8 @@ class MrpProduction(models.Model):
}
def _generate_finished_moves(self):
+ if self.product_id in self.bom_id.byproduct_ids.mapped('product_id'):
+ raise UserError(_("You cannot have %s as the finished product and in the Byproducts") % self.product_id.name)
moves_values = [self._get_finished_move_value(self.product_id.id, self.product_qty, self.product_uom_id.id)]
for byproduct in self.bom_id.byproduct_ids:
product_uom_factor = self.product_uom_id._compute_quantity(self.product_qty, self.bom_id.product_uom_id)
diff --git a/addons/mrp/models/stock_warehouse.py b/addons/mrp/models/stock_warehouse.py
index 1cc46635b73..0e26c2bb3ec 100644
--- a/addons/mrp/models/stock_warehouse.py
+++ b/addons/mrp/models/stock_warehouse.py
@@ -249,7 +249,7 @@ class StockWarehouse(models.Model):
@api.multi
def _get_all_routes(self):
- routes = super(StockWarehouse, self).get_all_routes_for_wh()
+ routes = super(StockWarehouse, self)._get_all_routes()
routes |= self.filtered(lambda self: self.manufacture_to_resupply and self.manufacture_pull_id and self.manufacture_pull_id.route_id).mapped('manufacture_pull_id').mapped('route_id')
return routes
diff --git a/addons/payment/controllers/portal.py b/addons/payment/controllers/portal.py
index 55a4d08e4b9..8b4585b9393 100644
--- a/addons/payment/controllers/portal.py
+++ b/addons/payment/controllers/portal.py
@@ -2,6 +2,7 @@
# Part of Odoo. See LICENSE file for full copyright and licensing details.
import logging
+import psycopg2
from odoo import http, _
from odoo.http import request
@@ -40,7 +41,7 @@ class PaymentProcessing(http.Controller):
# I prefer to let the controller chose when to access to payment.transaction using sudo
return request.session.get("__payment_tx_ids__", [])
- @http.route(['/payment/process'], type="http", auth="public", website=True)
+ @http.route(['/payment/process'], type="http", auth="public", website=True, sitemap=False)
def payment_status_page(self, **kwargs):
# When the customer is redirect to this website page,
# we retrieve the payment transaction list from his session
@@ -93,11 +94,15 @@ class PaymentProcessing(http.Controller):
tx_to_process = payment_transaction_ids.filtered(lambda x: x.state == 'done' and x.is_processed is False)
try:
tx_to_process._post_process_after_done()
+ except psycopg2.OperationalError as e:
+ request.env.cr.rollback()
+ result['success'] = False
+ result['error'] = "tx_process_retry"
except Exception as e:
request.env.cr.rollback()
result['success'] = False
result['error'] = str(e)
- _logger.error("Error while processing transaction(s) %s, exception \"%s\"", tx_to_process.ids, str(e))
+ _logger.exception("Error while processing transaction(s) %s, exception \"%s\"", tx_to_process.ids, str(e))
return result
@@ -122,7 +127,7 @@ class WebsitePayment(http.Controller):
}
return request.render("payment.pay_methods", values)
- @http.route(['/website_payment/pay'], type='http', auth='public', website=True)
+ @http.route(['/website_payment/pay'], type='http', auth='public', website=True, sitemap=False)
def pay(self, reference='', order_id=None, amount=False, currency_id=None, acquirer_id=None, **kw):
env = request.env
user = env.user.sudo()
@@ -262,7 +267,7 @@ class WebsitePayment(http.Controller):
except Exception as e:
return request.redirect('/payment/process')
- @http.route(['/website_payment/confirm'], type='http', auth='public', website=True)
+ @http.route(['/website_payment/confirm'], type='http', auth='public', website=True, sitemap=False)
def confirm(self, **kw):
tx_id = int(kw.get('tx_id', 0))
if tx_id:
diff --git a/addons/payment/models/payment_acquirer.py b/addons/payment/models/payment_acquirer.py
index 0f2ce5d222a..6847cb76461 100644
--- a/addons/payment/models/payment_acquirer.py
+++ b/addons/payment/models/payment_acquirer.py
@@ -899,7 +899,7 @@ class PaymentTransaction(models.Model):
# custom create
custom_method_name = '%s_create' % acquirer.provider
- if hasattr(acquirer, custom_method_name):
+ if hasattr(self, custom_method_name):
values.update(getattr(self, custom_method_name)(values))
if not values.get('reference'):
diff --git a/addons/payment/static/src/js/payment_processing.js b/addons/payment/static/src/js/payment_processing.js
index 0fcfbc7ce81..73af1a344bb 100644
--- a/addons/payment/static/src/js/payment_processing.js
+++ b/addons/payment/static/src/js/payment_processing.js
@@ -54,6 +54,8 @@ odoo.define('payment.processing', function (require) {
}
else {
switch(data.error) {
+ case "tx_process_retry":
+ break;
case "no_tx_found":
self.displayContent("payment.no_tx_found", {});
break;
@@ -63,18 +65,12 @@ odoo.define('payment.processing', function (require) {
}
}
self.startPolling();
- }).then(function() {
- if ($.blockUI) {
- $.unblockUI();
- }
+
}).guardedCatch(function() {
- if ($.blockUI) {
- $.unblockUI();
- }
self.displayContent("payment.rpc_error", {});
self.startPolling();
});
- },
+ },g
processPolledData: function (transactions) {
var render_values = {
'tx_draft': [],
@@ -120,6 +116,7 @@ odoo.define('payment.processing', function (require) {
},
displayContent: function (xmlid, render_values) {
var html = Qweb.render(xmlid, render_values);
+ $.unblockUI();
this.$el.find('.o_payment_processing_content').html(html);
},
displayLoading: function () {
diff --git a/addons/payment_authorize/models/authorize_request.py b/addons/payment_authorize/models/authorize_request.py
index 79d0a7589c5..922d9df1bf1 100644
--- a/addons/payment_authorize/models/authorize_request.py
+++ b/addons/payment_authorize/models/authorize_request.py
@@ -226,6 +226,12 @@ class AuthorizeAPI():
etree.SubElement(customer, "email").text = partner.email or ''
response = self._authorize_request(root)
res = dict()
+ if not response.find('customerProfileId'):
+ _logger.warning(
+ 'Unable to create customer payment profile, data missing from transaction. Transaction_id: %s - Partner_id: %s'
+ % (transaction_id, partner)
+ )
+ return res
res['profile_id'] = response.find('customerProfileId').text
res['payment_profile_id'] = response.find('customerPaymentProfileIdList/numericString').text
root_profile = self._base_tree('getCustomerPaymentProfileRequest')
diff --git a/addons/payment_authorize/models/payment.py b/addons/payment_authorize/models/payment.py
index 5a6ed0bf8e1..946f031484d 100644
--- a/addons/payment_authorize/models/payment.py
+++ b/addons/payment_authorize/models/payment.py
@@ -228,17 +228,18 @@ class TxAuthorize(models.Model):
(self.type == 'form_save' or self.acquirer_id.save_token == 'always'):
transaction = AuthorizeAPI(self.acquirer_id)
res = transaction.create_customer_profile_from_tx(self.partner_id, self.acquirer_reference)
- token_id = self.env['payment.token'].create({
- 'authorize_profile': res.get('profile_id'),
- 'name': res.get('name'),
- 'acquirer_ref': res.get('payment_profile_id'),
- 'acquirer_id': self.acquirer_id.id,
- 'partner_id': self.partner_id.id,
- })
- self.payment_token_id = token_id
+ if res:
+ token_id = self.env['payment.token'].create({
+ 'authorize_profile': res.get('profile_id'),
+ 'name': res.get('name'),
+ 'acquirer_ref': res.get('payment_profile_id'),
+ 'acquirer_id': self.acquirer_id.id,
+ 'partner_id': self.partner_id.id,
+ })
+ self.payment_token_id = token_id
- if self.payment_token_id:
- self.payment_token_id.verified = True
+ if self.payment_token_id:
+ self.payment_token_id.verified = True
return True
elif status_code == self._authorize_pending_tx_status:
self.write({'acquirer_reference': data.get('x_trans_id')})
diff --git a/addons/point_of_sale/models/pos_order.py b/addons/point_of_sale/models/pos_order.py
index bf13410b137..8ee35a1f0ab 100644
--- a/addons/point_of_sale/models/pos_order.py
+++ b/addons/point_of_sale/models/pos_order.py
@@ -891,7 +891,7 @@ class PosOrder(models.Model):
# a serialnumber always has a quantity of 1 product, a lot number takes the full quantity of the order line
qty = 1.0
if stock_production_lot.product_id.tracking == 'lot':
- qty = pos_pack_lot.pos_order_line_id.qty
+ qty = abs(pos_pack_lot.pos_order_line_id.qty)
qty_done += qty
pack_lots.append({'lot_id': stock_production_lot.id, 'qty': qty})
else:
diff --git a/addons/point_of_sale/static/src/js/gui.js b/addons/point_of_sale/static/src/js/gui.js
index 0184b07a984..0a269721abd 100644
--- a/addons/point_of_sale/static/src/js/gui.js
+++ b/addons/point_of_sale/static/src/js/gui.js
@@ -405,7 +405,7 @@ var Gui = core.Class.extend({
}
} else if (input === '-') {
if (options.firstinput) {
- newbuf = '-';
+ newbuf = '-0';
} else if ( newbuf[0] === '-' ) {
newbuf = newbuf.substring(1,newbuf.length);
} else {
@@ -420,6 +420,9 @@ var Gui = core.Class.extend({
newbuf += input;
}
}
+ if (newbuf === "-") {
+ newbuf = "";
+ }
// End of input buffer at 12 characters.
if (newbuf.length > buffer.length && newbuf.length > 12) {
diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index 10025258bde..2a1e1490633 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -1450,7 +1450,7 @@ exports.Orderline = Backbone.Model.extend({
var lots_required = 1;
if (this.product.tracking == 'serial') {
- lots_required = this.quantity;
+ lots_required = Math.abs(this.quantity);
}
return lots_required;
@@ -1998,8 +1998,11 @@ var PacklotlineCollection = Backbone.Collection.extend({
set_quantity_by_lot: function() {
if (this.order_line.product.tracking == 'serial') {
- var valid_lots = this.get_valid_lots();
- this.order_line.set_quantity(valid_lots.length);
+ var valid_lots_quantity = this.get_valid_lots().length;
+ if (this.order_line.quantity < 0){
+ valid_lots_quantity = -valid_lots_quantity;
+ }
+ this.order_line.set_quantity(valid_lots_quantity);
}
}
});
diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index 26d315631a8..17c47b154ad 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -990,7 +990,7 @@
-
diff --git a/addons/point_of_sale/views/point_of_sale_dashboard.xml b/addons/point_of_sale/views/point_of_sale_dashboard.xml
index c45bc2e19cf..b630f2e4e12 100644
--- a/addons/point_of_sale/views/point_of_sale_dashboard.xml
+++ b/addons/point_of_sale/views/point_of_sale_dashboard.xml
@@ -47,7 +47,6 @@
0
- 0:
+ if (discount > 0 and new_list_price > 0) or (discount < 0 and new_list_price < 0):
self.discount = discount
def _is_delivery(self):
diff --git a/addons/sale/report/report_all_channels_sales.py b/addons/sale/report/report_all_channels_sales.py
index 1638c087d05..473ab1f1362 100644
--- a/addons/sale/report/report_all_channels_sales.py
+++ b/addons/sale/report/report_all_channels_sales.py
@@ -52,7 +52,7 @@ class PosSaleReport(models.Model):
LEFT JOIN product_pricelist pp ON (so.pricelist_id = pp.id)
LEFT JOIN uom_uom u on (u.id=sol.product_uom)
LEFT JOIN uom_uom u2 on (u2.id=pt.uom_id)
- WHERE so.state != 'cancel'
+ WHERE so.state in ('sale','done')
"""
return so_str
diff --git a/addons/sale/static/src/js/variant_mixin.js b/addons/sale/static/src/js/variant_mixin.js
index 6ce51f2998d..f216fce656e 100644
--- a/addons/sale/static/src/js/variant_mixin.js
+++ b/addons/sale/static/src/js/variant_mixin.js
@@ -1,6 +1,7 @@
odoo.define('sale.VariantMixin', function (require) {
'use strict';
+var concurrency = require('web.concurrency');
var core = require('web.core');
var utils = require('web.utils');
var ajax = require('web.ajax');
@@ -8,9 +9,8 @@ var _t = core._t;
var VariantMixin = {
events: {
- 'click .css_attribute_color input': '_onChangeColorAttribute',
+ 'change .css_attribute_color input': '_onChangeColorAttribute',
'change .main_product:not(.in_cart) input.js_quantity': 'onChangeAddQuantity',
- 'click button.js_add_cart_json': 'onClickAddCartJSON',
'change [data-attribute_exclusions]': 'onChangeVariant'
},
@@ -36,6 +36,20 @@ var VariantMixin = {
* @param {$.Element} [params.$container] force the used container
*/
onChangeVariant: function (ev, params) {
+ var $parent = $(ev.target).closest('.js_product');
+ if (!$parent.data('uniqueId')) {
+ $parent.data('uniqueId', _.uniqueId());
+ }
+ this._throttledGetCombinationInfo($parent.data('uniqueId'))(ev);
+ },
+ /**
+ * @see onChangeVariant
+ *
+ * @private
+ * @param {Event} ev
+ * @returns {Deferred}
+ */
+ _getCombinationInfo: function (ev) {
var self = this;
if ($(ev.target).hasClass('variant_custom_value')) {
@@ -57,16 +71,21 @@ var VariantMixin = {
var qty = $component.find('input[name="add_qty"]').val();
var $parent = $(ev.target).closest('.js_product');
+
var combination = this.getSelectedVariantValues($parent);
+ var parentCombination = $parent.find('ul[data-attribute_exclusions]').data('attribute_exclusions').parent_combination;
+
+ var productTemplateId = parseInt($parent.find('.product_template_id').val());
self._checkExclusions($parent, combination);
ajax.jsonRpc(this._getUri('/sale/get_combination_info'), 'call', {
- product_template_id: parseInt($parent.find('.product_template_id').val()),
- product_id: this._getProductId($parent),
- combination: combination,
- add_qty: parseInt(qty),
- pricelist_id: this.pricelistId || false,
+ 'product_template_id': productTemplateId,
+ 'product_id': this._getProductId($parent),
+ 'combination': combination,
+ 'add_qty': parseInt(qty),
+ 'pricelist_id': this.pricelistId || false,
+ 'parent_combination': parentCombination,
}).then(function (combinationData) {
self._onChangeCombination(ev, $parent, combinationData);
});
@@ -138,10 +157,13 @@ var VariantMixin = {
var $input = $link.closest('.input-group').find("input");
var min = parseFloat($input.data("min") || 0);
var max = parseFloat($input.data("max") || Infinity);
- var quantity = ($link.has(".fa-minus").length ? -1 : 1) + parseFloat($input.val() || 0, 10);
+ var previousQty = parseFloat($input.val() || 0, 10);
+ var quantity = ($link.has(".fa-minus").length ? -1 : 1) + previousQty;
var newQty = quantity > min ? (quantity < max ? quantity : max) : min;
- $input.val(newQty).trigger('change');
+ if (newQty !== previousQty) {
+ $input.val(newQty).trigger('change');
+ }
return false;
},
@@ -332,23 +354,6 @@ var VariantMixin = {
* @param {Array} combination the selected combination of product attribute values
*/
_checkExclusions: function ($parent, combination) {
-
- function areCombinationsEqual(c1, c2) {
- return c1.length === c2.length && _.every(c1, function (ptav) {
- return c2.indexOf(ptav) > -1;
- });
- }
-
- function isCombinationInList(c1, list) {
- return _.some(list, function (c2) {
- return areCombinationsEqual(c1, c2);
- });
- }
-
- function isPtavInCombination(ptav, combination) {
- return combination.indexOf(ptav) > -1;
- }
-
var self = this;
var combinationData = $parent
.find('ul[data-attribute_exclusions]')
@@ -360,17 +365,6 @@ var VariantMixin = {
.attr('title', '')
.data('excluded-by', '');
- var disable = false;
-
- // compatibility 12.0
- var filteredCombination = combination;
- if (combinationData.no_variant_product_template_attribute_value_ids !== undefined) {
- var no_variants = combinationData.no_variant_product_template_attribute_value_ids;
- filteredCombination = _.filter(combination, function (ptav) {
- return !isPtavInCombination(ptav, no_variants);
- });
- }
-
// exclusion rules: array of ptav
// for each of them, contains array with the other ptav they exclude
if (combinationData.exclusions) {
@@ -379,11 +373,6 @@ var VariantMixin = {
if (combinationData.exclusions.hasOwnProperty(current_ptav)) {
// for each exclusion of the current attribute:
_.each(combinationData.exclusions[current_ptav], function (excluded_ptav) {
- // disable if it excludes any other attribute already in the combination
- if (isPtavInCombination(excluded_ptav, combination)) {
- disable = true;
- }
-
// disable the excluded input (even when not already selected)
// to give a visual feedback before click
self._disableInput(
@@ -401,9 +390,6 @@ var VariantMixin = {
_.each(combinationData.parent_exclusions, function (exclusions, excluded_by){
// check that the selected combination is in the parent exclusions
_.each(exclusions, function (ptav) {
- if (isPtavInCombination(ptav, combination)) {
- disable = true;
- }
// disable the excluded input (even when not already selected)
// to give a visual feedback before click
@@ -416,29 +402,7 @@ var VariantMixin = {
);
});
});
-
- // archived variants
- if (isCombinationInList(filteredCombination, combinationData.archived_combinations)) {
- disable = true;
- }
-
- // if not using dynamic attributes, exclude variants that are deleted
- if (filteredCombination.length && // compatibility 12.0 list view of variants
- combinationData.has_dynamic_attributes === false &&
- combinationData.existing_combinations !== undefined &&
- !isCombinationInList(filteredCombination, combinationData.existing_combinations)
- ) {
- disable = true;
- }
-
- $parent.toggleClass('css_not_available', disable);
- $parent.find("#add_to_cart").toggleClass('disabled', disable);
- $parent
- .parents('.modal')
- .find('.o_sale_product_configurator_add, .o_sale_product_configurator_edit')
- .toggleClass('disabled', disable);
},
-
/**
* Extracted to a method to be extendable by other modules
*
@@ -447,7 +411,6 @@ var VariantMixin = {
_getProductId: function ($parent) {
return parseInt($parent.find('.product_id').val());
},
-
/**
* Will disable the input/option that refers to the passed attributeValueId.
* This is used for showing the user that some combinations are not available.
@@ -489,7 +452,6 @@ var VariantMixin = {
$target.data('excluded-by', JSON.stringify(excludedByData));
}
},
-
/**
* @see onChangeVariant
*
@@ -506,6 +468,10 @@ var VariantMixin = {
$price.text(self._priceToStr(combination.price));
$default_price.text(self._priceToStr(combination.list_price));
+ var isCombinationPossible = combination.is_combination_possible;
+ this._toggleDisable($parent, isCombinationPossible);
+
+
// compatibility_check to remove in master
// needed for fix in 12.0 in the case of git pull and no server restart
var compatibility_check = combination.list_price - combination.price >= 0.01;
@@ -545,7 +511,8 @@ var VariantMixin = {
combination.display_image,
combination.product_id,
combination.product_template_id,
- combination.carousel
+ combination.carousel,
+ isCombinationPossible
);
}
@@ -586,7 +553,46 @@ var VariantMixin = {
formatted[0] = utils.insert_thousand_seps(formatted[0]);
return formatted.join(l10n.decimal_point);
},
-
+ /**
+ * Returns a throttled `_getCombinationInfo` with a leading and a trailing
+ * call, which is memoized per `uniqueId`, and for which previous results
+ * are dropped.
+ *
+ * The uniqueId is needed because on the configurator modal there might be
+ * multiple elements triggering the rpc at the same time, and we need each
+ * individual product rpc to be executed, but only once per individual
+ * product.
+ *
+ * The leading execution is to keep good reactivity on the first call, for
+ * a better user experience. The trailing is because ultimately only the
+ * information about the last selected combination is useful. All
+ * intermediary rpc can be ignored and are therefore best not done at all.
+ *
+ * The DropMisordered is to make sure slower rpc are ignored if the result
+ * of a newer rpc has already been received.
+ *
+ * @private
+ * @param {string} uniqueId
+ * @returns {function}
+ */
+ _throttledGetCombinationInfo: _.memoize(function (uniqueId) {
+ var dropMisordered = new concurrency.DropMisordered();
+ var _getCombinationInfo = _.throttle(this._getCombinationInfo.bind(this), 500);
+ return function (ev) {
+ return dropMisordered.add(_getCombinationInfo(ev));
+ };
+ }),
+ /**
+ * Toggles the disabled class depending on the $parent element
+ * and the possibility of the current combination.
+ *
+ * @private
+ * @param {$.Element} $parent
+ * @param {boolean} isCombinationPossible
+ */
+ _toggleDisable: function ($parent, isCombinationPossible) {
+ $parent.toggleClass('css_not_available', !isCombinationPossible);
+ },
/**
* Updates the product image.
* This will use the productId if available or will fallback to the productTemplateId.
diff --git a/addons/sale/views/res_config_settings_views.xml b/addons/sale/views/res_config_settings_views.xml
index 86abec7541c..7c825ff4973 100644
--- a/addons/sale/views/res_config_settings_views.xml
+++ b/addons/sale/views/res_config_settings_views.xml
@@ -61,7 +61,7 @@
diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml
index b2c3a1009ad..0ef68fd2ae1 100644
--- a/addons/sale/views/sale_views.xml
+++ b/addons/sale/views/sale_views.xml
@@ -477,6 +477,7 @@
Maximum overdraft that your employees can reach
diff --git a/addons/lunch/wizard/lunch_line_wizard.py b/addons/lunch/wizard/lunch_line_wizard.py
index 2006144e582..d05cfd06de1 100644
--- a/addons/lunch/wizard/lunch_line_wizard.py
+++ b/addons/lunch/wizard/lunch_line_wizard.py
@@ -86,7 +86,7 @@ class LunchOrderWizard(models.TransientModel):
sum((wizard.topping_ids_1 | wizard.topping_ids_2 | wizard.topping_ids_3).mapped('price')))
def _get_matching_lines(self):
- domain = [('product_id', '=', self.product_id.id), ('date', '=', fields.Date.today()), ('note', '=', self._get_note())]
+ domain = [('user_id', '=', self.user_id.id), ('product_id', '=', self.product_id.id), ('date', '=', fields.Date.today()), ('note', '=', self._get_note())]
lines = self.env['lunch.order'].search(domain)
return lines.filtered(lambda line: (line.topping_ids_1 | line.topping_ids_2 | line.topping_ids_3) == self.topping_ids_1)
diff --git a/addons/mail/models/mail_activity.py b/addons/mail/models/mail_activity.py
index f5bfd7c11cf..bf0b0141604 100644
--- a/addons/mail/models/mail_activity.py
+++ b/addons/mail/models/mail_activity.py
@@ -147,7 +147,7 @@ class MailActivity(models.Model):
('today', 'Today'),
('planned', 'Planned')], 'State',
compute='_compute_state')
- recommended_activity_type_id = fields.Many2one('mail.activity.type', string="Recommended Activity Type", readonly=True)
+ recommended_activity_type_id = fields.Many2one('mail.activity.type', string="Recommended Activity Type")
previous_activity_type_id = fields.Many2one('mail.activity.type', string='Previous Activity Type', readonly=True)
has_recommended_activities = fields.Boolean(
'Next activities available',
@@ -298,7 +298,7 @@ class MailActivity(models.Model):
target_record = self.env[activity.res_model].browse(activity.res_id)
if hasattr(target_record, 'company_id') and (
target_record.company_id != target_user.company_id and (
- len(target_user.company_ids) > 1)):
+ len(target_user.sudo().company_ids) > 1)):
return # in that case we skip the check, assuming it would fail because of the company
model.browse(activity.res_id).check_access_rule('read')
except exceptions.AccessError:
diff --git a/addons/mail/models/mail_message.py b/addons/mail/models/mail_message.py
index e2ebb16c69e..39510206641 100644
--- a/addons/mail/models/mail_message.py
+++ b/addons/mail/models/mail_message.py
@@ -4,6 +4,7 @@
import logging
import re
+from binascii import Error as binascii_error
from operator import itemgetter
from email.utils import formataddr
from openerp.http import request
@@ -933,7 +934,7 @@ class Message(models.Model):
def _invalidate_documents(self):
""" Invalidate the cache of the documents followed by ``self``. """
for record in self:
- if record.model and record.res_id and 'message_ids' in self.env[record.model]:
+ if record.model and record.res_id and issubclass(self.pool[record.model], self.pool['mail.thread']):
self.env[record.model].invalidate_cache(fnames=[
'message_ids',
'message_unread',
@@ -968,16 +969,21 @@ class Message(models.Model):
key = match.group(2)
if not data_to_url.get(key):
name = match.group(4) if match.group(4) else 'image%s' % len(data_to_url)
- attachment = Attachments.create({
- 'name': name,
- 'datas': match.group(2),
- 'datas_fname': name,
- 'res_model': values.get('model'),
- 'res_id': values.get('res_id'),
- })
- attachment.generate_access_token()
- values['attachment_ids'].append((4, attachment.id))
- data_to_url[key] = ['/web/image/%s?access_token=%s' % (attachment.id, attachment.access_token), name]
+ try:
+ attachment = Attachments.create({
+ 'name': name,
+ 'datas': match.group(2),
+ 'datas_fname': name,
+ 'res_model': values.get('model'),
+ 'res_id': values.get('res_id'),
+ })
+ except binascii_error:
+ _logger.warning("Impossible to create an attachment out of badly formated base64 embedded image. Image has been removed.")
+ return match.group(3) # group(3) is the url ending single/double quote matched by the regexp
+ else:
+ attachment.generate_access_token()
+ values['attachment_ids'].append((4, attachment.id))
+ data_to_url[key] = ['/web/image/%s?access_token=%s' % (attachment.id, attachment.access_token), name]
return '%s%s alt="%s"' % (data_to_url[key][0], match.group(3), data_to_url[key][1])
values['body'] = _image_dataurl.sub(base64_to_boundary, tools.ustr(values['body']))
diff --git a/addons/mail/static/src/js/chatter.js b/addons/mail/static/src/js/chatter.js
index 296cf092efb..a11be5335a4 100644
--- a/addons/mail/static/src/js/chatter.js
+++ b/addons/mail/static/src/js/chatter.js
@@ -139,7 +139,7 @@ var Chatter = Widget.extend({
if (this.fields.activity) {
this.fields.activity.$el.detach();
}
- if (this.fields.thread) {
+ if (this.fields.thread && this.fields.thread.$el ) {
this.fields.thread.$el.detach();
}
@@ -404,7 +404,7 @@ var Chatter = Widget.extend({
self.fields.followers.$el.insertBefore(self.$('.o_chatter_button_attachment'));
}
}
- if (self.fields.thread) {
+ if (self.fields.thread && self.fields.thread.$el) {
self.fields.thread.$el.appendTo(self.$el);
}
}).then(always).guardedCatch(always);
diff --git a/addons/mail/static/src/js/models/messages/message.js b/addons/mail/static/src/js/models/messages/message.js
index 77e4120da29..a118807ac47 100644
--- a/addons/mail/static/src/js/models/messages/message.js
+++ b/addons/mail/static/src/js/models/messages/message.js
@@ -578,7 +578,8 @@ var Message = AbstractMessage.extend(Mixins.EventDispatcherMixin, ServicesMixin
* @return {boolean}
*/
_isOdoobotAuthor: function () {
- return this._serverAuthorID === this.call('mail_service', 'getOdoobotID');
+ return this._serverAuthorID &&
+ this._serverAuthorID[0] === this.call('mail_service', 'getOdoobotID')[0];
},
/**
* State whether the message is transient or not
diff --git a/addons/mail/static/src/js/services/mail_manager.js b/addons/mail/static/src/js/services/mail_manager.js
index 27a7183ec88..dedeacca013 100644
--- a/addons/mail/static/src/js/services/mail_manager.js
+++ b/addons/mail/static/src/js/services/mail_manager.js
@@ -46,7 +46,7 @@ var PREVIEW_MSG_MAX_SIZE = 350; // optimal for native english speakers
var MailManager = AbstractService.extend({
dependencies: ['ajax', 'bus_service', 'local_storage'],
- _ODOOBOT_ID: "ODOOBOT", // default authorID for transient messages
+ _ODOOBOT_ID: ["ODOOBOT", "ODOOBOT"], // authorID for transient messages
/**
* @override
@@ -258,7 +258,7 @@ var MailManager = AbstractService.extend({
/**
* Get the OdooBot ID, which is the default authorID for transient messages
*
- * @returns {string}
+ * @returns {Array
- Send a product-specific email once the invoice is paid
+ Send a product-specific email once the invoice is validated
diff --git a/addons/sale_product_configurator/static/src/js/product_configurator_modal.js b/addons/sale_product_configurator/static/src/js/product_configurator_modal.js
index da3ac1d8494..cac81164161 100644
--- a/addons/sale_product_configurator/static/src/js/product_configurator_modal.js
+++ b/addons/sale_product_configurator/static/src/js/product_configurator_modal.js
@@ -11,6 +11,7 @@ var optionalProductsMap = {};
var OptionalProductsModal = Dialog.extend(ServicesMixin, VariantMixin, {
events: _.extend({}, Dialog.prototype.events, VariantMixin.events, {
'click a.js_add, a.js_remove': '_onAddOrRemoveOption',
+ 'click button.js_add_cart_json': 'onClickAddCartJSON',
'change .in_cart.main_product input.js_quantity': '_onChangeQuantity',
'change .js_raw_price': '_computePriceTotal'
}),
@@ -60,7 +61,6 @@ var OptionalProductsModal = Dialog.extend(ServicesMixin, VariantMixin, {
this.previousModalHeight = params.previousModalHeight;
this.dialogClass = 'oe_optional_products_modal';
this._productImageField = 'image_medium';
-
// reset any previously populated properties maps
optionalProductsMap = {};
@@ -153,6 +153,25 @@ var OptionalProductsModal = Dialog.extend(ServicesMixin, VariantMixin, {
// Public
//--------------------------------------------------------------------------
+ /**
+ * Computes and updates the total price, useful when a product is added or
+ * when the quantity is changed.
+ * TODO awa: add a container context to avoid global selectors ?
+ */
+ computePriceTotal: function () {
+ if ($('.js_price_total').length) {
+ var price = 0;
+ $('.js_product.in_cart').each(function () {
+ var quantity = parseInt($('input[name="add_qty"]').first().val());
+ price += parseFloat($(this).find('.js_raw_price').html()) * quantity;
+ });
+
+ $('.js_price_total .oe_currency_value').html(
+ this._priceToStr(parseFloat(price))
+ );
+ }
+ ProductConfiguratorMixin.computePriceTotal.apply(this, arguments);
+ },
/**
* Returns the list of selected products.
* The root product is added on top of the list.
@@ -437,6 +456,8 @@ var OptionalProductsModal = Dialog.extend(ServicesMixin, VariantMixin, {
.text(combination.display_name);
VariantMixin._onChangeCombination.apply(this, arguments);
+
+ this.computePriceTotal();
},
/**
* When the quantity of the root product is updated, we need to update
diff --git a/addons/sale_product_configurator/static/src/js/product_configurator_renderer.js b/addons/sale_product_configurator/static/src/js/product_configurator_renderer.js
index 339254c8e45..0e3829f69e1 100644
--- a/addons/sale_product_configurator/static/src/js/product_configurator_renderer.js
+++ b/addons/sale_product_configurator/static/src/js/product_configurator_renderer.js
@@ -5,6 +5,11 @@ var FormRenderer = require('web.FormRenderer');
var VariantMixin = require('sale.VariantMixin');
var ProductConfiguratorFormRenderer = FormRenderer.extend(VariantMixin, {
+
+ events: _.extend({}, FormRenderer.prototype.events, VariantMixin.events, {
+ 'click button.js_add_cart_json': 'onClickAddCartJSON',
+ }),
+
/**
* @override
*/
@@ -73,6 +78,17 @@ var ProductConfiguratorFormRenderer = FormRenderer.extend(VariantMixin, {
}
},
+ /**
+ * Toggles the add button depending on the possibility of the current
+ * combination.
+ *
+ * @override
+ */
+ _toggleDisable: function ($parent, isCombinationPossible) {
+ VariantMixin._toggleDisable.apply(this, arguments);
+ $parent.parents('.modal').find('.o_sale_product_configurator_add').toggleClass('disabled', !isCombinationPossible);
+ },
+
/**
* Will fill the custom values input based on the provided initial configuration.
*
diff --git a/addons/sale_product_configurator/static/tests/product_configurator_test_ui.js b/addons/sale_product_configurator/static/tests/product_configurator_test_ui.js
index 7bce9880f73..6c36897ef71 100644
--- a/addons/sale_product_configurator/static/tests/product_configurator_test_ui.js
+++ b/addons/sale_product_configurator/static/tests/product_configurator_test_ui.js
@@ -36,11 +36,7 @@ tour.register('sale_product_configurator_tour', {
run: 'click'
}, {
trigger: '.configurator_container span:contains("Steel")',
- run: function () {
- $('input.product_id').change(function () {
- $('.o_sale_product_configurator_add').attr('request_count', 1);
- });
- }
+ run: function () {},
}, {
trigger: '.configurator_container span:contains("Aluminium")',
run: 'click'
@@ -48,8 +44,11 @@ tour.register('sale_product_configurator_tour', {
trigger: 'span.oe_currency_value:contains("800.40")',
run: function (){} // check updated price
}, {
- trigger: '.o_sale_product_configurator_add[request_count="1"]',
- run: function (){} // used to sync with "get_combination_info" completion
+ trigger: 'input[data-value_name="Black"]'
+}, {
+ trigger: '.o_sale_product_configurator_add.disabled'
+}, {
+ trigger: 'input[data-value_name="White"]'
}, {
trigger: '.o_sale_product_configurator_add:not(.disabled)'
}, {
diff --git a/addons/sale_stock/models/sale_order.py b/addons/sale_stock/models/sale_order.py
index bac4703a498..75046ee3a3c 100644
--- a/addons/sale_stock/models/sale_order.py
+++ b/addons/sale_stock/models/sale_order.py
@@ -96,6 +96,21 @@ class SaleOrder(models.Model):
if self.warehouse_id.company_id:
self.company_id = self.warehouse_id.company_id.id
+ @api.onchange('partner_shipping_id')
+ def _onchange_partner_shipping_id(self):
+ res = {}
+ pickings = self.picking_ids.filtered(
+ lambda p: p.state not in ['done', 'cancel'] and p.partner_id != self.partner_shipping_id
+ )
+ if pickings:
+ res['warning'] = {
+ 'title': _('Warning!'),
+ 'message': _(
+ 'Do not forget to change the partner on the following delivery orders: %s'
+ ) % (','.join(pickings.mapped('name')))
+ }
+ return res
+
@api.multi
def action_view_delivery(self):
'''
diff --git a/addons/sale_timesheet/models/sale_order.py b/addons/sale_timesheet/models/sale_order.py
index 542696fdcf7..203674c2d28 100644
--- a/addons/sale_timesheet/models/sale_order.py
+++ b/addons/sale_timesheet/models/sale_order.py
@@ -258,6 +258,10 @@ class SaleOrderLine(models.Model):
'partner_id': self.order_id.partner_id.id,
'email_from': self.order_id.partner_id.email,
})
+ # duplicating a project doesn't set the SO on sub-tasks
+ project.tasks.filtered(lambda task: task.parent_id != False).write({
+ 'sale_line_id': self.id,
+ })
else:
project = self.env['project.project'].create(values)
# link project as generated by current so line
diff --git a/addons/sales_team/tests/__init__.py b/addons/sales_team/tests/__init__.py
new file mode 100644
index 00000000000..7bb8a11fc5e
--- /dev/null
+++ b/addons/sales_team/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_default_team
diff --git a/addons/sales_team/tests/test_default_team.py b/addons/sales_team/tests/test_default_team.py
new file mode 100644
index 00000000000..9905272b3d9
--- /dev/null
+++ b/addons/sales_team/tests/test_default_team.py
@@ -0,0 +1,48 @@
+from odoo.tests import common
+
+
+class TestDefaultTeam(common.SavepointCase):
+ """Tests to check if correct default team is found."""
+
+ @classmethod
+ def setUpClass(cls):
+ """Set up data for default team tests."""
+ super(TestDefaultTeam, cls).setUpClass()
+ cls.CrmTeam = cls.env['crm.team']
+ ResUsers = cls.env['res.users'].with_context(
+ {'no_reset_password': True})
+ group_sale_manager = cls.env.ref('sales_team.group_sale_manager')
+ cls.user = ResUsers.create({
+ 'name': 'Team User',
+ 'login': 'sales_team_user',
+ 'email': 'sales.team.user@example.com',
+ 'groups_id': [(6, 0, [group_sale_manager.id])]
+ })
+ cls.team_1 = cls.env['crm.team'].create({
+ 'name': 'Test Team',
+ 'member_ids': [(4, cls.user.id)],
+ 'company_id': False
+ })
+ # Europe Team (fall back team)
+ cls.team_2 = cls.env.ref('sales_team.team_sales_department')
+
+ def test_01_user_team(self):
+ """Get default team, when user belongs to one."""
+ team = self.CrmTeam.sudo(self.user)._get_default_team_id()
+ self.assertEqual(team, self.team_1)
+
+ def test_02_fallback_team(self):
+ """Get default team when user does not belong to any team.
+
+ Case 1: fall back default team (from XML ref) is active.
+ Case 2: fall back default team is not active.
+ """
+ # Clear users from team.
+ self.team_1.member_ids = [(5,)]
+ # Case 1.
+ team = self.CrmTeam.sudo(self.user)._get_default_team_id()
+ self.assertEqual(team, self.team_2)
+ # Case 2.
+ self.team_2.active = False
+ team = self.CrmTeam.sudo(self.user)._get_default_team_id()
+ self.assertEqual(team, self.CrmTeam)
diff --git a/addons/sms/models/mail_thread.py b/addons/sms/models/mail_thread.py
index 1fb62a72de4..a439487e4e9 100644
--- a/addons/sms/models/mail_thread.py
+++ b/addons/sms/models/mail_thread.py
@@ -39,8 +39,8 @@ class MailThread(models.AbstractModel):
if not partners:
partners = self._get_default_sms_recipients()
- # Collect numbers, we will consider the message to be sent if at least one number can be found
- numbers = list(set([i.mobile for i in partners if i.mobile]))
+ # Collect numbers, we will consider the message to be sent if at least one number can be found
+ numbers = list(set([i.mobile for i in partners if i.mobile]))
if numbers:
try:
diff --git a/addons/sms/wizard/send_sms.py b/addons/sms/wizard/send_sms.py
index 786a5e2af76..986fd1c9239 100644
--- a/addons/sms/wizard/send_sms.py
+++ b/addons/sms/wizard/send_sms.py
@@ -45,8 +45,8 @@ class SendSMS(models.TransientModel):
return number
if not phonenumbers.is_possible_number(phone_nbr) or not phonenumbers.is_valid_number(phone_nbr):
return number
- phone_fmt = phonenumbers.PhoneNumberFormat.INTERNATIONAL
- return phonenumbers.format_number(phone_nbr, phone_fmt).replace(' ', '')
+ phone_fmt = phonenumbers.PhoneNumberFormat.E164
+ return phonenumbers.format_number(phone_nbr, phone_fmt)
else:
return number
@@ -62,12 +62,11 @@ class SendSMS(models.TransientModel):
@api.model
def default_get(self, fields):
result = super(SendSMS, self).default_get(fields)
-
active_model = self.env.context.get('active_model')
- model = self.env[active_model]
- records = self._get_records(model)
- if getattr(records, '_get_default_sms_recipients') and not self.env.context.get('default_recipients'):
+ if not self.env.context.get('default_recipients') and active_model and hasattr(self.env[active_model], '_get_default_sms_recipients'):
+ model = self.env[active_model]
+ records = self._get_records(model)
partners = records._get_default_sms_recipients()
phone_numbers = []
no_phone_partners = []
@@ -84,12 +83,12 @@ class SendSMS(models.TransientModel):
return result
def action_send_sms(self):
- numbers = self.recipients.split(',')
+ numbers = [number.strip() for number in self.recipients.split(',') if number.strip()]
active_model = self.env.context.get('active_model')
- model = self.env[active_model]
- records = self._get_records(model)
- if getattr(records, 'message_post_send_sms'):
+ if active_model and hasattr(self.env[active_model], 'message_post_send_sms'):
+ model = self.env[active_model]
+ records = self._get_records(model)
records.message_post_send_sms(self.message, numbers=numbers)
else:
self.env['sms.api']._send_sms(numbers, self.message)
diff --git a/addons/snailmail/models/snailmail_letter.py b/addons/snailmail/models/snailmail_letter.py
index bddadf07290..b058a6b9ecf 100644
--- a/addons/snailmail/models/snailmail_letter.py
+++ b/addons/snailmail/models/snailmail_letter.py
@@ -10,7 +10,6 @@ from odoo.exceptions import UserError
from odoo.tools.safe_eval import safe_eval
DEFAULT_ENDPOINT = 'https://iap-snailmail.odoo.com'
-ESTIMATE_ENDPOINT = '/iap/snailmail/1/estimate'
PRINT_ENDPOINT = '/iap/snailmail/1/print'
ERROR_CODES = [
@@ -347,69 +346,6 @@ class SnailmailLetter(models.Model):
self.write({'state': 'canceled', 'error_code': False})
self.send_snailmail_update()
- @api.multi
- def _snailmail_estimate(self):
- """
- Send a request to estimate the cost of sending all the documents with
- the differents options.
-
- The JSON object sent is the one generated from self._snailmail_create()
-
- arguments sent:
- {
- "documents":[{
- pages: int,
- res_id: int (client_side, optional),
- res_model: int (client_side, optional),
- address: {
- country_code: char (country name)
- }
- }],
- 'color': # color on the letter,
- 'duplex': # one/two side printing,
- }
-
- The answer of the server is the same JSON object with some additionnal fields:
- {
- "total_cost": integer, //The cost of sending ALL the documents
- body: JSON object (same as body param except new param 'cost' in each documents)
- }
- """
- endpoint = self.env['ir.config_parameter'].sudo().get_param('snailmail.endpoint', DEFAULT_ENDPOINT)
- params = self._snailmail_create('estimate')
- req = jsonrpc(endpoint + '/iap/snailmail/1/estimate', params=params)
-
- return req['total_cost']
-
- @api.model
- def _snailmail_estimate_from_documents(self, res_model, res_ids, partner_field=None):
- endpoint = self.env['ir.config_parameter'].sudo().get_param('snailmail.endpoint', DEFAULT_ENDPOINT)
- docs = self.env[res_model].browse(res_ids)
- doc_list = []
- for doc in docs:
- if partner_field:
- country_code = doc[partner_field].country_id.code
- else:
- country_code = doc.country_id.code
- val = {
- 'pages': 1,
- 'address': {
- 'country_code': country_code,
- },
- }
- doc_list.append(val)
- params = {
- 'account_token': "",
- 'documents': doc_list,
- 'options': {
- 'color': self.env.user.company_id.snailmail_color,
- 'duplex': self.env.user.company_id.snailmail_duplex,
- 'currency_name': 'EUR',
- },
- }
- req = jsonrpc(endpoint + '/iap/snailmail/1/estimate', params=params)
- return req['total_cost']
-
@api.model
def _snailmail_cron(self):
letters_send = self.search([
diff --git a/addons/snailmail_account/wizard/account_invoice_send.py b/addons/snailmail_account/wizard/account_invoice_send.py
index e8575b645d8..25eba8778a4 100644
--- a/addons/snailmail_account/wizard/account_invoice_send.py
+++ b/addons/snailmail_account/wizard/account_invoice_send.py
@@ -35,7 +35,7 @@ class AccountInvoiceSend(models.TransientModel):
@api.depends('snailmail_is_letter')
def _compute_snailmail_cost(self):
for wizard in self:
- wizard.snailmail_cost = wizard.env['snailmail.letter']._snailmail_estimate_from_documents(wizard.invoice_ids._name, wizard.invoice_ids.ids, 'partner_id')
+ wizard.snailmail_cost = len(wizard.invoice_ids.ids)
@api.multi
def snailmail_print_action(self):
diff --git a/addons/stock/models/product.py b/addons/stock/models/product.py
index e819d9cdfb9..7c5aec3e027 100644
--- a/addons/stock/models/product.py
+++ b/addons/stock/models/product.py
@@ -497,6 +497,10 @@ class ProductTemplate(models.Model):
def _is_cost_method_standard(self):
return True
+ @api.depends(
+ 'product_variant_ids',
+ 'product_variant_ids.stock_quant_ids',
+ )
def _compute_quantities(self):
res = self._compute_quantities_dict()
for template in self:
diff --git a/addons/stock/models/stock_move.py b/addons/stock/models/stock_move.py
index 694ceecdb82..07e064a3dea 100644
--- a/addons/stock/models/stock_move.py
+++ b/addons/stock/models/stock_move.py
@@ -468,6 +468,7 @@ class StockMove(models.Model):
else:
view = self.env.ref('stock.view_stock_move_nosuggest_operations')
+ picking_type_id = self.picking_type_id or self.picking_id.picking_type_id
return {
'name': _('Detailed Operations'),
'type': 'ir.actions.act_window',
@@ -480,8 +481,8 @@ class StockMove(models.Model):
'res_id': self.id,
'context': dict(
self.env.context,
- show_lots_m2o=self.has_tracking != 'none' and (self.picking_type_id.use_existing_lots or self.state == 'done' or self.origin_returned_move_id.id), # able to create lots, whatever the value of ` use_create_lots`.
- show_lots_text=self.has_tracking != 'none' and self.picking_type_id.use_create_lots and not self.picking_type_id.use_existing_lots and self.state != 'done' and not self.origin_returned_move_id.id,
+ show_lots_m2o=self.has_tracking != 'none' and (picking_type_id.use_existing_lots or self.state == 'done' or self.origin_returned_move_id.id), # able to create lots, whatever the value of ` use_create_lots`.
+ show_lots_text=self.has_tracking != 'none' and picking_type_id.use_create_lots and not picking_type_id.use_existing_lots and self.state != 'done' and not self.origin_returned_move_id.id,
show_source_location=self.location_id.child_ids and self.picking_type_id.code != 'incoming',
show_destination_location=self.location_dest_id.child_ids and self.picking_type_id.code != 'outgoing',
show_package=not self.location_id.usage == 'supplier',
diff --git a/addons/stock/models/stock_warehouse.py b/addons/stock/models/stock_warehouse.py
index 75d63847be6..55d30bc0663 100644
--- a/addons/stock/models/stock_warehouse.py
+++ b/addons/stock/models/stock_warehouse.py
@@ -894,7 +894,6 @@ class Warehouse(models.Model):
@api.returns('self')
def _get_all_routes(self):
- # TDE FIXME: check overrides
routes = self.mapped('route_ids') | self.mapped('mto_pull_id').mapped('route_id')
routes |= self.env["stock.location.route"].search([('supplied_wh_id', 'in', self.ids)])
return routes
diff --git a/addons/stock/report/report_stock_forecast.py b/addons/stock/report/report_stock_forecast.py
index 59e788ac4b6..1bf69ab5719 100644
--- a/addons/stock/report/report_stock_forecast.py
+++ b/addons/stock/report/report_stock_forecast.py
@@ -129,6 +129,8 @@ class ReportStockForecat(models.Model):
WHERE
final.product_qty != 0 OR final.reference = 'Starting Inventory'
%s
+ ORDER BY
+ date
)
""" % (self._select(), self._left_join(), self._groupby())
self.env.cr.execute(query)
@@ -185,7 +187,6 @@ class ReportStockForecat(models.Model):
order to analyze different quantities in different situations.
"""
# Sort result by date_expected and id.
- orderby = 'date, id' if not orderby else orderby
if 'cumulative_quantity' in fields and 'quantity' not in fields:
fields.append('quantity')
res = super(ReportStockForecat, self).read_group(domain, fields, groupby, offset=offset, limit=limit, orderby=orderby, lazy=lazy)
diff --git a/addons/stock/wizard/stock_picking_return_views.xml b/addons/stock/wizard/stock_picking_return_views.xml
index 3c901072aa7..e4cb319456c 100644
--- a/addons/stock/wizard/stock_picking_return_views.xml
+++ b/addons/stock/wizard/stock_picking_return_views.xml
@@ -29,7 +29,7 @@
References
diff --git a/addons/website_customer/views/website_customer_templates.xml b/addons/website_customer/views/website_customer_templates.xml index da6e9aa8a33..9cd668d901d 100644 --- a/addons/website_customer/views/website_customer_templates.xml +++ b/addons/website_customer/views/website_customer_templates.xml @@ -234,4 +234,13 @@
-
+
Name
-
+
Email
-
- Phone (optional)
+
+ Phone (optional)
-
-
+
-
Name
@@ -550,7 +550,7 @@
+
-
Email
@@ -558,9 +558,9 @@
+
diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index ed2cb30df2e..bd62e519338 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -439,7 +439,7 @@ class WebsiteForum(WebsiteProfile):
values = self._prepare_user_values(forum=forum)
values.update({
- 'posts_ids': posts_to_validate_ids,
+ 'posts_ids': posts_to_validate_ids.sudo(),
'queue_type': 'validation',
})
@@ -459,7 +459,7 @@ class WebsiteForum(WebsiteProfile):
values = self._prepare_user_values(forum=forum)
values.update({
- 'posts_ids': flagged_posts_ids,
+ 'posts_ids': flagged_posts_ids.sudo(),
'queue_type': 'flagged',
'flagged_queue_active': 1,
})
@@ -478,7 +478,7 @@ class WebsiteForum(WebsiteProfile):
values = self._prepare_user_values(forum=forum)
values.update({
- 'posts_ids': offensive_posts_ids,
+ 'posts_ids': offensive_posts_ids.sudo(),
'queue_type': 'offensive',
})
diff --git a/addons/website_forum/models/forum.py b/addons/website_forum/models/forum.py
index 3c29e8cf9fe..401521f7b60 100644
--- a/addons/website_forum/models/forum.py
+++ b/addons/website_forum/models/forum.py
@@ -251,10 +251,11 @@ class Post(models.Model):
operator = operator == "=" and '!=' or '='
value = True
- if self._uid == SUPERUSER_ID:
+ user = self.env.user
+ # Won't impact sitemap, search() in converter is forced as public user
+ if user._is_admin():
return [(1, '=', 1)]
- user = self.env['res.users'].browse(self._uid)
req = """
SELECT p.id
FROM forum_post p
diff --git a/addons/website_forum/models/res_users.py b/addons/website_forum/models/res_users.py
index 67326175ac9..35a5fc32545 100644
--- a/addons/website_forum/models/res_users.py
+++ b/addons/website_forum/models/res_users.py
@@ -1,27 +1,12 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
-import hashlib
-
-from datetime import datetime
-
-from werkzeug import urls
-
from odoo import api, fields, models
class Users(models.Model):
_inherit = 'res.users'
- def __init__(self, pool, cr):
- init_res = super(Users, self).__init__(pool, cr)
- type(self).SELF_WRITEABLE_FIELDS = list(
- set(
- self.SELF_WRITEABLE_FIELDS +
- ['country_id', 'city', 'website', 'website_description', 'website_published']))
- type(self).SELF_READABLE_FIELDS = type(self).SELF_READABLE_FIELDS + ['karma']
- return init_res
-
create_date = fields.Datetime('Create Date', readonly=True, index=True)
forum_waiting_posts_count = fields.Integer('Waiting post', compute="_get_user_waiting_post")
diff --git a/addons/website_forum/static/src/scss/website_forum.scss b/addons/website_forum/static/src/scss/website_forum.scss
index 9d0b796cb00..a5b0a4f1db4 100644
--- a/addons/website_forum/static/src/scss/website_forum.scss
+++ b/addons/website_forum/static/src/scss/website_forum.scss
@@ -22,6 +22,7 @@ $bronze: #eea91e;
font-style: italic;
font-weight: lighter;
}
+ word-wrap: break-word;
}
.vote {
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 042fa0364ed..49519ba8570 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -52,7 +52,7 @@
-
- Phone (optional)
+ Phone (optional)
-
@@ -661,7 +661,7 @@
+
-
- Ask a Question
-
-
-
-
-
+
-
-
- Tag
-
-
- Tags
-
-
+
+ Ask a Question
+
-
- Keep Informed
-
-
-
+ Tags
-
-
+
+
+
-
- About This Community
-
-
- Read Guidelines
- Back to
-
-
-
- Moderation Tools
-
+
+ Keep Informed
+
+
+
+
+ About This Community
+
+
+ Read Guidelines
+ Back to
+
+
+
+ Moderation Tools
+
+
+
+
@@ -388,6 +387,7 @@
-
Keep Informed
-
-
-
+ Tags
-
+
+
+
-
-
-
-
- About This Community
-
-
- Read Guidelines
- Back to
-
-
-
+
Moderation Tools
- +
+
-
+ Keep Informed
+
+
+
+
+
+
+ About This Community
+
+
+ Read Guidelines
+ Back to
+
+
+
+ Moderation Tools
+ +
+
-
Resolved
+
@@ -1133,7 +1133,7 @@
+
-
+
+
+
![User rank]()
+ Unpublished
-
+
-
+
@@ -478,11 +478,14 @@
No results matched
+