Commit Graph
45 Commits
Author SHA1 Message Date
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
Olivier Dony 0bd4545348 [LEGAL] Use global LICENSE/COPYRIGHT files, remove boilerplate text
- Preserved explicit 3rd-party copyright notices
- Explicit boilerplate should not be necessary - copyright law applies
  automatically in all countries thanks to Berne Convention + WTO rules,
  and a reference to the applicable license is clear enough.
2015-06-02 03:16:04 +02:00
Damien Bouvy 5047f4ecad [IMP] website_quote: UOM onchange, respect pricelists on SO, layout fixes
* add on_change_uom behaviour to quote templates lines
* fixes frontend layout issues
* use action_button_confirm instead of signal_workflow
  when confirming the quote in the frontend to trigger
  all events properly
* adapt prices using pricelist on onchange_template_id
   on sale orders
2015-05-28 19:04:13 +02:00
Christophe Simonis fe2b5f35a4 [MERGE] forward port of branch saas-6 up to bf1e999 2015-05-28 14:27:38 +02:00
Christophe Simonis 0da722aa6a [MERGE] forward port of branch 8.0 up to bff6dff 2015-05-11 15:12:24 +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
qdp-odoo c04065abd8 [IMP] accounting v9. Yeeeeaah 2015-05-05 17:28:04 +02:00
Christophe Simonis f6d32a9fe9 [FIX] website_quote: use a copy of the context. 2015-02-26 17:59:14 +01:00
Christophe Simonis 61483e1a25 [MERGE] forward port of branch 8.0 up to 9333c62 2015-02-19 17:32:31 +01: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
Leonardo Donelli 4a0b13ed92 [REF] remove vim modelines and resulting trailing blank lines
Let 2015 be a year without modelines!
cf #4174
2014-12-31 15:52:13 +01:00
Christophe Simonis 52fee2811d [MERGE] forward port of branch 8.0 up to 2b192be 2014-10-16 16:04:39 +02:00
Amit Vora e1bc548e24 [IMP] website_quote: copy suggested products 2014-10-13 15:13:04 +02:00
Mahendra barad bf92a5b2fa [IMP] website_quote: onboarding
Views and labels improvements
2014-10-13 09:20:31 +02: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
Sheth Sunny 4530ef5f84 [IMP] website_quote: reorder quotation lines
Cherry-picked from b720a596210f5502ae595ffa7ce09b4acd4b63f8
2014-09-11 15:32:03 +02:00
Christophe Simonis 31bf30d2d0 [MERGE] forward port of branch 8.0 up to ed1c173 2014-09-05 15:28:22 +02:00
Denis Ledoux 2d9ddce327 [FIX] website_quote: onchange return nothing if product is False 2014-09-04 17:55:48 +02:00
Mitesh Savani 77bd5181f7 [IMP] sale, website_quote: expiration date is usefull even without using the website_quote module, therefore movign the field to the sale module. It has also be added to the email templates defined in sale and portal_sale, as well as in reports. 2014-09-02 10:14:30 +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
mdi-odoo 0af4da6ab5 [IMP] sale: product_id_change now supports a void pricelist and/or a void partner_id.
website_quote: validity, options and template now readonly when not in draft
and sent status (aka confirmed).
2014-08-13 13:12:23 +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
avo-odoo df75edbec7 [IMP] website_quote: add default quote template
(Closes #1380)
2014-08-04 16:23:14 +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