+
+ + I agree that by paying this proposal, I accept it on the behalf of + + , for an amount of + + with payment terms: . +
+
+
-
@@ -156,22 +156,13 @@
+
+
@@ -395,7 +395,7 @@
the message will be posted with the identity of the partner_id of the object
-->
-
diff --git a/addons/sale/__manifest__.py b/addons/sale/__manifest__.py
index a5ff679d745..5924941af76 100644
--- a/addons/sale/__manifest__.py
+++ b/addons/sale/__manifest__.py
@@ -9,7 +9,7 @@
'description': """
This module contains all the common features of Sales Management and eCommerce.
""",
- 'depends': ['sales_team', 'account', 'portal'],
+ 'depends': ['sales_team', 'payment', 'portal'],
'data': [
'security/sale_security.xml',
'security/ir.model.access.csv',
@@ -31,6 +31,7 @@ This module contains all the common features of Sales Management and eCommerce.
'views/sale_onboarding_views.xml',
'views/res_config_settings_views.xml',
'views/res_users_views.xml',
+ 'views/payment_views.xml',
],
'demo': [
'data/sale_demo.xml',
diff --git a/addons/sale/controllers/portal.py b/addons/sale/controllers/portal.py
index 99f4253e929..a7a7a48a47c 100644
--- a/addons/sale/controllers/portal.py
+++ b/addons/sale/controllers/portal.py
@@ -1,13 +1,12 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
-import base64
-
-from odoo import http, _
+from odoo import fields, http, _
from odoo.exceptions import AccessError
from odoo.http import request
from odoo.addons.portal.controllers.mail import _message_post_helper
from odoo.addons.portal.controllers.portal import CustomerPortal, pager as portal_pager, get_records_pager
+from odoo.osv import expression
class CustomerPortal(CustomerPortal):
@@ -36,15 +35,6 @@ class CustomerPortal(CustomerPortal):
# Quotations and Sales Orders
#
- def _order_get_page_view_values(self, order, access_token, **kwargs):
- order_invoice_lines = {il.product_id.id: il.invoice_id for il in order.invoice_ids.mapped('invoice_line_ids')}
- values = {
- 'order': order,
- 'order_invoice_lines': order_invoice_lines,
- 'portal_confirmation': order.get_portal_confirmation_action(),
- }
- return self._get_page_view_values(order, access_token, values, 'my_orders_history', True, **kwargs)
-
@http.route(['/my/quotes', '/my/quotes/page/'], type='http', auth="user", website=True)
def portal_my_quotes(self, page=1, date_begin=None, date_end=None, sortby=None, **kw):
values = self._prepare_portal_layout_values()
@@ -149,66 +139,59 @@ class CustomerPortal(CustomerPortal):
return request.render("sale.portal_my_orders", values)
@http.route(['/my/orders/'], type='http', auth="public", website=True)
- def portal_order_page(self, order_id=None, access_token=None, **kw):
+ def portal_order_page(self, order_id, pdf=None, access_token=None, message=False, **kw):
try:
order_sudo = self._document_check_access('sale.order', order_id, access_token=access_token)
except AccessError:
return request.redirect('/my')
- values = self._order_get_page_view_values(order_sudo, access_token, **kw)
- return request.render("sale.portal_order_page", values)
+ if pdf:
+ pdf = request.env.ref('sale.report_web_quote').sudo().with_context(set_viewport_size=True).render_qweb_pdf([order_sudo.id])[0]
+ pdfhttpheaders = [('Content-Type', 'application/pdf'), ('Content-Length', len(pdf))]
+ return request.make_response(pdf, headers=pdfhttpheaders)
- @http.route(['/my/orders/pdf/'], type='http', auth="public", website=True)
- def portal_order_report(self, order_id, access_token=None, **kw):
- try:
- order_sudo = self._document_check_access('sale.order', order_id, access_token)
- except AccessError:
+ # use sudo to allow accessing/viewing orders for public user
+ # only if he knows the private token
+ now = fields.Date.today()
+
+ # Log only once a day
+ if order_sudo and request.session.get('view_quote_%s' % order_sudo.id) != now and request.env.user.share and access_token:
+ request.session['view_quote_%s' % order_sudo.id] = now
+ body = _('Quotation viewed by customer')
+ _message_post_helper(res_model='sale.order', res_id=order_sudo.id, message=body, token=order_sudo.access_token, message_type='notification', subtype="mail.mt_note", partner_ids=order_sudo.user_id.sudo().partner_id.ids)
+ if not order_sudo:
return request.redirect('/my')
- # print report as sudo, since it require access to taxes, payment term, ... and portal
- # does not have those access rights.
- pdf = request.env.ref('sale.action_report_saleorder').sudo().render_qweb_pdf([order_sudo.id])[0]
- pdfhttpheaders = [
- ('Content-Type', 'application/pdf'),
- ('Content-Length', len(pdf)),
- ]
- return request.make_response(pdf, headers=pdfhttpheaders)
+ transaction = order_sudo.get_portal_last_transaction()
- def _portal_quote_user_can_accept(self, order):
- return order.company_id.portal_confirmation_sign or order.company_id.portal_confirmation_pay
-
- @http.route(['/my/quotes/accept'], type='json', auth="public", website=True)
- def portal_quote_accept(self, res_id, access_token=None, partner_name=None, signature=None):
- try:
- order_sudo = self._document_check_access('sale.order', res_id, access_token=access_token)
- except AccessError:
- return {'error': _('Invalid order')}
- if order_sudo.state != 'sent':
- return {'error': _('Order is not in a state requiring customer validation.')}
-
- if not self._portal_quote_user_can_accept(order_sudo):
- return {'error': _('Operation not allowed')}
- if not signature:
- return {'error': _('Signature is missing.')}
-
- success_message = _('Your order has been signed but still needs to be paid to be confirmed.')
-
- if not order_sudo.has_to_be_paid():
- order_sudo.action_confirm()
- success_message = _('Your order has been confirmed.')
-
- order_sudo.signature = signature
- order_sudo.signed_by = partner_name
-
- pdf = request.env.ref('sale.action_report_saleorder').sudo().render_qweb_pdf([order_sudo.id])[0]
- _message_post_helper(
- res_model='sale.order',
- res_id=order_sudo.id,
- message=_('Order signed by %s') % (partner_name,),
- attachments=[('%s.pdf' % order_sudo.name, pdf)],
- **({'token': access_token} if access_token else {}))
-
- return {
- 'success': success_message,
- 'redirect_url': '/my/orders/%s?%s' % (order_sudo.id, access_token and 'access_token=%s' % order_sudo.access_token or ''),
+ # TODO SEB fix breadcrumbs -> should always be visible (or at least no home alone)
+ values = {
+ 'sale_order': order_sudo,
+ 'message': int(message) if message else False,
+ 'action': request.env.ref('sale.action_quotations').id,
+ 'no_breadcrumbs': request.env.user.partner_id.commercial_partner_id not in order_sudo.message_partner_ids,
+ 'tx_state': transaction.state if transaction else False,
+ 'need_payment': order_sudo.invoice_status == 'to invoice' and transaction.state in ['draft', 'cancel'],
+ 'token': access_token,
+ 'return_url': '/shop/payment/validate',
+ 'bootstrap_formatting': True,
+ 'partner_id': order_sudo.partner_id.id,
}
+
+ if order_sudo.has_to_be_paid() or values['need_payment']:
+ domain = expression.AND([
+ ['&', ('website_published', '=', True), ('company_id', '=', order_sudo.company_id.id)],
+ ['|', ('specific_countries', '=', False), ('country_ids', 'in', [order_sudo.partner_id.country_id.id])]
+ ])
+ acquirers = request.env['payment.acquirer'].sudo().search(domain)
+
+ values['form_acquirers'] = [acq for acq in acquirers if acq.payment_flow == 'form' and acq.view_template_id]
+ values['s2s_acquirers'] = [acq for acq in acquirers if acq.payment_flow == 's2s' and acq.registration_view_template_id]
+ values['pms'] = request.env['payment.token'].search(
+ [('partner_id', '=', order_sudo.partner_id.id),
+ ('acquirer_id', 'in', [acq.id for acq in values['s2s_acquirers']])])
+
+ history = request.session.get('my_quotes_history', [])
+ values.update(get_records_pager(history, order_sudo))
+
+ return request.render('sale.sale_order_portal_template', values)
diff --git a/addons/sale/models/__init__.py b/addons/sale/models/__init__.py
index cb33ba80b1a..293a9217d67 100644
--- a/addons/sale/models/__init__.py
+++ b/addons/sale/models/__init__.py
@@ -12,3 +12,4 @@ from . import sale
from . import res_config_settings
from . import sales_team
from . import res_users
+from . import payment
diff --git a/addons/sale_payment/models/payment.py b/addons/sale/models/payment.py
similarity index 98%
rename from addons/sale_payment/models/payment.py
rename to addons/sale/models/payment.py
index 36287a051de..cfe87d570d5 100644
--- a/addons/sale_payment/models/payment.py
+++ b/addons/sale/models/payment.py
@@ -66,7 +66,7 @@ class PaymentTransaction(models.Model):
sales_orders.force_quotation_send()
sales_orders = self.mapped('sale_order_ids').filtered(lambda so: so.state == 'sent')
sales_orders.action_confirm()
- automatic_invoice = self.env['ir.config_parameter'].sudo().get_param('sale_payment.automatic_invoice')
+ automatic_invoice = self.env['ir.config_parameter'].sudo().get_param('sale.automatic_invoice')
if automatic_invoice:
for trans in self.filtered(lambda t: t.sale_order_ids):
trans.sale_order_ids._force_lines_to_invoice_policy_order()
@@ -74,7 +74,7 @@ class PaymentTransaction(models.Model):
trans.invoice_ids = [(6, 0, invoices)]
res = super(PaymentTransaction, self)._set_transaction_done()
if automatic_invoice:
- default_template = self.env['ir.config_parameter'].sudo().get_param('sale_payment.default_email_template')
+ default_template = self.env['ir.config_parameter'].sudo().get_param('sale.default_email_template')
if default_template:
for invoice in trans.invoice_ids:
invoice.with_context(mark_invoice_as_sent=True).message_post_with_template(int(default_template), notif_layout="mail.mail_notification_paynow")
diff --git a/addons/sale/models/res_company.py b/addons/sale/models/res_company.py
index 77264e51557..f9b62399911 100644
--- a/addons/sale/models/res_company.py
+++ b/addons/sale/models/res_company.py
@@ -8,8 +8,9 @@ class ResCompany(models.Model):
_inherit = "res.company"
sale_note = fields.Text(string='Default Terms and Conditions', translate=True)
- portal_confirmation_sign = fields.Boolean(string='Digital Signature')
+ portal_confirmation_sign = fields.Boolean(string='Online Signature')
portal_confirmation_pay = fields.Boolean(string='Electronic Payment')
+ quotation_validity_days = fields.Integer(default=30, string="Default Quotation Validity (Days)")
# sale quotation onboarding
sale_quotation_onboarding_state = fields.Selection([('not_done', "Not done"), ('just_done', "Just done"), ('done', "Done"), ('closed', "Closed")], string="State of the sale onboarding panel", default='not_done')
@@ -108,3 +109,5 @@ class ResCompany(models.Model):
action = self.env.ref('sale.action_open_sale_onboarding_quotation_layout').read()[0]
action['res_id'] = self.env.user.company_id.id
return action
+
+ _sql_constraints = [('check_quotation_validity_days', 'CHECK(quotation_validity_days > 0)', 'Quotation Validity is required and must be greater than 0.')]
diff --git a/addons/sale/models/res_config_settings.py b/addons/sale/models/res_config_settings.py
index b99e547d6ad..208f05802f4 100644
--- a/addons/sale/models/res_config_settings.py
+++ b/addons/sale/models/res_config_settings.py
@@ -1,8 +1,6 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
-from ast import literal_eval
-
from odoo import api, fields, models
@@ -16,11 +14,11 @@ class ResConfigSettings(models.TransientModel):
config_parameter='sale.use_sale_note')
group_discount_per_so_line = fields.Boolean("Discounts", implied_group='sale.group_discount_per_so_line')
module_sale_margin = fields.Boolean("Margins")
+ quotation_validity_days = fields.Integer(related='company_id.quotation_validity_days', string="Default Quotation Validity (Days)")
+ use_quotation_validity_days = fields.Boolean("Default Quotation Validity", config_parameter='sale.use_quotation_validity_days')
group_warning_sale = fields.Boolean("Sale Order Warnings", implied_group='sale.group_warning_sale')
- portal_confirmation_sign = fields.Boolean(related='company_id.portal_confirmation_sign', string='Digital Signature')
+ portal_confirmation_sign = fields.Boolean(related='company_id.portal_confirmation_sign', string='Online Signature')
portal_confirmation_pay = fields.Boolean(related='company_id.portal_confirmation_pay', string='Electronic Payment')
- module_sale_payment = fields.Boolean("Sale Payment", help='Technical field implied by user choice of portal_confirmation_pay.')
- module_website_quote = fields.Boolean("Quotations Templates")
group_sale_delivery_address = fields.Boolean("Customer Addresses", implied_group='sale.group_delivery_invoice_address')
multi_sales_price = fields.Boolean("Multiple Sales Prices per Product")
multi_sales_price_method = fields.Selection([
@@ -67,6 +65,18 @@ class ResConfigSettings(models.TransientModel):
module_product_email_template = fields.Boolean("Specific Email")
module_sale_coupon = fields.Boolean("Coupons & Promotions")
+ automatic_invoice = fields.Boolean("Automatic Invoice",
+ help="The invoice is generated automatically and available in the customer portal "
+ "when the transaction is confirmed by the payment acquirer.\n"
+ "The invoice is marked as paid and the payment is registered in the payment journal "
+ "defined in the configuration of the payment acquirer.\n"
+ "This mode is advised if you issue the final invoice at the order and not after the delivery.",
+ config_parameter='sale.automatic_invoice')
+ template_id = fields.Many2one('mail.template', 'Email Template',
+ domain="[('model', '=', 'account.invoice')]",
+ config_parameter='sale.default_email_template',
+ default=lambda self: self.env.ref('account.email_template_edi_invoice', False))
+
def set_values(self):
super(ResConfigSettings, self).set_values()
if not self.group_discount_per_so_line:
@@ -107,6 +117,19 @@ class ResConfigSettings(models.TransientModel):
if self.portal_confirmation_pay:
self.module_sale_payment = True
+ @api.onchange('use_quotation_validity_days')
+ def _onchange_use_quotation_validity_days(self):
+ if self.quotation_validity_days <= 0:
+ self.quotation_validity_days = self.env['res.company'].default_get(['quotation_validity_days'])['quotation_validity_days']
+
+ @api.onchange('quotation_validity_days')
+ def _onchange_quotation_validity_days(self):
+ if self.quotation_validity_days <= 0:
+ self.quotation_validity_days = self.env['res.company'].default_get(['quotation_validity_days'])['quotation_validity_days']
+ return {
+ 'warning': {'title': "Warning", 'message': "Quotation Validity is required and must be greater than 0."},
+ }
+
@api.model
def get_values(self):
res = super(ResConfigSettings, self).get_values()
diff --git a/addons/sale/models/sale.py b/addons/sale/models/sale.py
index 2d6fa9e9cb1..75fef0fc29a 100644
--- a/addons/sale/models/sale.py
+++ b/addons/sale/models/sale.py
@@ -1,14 +1,12 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
-import uuid
-
from datetime import datetime, timedelta
from functools import partial
from itertools import groupby
from odoo import api, fields, models, _
-from odoo.exceptions import UserError, AccessError
+from odoo.exceptions import UserError, ValidationError
from odoo.tools.misc import formatLang
from odoo.osv import expression
from odoo.tools import float_is_zero, float_compare
@@ -23,6 +21,13 @@ class SaleOrder(models.Model):
_description = "Quotation"
_order = 'date_order desc, id desc'
+ def _default_validity_date(self):
+ if self.env['ir.config_parameter'].sudo().get_param('sale.use_quotation_validity_days'):
+ days = self.env.user.company_id.quotation_validity_days
+ if days > 0:
+ return fields.Date.to_string(datetime.now() + timedelta(days))
+ return False
+
@api.depends('order_line.price_total')
def _amount_all(self):
"""
@@ -121,9 +126,10 @@ class SaleOrder(models.Model):
('cancel', 'Cancelled'),
], string='Status', readonly=True, copy=False, index=True, track_visibility='onchange', track_sequence=3, default='draft')
date_order = fields.Datetime(string='Order Date', required=True, readonly=True, index=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, copy=False, default=fields.Datetime.now)
- validity_date = fields.Date(string='Quote Validity', readonly=True, copy=False, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]},
- help="Validity date of the quotation, after this date, the customer won't be able to validate the quotation online.")
+ validity_date = fields.Date(string='Validity', readonly=True, copy=False, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]},
+ help="Validity date of the quotation, after this date, the customer won't be able to validate the quotation online.", default=_default_validity_date)
is_expired = fields.Boolean(compute='_compute_is_expired', string="Is expired")
+ remaining_validity_days = fields.Integer(compute='_compute_remaining_validity_days', string="Remaining Validity Days")
create_date = fields.Datetime(string='Creation Date', readonly=True, index=True, help="Date on which sales order is created.")
confirmation_date = fields.Datetime(string='Confirmation Date', readonly=True, index=True, help="Date on which the sales order is confirmed.", oldname="date_confirm", copy=False)
user_id = fields.Many2one('res.users', string='Salesperson', index=True, track_visibility='onchange', track_sequence=2, default=lambda self: self.env.user)
@@ -168,6 +174,12 @@ class SaleOrder(models.Model):
"will be scheduled based on this date rather than product lead times.")
expected_date = fields.Datetime("Expected Date", compute='_compute_expected_date', store=False, oldname='commitment_date', # Note: can not be stored since depends on today()
help="Delivery date you can promise to the customer, computed from product lead times and from the shipping policy of the order.")
+ amount_undiscounted = fields.Float('Amount Before Discount', compute='_compute_amount_undiscounted', digits=0)
+
+ transaction_ids = fields.Many2many('payment.transaction', 'sale_order_transaction_rel', 'sale_order_id', 'transaction_id',
+ string='Transactions', copy=False, readonly=True)
+ authorized_transaction_ids = fields.Many2many('payment.transaction', compute='_compute_authorized_transaction_ids',
+ string='Authorized Transactions', copy=False, readonly=True)
def _compute_access_url(self):
super(SaleOrder, self)._compute_access_url()
@@ -197,9 +209,25 @@ class SaleOrder(models.Model):
if dates_list:
order.expected_date = fields.Datetime.to_string(min(dates_list))
- @api.model
- def _get_customer_lead(self, product_tmpl_id):
- return False
+ @api.multi
+ def _compute_remaining_validity_days(self):
+ for record in self:
+ if record.validity_date:
+ record.remaining_validity_days = (record.validity_date - fields.Date.today()).days + 1
+ else:
+ record.remaining_validity_days = 0
+
+ @api.depends('transaction_ids')
+ def _compute_authorized_transaction_ids(self):
+ for trans in self:
+ trans.authorized_transaction_ids = trans.transaction_ids.filtered(lambda t: t.state == 'authorized')
+
+ @api.one
+ def _compute_amount_undiscounted(self):
+ total = 0.0
+ for line in self.order_line:
+ total += line.price_subtotal + line.price_unit * ((line.discount or 0.0) / 100.0) * line.product_uom_qty # why is there a discount in a field named amount_undiscounted ??
+ self.amount_undiscounted = total
@api.multi
def unlink(self):
@@ -401,7 +429,8 @@ class SaleOrder(models.Model):
'fiscal_position_id': self.fiscal_position_id.id or self.partner_invoice_id.property_account_position_id.id,
'company_id': self.company_id.id,
'user_id': self.user_id and self.user_id.id,
- 'team_id': self.team_id.id
+ 'team_id': self.team_id.id,
+ 'transaction_ids': [(6, 0, self.transaction_ids.ids)],
}
return invoice_vals
@@ -694,6 +723,104 @@ class SaleOrder(models.Model):
return groups
+ @api.multi
+ def _create_payment_transaction(self, vals):
+ '''Similar to self.env['payment.transaction'].create(vals) but the values are filled with the
+ current sales orders fields (e.g. the partner or the currency).
+ :param vals: The values to create a new payment.transaction.
+ :return: The newly created payment.transaction record.
+ '''
+ # Ensure the currencies are the same.
+ currency = self[0].pricelist_id.currency_id
+ if any([so.pricelist_id.currency_id != currency for so in self]):
+ raise ValidationError(_('A transaction can\'t be linked to sales orders having different currencies.'))
+
+ # Ensure the partner are the same.
+ partner = self[0].partner_id
+ if any([so.partner_id != partner for so in self]):
+ raise ValidationError(_('A transaction can\'t be linked to sales orders having different partners.'))
+
+ # Try to retrieve the acquirer. However, fallback to the token's acquirer.
+ acquirer_id = vals.get('acquirer_id')
+ acquirer = False
+ payment_token_id = vals.get('payment_token_id')
+
+ if payment_token_id:
+ payment_token = self.env['payment.token'].sudo().browse(payment_token_id)
+
+ # Check payment_token/acquirer matching or take the acquirer from token
+ if acquirer_id:
+ acquirer = self.env['payment.acquirer'].browse(acquirer_id)
+ if payment_token and payment_token.acquirer_id != acquirer:
+ raise ValidationError(_('Invalid token found! Token acquirer %s != %s') % (
+ payment_token.acquirer_id.name, acquirer.name))
+ if payment_token and payment_token.partner_id != partner:
+ raise ValidationError(_('Invalid token found! Token partner %s != %s') % (
+ payment_token.partner.name, partner.name))
+ else:
+ acquirer = payment_token.acquirer_id
+
+ # Check an acquirer is there.
+ if not acquirer_id and not acquirer:
+ raise ValidationError(_('A payment acquirer is required to create a transaction.'))
+
+ if not acquirer:
+ acquirer = self.env['payment.acquirer'].browse(acquirer_id)
+
+ # Check a journal is set on acquirer.
+ if not acquirer.journal_id:
+ raise ValidationError(_('A journal must be specified of the acquirer %s.' % acquirer.name))
+
+ if not acquirer_id and acquirer:
+ vals['acquirer_id'] = acquirer.id
+
+ vals.update({
+ 'amount': sum(self.mapped('amount_total')),
+ 'currency_id': currency.id,
+ 'partner_id': partner.id,
+ 'sale_order_ids': [(6, 0, self.ids)],
+ })
+
+ transaction = self.env['payment.transaction'].create(vals)
+
+ # Process directly if payment_token
+ if transaction.payment_token_id:
+ transaction.s2s_do_transaction()
+
+ return transaction
+
+ def _force_lines_to_invoice_policy_order(self):
+ for line in self.order_line:
+ if self.state in ['sale', 'done']:
+ line.qty_to_invoice = line.product_uom_qty - line.qty_invoiced
+ else:
+ line.qty_to_invoice = 0
+
+ @api.multi
+ def payment_action_capture(self):
+ self.authorized_transaction_ids.s2s_capture_transaction()
+
+ @api.multi
+ def payment_action_void(self):
+ self.authorized_transaction_ids.s2s_void_transaction()
+
+ @api.multi
+ def get_portal_url(self, suffix=None):
+ """
+ Get a portal url for this sale order, including access_token.
+ - suffix: string to append to the url, before the query string
+ """
+ self.ensure_one()
+ return self.access_url + '%s?access_token=%s' % (suffix if suffix else '', self._portal_ensure_token())
+
+ @api.multi
+ def get_portal_last_transaction(self):
+ self.ensure_one()
+ return self.transaction_ids.get_last_transaction()
+
+ @api.model
+ def _get_customer_lead(self, product_tmpl_id):
+ return False
class SaleOrderLine(models.Model):
_name = 'sale.order.line'
diff --git a/addons/sale/report/sale_report.xml b/addons/sale/report/sale_report.xml
index 9c9addca79b..7b7835c61c2 100644
--- a/addons/sale/report/sale_report.xml
+++ b/addons/sale/report/sale_report.xml
@@ -21,5 +21,18 @@
name="sale.report_saleorder_pro_forma"
print_report_name="'PRO-FORMA - %s' % (object.name)"
/>
+
+
+
+
+
+
+
+
+
diff --git a/addons/sale/static/src/js/sale_portal_sidebar.js b/addons/sale/static/src/js/sale_portal_sidebar.js
new file mode 100644
index 00000000000..0a06e52cc85
--- /dev/null
+++ b/addons/sale/static/src/js/sale_portal_sidebar.js
@@ -0,0 +1,146 @@
+odoo.define('sale.SalePortalSidebar.instance', function (require) {
+"use strict";
+
+require('web.dom_ready');
+var SalePortalSidebar = require('sale.SalePortalSidebar');
+
+if (!$('.o_portal_sale_sidebar').length) {
+ return $.Deferred().reject("DOM doesn't contain '.o_portal_sale_sidebar'");
+}
+
+var $spyWatch = $('body[data-target=".navspy"]'),
+ sale_portal_sidebar = new SalePortalSidebar($spyWatch);
+
+return sale_portal_sidebar.attachTo($('.o_portal_sale_sidebar')).then(function () {
+ return sale_portal_sidebar;
+});
+});
+
+//==============================================================================
+
+odoo.define('sale.SalePortalSidebar', function (require) {
+"use strict";
+
+var PortalSidebar = require('portal.PortalSidebar');
+
+var SalePortalSidebar = PortalSidebar.extend({
+ events: {
+ 'click .o_portal_sale_print': '_onPrintSaleOrder',
+ },
+ /**
+ * @override
+ * @param {Object} $watched_selector
+ */
+ init: function ($watched_selector) {
+ this._super.apply(this, arguments);
+ this.authorizedTextTag = ['em', 'b', 'i', 'u'];
+ this.spyWatched = $watched_selector;
+ },
+ /**
+ * @override
+ */
+ start: function () {
+ this._super.apply(this, arguments);
+ var $spyWatcheElement = this.$el.find('[data-id="portal_sidebar"]');
+ this._setElementId($spyWatcheElement);
+ // Nav Menu ScrollSpy
+ this._generateMenu();
+ },
+
+ //--------------------------------------------------------------------------
+ // Private
+ //---------------------------------------------------------------------------
+
+ /**
+ * create an unique id and added as a attribute of spyWatched element
+ *
+ * @private
+ * @param {string} prefix
+ * @param {Object} $el
+ *
+ */
+ _setElementId: function (prefix, $el) {
+ var id = _.uniqueId(prefix);
+ this.spyWatched.find($el).attr('id', id);
+ return id;
+ },
+ /**
+ * generate the new spy menu
+ *
+ * @private
+ *
+ */
+ _generateMenu: function () {
+ var self = this,
+ lastLI = false,
+ lastUL = null,
+ $bsSidenav = this.$el.find('.bs-sidenav');
+
+ $("[id^=quote_header_], [id^=quote_]", this.spyWatched).attr("id", "");
+ _.each(this.spyWatched.find("h1, h2"), function (el) {
+ var id, text;
+ switch (el.tagName.toLowerCase()) {
+ case "h1":
+ id = self._setElementId('quote_header_', el);
+ text = self._extractText($(el));
+ if (!text) {
+ break;
+ }
+ lastLI = $("").append($('').text(text)).appendTo($bsSidenav);
+ lastUL = false;
+ break;
+ case "h2":
+ id = self._setElementId('quote_', el);
+ text = self._extractText($(el));
+ if (!text) {
+ break;
+ }
+ if (lastLI) {
+ if (!lastUL) {
+ lastUL = $("
+
+
-
-
-
Request an electronic payment to confirm orders
-
-
+
-
-
-
-
@@ -203,6 +194,23 @@
- Design standardized offers
+
+
+
+
+
+
+
+
+
+ Set a default validity on your quotations
+
+
+
+
+ Default Limit:
+
+
+
+
+
+
+
+ Generate the invoice automatically when the electronic payment is confirmed
+
+
+
+
+
diff --git a/addons/sale/views/sale_portal_templates.xml b/addons/sale/views/sale_portal_templates.xml
index b71f4ae9711..6045bd4eb0e 100644
--- a/addons/sale/views/sale_portal_templates.xml
+++ b/addons/sale/views/sale_portal_templates.xml
@@ -1,15 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
Quotations
Quotations
-
+
Sales Orders
Sales Orders
-
+
Quotation
Order
-
-
- Quotations
-
-
-
-
There are currently no quotations for your account.
-
-
-
-
-
-
- Sales Orders
-
-
-
-
| Quotation # | -Order Date | -Valid Until | -- | Total | -
|---|---|---|---|---|
|
- |
- - | - |
- |
- - | -
-
+
+ Quotations
+
+
+
+
-
-
+
- There are currently no quotations for your account.
+There are currently no orders for your account.
-
-
-
-
-
-
| - Sales Order # - Ref. - | -Order Date | -- | Total | -
|---|---|---|---|
|
- |
- - - - | -
- |
- - |
-
+
+ Sales Orders
+
+
+
+
-
-
+
-
- There are currently no orders for your account.
+
-
-
-
-
-
-
- Quotation
- Order
-
-
- Cancelled
+
+
+
+
-
-
-
- Invoices
-
-
-
-
+
+
+
+
+
+
+ Your message has been successfully sent!
+
+
+
+ This order has been validated. Thanks for your trust
+ and do not hesitate to contact us for
+ any question.
+
+
+
+
+
+
+
+ This order
+ has not yet been sent!
+ has already been cancelled!
+ has already been validated!
+ You can contact us for
+ any questions.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ This quotation has been canceled. Contact us to get a new quotation.
+
+
+
+
+
+
+
+ Pay Now
+
+
+
+
+
+ Communication
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Quotation
+ Sales Order
+
+
+
+ -
+ Edit Quotation
+ Back to Sales Order
+
+ -
+ Print
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Date:
+
+
+ Expiration Date:
+
+
+
+
+ Invoicing Address
+
+
+
+
-
- Shipping Address
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ Shipping Address
-
- %
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Subtotal:
-
-
-
-
-
-
-
-
+
+
-
-
-
- Accept & Sign
-
-
+
+
+
+
+ Details
+
+
+
+
+ Products
+ Quantity
+
+ Taxes
+
+
+ Discount
+
+ Unit Price
+
+ Amount
+ Total Price
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Subtotal:
+
+
+
+
+
+
+
+
+
+
+
+
+ Subtotal
+
+
+
+
+
+
+
+
+
+ on
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Total
+
+
+
+
+
-
-
-
-
+
+
+
+ Terms & Conditions
+
+
+
+
+
+
+ Signature
+
+
+ ![]()
+
+
+
+
+
+
+
-
-
-
- ×
-
- There was an error processing this page.
-
-
-
-
-
-
-
-
- ×
-
-
-
diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml
index 3e955ba02e6..2dcd3b3c0ee 100644
--- a/addons/sale/views/sale_views.xml
+++ b/addons/sale/views/sale_views.xml
@@ -209,14 +209,22 @@
-
- Date:
-
-
- Expiration Date:
-
-
-
-
-
+
+
+
+
+
+
+
- Invoicing Address
-
-
-
-
-
- Invoices
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Your message has been successfully sent!
+
+
+
+ This order has been validated. Thanks for your trust
+ and do not hesitate to contact us for
+ any question.
+
+
+
+ This order
+ has not yet been sent!
+ has already been cancelled!
+ has already been validated!
+ You can contact us for
+ any questions.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ This quotation has been canceled. Contact us to get a new quotation.
+
+
+
+
+ Pay Now
+
+
+
+
+
+
+ Communication
+
+
+
+
+
+
+ Quotation
+ Sales Order
+
+
+
+ -
+ Edit Quotation
+ Back to Sales Order
+
+ -
+ Print
+
+
+
+
+ -
+
- + Edit Quotation + Back to Sales Order + +
- + Print + +
+
- - -
-
-
+
+
+
+
+
+
+ Date:
+
+
+ Expiration Date:
+
+
+
-
-
+
+ Invoicing Address
+
+
+
+
-
-
- Shipping Address
-
-
-
-
- - - -
-
-
-
- Product
-
-
- Unit Price
-
-
- Discount
-
-
- Quantity
-
-
- Qty.
-
-
- Subtotal
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
- -
-
+ Shipping Address
-
- %
+
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Subtotal:
-
- - -
+
+
-
-
-
-
+
-
-
-
+
+
+
+ Accept & Sign
-Details
+ +
+
+
+
+
+
+ | + | Products | +Quantity | +
+ Taxes
+ |
+
+ Discount
+ |
+ Unit Price | ++ Amount + Total Price + | +||
|---|---|---|---|---|---|---|---|---|
|
+
+
+
+ |
+ + |
+
+
+
+
+ |
+ + + | +
+
+ |
+
+
+
+
+ |
+ + + + | ++ + | ++ + | +
| + Subtotal: + | +
+
-
+
+
+
| Subtotal | ++ + | +||
|
+
+ on |
+ + + | ++ + | ++ + | +
| Total | ++ + | +
Terms & Conditions
+ +
+
+
+ Signature
+
+
+ ![]()
+
+
+
+
+
-
-
-
-
-
- ×
-
- There was an error processing this page.
-
-
-
-
-
diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml
index 3e955ba02e6..2dcd3b3c0ee 100644
--- a/addons/sale/views/sale_views.xml
+++ b/addons/sale/views/sale_views.xml
@@ -209,14 +209,22 @@
- ×
-
-