Commit Graph

24 Commits

Author SHA1 Message Date
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
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
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
Nicolas Lempereur 6553eb3742 [FIX] website_quote: use sale description for options lines
Use the sale description for suggesteds items.

So when seeing suggesteds items in a quotation, we so the sale description
(if there is one) next to the product name.

It was already done for contained items, but not for the suggested ones.

closes #6565
opw-634507
2015-05-06 15:41:00 +02:00
Goffin Simon 427835e47f [FIX] website_quote: quote template does not take into account variant prices.
In a quote_line, if the product is a product variant, the unit price must be
the sum of the sale price and the price extra.

opw: 625957
2015-02-18 14:21:42 +01:00
Denis Ledoux a67747f77e [FIX] website_quote: duplicate sales order options on order duplication 2015-02-12 14:11:49 +01:00
Simon Lejeune 1029dbc4f3 [FIX] website_quote: forbid to define a quote template on a sale order
Defining a quote template may change the product list. The field template_id is now editable
only when the sale.order is in draft or sent state.
2014-10-06 15:13:30 +02:00
Julien Legros 5153b2d281 [FIX] website_quote: use dedicated email template if a quote template exists 2014-10-03 14:22:38 +02:00
Denis Ledoux 2d9ddce327 [FIX] website_quote: onchange return nothing if product is False 2014-09-04 17:55:48 +02:00
Jeremy Kersten 94b20608c6 [IMP] website_quote: handle quote and website descriptions
Add field quote_description on product.template and turn website_description from sale.quote.line into a related.
Overwrite write and create methods to synchronise both fields when setting a product.
website_description on product.template is added by website_sale but there is no dependency relations between these modules so we need to define it in both modules.
2014-08-18 18:40:54 +02:00
Denis Ledoux ae65be2b2a [MERGE] forward port of branch saas-5 up to 0739bc4 2014-08-11 15:58:02 +02:00
Denis Ledoux 0a1e4a05b2 [MERGE] forward port of branch saas-3 up to 81a902a 2014-08-08 17:06:39 +02:00
Thibault Delavallée 2e5412fc1d [FIX] mail, BaseModel, portal_sale: fixes and improvements in the URL
management to access documents in notification emails, as well as for the
'view quotation' link in portal_sale module.

models: added a get_access_action method: basically, returns the action to
access a document. It uses the get_formview_action by default (form view
of the document). However for some documents we want to directly go to the
website, leading to an act_url action for some documents. This method allows
this behavior.

portal_sale: get_signup_url now uses the mail.action_mail_redirect method
instead of directly redirecting towards a portal menu. This allows to fall
back on a standard behavior.

portal_sale: get_formview_action updated, to match actions tailored for
portal users.

website_quote: get_access_action of sale order updated. If the sale order
has a template defined, the returned action is an act_url (website view
of the quotation), not the form action anymore.

mail: fixed signature + company signature in notification emails. Even without
user signature, the company signature + access link should be correct.

portal: signup url in notification emali was not using the mail redirection
as action. It is now the case.
2014-08-07 16:47:59 +02:00
Denis Ledoux c45c2eb58e [FIX] website_quote: add description sale to quote line description 2014-08-06 11:17:39 +02:00
Denis Ledoux 1bb219907f [MERGE] forward port of branch saas-5 up to 655a5b9 2014-08-04 16:56:10 +02:00
Simon Lejeune e56635c3f1 [REF] website_quote: displayed string of validity_date field changed from 'Validity Date' to 'Expiry Date' 2014-08-04 15:49:16 +02:00
Raphael Collet cbe2dbb672 [MERGE] new v8 api by rco
A squashed merge is required as the conversion of the apiculture branch from
bzr to git was not correctly done. The git history contains irrelevant blobs
and commits. This branch brings a lot of changes and fixes, too many to list
exhaustively.

- New orm api, objects are now used instead of ids
- Environements to encapsulates cr uid context while maintaining backward compatibility
- Field compute attribute is a new object oriented way to define function fields
- Shared browse record cache
- New onchange protocol
- Optional copy flag on fields
- Documentation update
- Dead code cleanup
- Lots of fixes
2014-07-06 17:05:41 +02:00
Jaydeep Barot 026e38b48f [REM] Unnecessary `size` parameters on char fields 2014-06-25 17:13:43 +02:00
Kersten Jeremy c2f3fffee6 [FIX] Empty all current line(s) when you change template. Before, the display do it, but when you save, you have back the old lines.
bzr revid: jke@openerp.com-20140411142022-rceic1ma2axakzpe
2014-04-11 16:20:22 +02:00
Kersten Jeremy 563dd0c138 [FIX] website_sale_quote - Make the sale quote template translatable when you edit a template. Force use of the language of partner in quotation, when you use a template.
bzr revid: jke@openerp.com-20140411141932-fk41zgsuw9e68t3a
2014-04-11 16:19:32 +02:00
Martin Trigaux 39633b3933 [FIX] website_quote: skip onchange method when specify no sale.quote.template (opw 605992)
bzr revid: mat@openerp.com-20140402142823-btyutrctuc3jh8l3
2014-04-02 16:28:23 +02:00
Christophe Simonis 5420c428e3 [FIX] website_quote: inject website description when creating/writing sale order lines
bzr revid: chs@openerp.com-20140127193139-8kcmpgazvt6vplyj
2014-01-27 20:31:39 +01:00
Christophe Simonis c83ad0d1b6 [FIX] website_roller: remove useless on_change
bzr revid: chs@openerp.com-20140127175956-04nmxodpnbn59bmc
2014-01-27 18:59:56 +01:00
Fabien Pinckaers 7d892584d8 [IMP] renaming to website_quote for coherence with controllers
bzr revid: fp@tinyerp.com-20140125230911-k439s96bw718l23d
2014-01-26 00:09:11 +01:00