Antony Lesuisse
25d0a3ecb1
[FIX] phantomjs test remove injection
...
It's now deprecated, assets bundles should be used instead.
2014-06-28 19:59:59 +02:00
Simon Lejeune
195fa93168
[MERGE] backend front end integration
...
Render the top-menu (backend menu or frontend editbar) server-side.
Use Fontawesome icons (mail, timezone, chat).
Refactor website widgets, split Website.editorBarin editorbar, ace, editorbar- content, editorbarCustomize.
2014-06-27 11:03:34 +02:00
Christophe Matthieu
a7816a827f
[FIX] website_sale: assets xml id and jquery selector (unbind click for login page)
2014-06-25 15:05:48 +02:00
Christophe Matthieu
77a07670cf
[IMP] website: move custom scripts in the assets; fix website_sale_option to display modal in grid view
2014-06-25 14:03:23 +02:00
Christophe Matthieu
412a7593be
[IMP] website_sale_options
2014-06-25 11:31:39 +02:00
Christophe Matthieu
7505cce2e9
[WIP]
2014-06-24 17:37:13 +02:00
Christophe Matthieu
204a62499a
[IMP] website_sale_options
2014-06-24 15:11:53 +02:00
Christophe Matthieu
34815021b8
merge upstream
2014-06-24 10:13:11 +02:00
Christophe Matthieu
1d1b6e79b5
[FIX] website_sale: user can't edit the price.
2014-06-23 16:38:04 +02:00
Christophe Matthieu
e75d9525bb
merge upstream
2014-06-20 10:09:16 +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
5206eb16d5
merge upstream
2014-06-19 13:13:27 +02:00
Christophe Matthieu
22d528c7a7
[IMP] website_sale: display the discount in the product template when the user select a variant
2014-06-19 13:12:08 +02:00
Christophe Matthieu
43ca22d10c
[FIX] website_sale: access right for currency for public user
2014-06-19 13:12:07 +02:00
Christophe Matthieu
a6185caa18
[FIX] website_sale: display in currency of the user
2014-06-19 13:12:06 +02:00
Christophe Matthieu
7295a07c4a
[FIX] website_sale: display price with user curencie.
2014-06-19 13:12:06 +02:00
Christophe Matthieu
087bf22fb5
[IMP] website_sale: add GeoIP localisation for default value in checkout; display vat number if vat module is installed; fix labels
2014-06-19 13:12:05 +02:00
Christophe Matthieu
c3c922f84e
[IMP] website_sale: convert comma to dashed for url attrib
2014-06-19 13:12:05 +02:00
Christophe Matthieu
86c6cf7a68
[FIX] website_sale: display discount only if the price is lower than the standard price
2014-06-19 13:12:04 +02:00
Christophe Matthieu
7ae7a5315f
[FIX] website_sale: modal layout
2014-06-17 15:58:13 +02:00
Christophe Matthieu
0d9f3af113
[IMP] website_sale: optional product + fix forgotten line_id in website_event_sale
2014-06-17 15:49:48 +02:00
Christophe Matthieu
9f77cb9d1f
[IMP] website_sale: optional product have all time the same quantity of the liked product.
2014-06-17 14:23:15 +02:00
Christophe Matthieu
9867d63b5d
[IMP] website_sale: add demo data for optional products
2014-06-17 12:01:36 +02:00
Christophe Matthieu
0ac338ea0a
[IMP] website_sale: display state function of selected country
2014-06-17 11:33:28 +02:00
Christophe Matthieu
dcce993958
[FIX] website_sale: typo and preview display all time in modal
2014-06-17 10:54:47 +02:00
Christophe Matthieu
474d63d6b9
[FIX] website_sale: fix keep query and clean code
2014-06-17 09:44:32 +02:00
Dharmraj Jhala
a8497e07c9
[ADD] added instantclick library to load data faster in anonymous mode
2014-06-16 16:00:06 +05:30
Christophe Matthieu
0492e59314
[FIX] website_sale: rounding price; typo and search sequence of membership
2014-06-16 10:53:34 +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
Christophe Matthieu
8fdfc68074
[IMP] website_sale: display variants choice in confirm dialog box
2014-06-13 13:59:28 +02:00
Christophe Matthieu
d8516bcfd8
[IMP] website_sale: optional quantity in product form
2014-06-13 12:47:54 +02:00
Christophe Matthieu
57c59ddfac
[IMP] website_sale: confirm/options dialog box have same layout of my cart
2014-06-13 12:31:41 +02:00
Christophe Matthieu
8a24171996
[IMP] website_sale: display 'Product not available' message in product selector
2014-06-13 09:32:28 +02:00
Christophe Matthieu
9d363b8758
[FIX] website_sale: remove disabled attribute on button in the xml template for product without variants
2014-06-12 17:03:17 +02:00
Christophe Matthieu
f62673c266
[IMP] website_sale: Optional product with variant suggestion
2014-06-12 16:58:44 +02:00
Christophe Matthieu
8319356630
[IMP] website_sale: allow optional products in shop; In shop, it opens the modal jus after having clicked on the 'Add to cart'. The modal contains the optional products.
2014-06-11 12:50:41 +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
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 Simonis
960b86611e
[FIX] website_sale: remove invalid (and stupid) function field
2014-05-31 14:05:48 +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
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
e987cd6c75
[FIX] website_sale: fix the product attribute templates to display the comma
2014-05-27 18:07:26 +02:00
Xavier Morel
e06f5b414b
[IMP] inherit_option_id -> application
2014-05-27 12:13:51 +02:00
Christophe Matthieu
b5833591dc
[IMP] website_sale: add vat field on checkout
2014-05-27 12:05:41 +02:00