Commit Graph
416 Commits
Author SHA1 Message Date
Dhaval Panchal a04bda67e8 [IMP] sale: Pay option appears when the document is a confirmed SO. 2016-04-12 17:21:15 +02:00
Jérome Maes 4a76713490 [FIX] website_quote : avoid UnboundLocalError
Introduced in 0ce6e1543a, if we don't use a token to see the quotation, it crashes.
2016-04-12 15:28:50 +02:00
Christophe Simonis 9b5ba8b238 [MERGE] forward port of branch saas-10 up to 21c7ef8 2016-04-12 12:38:02 +02:00
Christophe Simonis 21c7ef8bf5 [MERGE] forward port of branch saas-9 up to eb44341 2016-04-12 11:56:44 +02:00
Christophe Simonis eb443410ff [MERGE] forward port of branch 9.0 up to afba8ce 2016-04-12 11:12:57 +02:00
Goffin Simon 0dbdbf136e [FIX] website_quote: onchange for product with sale.quote.option
The on_change_product_id defined for sale.quote.option has been removed
in the form view.

opw:673285
2016-04-12 10:38:31 +02:00
Odoo Translation Bot d4672389f7 [I18N] Update translation terms from Transifex 2016-04-10 00:32:08 +02:00
Christophe Simonis 79976bd779 [MERGE] forward port of branch saas-10 up to 6e95659 2016-04-01 19:10:34 +02:00
Christophe Simonis 6e95659a08 [MERGE] forward port of branch saas-9 up to f4d1adc 2016-04-01 18:51:55 +02:00
Olivier Dony d3c93a838b [FIX] website_quote: spellchecking 2016-04-01 17:04:47 +02:00
Christophe Simonis 6c8141a1df [MERGE] forward port of branch saas-10 up to 2483327 2016-04-01 16:15:35 +02:00
Denis Ledoux d26460a96a [MERGE] forward port of branch saas-7 up to 8397003 2016-04-01 15:54:34 +02:00
Denis Ledoux 8397003028 [MERGE] forward port of branch 9.0 up to 895e77a 2016-04-01 15:54:10 +02:00
Denis Ledoux 895e77a336 [FIX] website_quote: utility method to determine the transaction type of an order
The transaction `type` of an order can depend according
to the order.

For instance, if the order leads to recurring payments,
the transaction type became `form_save`
instead of `form`.

This new method allow to easily override this `type` value
for other modules, so the entire button
rendering code does not have to be
copy/pasted.
2016-04-01 14:50:10 +02:00
Denis Ledoux 17f4d22594 [MERGE] forward port of branch saas-7 up to 2d2028a 2016-04-01 11:26:27 +02:00
Denis Ledoux 2d2028a66c [MERGE] forward port of branch 9.0 up to b44cb82 2016-03-31 17:57:22 +02:00
Goffin Simon 0ce6e1543a [IMP] website_mail, website_quote: check token before browsing the order
Refactoring
2016-03-30 11:36:04 +02:00
Odoo Translation Bot f02b8a76df [I18N] Update translation terms from Transifex 2016-03-27 00:32:16 +01:00
David Monjoie f280bfe8a1 [IMP] website_quote: use new pagebreak mechanism 2016-03-25 11:34:26 +01:00
Julien Louette 293c1c06e6 [IMP] website_quote: adding layout categories to website quotations 2016-03-25 11:34:26 +01:00
Srushti Patel 91e8de0b05 [ADD] website_quote: Allow reordering of suggested products on quotations
This commit adds a sequence field on suggested products, allowing to arrange the order in which the suggested products will appear on the quotation
2016-03-25 10:26:17 +01:00
Christophe Simonis ddb0fb2739 [MERGE] forward port of branch saas-9 up to 59d3f63 2016-03-24 16:53:45 +01:00
Christophe Simonis 59d3f63c58 [MERGE] forward port of branch saas-7 up to 9e4157b 2016-03-24 15:12:00 +01:00
Christophe Simonis 9e4157b648 [MERGE] forward port of branch 9.0 up to a2c5fe4 2016-03-24 15:10:36 +01:00
Damien Bouvy 7682760dca [FIX] website_sale,website_quote: form must be in dom to be submitted
Revision 15f27b2 introduced a dynamic form submission to
avoid some payment transaction problems.

It so happens that form submission in jquery necessitates
said form to actually be in the dom (at least for Firefox
and some version of MSIE); this revision ensures that the
form is updated in the dom by the rpc call then properly
submitted.
2016-03-23 16:38:57 +01:00
Martin Trigaux b54b888305 [MERGE] Forwardport of branch 9.0 up to revision 87578177 2016-03-22 14:30:21 +01:00
Denis Ledoux 06351ec607 [FIX] website_quote: pay multiple quotations in the same session
Since aae5647988,
the payment transaction ID is set in the session.

Unlike ecommerce carts, this is possible to open multiple
quotations at the same time
(one browser tab on SO001, another one on SO002),
and therefore to pay multiple quotes at the same time.

This revision makes sure to get from the session the transaction
of the right quote.

That way, the message "Your payment has been received, thank you for your trust.",
is not displayed when opening a new quote when another one was paid
just before.
2016-03-21 14:02:17 +01:00
Denis Ledoux 15f27b2614 [FIX] website_sale: always re-render the pay now button
Before this revision,
when a user tried to pay his cart with a first acquirer
e.g. Ogone
then came back to the shop (using the browser back button)
then chose another acquirer
e.g. Paypal
a new transaction is created, due to the change of acquirer
(following revision cb9d798)
and therefore, the transaction has a new reference compared
to the last payment transaction attempt (e.g. the ogone one)
but, the old reference is still referenced within
the `Pay now` form values, because the page wasn't re-rendered,
because the user pressed the browser back button, and this
doesn't refresh/re-render the page, and, therefore,
the old reference was still referenced within the `Pay Now`
form values.

Therefore, the wrong reference was sent to the acquirer
(e.g. paypal) and this prevented the payment validation
at the payment feedback, as the new reference was expected
in the feedback information, while we receive the older one.

This revision makes sure to always re-render the `Pay now`
form, so the transaction reference, as well as the other
possible changes in the values, are correctly set,
before sending the information to the acquirer.
2016-03-21 10:30:03 +01:00
Denis Ledoux aae5647988 [FIX] website_quote: port of f89e8f9df2
The above revision needs to be applied on website_quote
as well.
2016-03-21 10:30:03 +01:00
Denis Ledoux 6a1116e947 [FIX] website_quote: port of cb9d7982c1
The above revision need to be applied in website_quote
as well.
2016-03-21 10:30:03 +01:00
Goffin Simon a706ada628 [FIX] sale, sale_stock, website_quote: delivery lead time with website quote
The related customer_lead of each product in a SO line must be set when a
quotation template is used in a SO.

opw:671938
2016-03-21 09:43:32 +01:00
Odoo Translation Bot ef026d7cf2 [I18N] Update translation terms from Transifex 2016-03-20 00:32:37 +01:00
Anand Kansagra 9c3cf2abb9 [IMP] sale, account: Rename 'Price' into 'Tax Excluded Price' on the sales orders/ quotations and account invoices reports. 2016-03-18 09:48:30 +01:00
qdp-odoo 7a3d63b377 [MERGE] forward port of branch saas-7 up to revision 71d16a369e 2016-03-16 10:27:19 +01:00
qdp-odoo 71d16a369e [MERGE] forward port of branch 9.0 up to revision 083e172dd9 2016-03-16 10:08:49 +01:00
Odoo Translation Bot 41c94f6c77 [I18N] Update translation terms from Transifex 2016-03-13 00:33:15 +01:00
Denis Ledoux 6e09293b7d [MERGE] forward port of branch 9.0 up to 8e69043 2016-03-11 11:42:43 +01:00
Odoo Translation Bot 7d3d9272bf [I18N] Update translation terms from Transifex 2016-03-06 00:33:40 +01:00
Damien Bouvy 161e85a1dc [FIX] website_quote: do not force send the quotation in case of payment error
Mirror code, mirror fix: 84573fe
2016-03-04 15:37:39 +01:00
Damien Bouvy 48a30be234 [FIX] website_quote: set default template on new SOs
Commit 7270780 removed the default for the 'template_id' field,
but other modules assumes SOs are created with it. If not, you
cannot view the quote in the frontend and if you change the template
afterward, you lose all the lines currently in the quote. This commit
restores the behaviour from 9.0.

Since the commit that removed them did not mention why it did (not
even remotely), I'll assume it was unintentional and/or not thought
through.
2016-03-02 09:37:30 +01:00
Christophe Simonis 1c7f5a45e5 [MERGE] forward port of branch saas-7 up to d016457 2016-02-29 12:30:27 +01:00
Christophe Simonis d0164570c1 [MERGE] forward port of branch 9.0 up to f03eee7 2016-02-29 11:46:58 +01:00
Odoo Translation Bot 39d7abae26 [I18N] Update translation terms from Transifex 2016-02-28 00:34:20 +01:00
Christophe Simonis 3b6c243440 [MERGE] forward port of branch 9.0 up to c169c59 2016-02-24 18:50:09 +01:00
Denis Ledoux c63be58eca [MERGE] forward port of branch saas-6 up to 8a098df 2016-02-23 15:33:08 +01:00
Odoo Translation Bot f83c28eb72 [I18N] Update translation terms from Transifex 2016-02-22 11:06:52 +01:00
Christophe Simonis f2855c6c42 [MERGE] forward port of branch 9.0 up to 25c45a61 2016-02-19 18:10:57 +01:00
Nicolas Martinelli f16c5aacf1 [FIX] web_tip, *: translate description
The description of the web tips should be translatable field.

opw-668945
2016-02-19 15:16:24 +01:00
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