Christophe Matthieu
1d1b6e79b5
[FIX] website_sale: user can't edit the price.
2014-06-23 16:38:04 +02:00
Christophe Matthieu
5165b52b43
merge upstream
2014-06-19 18:46:49 +02:00
Christophe Simonis
eef6330c55
[MERGE] forward port of branch saas-5 up to adf07a9
2014-06-19 16:23:32 +02:00
Christophe Simonis
adf07a9490
[MERGE] forward port of branch saas-4 up to 5087612
2014-06-19 16:13:35 +02:00
Christophe Simonis
5087612d1d
[MERGE] forward port of branch saas-3 up to bf53aed
2014-06-19 15:44:07 +02:00
Christophe Matthieu
bc3fc54fac
[IMP] Tour: add tour in web module; tour became available in backend.
2014-06-18 12:25:13 +02:00
Dharmraj Jhala
a8497e07c9
[ADD] added instantclick library to load data faster in anonymous mode
2014-06-16 16:00:06 +05:30
Jeremy Kersten
7107b646f6
[IMP] Website Sale - ribbon - html class from product.style is not required, so we need to display it as empty in website to avoid an internal 500
2014-06-16 11:31:21 +02:00
Christophe Matthieu
98d9901c17
[FIX] website_sale: retur the browse record of category insead of int
2014-06-13 16:17:51 +02:00
Fabien Meghazi
faa09da325
Removed version="7.0" from form views
2014-06-12 09:09:59 +02:00
Christophe Matthieu
ef48c4d440
[FIX] website_sale: disable button does'nt work in the product template.
2014-06-06 10:57:50 +02:00
Christophe Matthieu
5f43d87a33
[IMP] website_sale: display image function of the selected product variant
2014-06-06 10:40:50 +02:00
Denis Ledoux
489742873d
[FIX] website_sale: backport commit 3cc4785ba6
of master
...
This fix aimed saas-5, not master.
original Commit message:
display accessory field in form view and display the good accessory product inside ecommerce
This is related to previous rev 86055fb8cd
2014-06-04 11:25:51 +02:00
Denis Ledoux
86055fb8cd
[FIX] website_sale: accessory_product_ids are product.product, not product.template
...
This many2many field should actually have product.template as relation
But, in a stable release, we cannot alter the database
Therefore, when displaying accessory products in the card, it display the product_tmpl_id of the product.product, not itself
This relation should be changed in trunk
+ Actually displaying this field in the backend
2014-06-04 10:44:56 +02:00
Christophe Simonis
a5908c5812
[MERGE] forward port of branch saas-5 up to b1c0bc0
2014-06-03 20:02:00 +02:00
Christophe Matthieu
c5ab412acc
[FIX] website_sale: change template for product and variant selector (type color)
2014-06-03 15:38:11 +02:00
Christophe Matthieu
3cc4785ba6
[FIX] website_sale: display accessory field in form view and display the good accessory product inside ecommerce
2014-06-02 12:11:54 +02:00
Christophe Matthieu
e3bd7d953a
[FIX] website_sale: tour about customize don't check last step
2014-06-02 12:11:04 +02:00
Denis Ledoux
9d33ce4900
[FIX] website_sale: missing openerp.tools import
2014-06-01 20:20:21 +02:00
Christophe Simonis
285e1d5c38
[FIX] website_sale: so javascipt does not like tuples. use a list instead
2014-05-31 15:37:23 +02:00
Christophe Simonis
960b86611e
[FIX] website_sale: remove invalid (and stupid) function field
2014-05-31 14:05:48 +02:00
Richard Mathot
29387c518e
[REV][FIX] Reverting regression introduced in forward-port
...
04211015fc
2014-05-30 15:20:18 +02:00
Christophe Simonis
fb650ee92e
[MERGE] product: refactoring of product variants.
...
close PR #222
2014-05-30 10:22:36 +02:00
Christophe Matthieu
435b5b9ca3
[IMP] product: rename fields variant_ids into attribute_line_ids on the template and attribute_value_ids on the product.
2014-05-28 19:42:15 +02:00
Christophe Simonis
d42840a6f8
Merge pull request #226 from odoo-dev/master-website_sale-add-vat-chm
...
[IMP] website_sale: add vat field on checkout + validate it if base_vat module is installed
2014-05-28 18:45:12 +02:00
Denis Ledoux
f085274d5f
[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. df0ae7e4d1
2014-05-28 14:53:32 +02:00
Denis Ledoux
00dc3a59df
[FIX] website_sale: force changing pricelist on different account signin
...
opw-607517
2014-05-28 12:04:41 +02:00
Christophe Matthieu
c6f0699435
[FIX] website_sale: search attributes error when the user select a product with a search
2014-05-27 20:57:00 +02:00
Olivier Dony
04211015fc
[MERGE] Forward-port of latest saas-4 fixes, up to 0452851
2014-05-27 20:49:49 +02:00
Christophe Matthieu
585511d36e
[FIX] website_sale: inherit_option_id must be convert in optional='enabled'
2014-05-27 18:56:58 +02:00
Christophe Matthieu
abab5c2e94
[MERGE] from trunk
2014-05-27 18:28:40 +02:00
Christophe Matthieu
bb669f82c8
[FIX] website_sale: search by attributes not work for more of one selection
2014-05-27 18:20:42 +02:00
Christophe Matthieu
e987cd6c75
[FIX] website_sale: fix the product attribute templates to display the comma
2014-05-27 18:07:26 +02:00
Christophe Matthieu
d24aede8d7
[FIX] product: don't create new variants if the product.template is create by product.product.
2014-05-27 18:03:15 +02:00
Christophe Simonis
e16233217c
[MERGE] Replace inherit_option_id by a selection field (PR #229 )
2014-05-27 17:57:33 +02:00
Olivier Dony
fd21abd847
[MERGE] Forward-port latest saas-3 bugfixes, up to 30f43da
2014-05-27 17:18:43 +02:00
Fabien Meghazi
0544fc2929
Revert "Merge pull request #225 from odoo-dev/master-frontend-assets"
...
This reverts commit dd900408de
, reversing
changes made to 4da882d48f
.
2014-05-27 16:12:52 +02:00
Denis Ledoux
63b7f678f3
[FIX] website_sale: in the product grid, a product must have min size 1 and max size 4
2014-05-27 16:11:27 +02:00
Christophe Matthieu
2efb074733
[IMP] website_sale: use company vat_check_vies field to select the method to check the vat id base_vat is installed
2014-05-27 14:35:07 +02:00
Thibault Delavallée
4fecb29c51
[FIX] website_sale, website_event_sale: updated tests according to the new dom of the checkout page introduced in pull request 232
2014-05-27 14:22:29 +02:00
Christophe Matthieu
59be055c37
[IMP] website_sale: if base_vat is installed, when the use try to validate checkout, the vat is checked (VAT Information Exchange System)
2014-05-27 12:49:16 +02:00
Xavier Morel
e06f5b414b
[IMP] inherit_option_id -> application
2014-05-27 12:13:51 +02:00
Thibault Delavallée
b5a7156f7d
Merge pull request #224 from odoo-dev/master-payment-post-tde
...
[IMP] website_sale: correctly submit the payment form using a post request, correctly create the tx asynchronously
2014-05-27 12:09:01 +02:00
Christophe Matthieu
b5833591dc
[IMP] website_sale: add vat field on checkout
2014-05-27 12:05:41 +02:00
Thibault Delavallée
a6379e2e67
[IMP] payment addons: fixed submit buttons: now have type=submit (and not image or nothing) and removed name, because this may cause issues when trying to submit a form manually with type=submit and a name. Also improved js code in website_sale to correctly handle the click binding, the asynchronous call to the server to create the transaction, and then submit the form. As form submission is synchronous in javascript, we cannot use the deferred. Instead we prevent the click event from bubbling, wait for the server to create the transaction, adn then manually submit the form.
2014-05-27 11:35:32 +02:00
--global
ed51e843a2
[IMP] website_sale: change 'pay now' button behavior.
...
Now: intercept the call, make an asynchronous call to create the tx, then continue to the acquirer. Previous this was done by
a redirection, leading to a get request beign done. However it should be a post request.
2014-05-27 11:35:32 +02:00
Fabien Meghazi
1744208928
Changed xpath expression from /t to .
2014-05-27 10:45:07 +02:00
Richard Mathot
af72adcd64
[DIRTY FIX] website_sale: make the runbot green
2014-05-27 10:01:58 +02:00
Christophe Matthieu
43977deb71
[IMP] product: refactoring of product variant. The main view became the view of product template and the product product (or product variant) are created with the variant values combinaison. Bom is splitted into bom and bom line and can use the variant combinaison.
2014-05-27 09:42:52 +02:00
Mitesh Savani
d89064c73c
[IMP]Improved code
2014-05-27 10:45:04 +05:30