Commit Graph
87 Commits
Author SHA1 Message Date
Christophe Simonis 60c9cac46b [MERGE] forward port of branch saas-9 up to 87a01c7 2016-02-17 18:07:21 +01:00
Christophe Simonis 87a01c75ef [MERGE] forward port of branch saas-7 up to 5be43b8 2016-02-17 18:01:11 +01:00
Christophe Simonis 5be43b8d9a [MERGE] forward port of branch 9.0 up to 27058c4 2016-02-17 17:48:03 +01:00
Damien Bouvy 36e681cbe5 [FIX] website_quote: sales order do not use workflow any longer
+ old message_post call with wrong kwargs.
2016-02-16 11:29:08 +01:00
Christophe Simonis 04416a5a6f [MERGE] forward port of branch saas-9 up to 469e04e 2016-02-02 14:55:52 +01:00
Christophe Simonis 469e04e97c [MERGE] forward port of branch saas-8 up to 2611a81 2016-02-02 14:52:15 +01:00
Christophe Simonis 2611a8198e [MERGE] forward port of branch saas-7 up to e765569 2016-02-02 14:48:31 +01:00
Christophe Simonis e765569d04 [MERGE] forward port of branch 9.0 up to f0a63e5 2016-02-02 14:44:39 +01:00
Damien Bouvy a7c664fb6c [FIX] website_quote: handling of uoms in _onchange_product_id
The condition self.uom_id != self.product_id.uom_id could actually
never be met, since a few lines before you could read
self.uom_id = product.product_tmpl_id.uom_id. From now on, simply
check if the uom_id on the cached record is different from the one
on the product and check the price using the pricelist (_compute_price
does not take pricelists into account) with the wonderfully explicit
with_context call.
2016-02-02 14:23:09 +01:00
Christophe Simonis 1231585df1 [MERGE] forward port of branch saas-9 up to 78d20b5 2016-01-27 12:27:01 +01:00
Christophe Simonis 78d20b552b [MERGE] forward port of branch saas-8 up to 7e44ddc 2016-01-27 12:24:04 +01:00
Christophe Simonis 7e44ddcda3 [MERGE] forward port of branch saas-7 up to 6f923cb 2016-01-27 12:23:09 +01:00
Goffin Simon 7e7a0072a4 [FIX] website_quote: get_access_action
To read a quotion, the user must have the access rights or the token
of this quotation. Then if a quotation is sent by email with a link
to access it, the token of the quotation must be in the link.

opw:666618
2016-01-19 16:30:24 +01:00
Goffin Simon 85b3e96396 [FIX] website_quote: get_access_action
To read a quotion, the user must have the access rights.
Then if a quotation is sent by email with a link to access it,
the user who clicks on the link must be redirected to the login
page.

opw:666618
2016-01-18 17:22:33 +01:00
Damien Bouvy db5e6a124a [IMP] website_quote: mail template on a quote template for confirmation 2016-01-15 10:01:53 +01:00
Yannick Tivisse d0e58a647d [FIX] website_quote: Take the template order line description if the
product is defined on the template

Also, implement 'back' button in quote template frontend edit mode
2016-01-06 16:58:19 +01:00
Christophe Simonis f61cfaefc8 [MERGE] forward port of branch saas-7 up to 572cbfc 2015-11-25 16:43:19 +01:00
Christophe Simonis d490630745 [MERGE] forward port of branch 9.0 up to b293953 2015-11-25 16:18:10 +01:00
Goffin Simon b2939537d9 [FIX] website_quote: using a quotation template with a fiscal position
When creating a SO with a quotation template, the lines created
with the quotation template must take into account the fiscal position
set on the SO to compute the right taxes.

opw:657015
2015-11-25 14:31:22 +01:00
Christophe Simonis 56a442e205 [MERGE] forward port of branch saas-6 up to dade7e3 2015-11-25 13:26:02 +01:00
Denis Ledoux dade7e3c17 [FIX] website_quote: confirmation email at payment.
`website_quote` overrides `payment.transaction`.`form_feedback`
the same way `website_sale` does,
in case `website_quote` is installed without `website_sale`.

Therefore, the revisions
 - 4adb4b8
 - 809e1a6

must be applied there as well.

opw-657432
2015-11-25 11:22:44 +01:00
Goffin Simon 15ff26c9f7 [FIX] website_quote: onchange_template_id
If a quotation template was used to create a SO, the default customer
taxes set on the product's line were not set on the SO lines.

opw:657015
2015-11-25 10:14:34 +01:00
Fabien Pinckaers 72707806cc [IMP] Quotation template buttons 2015-11-20 01:25:43 +01:00
Goffin Simon e42e6d4b0d [FIX] website_quote: old api on_change_product_id
The old api on_change_product_id function in model 'sale.order.option'
doesn't receive the order_id to compute correctly the price unit for
suggested products. The new api _onchange_product_id function has exactly
the same logic as on_change_product_id and this function receives the order_id.
Then the new one can replace the old one. But to keep the compatibility with partners
who overwrite this old function, it is kept in the code.
This bug was introduced by 5047f4e, this commit defined the product_uom_change function
which called on_change_product_id. This commit was applied in saas-6.
The onchange calls in the views have be removed because all the new api onchange are called
even if they were still there.

opw:656494
2015-11-19 16:10:34 +01:00
Nicolas Martinelli 6f7e757fa2 [FIX] website_quote: description translatable
The website description should be translatable.

opw-652454
2015-11-10 12:10:19 +01:00
Christophe Simonis 0a07be8190 [MERGE] forward port of branch 9.0 up to 87a8896 2015-11-03 13:14:23 +01:00
Thibault Delavallée 7fe9d58b0d [IMP] invoice, sale, purchase: template update
Templates used to send invoice / quotation / PO by email are cleaned. Custom
style is removed. Content is simplified.

For sale, only one template is kept through the various addons. Previously to
this commit there are 3 templates: standard, portal and online quote. Those
template are similar except the link to get the sale order. Now the base template
contains some logic that should be sufficient to cover all cases. This breaks
the modular approach but is easier to use for users. As templates are still mako
it is not possible to use inheritance. So having a base template knowing some bits
of overriding modules is necessary if we want to avoid having the same template
duplicated.
2015-11-02 11:51:09 +01:00
Thibault Delavallée 6dfcc5f9c8 [FIX] various: get_access_action form one to multi
As this method is overided in several modules, the mix of new and
old API makes it difficult to handle. Indeed in some cases we
receive the expected dictionary, sometimes in a list, sometimes
in a list of list, due to api.one decorator.

This is a change in the method API, however it is currently completely
buggy. Moreover this method is used internally and should not be
used as an external API. Lastly, this method is new from v9.
2015-10-30 15:44:15 +01:00
Thibault Delavallée 5987648656 [FIX] website_portal_sale, website_quote: access link
/my/orders is available only for quotations not in draft or cancel mode. No
need to redirect to website for those quotations.

online quotation was buggy, id was not defined, use quote.id instead. Woaw.
2015-10-30 15:44:15 +01:00
Nicolas Martinelli 93c85c26a3 [FIX] sale, website_quote: Terms and Conditions
When website_quote is installed, the Terms and Conditions of the quote
template should replace the Terms and Conditions of the company.
However, if the T&C of the quote are not filled, they will be kept
empty. This fix uses the T&C of the company as a backup.

This fix also set the TéC in the lang of the partner.

opw-652390
2015-10-21 14:18:18 +02:00
Christophe Simonis d750206c49 [MERGE] forward port of branch saas-6 up to e9f1ee4 2015-10-01 15:16:59 +02:00
Damien Bouvy 99ccb7f384 [FIX] website_quote: either you adapt the price or you don't
When changing the template of a quote, lines and suggested lines are added to your quotation
The price of line is adapted to the quote's pricelist but not the price of options

This commit adds this behaviour to option lines
2015-09-30 14:01:20 +02:00
Olivier Dony af4a60b941 [MERGE] Forward-port 8.0 up to rev. 26d0fe6d9f 2015-09-30 02:53:59 +02:00
Goffin Simon 06fbf3a572 [FIX] website_quote: price unit for suggested products
In a SO, the unit price of the suggested products must be computed with
the pricelist linked to this SO. Inspired from function 'product_id_change'
in model 'sale.order.line'.

opw:650168
2015-09-29 09:59:53 +02:00
Christophe Simonis 4b9b457369 [FIX] website_quote: use correct keyword argument when calling method
(error introduce by previous forward-port)
2015-09-23 17:04:41 +02:00
Christophe Simonis 57168a9e90 [MERGE] forward port of branch saas-6 up to a669433 2015-09-23 14:34:26 +02:00
Denis Ledoux 9975a04e4d [FIX] website_quote: quote creation without default template
onchanges methods are expected to return dicts
opw-649862
2015-09-21 11:46:50 +02:00
Christophe Simonis 88eaa7dad8 [MERGE] forward port of branch 8.0 up to 35233db 2015-09-11 17:28:07 +02:00
Denis Ledoux 63a5bc8c5f [FIX] website_quote: default quote template values
Once the website_quote module installed,
the "default template" is set by default
on all new quotations.

There is an onchange on the field `template_id`,
setting some values according to the template,
including the description in the website quote.

When creating the quotation / sale order from
the web interface, the on change is triggered,
and the values related to the template are correctly
loaded.

However, when the quotation is created through
the code or the API, the default `template_id` was
correctly set, but as the onchange wasn't triggered,
as onchanges are automatically triggered only
through the webclient creations, the related values,
issued from the template, were not, such as
the quote website description, or the date expiration,
and so on.

In particular, this happen when creating a quotation from
an opportunity, through the "Convert to quotation"
button.

opw-648920
2015-09-10 15:56:05 +02:00
Denis Ledoux 428588a8b7 [FIX] website_quote: Amount before discount with included taxes
The undiscounted amount did not take into account the taxes
included in the price. Included taxes were seen as a discount.

For a quotation with one line with an included tax of 15%,
but no discount, the undiscounted amount must be the line price subtotal,
the price subtotal already removing the taxes from the price unit.

For a quotation with one line with an included tax of 15%,
and a discount of 10%, the undiscounted amount must be the line price subtotal,
plus the amount discounted. That way, the taxes included are already removed
from the price, but the discount is not included.

opw-648388
2015-09-10 15:06:44 +02:00
Damien Bouvy 063ad00442 [FIX] sale: function changed name in refactoring is now applied everywhere
Somehow, we forgot to change some calls to action_button_confirm the to new action_confirm on the sale.order object
This applies to the following modules:
portal_sale
website_event
website_quote
website_sale
2015-09-04 16:08:22 +02:00
Yannick Tivisse ca8b417ded [IMP] Chnage the boolean require_payment to a selection field + radio button 2015-08-25 13:52:00 +02:00
Christophe Simonis 2cf91d16a5 [MERGE] forward port of branch saas-6 up to 63e92cb 2015-07-22 16:17:54 +02:00
Christophe Simonis fe92deaa1d [MERGE] forward port of branch 8.0 up to 2de301d 2015-07-07 18:13:57 +02:00
Damien Bouvy 73cb55284b [IMP] website_quote: payment could be exploited when using a public route, order confirmation is now done using a callback call
This commit implements the callback feature (s2s_cb_eval) on form transaction (up until now, it was only used on s2s transactions).
2015-07-07 15:46:47 +02:00
Nicolas Lempereur 880c997e12 [FIX] website_quote: take suggested product lang from partner
Use the lang from the sale order's partner when updating suggested
product line. To achieve this, the onchange has been replaced by an
onchange of the new api which gives access to all the fields.

closes #7268
opw-643098
2015-07-03 13:58:22 +02:00
Damien Bouvy 2562ad523e [FIX] website_quote: when changing templates, lines were copied from the quote template but the prices were not updated with their correct uom (unit of measure) 2015-06-30 12:54:53 +02:00
Christophe Simonis a304194936 [MERGE] forward port of branch saas-6 up to 81b5c60 2015-06-25 00:26:31 +02:00
Damien Bouvy 6009a83465 [FIX] website_quote: when selecting a quote template, suggested product's prices should be fetched from the pricelist if one is set on the SO 2015-06-17 10:39:06 +02:00
Damien Bouvy de8d90e12e [IMP] website_quote: add payment management
Until now, you could only sign and confirm a sale order from the frontend.

From now on, you can also pay sale orders if the 'Immediate Payment'
option is checked on the sale order.
2015-06-15 14:57:16 +02:00